lisp/startup.el (command-line): Use delayed warning for "_emacs".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 835fc7287e6176751bd20205cdfbc544b4189f3b..58bff4e6204731a1174867c0e527a255558fa064 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-28  Juanma Barranquero  <lekktu@gmail.com>
+
+       * startup.el (command-line): When warning about "_emacs", use a
+       delayed warning to allow the user to filter it out.
+
 2011-04-28  Deniz Dogan  <deniz@dogan.se>
 
        * net/rcirc.el (rcirc-handler-353): Fix bug for channels which the

diff --git a/lisp/startup.el b/lisp/startup.el
index 3285d47f088c969496fad4e4753157c63ab89e73..14f4c7829d1b8372082a588300859a32f73f672a 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1027,10 +1027,9 @@ opening the first frame (e.g. open a connection to an X server).")
                              "~/.emacs")
                             ((directory-files "~" nil "^_emacs\\(\\.elc?\\)?$")
                              ;; Also support _emacs for compatibility, but warn about it.
-                             (display-warning
-                              'initialization
-                              "`_emacs' init file is deprecated, please use `.emacs'"
-                              :warning)
+                             (push '(initialization
+                                     "`_emacs' init file is deprecated, please use `.emacs'")
+                                   delayed-warnings-list)
                              "~/_emacs")
                             (t ;; But default to .emacs if _emacs does not exist.
                              "~/.emacs"))))