* files.el (file-tree-walk): Use file-name-as-directory

unconditionally.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 445a461871440c13aa045e1e23cce3e3a67b2e21..454ee000c9a2909d78e70f5570565103f5cad4d2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-10  Andreas Schwab  <schwab@suse.de>
+
+       * files.el (file-tree-walk): Use file-name-as-directory
+       unconditionally.
+
 2014-12-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * files.el (directory-files-recursively): Use

diff --git a/lisp/files.el b/lisp/files.el
index e948c745b3cfed08dbf526985b9ee98644fd3ff6..568c1bb58b1c0126fe86d5435aebfe33cc5f45b2 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -743,8 +743,7 @@ 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)
-        (or (char-equal ?/ (aref dir (1- (length dir))))
-            (setq dir (file-name-as-directory dir)))
+        (setq dir (file-name-as-directory dir))
         (let ((lst (directory-files dir nil nil t))
               fullname file)
           (while lst