Avoid recursive load of eshell

* lisp/eshell/eshell.el: Provide eshell before requiring esh-mode to
avoid a recursive load when esh-mode requires esh-module (which in
turn requires eshell).  (Bug #34954)
The double loading can be noticed by entries in 'eshell-load-hook' or
forms passed to (with-eval-after-load 'eshell ...).

diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el
index 45168007565e3a0a6b1c5a73514b21035d354429..c7ed7103e402d8dc5e6dc5a493fbed3dc9c9dcd5 100644 (file)
--- a/lisp/eshell/eshell.el
+++ b/lisp/eshell/eshell.el
@@ -175,6 +175,9 @@
 (eval-when-compile
   (require 'cl-lib))
 (require 'esh-util)
+;; Provide eshell before requiring esh-mode, to avoid a recursive load.
+;; (Bug #34954)
+(provide 'eshell)
 (require 'esh-mode)
 
 (defgroup eshell nil
@@ -403,6 +406,4 @@ Emacs."
 
 (run-hooks 'eshell-load-hook)
 
-(provide 'eshell)
-
 ;;; eshell.el ends here