mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/files.el (file-tree-walk): Remove; of unknown authorship.

Browse source 
* etc/NEWS: Remove entry.

Fixes: debbugs:19325
This commit is contained in:
Glenn Morris 2015-01-07 20:52:24 -08:00
parent dff81fa7b7
commit ffa8603902
3 changed files with 4 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
etc/NEWS
View file

@ -141,10 +141,6 @@ this has no effect.
** A new text property `inhibit-read-only' can be used in read-only
buffers to allow certain parts of the text to be writable.
** A new function `file-tree-walk' allows to apply a certain action
to all the files and subdirectories of a directory, similarly to the C
library function `ftw'.
** A new function `directory-files-recursively' returns all matching
files (recursively) under a directory.

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2015-01-08 Glenn Morris <rgm@gnu.org>
* files.el (file-tree-walk): Remove; of unknown authorship. (Bug#19325)
2015-01-07 K. Handa <handa@gnu.org>
* international/ccl.el (define-ccl-program): Improve the docstring.

32
lisp/files.el
View file

@ -729,38 +729,6 @@ The path separator is colon in GNU and GNU-like systems."
(lambda (f) (and (file-directory-p f) 'dir-ok)))
(error "No such directory found via CDPATH environment variable"))))
(defun file-tree-walk (dir action &rest args)
"Walk DIR executing ACTION on each file, with ARGS as additional arguments.
For each file, the function calls ACTION as follows:
\(ACTION DIRECTORY BASENAME ARGS\)
Where DIRECTORY is the leading directory of the file,
BASENAME is the basename of the file,
and ARGS are as specified in the call to this function, or nil if omitted.
The ACTION is applied to each subdirectory before descending into
it, and if nil is returned at that point, the descent will be
prevented. Directory entries are sorted with string-lessp."
(cond ((file-directory-p dir)
(setq dir (file-name-as-directory dir))
(let ((lst (directory-files dir nil nil t))
fullname file)
(while lst
(setq file (car lst))
(setq lst (cdr lst))
(cond ((member file '("." "..")))
(t
(and (apply action dir file args)
(setq fullname (concat dir file))
(file-directory-p fullname)
(apply 'file-tree-walk fullname action args)))))))
(t
(apply action
(file-name-directory dir)
(file-name-nondirectory dir)
args))))
(defsubst directory-name-p (name)
"Return non-nil if NAME ends with a slash character."
(and (> (length name) 0)