From 78379264fb8fb2c6172a68211d6e6a448a2b0e23 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Fri, 4 Jan 2008 05:47:53 +0000 Subject: [PATCH] (Ffile_name_directory, Fexpand_file_name): Doc fixes. --- src/ChangeLog | 4 ++++ 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 @@ +2008-01-04 Richard Stallman + + * fileio.c (Ffile_name_directory, Fexpand_file_name): Doc fixes. + 2007-12-24 YAMAMOTO Mitsuharu * 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, 1, 1, 0, doc: /* Return the directory component in file name FILENAME. Return nil if FILENAME does not include a directory. -Otherwise return a directory spec. +Otherwise return a directory name. Given a Unix syntax file name, returns a string ending in slash; on VMS, perhaps instead a string ending in `:', `]' or `>'. */) (filename) @@ -1029,7 +1029,7 @@ 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); if DEFAULT-DIRECTORY is nil or missing, +\(does not start with slash or tilde); if DEFAULT-DIRECTORY is nil or missing, the current buffer's value of `default-directory' is used. File name components that are `.' are removed, and so are file name components followed by `..', along with the `..' itself; -- 2.39.2