diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-09-27 09:37:10 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-09-27 09:37:10 -0700 |
| commit | 2e8c9ede155668167e509ddb80c6a46dab8d70fe (patch) | |
| tree | 200d823eb9522f7531e8a31073ed003333cb34f4 /doc/emacs/custom.texi | |
| parent | a492013d07c59fab8eb9779924b384181e878a1a (diff) | |
| parent | f31c6792ab98c8be343838f59d96e35c05353521 (diff) | |
| download | emacs-2e8c9ede155668167e509ddb80c6a46dab8d70fe.tar.gz | |
Merge from origin/emacs-27
f31c6792ab Fix support for Zip64 zip files
ba635a19fb * lisp/hi-lock.el (hi-lock-auto-select-face): Doc fix. (B...
cc8fef2bdd Avoid infinite recursion with 'relative' line numbers display
395f10cb98 ; Fix more trivial typos
bf4accb65e ; Fix some trivial typos
# Conflicts:
# etc/NEWS
# lisp/arc-mode.el
Diffstat (limited to 'doc/emacs/custom.texi')
| -rw-r--r-- | doc/emacs/custom.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index a512fd14c80..81874a04aa7 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -2679,7 +2679,7 @@ basename.) Emacs can also look in an XDG-compatible location for @file{init.el}, the default is the directory @file{~/.config/emacs}. This can be -overriden by setting @env{XDG_CONFIG_HOME} in your environment, its +overridden by setting @env{XDG_CONFIG_HOME} in your environment, its value replaces @file{~/.config} in the name of the default XDG init file. However @file{~/.emacs.d}, @file{~/.emacs}, and @file{~/.emacs.el} are always preferred if they exist, which means |