# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1033332615 0
# Node ID ff9770dda6005748610af41c6171e546a8545677
# Parent  deb6fb65d76caf37a9566da561b14802a51f54f8
Fix previous change.

diff -r deb6fb65d76c -r ff9770dda600 lisp/startup.el
--- a/lisp/startup.el	Sun Sep 29 18:38:23 2002 +0000
+++ b/lisp/startup.el	Sun Sep 29 20:50:15 2002 +0000
@@ -1012,7 +1012,7 @@
 	(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 -r deb6fb65d76c -r ff9770dda600 src/search.c
--- a/src/search.c	Sun Sep 29 18:38:23 2002 +0000
+++ b/src/search.c	Sun Sep 29 20:50:15 2002 +0000
@@ -2569,14 +2569,15 @@
 
   /* 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;
       }
   }