diff options
| author | Mauro Aranda <maurooaranda@gmail.com> | 2019-03-23 11:38:14 -0300 |
|---|---|---|
| committer | Noam Postavsky <npostavs@users.sourceforge.net> | 2019-04-03 22:47:10 -0400 |
| commit | 5e55b1b82952a03b704c464e8086d3c41e993a46 (patch) | |
| tree | e92f22f81b5ebd3be9a3ea9a9050ee84b6cb0bcb /lisp/eshell/eshell.el | |
| parent | 64925714ef6b4d7485e5aee7a8ac063c20c07bc5 (diff) | |
| download | emacs-5e55b1b82952a03b704c464e8086d3c41e993a46.tar.gz emacs-5e55b1b82952a03b704c464e8086d3c41e993a46.tar.bz2 emacs-5e55b1b82952a03b704c464e8086d3c41e993a46.zip | |
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 ...).
Diffstat (limited to 'lisp/eshell/eshell.el')
| -rw-r--r-- | lisp/eshell/eshell.el | 5 |
1 files 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 |