From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 9 Apr 2019 08:01:24 +0000 (+0300)
Subject: Fix "M-x eshell"
X-Git-Tag: emacs-27.0.90~3261^2~31
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1e58dc9e11caa78e458e35ef4c7f32269e052d89;p=emacs.git

Fix "M-x eshell"

* lisp/eshell/em-dirs.el (eshell-variable-aliases-list)
(eshell-directory-name, eshell-mode): Defvar them.
(eshell-dirs-initialize): Require esh-var.  (Bug#35203)
(eshell-apply-indices): Declare.
---

diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el
index 937bc981c53..93b10b59948 100644
--- a/lisp/eshell/em-dirs.el
+++ b/lisp/eshell/em-dirs.el
@@ -46,6 +46,11 @@
 (require 'ring)
 (require 'esh-opt)
 
+(declare-function eshell-apply-indices "esh-var")
+(defvar eshell-variable-aliases-list)
+(defvar eshell-directory-name)
+(defvar eshell-mode)
+
 ;;;###autoload
 (progn
 (defgroup eshell-dirs nil
@@ -171,6 +176,7 @@ Thus, this does not include the current directory.")
 
 (defun eshell-dirs-initialize ()
   "Initialize the builtin functions for Eshell."
+  (require 'esh-var)
   (make-local-variable 'eshell-variable-aliases-list)
   (setq eshell-variable-aliases-list
 	(append