procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Xue Fuqiao 2013-06-12 09:12:59 +08:00
parent f56be016d5
commit d177e21300
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -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).

5
src/fileio.c
View file

@ -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