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 /doc | |
| 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 'doc')
| -rw-r--r-- | doc/lispref/os.texi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index c94e96bde82..ddbc8a82946 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi @@ -475,7 +475,8 @@ the value refers to the corresponding source file. @defvar user-emacs-directory This variable holds the name of the Emacs default directory. It defaults to @file{$@{XDG_CONFIG_HOME-'~/.config'@}/emacs/} -if that directory exists and @file{~/.emacs.d/} does not exist, +if that directory exists and @file{~/.emacs.d/} and @file{~/.emacs} do +not exist, otherwise to @file{~/.emacs.d/} on all platforms but MS-DOS@. Here, @file{$@{XDG_CONFIG_HOME-'~/.config'@}} stands for the value of the environment variable @env{XDG_CONFIG_HOME} |