From 5e55b1b82952a03b704c464e8086d3c41e993a46 Mon Sep 17 00:00:00 2001 From: Mauro Aranda Date: Sat, 23 Mar 2019 11:38:14 -0300 Subject: [PATCH] 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 ...). --- lisp/eshell/eshell.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el index 45168007565..c7ed7103e40 100644 --- 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 -- 2.39.2