Merge changes from emacs-23 branch

[gnu-emacs] / src / fileio.c

diff --git a/src/fileio.c b/src/fileio.c
index c2b93a6bd8b601c64e3f3c1795f9a31894c944ff..881dc92acab521249bf43c2837cfeb561a9a11fb 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -782,6 +782,8 @@ DEFUN ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0,
 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.
+NAME should be a string that is a valid file name for the underlying
+filesystem.
 File name components that are `.' are removed, and
 so are file name components followed by `..', along with the `..' itself;
 note that these simplifications are done without checking the resulting