[Emacs-diffs] trunk r112935: * src/fileio.c (expand_file_name): Doc fix.

[Xue Fuqiao]

------------------------------------------------------------
revno: 112935
revision-id: address@hidden
parent: address@hidden
committer: Xue Fuqiao <address@hidden>
branch nick: trunk
timestamp: Wed 2013-06-12 09:12:59 +0800
message:
  * src/fileio.c (expand_file_name): Doc fix.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/fileio.c                   fileio.c-20091113204419-o5vbwnq5f7feedwu-210

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-06-11 18:34:06 +0000
+++ b/src/ChangeLog     2013-06-12 01:12:59 +0000
@@ -1,3 +1,7 @@
+2013-06-12  Xue Fuqiao  <address@hidden>
+
+       * fileio.c (expand_file_name): Doc fix.
+
 2013-06-11  Paul Eggert  <address@hidden>
 
        Tickle glib by waiting for Emacs itself, not for process 0 (Bug#14569).

=== modified file 'src/fileio.c'
--- a/src/fileio.c      2013-05-31 01:31:10 +0000
+++ b/src/fileio.c      2013-06-12 01:12:59 +0000
@@ -776,8 +776,9 @@
 DEFUN ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0,
        doc: /* Convert filename NAME to absolute, and canonicalize it.
 Second arg DEFAULT-DIRECTORY is directory to start with if NAME is relative
-\(does not start with slash or tilde); if DEFAULT-DIRECTORY is nil or missing,
-the current buffer's value of `default-directory' is used.
+\(does not start with slash or tilde); both the directory name and
+a directory's file name are accepted.  If DEFAULT-DIRECTORY is nil or
+missing, the current buffer's value of `default-directory' is used.
 NAME should be a string that is a valid file name for the underlying
 filesystem.
 File name components that are `.' are removed, and