From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 16 Jan 1994 23:40:50 +0000 (+0000)
Subject: (isearch-mode): Set overriding-local-map locally.
X-Git-Tag: emacs-19.34~10236
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=849cfd72e1cdf38c6b33d730809946f1c3e53a93;p=emacs.git

(isearch-mode): Set overriding-local-map locally.
Don't set isearch-old-local-map and don't call use-local-map.
(isearch-done): Set overriding-local-map to nil.
Don't call use-local-map.
(isearch-old-local-map): Variable deleted.
---

diff --git a/lisp/isearch.el b/lisp/isearch.el
index b7534ba737b..7fd87e05e95 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -4,7 +4,7 @@
 
 ;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu>
 
-;; |$Date: 1994/01/10 22:27:52 $|$Revision: 1.60 $
+;; |$Date: 1994/01/15 16:24:47 $|$Revision: 1.61 $
 
 ;; This file is part of GNU Emacs.
 
@@ -349,7 +349,6 @@ Default value, nil, means edit the string instead.")
 (defvar isearch-opoint 0)
 ;;; The window configuration active at the beginning of the search.
 (defvar isearch-window-configuration nil)
-(defvar isearch-old-local-map nil)
 
 ;; Flag to indicate a yank occurred, so don't move the cursor.
 (defvar isearch-yank-flag nil)
@@ -502,7 +501,6 @@ is treated as a regexp.  See \\[isearch-forward] for more info."
 	isearch-small-window nil
 
 	isearch-opoint (point)
-	isearch-old-local-map (current-local-map)
 	search-ring-yank-pointer nil
 	regexp-search-ring-yank-pointer nil)
   (setq isearch-window-configuration
@@ -521,7 +519,8 @@ is treated as a regexp.  See \\[isearch-forward] for more info."
 
   (isearch-push-state)
 
-  (use-local-map isearch-mode-map)
+  (make-local-variable 'overriding-local-map)
+  (setq overriding-local-map isearch-mode-map)
   (isearch-update)
   (run-hooks 'isearch-mode-hook)
 
@@ -581,7 +580,7 @@ is treated as a regexp.  See \\[isearch-forward] for more info."
 (defun isearch-done (&optional nopush)
   ;; Called by all commands that terminate isearch-mode.
   ;; If NOPUSH is non-nil, we don't push the string on the search ring.
-  (use-local-map isearch-old-local-map)
+  (setq overriding-local-map nil)
   ;; (setq pre-command-hook isearch-old-pre-command-hook) ; for lemacs
   (isearch-dehighlight t)
   (let ((found-start (window-start (selected-window)))