changeset 57171:9bc06f7dfca8

(command-line) [windows-nt]: Try .emacs first, then _emacs, but revert to .emacs if neither exists in home directory.
author Jason Rumney <jasonr@gnu.org>
date Mon, 20 Sep 2004 20:09:29 +0000
parents 01f54f65a36b
children 49ccd53252ba
files lisp/startup.el
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/startup.el	Mon Sep 20 18:35:40 2004 +0000
+++ b/lisp/startup.el	Mon Sep 20 20:09:29 2004 +0000
@@ -810,9 +810,14 @@
 			    ((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