Commit 5e55b1b8 authored by Mauro Aranda's avatar Mauro Aranda Committed by Noam Postavsky

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 ...).
parent 64925714
Pipeline #1155 failed with stage
in 48 minutes and 29 seconds
......@@ -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
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