[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/fileio.c,v [EMACS_22_BASE]
From: |
Richard M. Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/src/fileio.c,v [EMACS_22_BASE] |
Date: |
Fri, 04 Jan 2008 05:46:33 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Branch: EMACS_22_BASE
Changes by: Richard M. Stallman <rms> 08/01/04 05:46:33
Index: fileio.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/fileio.c,v
retrieving revision 1.580.2.5
retrieving revision 1.580.2.6
diff -u -b -r1.580.2.5 -r1.580.2.6
--- fileio.c 17 Oct 2007 01:31:40 -0000 1.580.2.5
+++ fileio.c 4 Jan 2008 05:46:32 -0000 1.580.2.6
@@ -410,7 +410,7 @@
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 @@
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;
- [Emacs-diffs] Changes to emacs/src/fileio.c,v [EMACS_22_BASE],
Richard M. Stallman <=