diff options
| author | Eli Zaretskii | 2010-12-13 18:13:29 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2010-12-13 18:13:29 +0200 |
| commit | 1b2a627f96907faf36fc1603524cc0f9d16b7b5b (patch) | |
| tree | f578f23e5f925157c1cd72349f488fda9fc16a22 /src | |
| parent | 95e4cc854b04f98815f572218df0f93eebf7e13a (diff) | |
| download | emacs-1b2a627f96907faf36fc1603524cc0f9d16b7b5b.tar.gz emacs-1b2a627f96907faf36fc1603524cc0f9d16b7b5b.zip | |
Fix bug #7617 with documentation of expand-file-name.
fileio.c (Fexpand_file_name): One more doc fix.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/fileio.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 97401ffe40a..4d1225a112e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-12-13 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * fileio.c (Fexpand_file_name): One more doc fix. | ||
| 4 | |||
| 1 | 2010-12-12 Eli Zaretskii <eliz@gnu.org> | 5 | 2010-12-12 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * fileio.c (Fexpand_file_name): Doc fix. (Bug#7617) | 7 | * fileio.c (Fexpand_file_name): Doc fix. (Bug#7617) |
diff --git a/src/fileio.c b/src/fileio.c index e330f724142..da19c1e2a21 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -828,6 +828,8 @@ DEFUN ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0, | |||
| 828 | Second arg DEFAULT-DIRECTORY is directory to start with if NAME is relative | 828 | Second arg DEFAULT-DIRECTORY is directory to start with if NAME is relative |
| 829 | \(does not start with slash or tilde); if DEFAULT-DIRECTORY is nil or missing, | 829 | \(does not start with slash or tilde); if DEFAULT-DIRECTORY is nil or missing, |
| 830 | the current buffer's value of `default-directory' is used. | 830 | the current buffer's value of `default-directory' is used. |
| 831 | NAME should be a string that is a valid file name for the underlying | ||
| 832 | filesystem. | ||
| 831 | File name components that are `.' are removed, and | 833 | File name components that are `.' are removed, and |
| 832 | so are file name components followed by `..', along with the `..' itself; | 834 | so are file name components followed by `..', along with the `..' itself; |
| 833 | note that these simplifications are done without checking the resulting | 835 | note that these simplifications are done without checking the resulting |