emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 22294ae: Minor directory-files-recursively touch-up


From: Lars Ingebrigtsen
Subject: [Emacs-diffs] master 22294ae: Minor directory-files-recursively touch-up
Date: Fri, 16 Jan 2015 00:12:56 +0000

branch: master
commit 22294ae511509ad86586eb5d054c95de38e87894
Author: Lars Magne Ingebrigtsen <address@hidden>
Commit: Lars Magne Ingebrigtsen <address@hidden>

    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 150f32f..7ef0e6a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-16  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * files.el (directory-files-recursively): Don't use the word
+       "path" for a file name.
+
 2015-01-15  Wolfgang Jenkner  <address@hidden>
 
        * calc/calc-units.el (math-units-in-expr-p)
diff --git a/lisp/files.el b/lisp/files.el
index 175f85b..f8318d8 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))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]