diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2017-07-31 14:32:24 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2017-07-31 14:32:24 +0200 |
| commit | 3d58ea1c0ba821a4d6915d6beeaa1617d4ad606f (patch) | |
| tree | 58a4c0c6aaf65934f64b16f9ea85a6e6874fdc4b /lisp/dired.el | |
| parent | 55d62d344a0c2ad6c2726fae04366b2a3ed87f6f (diff) | |
| download | emacs-3d58ea1c0ba821a4d6915d6beeaa1617d4ad606f.tar.gz | |
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.
Diffstat (limited to 'lisp/dired.el')
| -rw-r--r-- | lisp/dired.el | 5 |
1 files changed, 5 insertions, 0 deletions
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 |