From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 31 May 1997 19:20:26 +0000 (+0000)
Subject: (Freplace_match): Fix previous change.
X-Git-Tag: emacs-20.1~1865
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3e18eecf3548e5f2c0e6a011027e9f815e79f600;p=emacs.git

(Freplace_match): Fix previous change.
---

diff --git a/src/search.c b/src/search.c
index 720012dfc5a..5e86e1cab54 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1422,7 +1422,7 @@ since only regular expressions have distinguished subexpressions.")
   register int c, prevc;
   int inslen;
   int sub;
-  int opoint;
+  int opoint, newpoint;
 
   CHECK_STRING (newtext, 0);
 
@@ -1675,6 +1675,8 @@ since only regular expressions have distinguished subexpressions.")
   else if (case_action == cap_initial)
     Fupcase_initials_region (make_number (PT - inslen), make_number (PT));
 
+  newpoint = PT;
+
   /* Put point back where it was in the text.  */
   if (opoint < 0)
     temp_set_point (opoint + ZV, current_buffer);
@@ -1682,7 +1684,7 @@ since only regular expressions have distinguished subexpressions.")
     temp_set_point (opoint, current_buffer);
 
   /* Now move point "officially" to the start of the inserted replacement.  */
-  move_if_not_intangible (search_regs.start[sub]);
+  move_if_not_intangible (newpoint);
   
   return Qnil;
 }