diff options
| author | Paul Eggert | 2018-11-14 09:31:28 -0800 |
|---|---|---|
| committer | Paul Eggert | 2018-11-14 09:32:28 -0800 |
| commit | 454f7923a7de9f65f55050dfab48eefc40d0ce29 (patch) | |
| tree | 49b5bc42234e0accb94af1af8f81de5551de5f9b | |
| parent | fb2514f3e29c140735e2ffccda4affffdb5b253d (diff) | |
| download | emacs-454f7923a7de9f65f55050dfab48eefc40d0ce29.tar.gz emacs-454f7923a7de9f65f55050dfab48eefc40d0ce29.zip | |
Document recent change to HOME handling
* doc/emacs/cmdargs.texi (General Variables):
* doc/emacs/custom.texi (Find Init):
* doc/lispref/files.texi (File Name Expansion):
* etc/NEWS: Document behavior when HOME is a relative file name.
| -rw-r--r-- | doc/emacs/cmdargs.texi | 6 | ||||
| -rw-r--r-- | doc/emacs/custom.texi | 7 | ||||
| -rw-r--r-- | doc/lispref/files.texi | 6 | ||||
| -rw-r--r-- | etc/NEWS | 4 |
4 files changed, 16 insertions, 7 deletions
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi index 2e2767ccada..25a25268889 100644 --- a/doc/emacs/cmdargs.texi +++ b/doc/emacs/cmdargs.texi | |||
| @@ -529,7 +529,11 @@ otherwise. | |||
| 529 | @item HOME | 529 | @item HOME |
| 530 | @vindex HOME@r{, environment variable} | 530 | @vindex HOME@r{, environment variable} |
| 531 | The location of your files in the directory tree; used for | 531 | The location of your files in the directory tree; used for |
| 532 | expansion of file names starting with a tilde (@file{~}). On MS-DOS, | 532 | expansion of file names starting with a tilde (@file{~}). |
| 533 | If set to a relative file name, Emacs expands @file{~} to the | ||
| 534 | corresponding absolute file name. If unset, it normally defaults to | ||
| 535 | the home directory of the user given by @env{LOGNAME}, @env{USER} or | ||
| 536 | your user ID, or to @file{/} if all else fails. On MS-DOS, | ||
| 533 | it defaults to the directory from which Emacs was started, with | 537 | it defaults to the directory from which Emacs was started, with |
| 534 | @samp{/bin} removed from the end if it was present. On Windows, the | 538 | @samp{/bin} removed from the end if it was present. On Windows, the |
| 535 | default value of @env{HOME} is the @file{Application Data} | 539 | default value of @env{HOME} is the @file{Application Data} |
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index ddde5b22e6b..3dbe8f8003f 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi | |||
| @@ -2557,10 +2557,9 @@ library. @xref{Hooks}. | |||
| 2557 | @node Find Init | 2557 | @node Find Init |
| 2558 | @subsection How Emacs Finds Your Init File | 2558 | @subsection How Emacs Finds Your Init File |
| 2559 | 2559 | ||
| 2560 | Normally Emacs uses the environment variable @env{HOME} | 2560 | Normally Emacs uses your home directory to find @file{~/.emacs}; |
| 2561 | (@pxref{General Variables, HOME}) to find @file{.emacs}; that's what | 2561 | that's what @samp{~} means in a file name. @xref{General Variables, HOME}. |
| 2562 | @samp{~} means in a file name. If @file{.emacs} is not found inside | 2562 | If neither @file{~/.emacs} nor @file{~/.emacs.el} is found, Emacs looks for |
| 2563 | @file{~/} (nor @file{.emacs.el}), Emacs looks for | ||
| 2564 | @file{~/.emacs.d/init.el} (which, like @file{~/.emacs.el}, can be | 2563 | @file{~/.emacs.d/init.el} (which, like @file{~/.emacs.el}, can be |
| 2565 | byte-compiled). | 2564 | byte-compiled). |
| 2566 | 2565 | ||
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index 5682919b645..b795864815d 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi | |||
| @@ -2367,8 +2367,10 @@ start with @samp{~}.) Otherwise, the current buffer's value of | |||
| 2367 | @end example | 2367 | @end example |
| 2368 | 2368 | ||
| 2369 | If the part of @var{filename} before the first slash is | 2369 | If the part of @var{filename} before the first slash is |
| 2370 | @samp{~}, it expands to the value of the @env{HOME} environment | 2370 | @samp{~}, it expands to your home directory, which is typically |
| 2371 | variable (usually your home directory). If the part before the first | 2371 | specified by the value of the @env{HOME} environment variable |
| 2372 | (@pxref{General Variables,,, emacs, The GNU Emacs Manual}). | ||
| 2373 | If the part before the first | ||
| 2372 | slash is @samp{~@var{user}} and if @var{user} is a valid login name, | 2374 | slash is @samp{~@var{user}} and if @var{user} is a valid login name, |
| 2373 | it expands to @var{user}'s home directory. | 2375 | it expands to @var{user}'s home directory. |
| 2374 | If you do not want this expansion for a relative @var{filename} that | 2376 | If you do not want this expansion for a relative @var{filename} that |
| @@ -961,6 +961,10 @@ its default value changed in Emacs 27.1. | |||
| 961 | 961 | ||
| 962 | ** The REPETITIONS argument of 'benchmark-run' can now also be a variable. | 962 | ** The REPETITIONS argument of 'benchmark-run' can now also be a variable. |
| 963 | 963 | ||
| 964 | ** If $HOME is a relative file name, 'expand-file-name' now expands | ||
| 965 | "~" and leading "~/" to the corresponding absolute file name. | ||
| 966 | Formerly, it incorrectly expanded them to a relative file name. | ||
| 967 | |||
| 964 | ** The FILENAME argument to 'file-name-base' is now mandatory and no | 968 | ** The FILENAME argument to 'file-name-base' is now mandatory and no |
| 965 | longer defaults to 'buffer-file-name'. | 969 | longer defaults to 'buffer-file-name'. |
| 966 | 970 | ||