From: Jim Porter <jporterbugs@gmail.com>
Date: Sat, 11 Feb 2023 20:37:32 +0000 (-0800)
Subject: Make sure core Eshell modules are loaded
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=14c97db7366435b1edbf2854f485058a9d7c6071;p=emacs.git

Make sure core Eshell modules are loaded

Previously, if you removed all (or most) extension modules from
Eshell, it failed to load esh-var.el, meaning that you couldn't use
variable expansions.  To avoid this issue, we now explicitly load the
core modules in esh-mode.el.

* lisp/eshell/esh-mode.el: Explicitly require core Eshell modules.
---

diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index 654e26777e0..46c3c2fa175 100644
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -58,10 +58,16 @@
 
 ;;; Code:
 
-(require 'esh-util)
-(require 'esh-module)
+;; Load the core Eshell modules; we'll call their initialization
+;; functions below in `eshell-mode'.
+(require 'esh-arg)
 (require 'esh-cmd)
-(require 'esh-arg)                      ;For eshell-parse-arguments
+(require 'esh-ext)
+(require 'esh-io)
+(require 'esh-module)
+(require 'esh-proc)
+(require 'esh-util)
+(require 'esh-var)
 
 (defgroup eshell-mode nil
   "This module contains code for handling input from the user."