Changeset 2fc8397

Timestamp:

Jul 11, 2009, 1:14:36 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

19a023f

Parents:

77f605d

git-author:

Nelson Elhage <nelhage@mit.edu> (07/06/09 20:41:51)

git-committer:

Nelson Elhage <nelhage@mit.edu> (07/11/09 13:14:36)

Message:

Implement {forward,backward}-paragraph

Files:

• commands.c (modified) (1 diff)
• editwin.c (modified) (1 diff)
• keys.c (modified) (1 diff)

commands.c

@@ -938 +938 @@
                   "runs 'editmulti:done'.\n"\
                   "Otherwise runs 'edit:delete-next-char'\n"),
+
+  OWLCMD_VOID_CTX("editmulti:forward-paragraph", owl_editwin_forward_paragraph,
+                  OWL_CTX_EDITMULTI,
+                  "Move forward to end of paragraph.",
+                  "",
+                  "Move the point to the end of the current paragraph"),
+
+  OWLCMD_VOID_CTX("editmulti:backward-paragraph", owl_editwin_backward_paragraph,
+                  OWL_CTX_EDITMULTI,
+                  "Move backward to the start of paragraph.",
+                  "",
+                  "Move the point to the start of the current paragraph"),
 
   /****************************************************************/

editwin.c

@@ -1050 +1050 @@
 }
 
+void owl_editwin_backward_paragraph(owl_editwin *e)
+{
+  owl_editwin_point_move(e, -1);
+  for (; e->index >= e->lock; owl_editwin_point_move(e, -1)) {
+    if (e->index <= e->lock ||
+        ((e->buff[e->index] == '\n') && (e->buff[e->index - 1]=='\n')))
+      break;
+  }
+}
+
+void owl_editwin_forward_paragraph(owl_editwin *e)
+{
+  owl_editwin_point_move(e, 1);
+  /* scan forward to the start of the next paragraph */
+  for(; e->index < e->bufflen; owl_editwin_point_move(e, 1)) {
+    if (e->buff[e->index -1] == '\n' && e->buff[e->index] == '\n')
+      break;
+  }
+}
+
 static int oe_display_column(owl_editwin *e)
 {

keys.c

@@ -109 +109 @@
   BIND_CMD("M-[ B",   "editmulti:move-down-line", "");
   BIND_CMD("C-n",     "editmulti:move-down-line", "");
+
+  BIND_CMD("M-}",     "editmulti:forward-paragraph", "");
+  BIND_CMD("M-{",     "editmulti:backward-paragraph", "");
 
   /* This would be nice, but interferes with C-c to cancel */