From 3d58ea1c0ba821a4d6915d6beeaa1617d4ad606f Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 31 Jul 2017 14:32:24 +0200 Subject: Small adaptions for directory wildcards * lisp/dired.el (dired-insert-directory): Remove "--dired" when there are wildcards, and the directory is remote. * test/lisp/net/tramp-tests.el (tramp--test-make-temp-name): Adapt docstring. (tramp-test17-dired-with-wildcards): Skip for all methods but those from tamp-sh.p. --- lisp/dired.el | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lisp/dired.el') diff --git a/lisp/dired.el b/lisp/dired.el index ca005785d67..c502dd8a509 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -1228,6 +1228,11 @@ see `dired-use-ls-dired' for more details.") (let ((dir-wildcard (insert-directory-wildcard-in-dir-p dir))) (cond (dir-wildcard (setq switches (concat "-d " switches)) + ;; We don't know whether the remote ls supports + ;; "--dired", so we cannot add it to the `process-file' + ;; call for wildcards. + (when (file-remote-p dir) + (setq switches (dired-replace-in-string "--dired" "" switches))) (let ((default-directory (car dir-wildcard)) (script (format "ls %s %s" switches (cdr dir-wildcard)))) (unless -- cgit v1.2.1