Mercurial > emacs
comparison src/fileio.c @ 112047:03c1dc6b7801
Fix bug #7617 with documentation of expand-file-name.
fileio.c (Fexpand_file_name): One more doc fix.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Mon, 13 Dec 2010 18:13:29 +0200 |
parents | 25ce072b5bd9 |
children | 40af77a50adc 376148b31b5e |
comparison
equal
deleted
inserted
replaced
112046:129f1ae93387 | 112047:03c1dc6b7801 |
---|---|
826 DEFUN ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0, | 826 DEFUN ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0, |
827 doc: /* Convert filename NAME to absolute, and canonicalize it. | 827 doc: /* Convert filename NAME to absolute, and canonicalize it. |
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 |
834 file names in the file system. | 836 file names in the file system. |
835 Multiple consecutive slashes are collapsed into a single slash, | 837 Multiple consecutive slashes are collapsed into a single slash, |