summaryrefslogtreecommitdiff
path: root/lisp/files.el
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2014-12-10 09:44:26 +0100
committerAndreas Schwab <schwab@suse.de>2014-12-10 09:47:36 +0100
commit94a3f7648cfc9d1d205e69eff0beec416d30a0fe (patch)
treeb55aea637daf2bbab2a566c8840ad4eaf392cfae /lisp/files.el
parent5c9a98bffb2c824e2fc07350ac7492a0bd9cbc18 (diff)
downloademacs-94a3f7648cfc9d1d205e69eff0beec416d30a0fe.tar.gz
emacs-94a3f7648cfc9d1d205e69eff0beec416d30a0fe.tar.bz2
emacs-94a3f7648cfc9d1d205e69eff0beec416d30a0fe.zip
* files.el (file-tree-walk): Use file-name-as-directory
unconditionally.
Diffstat (limited to 'lisp/files.el')
-rw-r--r--lisp/files.el3
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/files.el b/lisp/files.el
index e948c745b3c..568c1bb58b1 100644
--- 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