[Emacs-diffs] Changes to emacs/lisp/eshell/em-hist.el

[Richard M . Stallman]

Index: emacs/lisp/eshell/em-hist.el
diff -c emacs/lisp/eshell/em-hist.el:1.17 emacs/lisp/eshell/em-hist.el:1.18
*** emacs/lisp/eshell/em-hist.el:1.17   Mon Jul  4 17:25:26 2005
--- emacs/lisp/eshell/em-hist.el        Sat Jul 16 17:42:49 2005
***************
*** 204,209 ****
--- 204,211 ----
    (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,226 ****
  
    (if (and (eshell-using-module 'eshell-rebind)
           (not eshell-non-interactive-p))
!       (let ((rebind-alist (symbol-value 'eshell-rebind-keys-alist)))
        (make-local-variable 'eshell-rebind-keys-alist)
!       (set '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
--- 219,228 ----
  
    (if (and (eshell-using-module 'eshell-rebind)
           (not eshell-non-interactive-p))
!       (let ((rebind-alist eshell-rebind-keys-alist))
        (make-local-variable 'eshell-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