diff options
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2015-01-16 01:12:40 +0100 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2015-01-16 01:12:52 +0100 |
| commit | 22294ae511509ad86586eb5d054c95de38e87894 (patch) | |
| tree | a4033ee2fa77a6518477e00b00697fe4ed7cfdcf /lisp/files.el | |
| parent | 2290000ed69b1157739c280f090e5b60112e83fe (diff) | |
| download | emacs-22294ae511509ad86586eb5d054c95de38e87894.tar.gz | |
Minor directory-files-recursively touch-up
* files.el (directory-files-recursively): Don't use the word
"path" for a file name.
Diffstat (limited to 'lisp/files.el')
| -rw-r--r-- | lisp/files.el | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/files.el b/lisp/files.el index 175f85b29d0..f8318d8a34d 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -749,14 +749,15 @@ If INCLUDE-DIRECTORIES, also include directories that have matching names." (unless (member file '("./" "../")) (if (directory-name-p file) (let* ((leaf (substring file 0 (1- (length file)))) - (path (expand-file-name leaf dir))) + (full-file (expand-file-name leaf dir))) ;; Don't follow symlinks to other directories. - (unless (file-symlink-p path) - (setq result (nconc result (directory-files-recursively - path match include-directories)))) + (unless (file-symlink-p full-file) + (setq result + (nconc result (directory-files-recursively + full-file match include-directories)))) (when (and include-directories (string-match match leaf)) - (setq result (nconc result (list path))))) + (setq result (nconc result (list full-file))))) (when (string-match match file) (push (expand-file-name file dir) files))))) (nconc result (nreverse files)))) |