[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/startup.el
From: |
Jason Rumney |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/startup.el |
Date: |
Mon, 20 Sep 2004 16:15:33 -0400 |
Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.331 emacs/lisp/startup.el:1.332
*** emacs/lisp/startup.el:1.331 Wed Sep 8 11:43:30 2004
--- emacs/lisp/startup.el Mon Sep 20 20:09:29 2004
***************
*** 810,818 ****
((eq system-type 'ms-dos)
(concat "~" init-file-user "/_emacs"))
((eq system-type 'windows-nt)
(if (directory-files "~" nil
"^\\.emacs\\(\\.elc?\\)?$")
"~/.emacs"
! "~/_emacs"))
((eq system-type 'vax-vms)
"sys$login:.emacs")
(t
--- 810,823 ----
((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")))
((eq system-type 'vax-vms)
"sys$login:.emacs")
(t