;; 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.
(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)
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
(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)
(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)))