comparison src/fileio.c @ 87649:107ccd98fa12

Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
author Miles Bader <miles@gnu.org>
date Tue, 08 Jan 2008 20:46:54 +0000
parents d40e3ce78801 fc2bcd2a8aad
children 91da483b3fa5 606f2d163a64
comparison
equal deleted inserted replaced
87648:7ae99e295dfd 87649:107ccd98fa12
1 /* File IO for GNU Emacs. 1 /* File IO for GNU Emacs.
2 Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996, 2 Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996,
3 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 3 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4 2005, 2006, 2007 Free Software Foundation, Inc. 4 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5 5
6 This file is part of GNU Emacs. 6 This file is part of GNU Emacs.
7 7
8 GNU Emacs is free software; you can redistribute it and/or modify 8 GNU Emacs is free software; you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 it under the terms of the GNU General Public License as published by
411 411
412 DEFUN ("file-name-directory", Ffile_name_directory, Sfile_name_directory, 412 DEFUN ("file-name-directory", Ffile_name_directory, Sfile_name_directory,
413 1, 1, 0, 413 1, 1, 0,
414 doc: /* Return the directory component in file name FILENAME. 414 doc: /* Return the directory component in file name FILENAME.
415 Return nil if FILENAME does not include a directory. 415 Return nil if FILENAME does not include a directory.
416 Otherwise return a directory spec. 416 Otherwise return a directory name.
417 Given a Unix syntax file name, returns a string ending in slash; 417 Given a Unix syntax file name, returns a string ending in slash;
418 on VMS, perhaps instead a string ending in `:', `]' or `>'. */) 418 on VMS, perhaps instead a string ending in `:', `]' or `>'. */)
419 (filename) 419 (filename)
420 Lisp_Object filename; 420 Lisp_Object filename;
421 { 421 {
1030 1030
1031 1031
1032 DEFUN ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0, 1032 DEFUN ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0,
1033 doc: /* Convert filename NAME to absolute, and canonicalize it. 1033 doc: /* Convert filename NAME to absolute, and canonicalize it.
1034 Second arg DEFAULT-DIRECTORY is directory to start with if NAME is relative 1034 Second arg DEFAULT-DIRECTORY is directory to start with if NAME is relative
1035 \(does not start with slash); if DEFAULT-DIRECTORY is nil or missing, 1035 \(does not start with slash or tilde); if DEFAULT-DIRECTORY is nil or missing,
1036 the current buffer's value of `default-directory' is used. 1036 the current buffer's value of `default-directory' is used.
1037 File name components that are `.' are removed, and 1037 File name components that are `.' are removed, and
1038 so are file name components followed by `..', along with the `..' itself; 1038 so are file name components followed by `..', along with the `..' itself;
1039 note that these simplifications are done without checking the resulting 1039 note that these simplifications are done without checking the resulting
1040 file names in the file system. 1040 file names in the file system.