[Emacs-diffs] master 38bb639 1/2: * files.el (directory-files-recursively): Do not include remote file names.

[Michael Albinus]

branch: master
commit 38bb639d552524f9d7311a99536d7b353aa2f029
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    * files.el (directory-files-recursively): Do not include remote file names.
---
 lisp/ChangeLog |    5 +++++
 lisp/files.el  |    5 ++++-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 674b267..fba541f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-11  Michael Albinus  <address@hidden>
+
+       * files.el (directory-files-recursively): Do not include
+       superfluous remote file names.
+
 2015-01-10  Lars Magne Ingebrigtsen  <address@hidden>
 
        * net/shr.el (shr-urlify): Don't bother the user about
diff --git a/lisp/files.el b/lisp/files.el
index 1533c35..175f85b 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 '("./" "../"))