emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 5e55b1b 2/2: Avoid recursive load of eshell


From: Noam Postavsky
Subject: [Emacs-diffs] master 5e55b1b 2/2: Avoid recursive load of eshell
Date: Wed, 3 Apr 2019 22:51:31 -0400 (EDT)

branch: master
commit 5e55b1b82952a03b704c464e8086d3c41e993a46
Author: Mauro Aranda <address@hidden>
Commit: Noam Postavsky <address@hidden>

    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 4516800..c7ed710 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]