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

unconditionally.

lisp/ChangeLog

+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

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