From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 29 Sep 2002 20:50:15 +0000 (+0000)
Subject: Fix previous change.
X-Git-Tag: ttn-vms-21-2-B4~12994
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5b88a2c53a1fa7f8270e2922efc82f99fa45088f;p=emacs.git

Fix previous change.
---

diff --git a/lisp/startup.el b/lisp/startup.el
index 3e1526b37a5..eb8ce6e8418 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1012,7 +1012,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
 	(set-language-environment current-language-environment)))
     
     ;; Do this here in case the init file sets mail-host-address.
-    (or (equal user-mail-address "")
+    (if (equal user-mail-address "")
 	(setq user-mail-address (concat (user-login-name) "@"
 					(or mail-host-address
 					    (system-name)))))
diff --git a/src/search.c b/src/search.c
index 6f6aa90b919..11f4b01fc80 100644
--- a/src/search.c
+++ b/src/search.c
@@ -2569,14 +2569,15 @@ since only regular expressions have distinguished subexpressions.  */)
 
   /* Adjust search data for this change.  */
   {
+    int oldend = search_regs.end[sub];
     int change = newpoint - search_regs.end[sub];
     int i;
 
     for (i = 0; i < search_regs.num_regs; i++)
       {
-	if (search_regs.start[i] > newpoint)
+	if (search_regs.start[i] > oldend)
 	  search_regs.start[i] += change;
-	if (search_regs.end[i] > newpoint)
+	if (search_regs.end[i] > oldend)
 	  search_regs.end[i] += change;
       }
   }