[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/fileio.c,v
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/fileio.c,v |
Date: |
Tue, 08 Jan 2008 20:48:08 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Miles Bader <miles> 08/01/08 20:46:54
Index: src/fileio.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/fileio.c,v
retrieving revision 1.596
retrieving revision 1.597
diff -u -b -r1.596 -r1.597
--- src/fileio.c 16 Dec 2007 10:54:19 -0000 1.596
+++ src/fileio.c 8 Jan 2008 20:44:29 -0000 1.597
@@ -1,7 +1,7 @@
/* File IO for GNU Emacs.
Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996,
1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007 Free Software Foundation, Inc.
+ 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -413,7 +413,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)
@@ -1032,7 +1032,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,
Miles Bader <=