diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2019-08-27 14:21:45 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2019-08-27 14:49:30 -0700 |
commit | 4118297ae2fab4886b20d193ba511a229637aea3 (patch) | |
tree | 3343e13fc50cdfbe80b790a8ead9539fc7592a3e /doc/misc/url.texi | |
parent | fa41fa70f1ed0bb392328f84388b803ddef7f6d9 (diff) | |
download | emacs-4118297ae2fab4886b20d193ba511a229637aea3.tar.gz emacs-4118297ae2fab4886b20d193ba511a229637aea3.tar.bz2 emacs-4118297ae2fab4886b20d193ba511a229637aea3.zip |
Use XDG conventions more consistently
Fit in better with the XDG conventions.
Something like this was suggested in 2008 (Bug#583)
and the XDG conventions seem to have settled down by now.
* doc/emacs/custom.texi (Init File, Init Syntax, Find Init):
* doc/lispref/files.texi (Standard File Names):
* doc/lispref/os.texi (Init File):
* doc/misc/url.texi (Customization):
* etc/NEWS:
Adjust accordingly.
* lisp/startup.el (startup--load-user-init-file):
If init-file-name is nil, do not load from it; instead
just use the alt-file.
(find-init-path): Remove; no longer used.
(command-line): Don't check twice for XDG.
Look at XDG_CONFIG_HOME instead of assuming it's ~/.config.
Prefer XDG configuration if it exists; the user can disable
this by setting XDG_CONFIG_HOME to some other place.
* lisp/subr.el (user-emacs-directory):
Prefer XDG configuration if it exists.
Diffstat (limited to 'doc/misc/url.texi')
-rw-r--r-- | doc/misc/url.texi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/misc/url.texi b/doc/misc/url.texi index 0cdfcac24e8..bad7701daf1 100644 --- a/doc/misc/url.texi +++ b/doc/misc/url.texi @@ -1267,7 +1267,8 @@ files, etc. The default value specifies a subdirectory named @file{url/} in the standard Emacs user data directory specified by the variable -@code{user-emacs-directory} (normally @file{~/.emacs.d}). However, +@code{user-emacs-directory} (normally @file{~/.config/emacs} +or @file{~/.emacs.d}). However, the old default was @file{~/.url}, and this directory is used instead if it exists. @end defopt |