(command-line) [windows-nt]: Try .emacs first, then

_emacs, but revert to .emacs if neither exists in home directory.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c533b95ab8f9c2b2c4d8be84fd42e7efd67753cf..88cebb15340eb72c851b172028a9c7ef0d4e2fa2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-20  Jason Rumney  <jasonr@gnu.org>
+
+       * startup.el (command-line) [windows-nt]: Try .emacs first, then
+       _emacs, but revert to .emacs if neither exists in home directory.
+
 2004-09-20  John Paul Wallington  <jpw@gnu.org>
 
        * bindings.el (completion-ignored-extensions): Add .dfsl.

diff --git a/lisp/startup.el b/lisp/startup.el
index c32ba2ddfe7c438a336043b24ebd22fa7a772c55..f42c734563804aa9e8d0e9a6bcc3e31af62c58f0 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -810,9 +810,14 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
                            ((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"
-                              "~/_emacs"))
+                              ;; Also support _emacs for compatibility.
+                              (if (directory-files "~" nil "^_emacs\\(\\.elc?\\)?$")
+                                  "~/_emacs"
+                                ;; But default to .emacs if _emacs does not exist.
+                                "~/.emacs")))
                            ((eq system-type 'vax-vms)
                             "sys$login:.emacs")
                            (t