Merge from emacs--devo--0

[gnu-emacs] / src / fileio.c

diff --git a/src/fileio.c b/src/fileio.c
index 4dfb0d24796048f91dc6d6d68a4574286f7f6fe8..873d5d41d22e59589a4fc01a83ad95e8475ab881 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -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.
 
@@ -417,7 +417,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)
@@ -1036,7 +1036,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;