Commit e3bd33fb authored by Stefan Monnier's avatar Stefan Monnier

Eshell dependencies: Fix recent regressions

* lisp/dired.el (dired-insert-directory): Tweak bug#27817's ugly hack.

* lisp/eshell/em-ls.el: Refine 'require's.

* lisp/eshell/esh-opt.el: Require esh-util on behalf of its clients.
parent 526ffbad
Pipeline #1236 failed with stage
in 50 minutes and 55 seconds
......@@ -1269,8 +1269,8 @@ 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)))
;; FIXME: Big ugly hack for Eshell's eshell-ls-use-in-dired.
(not (bound-and-true-p eshell-ls-use-in-dired))
(or (file-remote-p dir)
(if (eq dired-use-ls-dired 'unspecified)
;; Check whether "ls --dired" gives exit code 0, and
......@@ -29,7 +29,8 @@
(require 'cl-lib)
(require 'esh-util)
(require 'esh-opt)
(eval-when-compile (require 'eshell))
(require 'esh-proc)
(require 'esh-cmd)
......@@ -33,6 +33,10 @@
;;; User Functions:
;; Macro expansion of eshell-eval-using-options refers to eshell-stringify-list
;; defined in esh-util.
(require 'esh-util)
(defmacro eshell-eval-using-options (name macro-args options &rest body-forms)
"Process NAME's MACRO-ARGS using a set of command line OPTIONS.
After doing so, stores settings in local symbols as declared by OPTIONS;
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