diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2019-09-19 00:59:59 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2019-09-19 01:01:35 -0700 |
| commit | d38110efa75372d4c3be702f157d3a8c6b7f37b5 (patch) | |
| tree | 812c055936b551436748bd486488236cbed64e87 /lisp | |
| parent | 30026cfe666e9647aeef73e26df5ffca2fa2c662 (diff) | |
| download | emacs-d38110efa75372d4c3be702f157d3a8c6b7f37b5.tar.gz | |
Also prefer .emacs.d if .emacs exists
Problem reported by Katsumi Yamaoka (Bug#37456).
* lisp/startup.el (startup--xdg-or-homedot): Also
prefer .emacs.d if a traditional .emacs file exists.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/startup.el | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index ef6234128aa..4078f23f3a8 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -508,7 +508,14 @@ DIRS are relative." (if (eq system-type 'ms-dos) "/_emacs.d/" "/.emacs.d/")))) - (if (file-exists-p emacs-d-dir) + (if (or (file-exists-p emacs-d-dir) + (if (eq system-type 'windows-nt) + (directory-files (concat "~" user-name) nil + "\\`[._]emacs\\(\\.elc?\\)?\\'") + (file-exists-p (concat "~" init-file-user + (if (eq system-type 'ms-dos) + "/_emacs" + "/.emacs"))))) emacs-d-dir xdg-dir)))) |