Changeset a0fbdee

Timestamp:

Jul 11, 2009, 1:14:33 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:

cedc95c

Parents:

d7043b4

git-author:

Karl Ramm <kcr@1ts.org> (06/08/09 18:58:00)

git-committer:

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

Message:

s/_?owl_editwin_(save_|restore_|)excursion/oe_\1excursion/
(and move the functions up in the file)

File:

• editwin.c (modified) (13 diffs)

editwin.c

@@ -30 +30 @@
   int index;
   int goal_column;
-} _owl_editwin_excursion;
+  int lock;
+} oe_excursion;
 
 static int owl_editwin_is_char_in(owl_editwin *e, char *set);
@@ -266 +267 @@
 }
 
+static void oe_save_excursion(owl_editwin *e, oe_excursion *x)
+{
+  x->index = e->index;
+  x->goal_column = e->goal_column;
+  x->lock = e->lock;
+}
+
+static void oe_restore_excursion(owl_editwin *e, oe_excursion *x)
+{
+  e->index = x->index;
+  e->goal_column = x->goal_column;
+  e->lock = x->lock;
+}
+
 static inline char *oe_next_point(owl_editwin *e, char *p)
 {
@@ -297 +312 @@
   char *p;
 
-  while(1) {
-    /* are we at the point? */
+    /* are we at the point already? */
     if (x != NULL && index == e->index)
       *x = width;
-
+  while(1) {
     /* get the current character */
     c = g_utf8_get_char(e->buff + index);
@@ -659 +673 @@
 }
 
-void owl_editwin_save_excursion(owl_editwin *e, _owl_editwin_excursion *x) /*noproto*/
-{
-  x->index = e->index;
-  x->goal_column = e->goal_column;
-}
-
-void owl_editwin_restore_excursion(owl_editwin *e, _owl_editwin_excursion *x) /*noproto*/
-{
-  e->index = x->index;
-  e->goal_column = x->goal_column;
-}
-
 void owl_editwin_adjust_for_locktext(owl_editwin *e)
 {
@@ -721 +723 @@
 int owl_editwin_at_beginning_of_line(owl_editwin *e) /*noproto*/
 {
-  _owl_editwin_excursion x;
+  oe_excursion x;
   int ret;
 
@@ -727 +729 @@
     return 1;
 
-  owl_editwin_save_excursion(e, &x);
+  oe_save_excursion(e, &x);
   owl_editwin_point_move(e, -1);
   ret = (_owl_editwin_get_char_at_point(e) == '\n');
-  owl_editwin_restore_excursion(e, &x);
+  oe_restore_excursion(e, &x);
 
   return ret;
@@ -864 +866 @@
 void owl_editwin_move_to_previousword(owl_editwin *e)
 {
-  _owl_editwin_excursion x;
+  oe_excursion x;
   int beginning;
   /* if in middle of word, beginning of word */
@@ -874 +876 @@
     owl_editwin_move_if_in(e, -1, WHITESPACE); /* leaves us on the last
                                                     character of the word */
-    owl_editwin_save_excursion(e, &x);
+    oe_save_excursion(e, &x);
     /* are we at the beginning of a word? */
     owl_editwin_point_move(e, -1);
     beginning = owl_editwin_is_char_in(e, WHITESPACE);
-    owl_editwin_restore_excursion(e, &x);
+    oe_restore_excursion(e, &x);
     if (beginning)
       return;
    } else {
     /* in the middle of the word; */
-    owl_editwin_save_excursion(e, &x);
+    oe_save_excursion(e, &x);
     owl_editwin_point_move(e, -1);
     if (owl_editwin_is_char_in(e, WHITESPACE)) { /* we were at the beginning */
@@ -889 +891 @@
       return;
     } else {
-      owl_editwin_restore_excursion(e, &x);
+      oe_restore_excursion(e, &x);
     }
   }
@@ -900 +902 @@
 void owl_editwin_delete_nextword(owl_editwin *e)
 {
-  _owl_editwin_excursion x;
+  oe_excursion x;
   int end;
 
-  owl_editwin_save_excursion(e, &x);
+  oe_save_excursion(e, &x);
   owl_editwin_move_to_nextword(e);
   end = e->index;
-  owl_editwin_restore_excursion(e, &x);
+  oe_restore_excursion(e, &x);
   _owl_editwin_remove_bytes(e, end - e->index);
 }
@@ -928 +930 @@
 void owl_editwin_delete_to_endofline(owl_editwin *e)
 {
-  _owl_editwin_excursion x;
+  oe_excursion x;
   int end;
 
-  owl_editwin_save_excursion(e, &x);
+  oe_save_excursion(e, &x);
   owl_editwin_move_to_line_end(e);
   end = e->index;
-  owl_editwin_restore_excursion(e, &x);
+  oe_restore_excursion(e, &x);
   _owl_editwin_remove_bytes(e, end - e->index);
 }
@@ -956 +958 @@
 {
 #if 0 /* XXX */
-  _owl_editwin_excursion x;
+  oe_excursion x;
   int i, save;
 
   /* save our starting point */
-  owl_editwin_save_excursion(e, &x);
+  oe_save_excursion(e, &x);
 
   save = e->index;
@@ -1025 +1027 @@
 
   /* put cursor back at starting point */
-  owl_editwin_restore_excursion(e, &x);
+  oe_restore_excursion(e, &x);
 #endif
 }