Mercurial > emacs
comparison lisp/isearch.el @ 1614:567e76c81b0c
* bytecomp.el: Declare unread-command-char an obsolete variable.
* vip.el (vip-escape-to-emacs, vip-prefix-arg-value,
vip-prefix-arg-com): Use unread-command-event instead of
unread-command-char; respect its new semantics.
* isearch-mode.el (isearch-update, isearch-unread): Same.
author | Jim Blandy <jimb@redhat.com> |
---|---|
date | Mon, 16 Nov 1992 01:37:06 +0000 |
parents | 816bfa185671 |
children | 04fb1d3d6992 |
comparison
equal
deleted
inserted
replaced
1613:694d5c6de713 | 1614:567e76c81b0c |
---|---|
2 ;; Copyright (C) 1992 Free Software Foundation, Inc. | 2 ;; Copyright (C) 1992 Free Software Foundation, Inc. |
3 | 3 |
4 ;; LCD Archive Entry: | 4 ;; LCD Archive Entry: |
5 ;; isearch-mode|Daniel LaLiberte|liberte@cs.uiuc.edu | 5 ;; isearch-mode|Daniel LaLiberte|liberte@cs.uiuc.edu |
6 ;; |A minor mode replacement for isearch.el. | 6 ;; |A minor mode replacement for isearch.el. |
7 ;; |$Date: 1992/11/01 22:10:59 $|$Revision: 1.14 $|~/modes/isearch-mode.el | 7 ;; |$Date: 1992/11/07 06:17:04 $|$Revision: 1.15 $|~/modes/isearch-mode.el |
8 | 8 |
9 ;; This file is not yet part of GNU Emacs, but it is based almost | 9 ;; This file is not yet part of GNU Emacs, but it is based almost |
10 ;; entirely on isearch.el which is part of GNU Emacs. | 10 ;; entirely on isearch.el which is part of GNU Emacs. |
11 | 11 |
12 ;; GNU Emacs is distributed in the hope that it will be useful, | 12 ;; GNU Emacs is distributed in the hope that it will be useful, |
86 ;; - Hooks and options for failed search. | 86 ;; - Hooks and options for failed search. |
87 | 87 |
88 ;;;==================================================================== | 88 ;;;==================================================================== |
89 ;;; Change History | 89 ;;; Change History |
90 | 90 |
91 ;;; $Header: /gd/gnu/emacs/19.0/lisp/RCS/isearch-mode.el,v 1.14 1992/11/01 22:10:59 rms Exp $ | 91 ;;; $Header: /home/gd/gnu/emacs/19.0/lisp/RCS/isearch-mode.el,v 1.15 1992/11/07 06:17:04 jimb Exp jimb $ |
92 ;;; $Log: isearch-mode.el,v $ | 92 ;;; $Log: isearch-mode.el,v $ |
93 ; Revision 1.15 1992/11/07 06:17:04 jimb | |
94 ; * isearch.el (isearch-frames-exist): This isn't what we want - | |
95 ; replaced by... | |
96 ; (isearch-gnu-emacs-events): non-nil if should expect events in the | |
97 ; style generated by GNU Emacs 19. Set if set-frame-height is | |
98 ; fboundp; this is true on any GNU Emacs 19, whether or not it was | |
99 ; compiled with multiple frame support. | |
100 ; (isearch-mode-map): Test isearch-gnu-emacs-events instead of | |
101 ; isearch-frames-exist to see if we should bind switch-frame events. | |
102 ; (isearch-update): Test isearch-gnu-emacs-events instead of | |
103 ; isearch-frames-exist to see if unread-command-char's quiescent | |
104 ; value is nil or -1. | |
105 ; | |
93 ; Revision 1.14 1992/11/01 22:10:59 rms | 106 ; Revision 1.14 1992/11/01 22:10:59 rms |
94 ; (isearch-search): Handle all sorts of errors from regexp search. | 107 ; (isearch-search): Handle all sorts of errors from regexp search. |
95 ; | 108 ; |
96 ; Revision 1.13 1992/10/27 04:11:46 rms | 109 ; Revision 1.13 1992/10/27 04:11:46 rms |
97 ; (isearch-edit-string): | 110 ; (isearch-edit-string): |
542 (defun isearch-update () | 555 (defun isearch-update () |
543 ;; Called after each command to update the display. | 556 ;; Called after each command to update the display. |
544 (if (if isearch-event-data-type | 557 (if (if isearch-event-data-type |
545 (null unread-command-event) | 558 (null unread-command-event) |
546 (if isearch-gnu-emacs-events | 559 (if isearch-gnu-emacs-events |
547 (null unread-command-char) | 560 (null unread-command-event) |
548 (< unread-command-char 0))) | 561 (< unread-command-char 0))) |
549 (progn | 562 (progn |
550 (if (not (input-pending-p)) | 563 (if (not (input-pending-p)) |
551 (isearch-message)) | 564 (isearch-message)) |
552 (if (and isearch-slow-terminal-mode | 565 (if (and isearch-slow-terminal-mode |
1410 (defun isearch-text-char-description (c) | 1423 (defun isearch-text-char-description (c) |
1411 (isearch-char-to-string c)) | 1424 (isearch-char-to-string c)) |
1412 | 1425 |
1413 (defun isearch-unread (char-or-event) | 1426 (defun isearch-unread (char-or-event) |
1414 ;; General function to unread a character or event. | 1427 ;; General function to unread a character or event. |
1415 (if isearch-event-data-type | 1428 (cond |
1416 (setq unread-command-event char-or-event) | 1429 (isearch-event-data-type |
1417 (setq unread-command-char char-or-event))) | 1430 (setq unread-command-event char-or-event)) |
1431 (isearch-gnu-emacs-events | |
1432 (setq unread-command-event char-or-event)) | |
1433 (t | |
1434 (setq unread-command-char char-or-event)))) | |
1418 | 1435 |
1419 (defun isearch-last-command-char () | 1436 (defun isearch-last-command-char () |
1420 ;; General function to return the last command character. | 1437 ;; General function to return the last command character. |
1421 (if isearch-event-data-type | 1438 (if isearch-event-data-type |
1422 last-command-event | 1439 last-command-event |