summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2019-04-09 11:01:24 +0300
committerEli Zaretskii <eliz@gnu.org>2019-04-09 11:01:24 +0300
commit1e58dc9e11caa78e458e35ef4c7f32269e052d89 (patch)
treeffb5751f6662311313522efd154708000589f955
parent062369e3aebdbcf25538e71686208a2126d83619 (diff)
downloademacs-1e58dc9e11caa78e458e35ef4c7f32269e052d89.tar.gz
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.
-rw-r--r--lisp/eshell/em-dirs.el6
1 files changed, 6 insertions, 0 deletions
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