Fix previous change.

diff --git a/lisp/startup.el b/lisp/startup.el
index 3e1526b37a55e7e79a2d9bb07612c8c5e5f23c75..eb8ce6e8418e5b7b08744123d7a847fbd062a3ac 100644 (file)
--- 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 6f6aa90b919fc23e7e1dad4611645baea9f98ec4..11f4b01fc80f845ece4121a14cf625398b30fcf9 100644 (file)
--- 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;
       }
   }