1 files changed, 28 insertions, 22 deletions

diff --git a/src/insdel.c b/src/insdel.c
index 5cee99f89cd..2d84ae1de62 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -27,6 +27,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 static void insert_1 ();
 static void insert_from_string_1 ();
+static void gap_left ();
+static void gap_right ();
+static void adjust_markers ();
 
 /* Move gap to position `pos'.
    Note that this can quit!  */
@@ -43,6 +46,7 @@ move_gap (pos)
 /* Move the gap to POS, which is less than the current GPT.
    If NEWGAP is nonzero, then don't update beg_unchanged and end_unchanged.  */
 
+static void
 gap_left (pos, newgap)
      register int pos;
      int newgap;
@@ -125,6 +129,7 @@ gap_left (pos, newgap)
   QUIT;
 }
 
+static void
 gap_right (pos)
      register int pos;
 {
@@ -206,6 +211,7 @@ gap_right (pos)
    of adjustment, are first moved back to the near end of the interval
    and then adjusted by `amount'.  */
 
+static void
 adjust_markers (from, to, amount)
      register int from, to, amount;
 {
@@ -290,7 +296,7 @@ insert (string, length)
   if (length > 0)
     {
       insert_1 (string, length);
-      signal_after_change (point-length, 0, length);
+      signal_after_change (PT-length, 0, length);
     }
 }
 
@@ -306,26 +312,26 @@ insert_1 (string, length)
   if (length + Z != XINT (temp))
     error ("maximum buffer size exceeded");
 
-  prepare_to_modify_buffer (point, point);
+  prepare_to_modify_buffer (PT, PT);
 
-  if (point != GPT)
-    move_gap (point);
+  if (PT != GPT)
+    move_gap (PT);
   if (GAP_SIZE < length)
     make_gap (length - GAP_SIZE);
 
-  record_insert (point, length);
+  record_insert (PT, length);
   MODIFF++;
 
   bcopy (string, GPT_ADDR, length);
 
   /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
-  offset_intervals (current_buffer, point, length);
+  offset_intervals (current_buffer, PT, length);
 
   GAP_SIZE -= length;
   GPT += length;
   ZV += length;
   Z += length;
-  SET_PT (point + length);
+  SET_PT (PT + length);
 }
 
 /* Insert the part of the text of STRING, a Lisp object assumed to be
@@ -345,7 +351,7 @@ insert_from_string (string, pos, length, inherit)
   if (length > 0)
     {
       insert_from_string_1 (string, pos, length, inherit);
-      signal_after_change (point-length, 0, length);
+      signal_after_change (PT-length, 0, length);
     }
 }
 
@@ -364,21 +370,21 @@ insert_from_string_1 (string, pos, length, inherit)
     error ("maximum buffer size exceeded");
 
   GCPRO1 (string);
-  prepare_to_modify_buffer (point, point);
+  prepare_to_modify_buffer (PT, PT);
 
-  if (point != GPT)
-    move_gap (point);
+  if (PT != GPT)
+    move_gap (PT);
   if (GAP_SIZE < length)
     make_gap (length - GAP_SIZE);
 
-  record_insert (point, length);
+  record_insert (PT, length);
   MODIFF++;
   UNGCPRO;
 
   bcopy (XSTRING (string)->data, GPT_ADDR, length);
 
   /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
-  offset_intervals (current_buffer, point, length);
+  offset_intervals (current_buffer, PT, length);
 
   GAP_SIZE -= length;
   GPT += length;
@@ -386,10 +392,10 @@ insert_from_string_1 (string, pos, length, inherit)
   Z += length;
 
   /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
-  graft_intervals_into_buffer (XSTRING (string)->intervals, point, length,
+  graft_intervals_into_buffer (XSTRING (string)->intervals, PT, length,
                                current_buffer, inherit);
 
-  SET_PT (point + length);
+  SET_PT (PT + length);
 }
 
 /* Insert the character C before point */
@@ -421,10 +427,10 @@ insert_before_markers (string, length)
 {
   if (length > 0)
     {
-      register int opoint = point;
+      register int opoint = PT;
       insert_1 (string, length);
       adjust_markers (opoint - 1, opoint, length);
-      signal_after_change (point-length, 0, length);
+      signal_after_change (PT-length, 0, length);
     }
 }
 
@@ -437,10 +443,10 @@ insert_from_string_before_markers (string, pos, length, inherit)
 {
   if (length > 0)
     {
-      register int opoint = point;
+      register int opoint = PT;
       insert_from_string_1 (string, pos, length, inherit);
       adjust_markers (opoint - 1, opoint, length);
-      signal_after_change (point-length, 0, length);
+      signal_after_change (PT-length, 0, length);
     }
 }
 
@@ -482,12 +488,12 @@ del_range_1 (from, to, prepare)
   MODIFF++;
 
   /* Relocate point as if it were a marker.  */
-  if (from < point)
+  if (from < PT)
     {
-      if (point < to)
+      if (PT < to)
         SET_PT (from);
       else
-        SET_PT (point - numdel);
+        SET_PT (PT - numdel);
     }
 
   /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */