(eshell-rebind-keys-alist): Add defvar.

(eshell-hist-initialize): Use that var the natural way.

1 files changed, 5 insertions, 3 deletions

diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el
index c82be565c4f..68770788349 100644
--- a/lisp/eshell/em-hist.el
+++ b/lisp/eshell/em-hist.el
@@ -204,6 +204,8 @@ element, regardless of any text on the command line.  In that case,
   (define-key eshell-isearch-map [(control ?c)] 'eshell-isearch-cancel-map)
   (define-key eshell-isearch-cancel-map [(control ?c)] 'eshell-isearch-cancel))
 
+(defvar eshell-rebind-keys-alist)
+
 ;;; Functions:
 
 (defun eshell-hist-initialize ()
@@ -217,10 +219,10 @@ element, regardless of any text on the command line.  In that case,
 
   (if (and (eshell-using-module 'eshell-rebind)
            (not eshell-non-interactive-p))
-      (let ((rebind-alist (symbol-value 'eshell-rebind-keys-alist)))
+      (let ((rebind-alist eshell-rebind-keys-alist))
         (make-local-variable 'eshell-rebind-keys-alist)
-        (set 'eshell-rebind-keys-alist
-             (append rebind-alist eshell-hist-rebind-keys-alist))
+        (setq eshell-rebind-keys-alist
+              (append rebind-alist eshell-hist-rebind-keys-alist))
         (set (make-local-variable 'search-invisible) t)
         (set (make-local-variable 'search-exit-option) t)
         (add-hook 'isearch-mode-hook