* src/fileio.c (expand_file_name): Doc fix.

diff --git a/src/ChangeLog b/src/ChangeLog
index b178f1130e0ed8b4a2a0857c2ec73cf4de2caf62..38eb460359cefd216198c3573d3224c44ad339bd 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-12  Xue Fuqiao  <xfq.free@gmail.com>
+
+       * fileio.c (expand_file_name): Doc fix.
+
 2013-06-11  Paul Eggert  <eggert@cs.ucla.edu>
 
        Tickle glib by waiting for Emacs itself, not for process 0 (Bug#14569).

diff --git a/src/fileio.c b/src/fileio.c
index 75e1f13a09b4cccbc2c36a5f3acc67328995ccbf..ce5d4854feef0fa4f6eb247ad71f798739e1f241 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -776,8 +776,9 @@ probably use `make-temp-file' instead, except in three circumstances:
 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