[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100306: Document that expand-file-name collapses multiple slashes. (Bug#7617)

[Eli Zaretskii]

------------------------------------------------------------
revno: 100306
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-23
timestamp: Sun 2010-12-12 22:37:54 +0200
message:
  Document that expand-file-name collapses multiple slashes.  (Bug#7617)
  
   fileio.c (Fexpand_file_name): Doc fix.
modified:
  src/ChangeLog
  src/fileio.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-12-11 15:20:11 +0000
+++ b/src/ChangeLog     2010-12-12 20:37:54 +0000
@@ -1,3 +1,7 @@
+2010-12-12  Eli Zaretskii  <address@hidden>
+
+       * fileio.c (Fexpand_file_name): Doc fix.  (Bug#7617)
+
 2010-12-11  Eli Zaretskii  <address@hidden>
 
        * w32fns.c (Fx_show_tip): Call try_window with last argument

=== modified file 'src/fileio.c'
--- a/src/fileio.c      2010-04-30 16:00:48 +0000
+++ b/src/fileio.c      2010-12-12 20:37:54 +0000
@@ -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;