emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/lisp/startup.el [emacs-unicode-2]


From: Miles Bader
Subject: [Emacs-diffs] Changes to emacs/lisp/startup.el [emacs-unicode-2]
Date: Tue, 21 Sep 2004 06:15:44 -0400

Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.321.2.6 emacs/lisp/startup.el:1.321.2.7
*** emacs/lisp/startup.el:1.321.2.6     Thu Sep  9 09:36:32 2004
--- emacs/lisp/startup.el       Tue Sep 21 09:34:08 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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]