From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 16 Jul 2005 17:42:49 +0000 (+0000)
Subject: (eshell-rebind-keys-alist): Add defvar.
X-Git-Tag: emacs-pretest-22.0.90~8093
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3c54e8f13680d43191ce274d5a71145fb8a89d01;p=emacs.git

(eshell-rebind-keys-alist): Add defvar.
(eshell-hist-initialize): Use that var the natural way.
---

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