diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/startup.el | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 835fc7287e6..58bff4e6204 100644 --- 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 3285d47f088..14f4c7829d1 100644 --- 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")))) |