[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master d5c41e9: Dired: Support eshell-ls from the beginnin
From: |
Tino Calancha |
Subject: |
[Emacs-diffs] master d5c41e9: Dired: Support eshell-ls from the beginning if the user wants to |
Date: |
Wed, 26 Jul 2017 03:55:59 -0400 (EDT) |
branch: master
commit d5c41e99a2071e3ee491a53a0f9506f62fa6ae54
Author: Tino Calancha <address@hidden>
Commit: Tino Calancha <address@hidden>
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.
---
lisp/dired.el | 1 +
test/lisp/dired-tests.el | 13 +++++++++++++
2 files changed, 14 insertions(+)
diff --git a/lisp/dired.el b/lisp/dired.el
index 9d500a9..3b29c71 100644
--- 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 6933145..601d657 100644
--- 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master d5c41e9: Dired: Support eshell-ls from the beginning if the user wants to,
Tino Calancha <=