[Emacs-diffs] /srv/bzr/emacs/trunk r104048: lisp/startup.el (command-line): Use delayed warning for "_emacs".

[Juanma Barranquero]

------------------------------------------------------------
revno: 104048
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Fri 2011-04-29 00:58:40 +0200
message:
  lisp/startup.el (command-line): Use delayed warning for "_emacs".
modified:
  lisp/ChangeLog
  lisp/startup.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-04-28 20:22:51 +0000
+++ b/lisp/ChangeLog    2011-04-28 22:58:40 +0000
@@ -1,3 +1,8 @@
+2011-04-28  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * net/rcirc.el (rcirc-handler-353): Fix bug for channels which the

=== modified file 'lisp/startup.el'
--- a/lisp/startup.el   2011-04-05 01:21:52 +0000
+++ b/lisp/startup.el   2011-04-28 22:58:40 +0000
@@ -1027,10 +1027,9 @@
                              "~/.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"))))