comparison src/fileio.c @ 79685:7a1e83fce56f

(Ffile_name_directory, Fexpand_file_name): Doc fixes.
author Richard M. Stallman <rms@gnu.org>
date Fri, 04 Jan 2008 05:46:32 +0000
parents 29f6806df351
children fc2bcd2a8aad
comparison
equal deleted inserted replaced
79684:309520d439e4 79685:7a1e83fce56f
408 408
409 DEFUN ("file-name-directory", Ffile_name_directory, Sfile_name_directory, 409 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)
417 Lisp_Object filename; 417 Lisp_Object filename;
418 { 418 {
1027 1027
1028 1028
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;
1036 note that these simplifications are done without checking the resulting 1036 note that these simplifications are done without checking the resulting
1037 file names in the file system. 1037 file names in the file system.