diff options
| author | Glenn Morris | 2019-03-09 10:07:46 -0800 |
|---|---|---|
| committer | Glenn Morris | 2019-03-09 10:07:46 -0800 |
| commit | 3b63afd73b541ea559aa58edc1901c8b30e2af40 (patch) | |
| tree | a68afec4142bd100f3b6dfa3eb90aa2c0a71b34f /doc/lispref/files.texi | |
| parent | e1819a254f28a7dcba3c395c345fe237a512e92e (diff) | |
| parent | 0589de55c465627c16314519568f22daa62ff654 (diff) | |
| download | emacs-3b63afd73b541ea559aa58edc1901c8b30e2af40.tar.gz emacs-3b63afd73b541ea559aa58edc1901c8b30e2af40.zip | |
Merge from origin/emacs-26
0589de5 (origin/emacs-26) Fix markup of fake keys in the ELisp manual
82d4b98 Avoid errors in Auto Revert mode
a3b1935 Mention empty strings in file name expansion, emacs lisp refe...
a38da0d cc-mode.texi: Work around makeinfo alignment bug. Fix proble...
464ee80 Warn against recursive invocations of 'buffer-list-update-hoo...
60b5c10 Provide more details in doc-string of 'delete-windows-on' (Bu...
f0be0f1 Improve documentation of 'delete-windows-on'
f1bddc7 * lisp/frame.el (make-frame-command): Doc fix. (Bug#34715)
2848623 Avoid undefined behavior in gdb-mi.el
dbf1837 * lisp/window.el (fit-frame-to-buffer): Make doc-string more ...
099ef44 Minor spelling and grammar fixes (bug#34756)
52fd400 Minor improvement of documentation of '(when CONDITION . SPEC)'
f872b65 Improve documentation of 'auto-coding-functions'
04cad5e Fix visiting XML files with non-Unix EOL format
a89fabe Update example major mode code in Elisp manual
# Conflicts:
# lisp/autorevert.el
# lisp/window.el
Diffstat (limited to 'doc/lispref/files.texi')
| -rw-r--r-- | doc/lispref/files.texi | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index 5c99ea2781c..0e57cf9666f 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi | |||
| @@ -16,7 +16,7 @@ described in @ref{Backups and Auto-Saving}. | |||
| 16 | names. A file name is a string. Most of these functions expand file | 16 | names. A file name is a string. Most of these functions expand file |
| 17 | name arguments using the function @code{expand-file-name}, so that | 17 | name arguments using the function @code{expand-file-name}, so that |
| 18 | @file{~} is handled correctly, as are relative file names (including | 18 | @file{~} is handled correctly, as are relative file names (including |
| 19 | @file{../}). @xref{File Name Expansion}. | 19 | @file{../} and the empty string). @xref{File Name Expansion}. |
| 20 | 20 | ||
| 21 | In addition, certain @dfn{magic} file names are handled specially. | 21 | In addition, certain @dfn{magic} file names are handled specially. |
| 22 | For example, when a remote file name is specified, Emacs accesses the | 22 | For example, when a remote file name is specified, Emacs accesses the |
| @@ -2402,6 +2402,17 @@ This is for the sake of filesystems that have the concept of a | |||
| 2402 | superroot above the root directory @file{/}. On other filesystems, | 2402 | superroot above the root directory @file{/}. On other filesystems, |
| 2403 | @file{/../} is interpreted exactly the same as @file{/}. | 2403 | @file{/../} is interpreted exactly the same as @file{/}. |
| 2404 | 2404 | ||
| 2405 | Expanding @file{.} or the empty string returns the default directory: | ||
| 2406 | |||
| 2407 | @example | ||
| 2408 | @group | ||
| 2409 | (expand-file-name "." "/usr/spool/") | ||
| 2410 | @result{} "/usr/spool" | ||
| 2411 | (expand-file-name "" "/usr/spool/") | ||
| 2412 | @result{} "/usr/spool" | ||
| 2413 | @end group | ||
| 2414 | @end example | ||
| 2415 | |||
| 2405 | Note that @code{expand-file-name} does @emph{not} expand environment | 2416 | Note that @code{expand-file-name} does @emph{not} expand environment |
| 2406 | variables; only @code{substitute-in-file-name} does that: | 2417 | variables; only @code{substitute-in-file-name} does that: |
| 2407 | 2418 | ||