Dired: Support eshell-ls from the beginning if the user wants to

* lisp/dired.el (dired-insert-directory): Check for eshell-ls
as well (Bug#27817).
* test/lisp/dired-tests.el (dired-test-bug27817): Add test.

diff --git a/lisp/dired.el b/lisp/dired.el
index 9d500a9f52d36535250aa2a6092ef38af57f4c43..3b29c7129d424d6e7da3bc5fc92b2f3cea503a8c 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1207,6 +1207,7 @@ If HDR is non-nil, insert a header line with the directory name."
         ;; as indicated by `ls-lisp-use-insert-directory-program'.
         (not (and (featurep 'ls-lisp)
                   (null ls-lisp-use-insert-directory-program)))
+         (not (and (featurep 'eshell) (bound-and-true-p eshell-ls-use-in-dired)))
         (or (if (eq dired-use-ls-dired 'unspecified)
                 ;; Check whether "ls --dired" gives exit code 0, and
                 ;; save the answer in `dired-use-ls-dired'.

diff --git a/test/lisp/dired-tests.el b/test/lisp/dired-tests.el
index 69331457c0ee9c9c9648ad024241879b26773d79..601d65768bd0bf05a3a40ae55aacc0b6e61d0521 100644 (file)
--- a/test/lisp/dired-tests.el
+++ b/test/lisp/dired-tests.el
@@ -175,5 +175,18 @@
           (should (looking-at "src")))
       (when (buffer-live-p buf) (kill-buffer buf)))))
 
+(ert-deftest dired-test-bug27817 ()
+  "Test for http://debbugs.gnu.org/27817 ."
+  (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)
+          (should (setq buf (dired source-directory))))
+      (customize-set-variable 'eshell-ls-use-in-dired orig)
+      (and (buffer-live-p buf) (kill-buffer)))))
+
 (provide 'dired-tests)
 ;; dired-tests.el ends here