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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 674b26716a465ec0b3c9b9bf12673ca8521ac01c..fba541fbc298f156062084b202fc3e887616136d 100644 (file)
--- 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 1533c35e6ca12b4f95d8190a216f515876d20c07..175f85b29d0a0cf54a4888925d4ab9b87f8a2b79 100644 (file)
--- 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 '("./" "../"))