diff options
| author | Richard M. Stallman | 2008-01-04 05:47:53 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2008-01-04 05:47:53 +0000 |
| commit | 78379264fb8fb2c6172a68211d6e6a448a2b0e23 (patch) | |
| tree | dc72145729b3775709700515d1b7f1cf96c768b5 /src | |
| parent | 23af75808e223fc338456c4ee1045fc3623d8938 (diff) | |
| download | emacs-78379264fb8fb2c6172a68211d6e6a448a2b0e23.tar.gz emacs-78379264fb8fb2c6172a68211d6e6a448a2b0e23.zip | |
(Ffile_name_directory, Fexpand_file_name): Doc fixes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/fileio.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c0b86a16593..de8dd197733 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-01-04 Richard Stallman <rms@gnu.org> | ||
| 2 | |||
| 3 | * fileio.c (Ffile_name_directory, Fexpand_file_name): Doc fixes. | ||
| 4 | |||
| 1 | 2007-12-24 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 5 | 2007-12-24 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
| 2 | 6 | ||
| 3 | * process.c (make_process): Initialize pty_flag to Qnil instead of 0 | 7 | * process.c (make_process): Initialize pty_flag to Qnil instead of 0 |
diff --git a/src/fileio.c b/src/fileio.c index 0f13c6535a0..b487c64767b 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -410,7 +410,7 @@ DEFUN ("file-name-directory", Ffile_name_directory, Sfile_name_directory, | |||
| 410 | 1, 1, 0, | 410 | 1, 1, 0, |
| 411 | doc: /* Return the directory component in file name FILENAME. | 411 | doc: /* Return the directory component in file name FILENAME. |
| 412 | Return nil if FILENAME does not include a directory. | 412 | Return nil if FILENAME does not include a directory. |
| 413 | Otherwise return a directory spec. | 413 | Otherwise return a directory name. |
| 414 | Given a Unix syntax file name, returns a string ending in slash; | 414 | Given a Unix syntax file name, returns a string ending in slash; |
| 415 | on VMS, perhaps instead a string ending in `:', `]' or `>'. */) | 415 | on VMS, perhaps instead a string ending in `:', `]' or `>'. */) |
| 416 | (filename) | 416 | (filename) |
| @@ -1029,7 +1029,7 @@ probably use `make-temp-file' instead, except in three circumstances: | |||
| 1029 | DEFUN ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0, | 1029 | DEFUN ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0, |
| 1030 | doc: /* Convert filename NAME to absolute, and canonicalize it. | 1030 | doc: /* Convert filename NAME to absolute, and canonicalize it. |
| 1031 | Second arg DEFAULT-DIRECTORY is directory to start with if NAME is relative | 1031 | Second arg DEFAULT-DIRECTORY is directory to start with if NAME is relative |
| 1032 | \(does not start with slash); if DEFAULT-DIRECTORY is nil or missing, | 1032 | \(does not start with slash or tilde); if DEFAULT-DIRECTORY is nil or missing, |
| 1033 | the current buffer's value of `default-directory' is used. | 1033 | the current buffer's value of `default-directory' is used. |
| 1034 | File name components that are `.' are removed, and | 1034 | File name components that are `.' are removed, and |
| 1035 | so are file name components followed by `..', along with the `..' itself; | 1035 | so are file name components followed by `..', along with the `..' itself; |