comparison lisp/isearch.el @ 12265:1d2296cfa1e3

(isearch-mode): Use overriding-terminal-local-map, not overriding-local-map. (isearch-done): Likewise.
author Karl Heuer <kwzh@gnu.org>
date Fri, 16 Jun 1995 06:10:21 +0000
parents 3ae851bcd773
children 07a76f045154
comparison
equal deleted inserted replaced
12264:93010bff5b56 12265:1d2296cfa1e3
498 (setq isearch-mode " Isearch") ;; forward? regexp? 498 (setq isearch-mode " Isearch") ;; forward? regexp?
499 (force-mode-line-update) 499 (force-mode-line-update)
500 500
501 (isearch-push-state) 501 (isearch-push-state)
502 502
503 (make-local-variable 'overriding-local-map) 503 (setq overriding-terminal-local-map isearch-mode-map)
504 (setq overriding-local-map isearch-mode-map)
505 (isearch-update) 504 (isearch-update)
506 (run-hooks 'isearch-mode-hook) 505 (run-hooks 'isearch-mode-hook)
507 506
508 (setq mouse-leave-buffer-hook '(isearch-done)) 507 (setq mouse-leave-buffer-hook '(isearch-done))
509 508
557 556
558 (defun isearch-done (&optional nopush edit) 557 (defun isearch-done (&optional nopush edit)
559 (setq mouse-leave-buffer-hook nil) 558 (setq mouse-leave-buffer-hook nil)
560 ;; Called by all commands that terminate isearch-mode. 559 ;; Called by all commands that terminate isearch-mode.
561 ;; If NOPUSH is non-nil, we don't push the string on the search ring. 560 ;; If NOPUSH is non-nil, we don't push the string on the search ring.
562 (setq overriding-local-map nil) 561 (setq overriding-terminal-local-map nil)
563 ;; (setq pre-command-hook isearch-old-pre-command-hook) ; for lemacs 562 ;; (setq pre-command-hook isearch-old-pre-command-hook) ; for lemacs
564 (isearch-dehighlight t) 563 (isearch-dehighlight t)
565 (let ((found-start (window-start (selected-window))) 564 (let ((found-start (window-start (selected-window)))
566 (found-point (point))) 565 (found-point (point)))
567 (if isearch-window-configuration 566 (if isearch-window-configuration