From: Michael Albinus <michael.albinus@gmx.de>
Date: Sun, 11 Jan 2015 14:58:06 +0000 (+0100)
Subject: * files.el (directory-files-recursively): Do not include remote file names.
X-Git-Tag: emacs-25.0.90~2603^2~32
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=38bb639d552524f9d7311a99536d7b353aa2f029;p=emacs.git

* files.el (directory-files-recursively): Do not include remote file names.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 674b26716a4..fba541fbc29 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-11  Michael Albinus  <michael.albinus@gmx.de>
+
+	* files.el (directory-files-recursively): Do not include
+	superfluous remote file names.
+
 2015-01-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* net/shr.el (shr-urlify): Don't bother the user about
diff --git a/lisp/files.el b/lisp/files.el
index 1533c35e6ca..175f85b29d0 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -740,7 +740,10 @@ This function works recursively.  Files are returned in \"depth first\"
 and alphabetical order.
 If INCLUDE-DIRECTORIES, also include directories that have matching names."
   (let ((result nil)
-	(files nil))
+	(files nil)
+	;; When DIR is "/", remote file names like "/method:" could
+	;; also be offered.  We shall suppress them.
+	(tramp-mode (and tramp-mode (file-remote-p dir))))
     (dolist (file (sort (file-name-all-completions "" dir)
 			'string<))
       (unless (member file '("./" "../"))