Add warning for obsolete _emacs init file.

* lisp/startup.el (command-line): Warn the user that _emacs is deprecated.
* etc/NEWS: Document warning about _emacs.

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 15f613edf8fa269d461a8f15a48c643a41ca8394..cbe46d3a53e15ba4afbeda6bcabca10f1a3ad527 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-16  Juanma Barranquero  <lekktu@gmail.com>
+
+       * NEWS: Document warning about _emacs.
+
 2011-03-14  Michael Albinus  <michael.albinus@gmx.de>
 
        * NEWS: `shell' prompts for the shell path name, when the default

diff --git a/etc/NEWS b/etc/NEWS
index 7b4bdc46e7a917a2ab0e51e787f39de55683be5e..bb59e0e2a24d6a9d87ca1f17b716f89aece7a7f4 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -62,6 +62,8 @@ longer have any effect.  (They were declared obsolete in Emacs 23.)
 ** New command line option `--no-site-lisp' removes site-lisp directories
 from load-path.  -Q now implies this.
 
+** On Windows, Emacs now warns when the obsolete _emacs init file is used.
+
 \f
 * Changes in Emacs 24.1
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 93a6e720a788657f2c27a3b4db5f372f64829455..9dcc5fb9ca59f947a3f61e8104341469e945f1b0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-16  Juanma Barranquero  <lekktu@gmail.com>
+
+       * startup.el (command-line): Warn the user that _emacs is deprecated.
+
 2011-03-16  Juanma Barranquero  <lekktu@gmail.com>
 
        * progmodes/delphi.el (delphi-search-path, delphi-indent-level)

diff --git a/lisp/startup.el b/lisp/startup.el
index 2bdb6fef505e8c01898e55e44e98aac7a9a5aacd..65b1a013c217d41399dc4c1b55d8ba9460467a09 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1006,19 +1006,23 @@ opening the first frame (e.g. open a connection to an X server).")
                (if init-file-user
                    (let ((user-init-file-1
                           (cond
-                           ((eq system-type 'ms-dos)
-                            (concat "~" init-file-user "/_emacs"))
-                           ((eq system-type 'windows-nt)
-                            ;; Prefer .emacs on Windows.
-                            (if (directory-files "~" nil "^\\.emacs\\(\\.elc?\\)?$")
-                                "~/.emacs"
-                              ;; Also support _emacs for compatibility.
-                              (if (directory-files "~" nil "^_emacs\\(\\.elc?\\)?$")
-                                  "~/_emacs"
-                                ;; But default to .emacs if _emacs does not exist.
-                                "~/.emacs")))
-                           (t
-                            (concat "~" init-file-user "/.emacs")))))
+                            ((eq system-type 'ms-dos)
+                             (concat "~" init-file-user "/_emacs"))
+                            ((not (eq system-type 'windows-nt))
+                             (concat "~" init-file-user "/.emacs"))
+                            ;; Else deal with the Windows situation
+                            ((directory-files "~" nil "^\\.emacs\\(\\.elc?\\)?$")
+                             ;; Prefer .emacs on Windows.
+                             "~/.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)
+                             "~/_emacs")
+                            (t ;; But default to .emacs if _emacs does not exist.
+                             "~/.emacs"))))
                      ;; This tells `load' to store the file name found
                      ;; into user-init-file.
                      (setq user-init-file t)