(command-line-1): Improve previous change.

diff --git a/lisp/startup.el b/lisp/startup.el
index ae34c9db10e8b006e971e3ea8080df16841d41ca..5d1d7574a28af5a440e914477baa009ccd99d71e 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -344,12 +344,14 @@ this variable, if non-nil; 2. `~/.emacs'; 3. `default.el'.")
                       (insert-file-contents user-init-file)
                       (re-search-forward
                        (concat
-                        "(setq inhibit-startup-echo-area-message[ \t]+"
-                        (prin1-to-string
-                         (if (string= init-file-user "")
-                             (user-login-name)
-                           init-file-user))
-                        "[ \t]*)")
+                        "([ \t\n]*setq[ \t\n]+"
+                        "inhibit-startup-echo-area-message[ \t\n]+"
+                        (regexp-quote
+                         (prin1-to-string
+                          (if (string= init-file-user "")
+                              (user-login-name)
+                            init-file-user)))
+                        "[ \t\n]*)")
                        nil t))
                   (error nil))
               (kill-buffer buffer))))