aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Ingebrigtsen2019-07-11 17:10:52 +0200
committerLars Ingebrigtsen2019-07-11 17:10:52 +0200
commitaecc82d7eb776985927bee3f62c5811cc4fc7b52 (patch)
tree17f6268b531fdaab0e16d4b175f388f8b4bc90e4 /src
parent1c3b3206144c074ab490a5ee0ccd265d12647ad7 (diff)
downloademacs-aecc82d7eb776985927bee3f62c5811cc4fc7b52.tar.gz
emacs-aecc82d7eb776985927bee3f62c5811cc4fc7b52.zip
Clarify the expand-file-name doc string
* src/fileio.c (Fexpand_file_name): Clarify that "~" in NAME is expanded, and not just "~/". Also clarify that ~USER is not expanded if USER doesn't exist (bug#36490).
Diffstat (limited to 'src')
-rw-r--r--src/fileio.c26
1 files changed, 16 insertions, 10 deletions
diff --git a/src/fileio.c b/src/fileio.c
index 614c0f989da..7f83267956c 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -745,16 +745,22 @@ a directory's file name are accepted. If DEFAULT-DIRECTORY is nil or
745missing, the current buffer's value of `default-directory' is used. 745missing, the current buffer's value of `default-directory' is used.
746NAME should be a string that is a valid file name for the underlying 746NAME should be a string that is a valid file name for the underlying
747filesystem. 747filesystem.
748File name components that are `.' are removed, and 748
749so are file name components followed by `..', along with the `..' itself; 749File name components that are `.' are removed, and so are file name
750note that these simplifications are done without checking the resulting 750components followed by `..', along with the `..' itself; note that
751file names in the file system. 751these simplifications are done without checking the resulting file
752Multiple consecutive slashes are collapsed into a single slash, 752names in the file system.
753except at the beginning of the file name when they are significant (e.g., 753
754UNC file names on MS-Windows.) 754Multiple consecutive slashes are collapsed into a single slash, except
755An initial `~/' expands to your home directory. 755at the beginning of the file name when they are significant (e.g., UNC
756An initial `~USER/' expands to USER's home directory. 756file names on MS-Windows.)
757See also the function `substitute-in-file-name'. 757
758An initial \"~\" in NAME expands to your home directory.
759
760An initial \"~USER\" in NAME expands to USER's home directory. If
761USER doesn't exist, \"~USER\" is not expanded.
762
763To do other file name substitutions, see `substitute-in-file-name'.
758 764
759For technical reasons, this function can return correct but 765For technical reasons, this function can return correct but
760non-intuitive results for the root directory; for instance, 766non-intuitive results for the root directory; for instance,