Commit f3ad1593 authored by Tino Calancha's avatar Tino Calancha
Browse files

Insert subdir content if dir-or-list is a string w/o wildcards

* lisp/eshell/em-ls.el (eshell-ls--insert-directory):
Append '("-d") into 'eshell-ls-dired-initial-args'
if 'dired-directory' is a cons or there are wildcars (Bug#27843).
* test/lisp/dired-tests.el (dired-test-bug27843): Add test.
parent 4ddc5645
......@@ -278,8 +278,12 @@ instead."
(let ((insert-func 'insert)
(error-func 'insert)
(flush-func 'ignore)
eshell-ls-dired-initial-args)
(eshell-do-ls (append switches (list file)))))))))
(switches
(append eshell-ls-dired-initial-args
(and (or (consp dired-directory) wildcard) (list "-d"))
switches)))
(eshell-do-ls (nconc switches (list file)))))))))
(declare-function eshell-extended-glob "em-glob" (glob))
(declare-function dired-read-dir-and-switches "dired" (str))
......
......@@ -325,6 +325,21 @@
(delete-directory dir 'recursive)
(when (buffer-live-p buf) (kill-buffer buf)))))
(ert-deftest dired-test-bug27843 ()
"Test for http://debbugs.gnu.org/27843 ."
(require 'em-ls)
(let ((orig eshell-ls-use-in-dired)
(dired-use-ls-dired 'unspecified)
buf insert-directory-program)
(unwind-protect
(progn
(customize-set-variable 'eshell-ls-use-in-dired t)
(setq buf (dired (list source-directory "lisp")))
(dired-toggle-marks)
(should-not (cdr (dired-get-marked-files))))
(customize-set-variable 'eshell-ls-use-in-dired orig)
(unload-feature 'em-ls 'force)
(and (buffer-live-p buf) (kill-buffer)))))
(provide 'dired-tests)
;; dired-tests.el ends here
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment