aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Innes1999-01-22 15:12:59 +0000
committerAndrew Innes1999-01-22 15:12:59 +0000
commit32291eb6a3ff65cc35eeedbc333e173c1c274f08 (patch)
tree8f8bfdf147285a99afc70121015fcf2e19c41568
parentc16273442a9865330c5942956d09e461890e60ec (diff)
downloademacs-32291eb6a3ff65cc35eeedbc333e173c1c274f08.tar.gz
emacs-32291eb6a3ff65cc35eeedbc333e173c1c274f08.zip
(command-line): [windows-nt]: Check for existence of
.emacs file so as to notice .emacs.el or .emacs.elc and use them in preference to _emacs.
-rw-r--r--lisp/startup.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index ccdc8804bd4..33e267ffe9f 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -689,7 +689,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
689 ((eq system-type 'ms-dos) 689 ((eq system-type 'ms-dos)
690 (concat "~" init-file-user "/_emacs")) 690 (concat "~" init-file-user "/_emacs"))
691 ((eq system-type 'windows-nt) 691 ((eq system-type 'windows-nt)
692 (if (file-exists-p "~/.emacs") 692 (if (directory-files "~" nil "^\.emacs\\(\.elc?\\)?$")
693 "~/.emacs" 693 "~/.emacs"
694 "~/_emacs")) 694 "~/_emacs"))
695 ((eq system-type 'vax-vms) 695 ((eq system-type 'vax-vms)