[Emacs-diffs] master e3bd33f: Eshell dependencies: Fix recent regressions

[Stefan Monnier]

branch: master
commit e3bd33fb1cecff290724f0aa2c9eb5feeefbca0c
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>

    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.
---
 lisp/dired.el          | 4 ++--
 lisp/eshell/em-ls.el   | 3 ++-
 lisp/eshell/esh-opt.el | 4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lisp/dired.el b/lisp/dired.el
index fc0b712..4c2c3f4 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -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
diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el
index 5e4bbdc..89969d3 100644
--- a/lisp/eshell/em-ls.el
+++ b/lisp/eshell/em-ls.el
@@ -29,7 +29,8 @@
 (require 'cl-lib)
 (require 'esh-util)
 (require 'esh-opt)
-(eval-when-compile (require 'eshell))
+(require 'esh-proc)
+(require 'esh-cmd)
 
 ;;;###autoload
 (progn
diff --git a/lisp/eshell/esh-opt.el b/lisp/eshell/esh-opt.el
index 5b26932..3ea5873 100644
--- a/lisp/eshell/esh-opt.el
+++ b/lisp/eshell/esh-opt.el
@@ -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;