Mercurial > emacs
changeset 111943:25ce072b5bd9
Document that expand-file-name collapses multiple slashes. (Bug#7617)
fileio.c (Fexpand_file_name): Doc fix.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sun, 12 Dec 2010 22:37:54 +0200 |
| parents | 9b5de34a8646 |
| children | 9dc65348ace1 |
| files | src/ChangeLog src/fileio.c |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Dec 11 20:45:53 2010 +0200 +++ b/src/ChangeLog Sun Dec 12 22:37:54 2010 +0200 @@ -1,3 +1,7 @@ +2010-12-12 Eli Zaretskii <eliz@gnu.org> + + * fileio.c (Fexpand_file_name): Doc fix. (Bug#7617) + 2010-12-11 Eli Zaretskii <eliz@gnu.org> * w32fns.c (Fx_show_tip): Call try_window with last argument
--- a/src/fileio.c Sat Dec 11 20:45:53 2010 +0200 +++ b/src/fileio.c Sun Dec 12 22:37:54 2010 +0200 @@ -832,6 +832,9 @@ so are file name components followed by `..', along with the `..' itself; note that these simplifications are done without checking the resulting file names in the file system. +Multiple consecutive slashes are collapsed into a single slash, +except at the beginning of the file name when they are significant (e.g., +UNC file names on MS-Windows.) An initial `~/' expands to your home directory. An initial `~USER/' expands to USER's home directory. See also the function `substitute-in-file-name'. @@ -839,7 +842,7 @@ For technical reasons, this function can return correct but non-intuitive results for the root directory; for instance, \(expand-file-name ".." "/") returns "/..". For this reason, use -(directory-file-name (file-name-directory dirname)) to traverse a +\(directory-file-name (file-name-directory dirname)) to traverse a filesystem tree, not (expand-file-name ".." dirname). */) (name, default_directory) Lisp_Object name, default_directory;