From 22294ae511509ad86586eb5d054c95de38e87894 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Fri, 16 Jan 2015 01:12:40 +0100 Subject: [PATCH] Minor directory-files-recursively touch-up * files.el (directory-files-recursively): Don't use the word "path" for a file name. --- lisp/ChangeLog | 5 +++++ lisp/files.el | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 150f32f351a..7ef0e6a2749 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-01-16 Lars Magne Ingebrigtsen + + * files.el (directory-files-recursively): Don't use the word + "path" for a file name. + 2015-01-15 Wolfgang Jenkner * calc/calc-units.el (math-units-in-expr-p) 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)))) -- 2.11.4.GIT