diff options
| author | thierry volpiatto | 2012-02-28 10:28:52 +0100 |
|---|---|---|
| committer | thierry volpiatto | 2012-02-28 10:28:52 +0100 |
| commit | 96b49301274ac12ce82c3dfd3361929f0344b9e3 (patch) | |
| tree | 0f02fd46c34e33112a1bfbec852c8c4e7417910a /doc | |
| parent | 44e97401cda5b464505ac798ae7f71dce0d2a06e (diff) | |
| download | emacs-96b49301274ac12ce82c3dfd3361929f0344b9e3.tar.gz emacs-96b49301274ac12ce82c3dfd3361929f0344b9e3.zip | |
* lisp/files.el (file-equal-p): renamed from `files-equal-p'.
Now return nil when one or both files doesn't exists.
(file-subdir-of-p): Now only top directory must exists,
return nil if it doesn't.
(copy-directory): No need to test with `file-subdir-of-p' after creating dir.
* tramp.el (tramp-file-name-for-operation): Rename `files-equal-p' to `file-equal-p'.
* files.texi: Rename `files-equal-p' to `file-equal-p'.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispref/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/lispref/files.texi | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index b27bcef9c12..1b5418b47aa 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-02-28 Thierry Volpiatto <thierry.volpiatto@gmail.com> | ||
| 2 | |||
| 3 | * files.texi Rename files-equal-p to file-equal-p. | ||
| 4 | Update chnaged behavior of file-subdir-of-p. | ||
| 5 | |||
| 1 | 2012-02-28 Glenn Morris <rgm@gnu.org> | 6 | 2012-02-28 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * advice.texi, anti.texi, display.texi, elisp.texi: | 8 | * advice.texi, anti.texi, display.texi, elisp.texi: |
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index cffaef37988..87a3035403f 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi | |||
| @@ -1018,7 +1018,7 @@ a regular file (not a directory, named pipe, terminal, or | |||
| 1018 | other I/O device). | 1018 | other I/O device). |
| 1019 | @end defun | 1019 | @end defun |
| 1020 | 1020 | ||
| 1021 | @defun files-equal-p file1 file2 | 1021 | @defun file-equal-p file1 file2 |
| 1022 | This function returns @code{t} if the files @var{file1} and | 1022 | This function returns @code{t} if the files @var{file1} and |
| 1023 | @var{file2} name the same file. Two ordinary files are considered to | 1023 | @var{file2} name the same file. Two ordinary files are considered to |
| 1024 | be the same if the function @code{file-attributes} (@pxref{File | 1024 | be the same if the function @code{file-attributes} (@pxref{File |
| @@ -1029,9 +1029,8 @@ Attributes}) returns @code{equal} values for them. | |||
| 1029 | This function returns @code{t} if directory @var{dir1} is a | 1029 | This function returns @code{t} if directory @var{dir1} is a |
| 1030 | subdirectory of @var{dir2}, or if @var{dir1} and @var{dir2} are the | 1030 | subdirectory of @var{dir2}, or if @var{dir1} and @var{dir2} are the |
| 1031 | same directory. It compares the @code{file-truename} values of the | 1031 | same directory. It compares the @code{file-truename} values of the |
| 1032 | two directories (@pxref{Truenames}). If either @var{dir1} or | 1032 | two directories (@pxref{Truenames}). If @var{dir2} |
| 1033 | @var{dir2} do not name existing directories, the return value is | 1033 | do not name an existing directory, the return value is @code{nil}. |
| 1034 | @code{nil}. | ||
| 1035 | @end defun | 1034 | @end defun |
| 1036 | 1035 | ||
| 1037 | @node Truenames | 1036 | @node Truenames |
| @@ -2722,7 +2721,7 @@ first, before handlers for jobs such as remote file access. | |||
| 2722 | @code{file-ownership-preserved-p}, | 2721 | @code{file-ownership-preserved-p}, |
| 2723 | @code{file-readable-p}, @code{file-regular-p}, @code{file-subdir-of-p}, | 2722 | @code{file-readable-p}, @code{file-regular-p}, @code{file-subdir-of-p}, |
| 2724 | @code{file-symlink-p}, @code{file-truename}, @code{file-writable-p}, | 2723 | @code{file-symlink-p}, @code{file-truename}, @code{file-writable-p}, |
| 2725 | @code{files-equal-p}, @code{find-backup-file-name}, | 2724 | @code{file-equal-p}, @code{find-backup-file-name}, |
| 2726 | @c Not sure why it was here: @code{find-file-noselect},@* | 2725 | @c Not sure why it was here: @code{find-file-noselect},@* |
| 2727 | @code{get-file-buffer}, | 2726 | @code{get-file-buffer}, |
| 2728 | @code{insert-directory}, | 2727 | @code{insert-directory}, |