Mercurial > emacs
annotate lisp/isearch.el @ 2318:50737ca2fd45
Decide automatically whether to use COFF or ELF.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Mon, 22 Mar 1993 19:50:35 +0000 |
| parents | 91fe00141e95 |
| children | fd15462e52a1 |
| rev | line source |
|---|---|
|
2233
fb0ed5a1d0f3
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
1 ;;; isearch.el --- incremental search minor mode. |
|
2230
6314334d7c2b
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2055
diff
changeset
|
2 |
|
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
792
diff
changeset
|
3 ;; Copyright (C) 1992 Free Software Foundation, Inc. |
|
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
792
diff
changeset
|
4 |
|
2230
6314334d7c2b
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2055
diff
changeset
|
5 ;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu> |
|
6314334d7c2b
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2055
diff
changeset
|
6 |
|
2296
91fe00141e95
* isearch.el (isearch-switch-frame-handler): Call
Jim Blandy <jimb@redhat.com>
parents:
2233
diff
changeset
|
7 ;; |$Date: 1993/03/17 17:17:05 $|$Revision: 1.26 $ |
| 725 | 8 |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
9 ;; This file is not yet part of GNU Emacs, but it is based almost |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
10 ;; entirely on isearch.el which is part of GNU Emacs. |
| 725 | 11 |
| 12 ;; GNU Emacs is distributed in the hope that it will be useful, | |
| 13 ;; but WITHOUT ANY WARRANTY. No author or distributor | |
| 14 ;; accepts responsibility to anyone for the consequences of using it | |
| 15 ;; or for whether it serves any particular purpose or works at all, | |
| 16 ;; unless he says so in writing. Refer to the GNU Emacs General Public | |
| 17 ;; License for full details. | |
| 18 | |
| 19 ;; Everyone is granted permission to copy, modify and redistribute | |
| 20 ;; GNU Emacs, but only under the conditions described in the | |
| 21 ;; GNU Emacs General Public License. A copy of this license is | |
| 22 ;; supposed to have been given to you along with GNU Emacs so you | |
| 23 ;; can know your rights and responsibilities. It should be in a | |
| 24 ;; file named COPYING. Among other things, the copyright notice | |
| 25 ;; and this notice must be preserved on all copies. | |
| 26 | |
|
2230
6314334d7c2b
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2055
diff
changeset
|
27 ;;; Commentary: |
|
6314334d7c2b
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2055
diff
changeset
|
28 |
| 725 | 29 ;;;==================================================================== |
| 30 ;; Instructions | |
| 31 | |
| 32 ;; Searching with isearch-mode.el should work just like isearch.el, | |
| 33 ;; except it is done in a temporary minor mode that terminates when | |
| 34 ;; you finish searching. | |
| 35 | |
| 36 ;; To use isearch-mode instead of the standard isearch.el, add the | |
| 37 ;; following to your .emacs file. The standard key bindings to | |
| 38 ;; isearch-forward, etc, will then use isearch-mode instead of | |
| 39 ;; isearch. | |
| 40 | |
| 41 ;; (fset 'isearch 'isearch-mode) | |
| 42 ;; (autoload 'isearch-mode "isearch-mode") | |
| 43 | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
44 ;; For programmed use of isearch-mode, e.g. calling (isearch-forward), |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
45 ;; isearch-mode behaves modally and does not return until the search |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
46 ;; is completed. It uses a recursive-edit to behave this way. Note: |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
47 ;; gnus does it wrong: (call-interactively 'isearch-forward). |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
48 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
49 ;; If any package you use invokes isearching non-interactively to get |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
50 ;; the modal behavior described above, you must use the redefinitions |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
51 ;; of isearch-forward, etc. found in this file instead of those in |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
52 ;; loaddefs.el. The simplest way to ensure this is to just load |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
53 ;; isearch-mode explicitly in your .emacs instead of using the above |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
54 ;; fset and autoload. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
55 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
56 ;; (load "isearch-mode") |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
57 |
| 725 | 58 ;; The key bindings active within isearch-mode are defined below in |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
59 ;; `isearch-mode-map' which is given bindings close to the default |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
60 ;; characters of the original isearch.el. With `isearch-mode', |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
61 ;; however, you can bind multi-character keys and it should be easier |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
62 ;; to add new commands. One bug though: keys with meta-prefix cannot |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
63 ;; be longer than two chars. Also see minibuffer-local-isearch-map |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
64 ;; for bindings active during `isearch-edit-string'. |
| 725 | 65 |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
66 ;; Note to emacs version 19 users: isearch-mode should work even if |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
67 ;; you switch windows with the mouse, in which case isearch-mode is |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
68 ;; terminated automatically before the switch. This is true of lemacs |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
69 ;; too, with a few more cleanups I've neglected in this release. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
70 ;; No one has supplied patches for epoch yet. |
| 725 | 71 |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
72 ;; The search ring and completion commands automatically put you in |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
73 ;; the minibuffer to edit the string. This gives you a chance to |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
74 ;; modify the search string before executing the search. There are |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
75 ;; three commands to terminate the editing: C-s and C-r exit the |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
76 ;; minibuffer and search forward and reverse respectively, while C-m |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
77 ;; exits and does a nonincremental search. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
78 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
79 ;; Exiting immediately from isearch uses isearch-edit-string instead |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
80 ;; of nonincremental-search, if search-nonincremental-instead is non-nil. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
81 ;; The name of this option should probably be changed if we decide to |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
82 ;; keep the behavior. No point in forcing nonincremental search until |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
83 ;; the last possible moment. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
84 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
85 ;; TODO |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
86 ;; - Integrate the emacs 19 generalized commmand history. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
87 ;; - Think about incorporating query-replace. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
88 ;; - Hooks and options for failed search. |
|
792
45d748a65f24
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
725
diff
changeset
|
89 |
|
2230
6314334d7c2b
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2055
diff
changeset
|
90 ;;; Change Log: |
|
6314334d7c2b
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2055
diff
changeset
|
91 |
|
792
45d748a65f24
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
725
diff
changeset
|
92 ;;;==================================================================== |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
93 ;;; Change History |
|
792
45d748a65f24
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
725
diff
changeset
|
94 |
|
2296
91fe00141e95
* isearch.el (isearch-switch-frame-handler): Call
Jim Blandy <jimb@redhat.com>
parents:
2233
diff
changeset
|
95 ;;; $Header: /home/gd/gnu/emacs/19.0/lisp/RCS/isearch.el,v 1.26 1993/03/17 17:17:05 eric Exp jimb $ |
|
2230
6314334d7c2b
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2055
diff
changeset
|
96 ;;; $Log: isearch.el,v $ |
|
2296
91fe00141e95
* isearch.el (isearch-switch-frame-handler): Call
Jim Blandy <jimb@redhat.com>
parents:
2233
diff
changeset
|
97 ; Revision 1.26 1993/03/17 17:17:05 eric |
|
91fe00141e95
* isearch.el (isearch-switch-frame-handler): Call
Jim Blandy <jimb@redhat.com>
parents:
2233
diff
changeset
|
98 ; Add standard library headers. |
|
91fe00141e95
* isearch.el (isearch-switch-frame-handler): Call
Jim Blandy <jimb@redhat.com>
parents:
2233
diff
changeset
|
99 ; |
|
2233
fb0ed5a1d0f3
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
100 ; Revision 1.25 1993/03/17 16:44:50 eric |
|
fb0ed5a1d0f3
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
101 ; Add standard library headers. |
|
fb0ed5a1d0f3
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
102 ; |
|
2232
4f9d60f7de9d
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2230
diff
changeset
|
103 ; Revision 1.24 1993/03/17 15:58:09 eric |
|
4f9d60f7de9d
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2230
diff
changeset
|
104 ; Add standard library headers. |
|
4f9d60f7de9d
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2230
diff
changeset
|
105 ; |
|
2230
6314334d7c2b
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2055
diff
changeset
|
106 ; Revision 1.23 1993/03/07 20:17:27 rms |
|
6314334d7c2b
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2055
diff
changeset
|
107 ; (isearch-other-meta-char): Call listify-key-sequence. |
|
6314334d7c2b
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2055
diff
changeset
|
108 ; (isearch-unread): Don't call it here. |
|
6314334d7c2b
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2055
diff
changeset
|
109 ; (isearch-mode-map): Bind the ASCII-equivalent function keys. |
|
6314334d7c2b
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2055
diff
changeset
|
110 ; |
|
2055
9234ebe088c9
(isearch-other-meta-char): Call listify-key-sequence.
Richard M. Stallman <rms@gnu.org>
parents:
2042
diff
changeset
|
111 ; Revision 1.22 1993/03/07 08:43:57 rms |
|
9234ebe088c9
(isearch-other-meta-char): Call listify-key-sequence.
Richard M. Stallman <rms@gnu.org>
parents:
2042
diff
changeset
|
112 ; (isearch-mode): Don't make a pre-command-hook. |
|
9234ebe088c9
(isearch-other-meta-char): Call listify-key-sequence.
Richard M. Stallman <rms@gnu.org>
parents:
2042
diff
changeset
|
113 ; |
|
2042
bbf37b9a24af
(isearch-mode): Don't make a pre-command-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2035
diff
changeset
|
114 ; Revision 1.21 1993/03/07 04:22:00 rms |
|
bbf37b9a24af
(isearch-mode): Don't make a pre-command-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2035
diff
changeset
|
115 ; (isearch-unread): Find last list element by hand. |
|
bbf37b9a24af
(isearch-mode): Don't make a pre-command-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2035
diff
changeset
|
116 ; |
|
2035
d59e199d4f6f
(isearch-unread): Find last list element by hand.
Richard M. Stallman <rms@gnu.org>
parents:
2031
diff
changeset
|
117 ; Revision 1.20 1993/03/06 06:15:05 rms |
|
d59e199d4f6f
(isearch-unread): Find last list element by hand.
Richard M. Stallman <rms@gnu.org>
parents:
2031
diff
changeset
|
118 ; (isearch-unread): Handle multiple args. |
|
d59e199d4f6f
(isearch-unread): Find last list element by hand.
Richard M. Stallman <rms@gnu.org>
parents:
2031
diff
changeset
|
119 ; For Emacs 19, use listify-key-sequence. |
|
d59e199d4f6f
(isearch-unread): Find last list element by hand.
Richard M. Stallman <rms@gnu.org>
parents:
2031
diff
changeset
|
120 ; If not Emacs 19, assume they are a meta sequence. |
|
d59e199d4f6f
(isearch-unread): Find last list element by hand.
Richard M. Stallman <rms@gnu.org>
parents:
2031
diff
changeset
|
121 ; (isearch-other-meta-char): Pass the whole key sequence. |
|
d59e199d4f6f
(isearch-unread): Find last list element by hand.
Richard M. Stallman <rms@gnu.org>
parents:
2031
diff
changeset
|
122 ; (isearch-other-control-char): Make this alias for ...-meta-char. |
|
d59e199d4f6f
(isearch-unread): Find last list element by hand.
Richard M. Stallman <rms@gnu.org>
parents:
2031
diff
changeset
|
123 ; |
|
2031
f2dbfd43a1c5
(isearch-unread): Handle multiple args.
Richard M. Stallman <rms@gnu.org>
parents:
1885
diff
changeset
|
124 ; Revision 1.19 1993/02/17 21:30:25 rms |
|
f2dbfd43a1c5
(isearch-unread): Handle multiple args.
Richard M. Stallman <rms@gnu.org>
parents:
1885
diff
changeset
|
125 ; Fix minor bugs in previous change. |
|
f2dbfd43a1c5
(isearch-unread): Handle multiple args.
Richard M. Stallman <rms@gnu.org>
parents:
1885
diff
changeset
|
126 ; |
|
1885
9e79ffe97d5b
Fix minor bugs in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
1883
diff
changeset
|
127 ; Revision 1.18 1993/02/17 20:34:20 rms |
|
9e79ffe97d5b
Fix minor bugs in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
1883
diff
changeset
|
128 ; (isearch-backward-regexp): |
|
9e79ffe97d5b
Fix minor bugs in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
1883
diff
changeset
|
129 ; New arg no-recursive-edit, always non-nil for interactive call. |
|
9e79ffe97d5b
Fix minor bugs in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
1883
diff
changeset
|
130 ; Rename first arg, and set it right in interactive call. |
|
9e79ffe97d5b
Fix minor bugs in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
1883
diff
changeset
|
131 ; (isearch-forward-regexp): Likewise. |
|
9e79ffe97d5b
Fix minor bugs in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
1883
diff
changeset
|
132 ; (isearch-forward, isearch-backward): Likewise no-recursive-edit. |
|
9e79ffe97d5b
Fix minor bugs in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
1883
diff
changeset
|
133 ; |
|
1883
b707809f29bb
(isearch-backward-regexp):
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
134 ; Revision 1.17 1993/01/26 01:48:27 jimb |
|
b707809f29bb
(isearch-backward-regexp):
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
135 ; JimB's changes since January 18th |
|
b707809f29bb
(isearch-backward-regexp):
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
136 ; |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1614
diff
changeset
|
137 ; Revision 1.16 1992/11/16 01:37:06 jimb |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1614
diff
changeset
|
138 ; * bytecomp.el: Declare unread-command-char an obsolete variable. |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1614
diff
changeset
|
139 ; * vip.el (vip-escape-to-emacs, vip-prefix-arg-value, |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1614
diff
changeset
|
140 ; vip-prefix-arg-com): Use unread-command-event instead of |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1614
diff
changeset
|
141 ; unread-command-char; respect its new semantics. |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1614
diff
changeset
|
142 ; * isearch-mode.el (isearch-update, isearch-unread): Same. |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1614
diff
changeset
|
143 ; |
|
1614
567e76c81b0c
* bytecomp.el: Declare unread-command-char an obsolete variable.
Jim Blandy <jimb@redhat.com>
parents:
1557
diff
changeset
|
144 ; Revision 1.15 1992/11/07 06:17:04 jimb |
|
567e76c81b0c
* bytecomp.el: Declare unread-command-char an obsolete variable.
Jim Blandy <jimb@redhat.com>
parents:
1557
diff
changeset
|
145 ; * isearch.el (isearch-frames-exist): This isn't what we want - |
|
567e76c81b0c
* bytecomp.el: Declare unread-command-char an obsolete variable.
Jim Blandy <jimb@redhat.com>
parents:
1557
diff
changeset
|
146 ; replaced by... |
|
567e76c81b0c
* bytecomp.el: Declare unread-command-char an obsolete variable.
Jim Blandy <jimb@redhat.com>
parents:
1557
diff
changeset
|
147 ; (isearch-gnu-emacs-events): non-nil if should expect events in the |
|
567e76c81b0c
* bytecomp.el: Declare unread-command-char an obsolete variable.
Jim Blandy <jimb@redhat.com>
parents:
1557
diff
changeset
|
148 ; style generated by GNU Emacs 19. Set if set-frame-height is |
|
567e76c81b0c
* bytecomp.el: Declare unread-command-char an obsolete variable.
Jim Blandy <jimb@redhat.com>
parents:
1557
diff
changeset
|
149 ; fboundp; this is true on any GNU Emacs 19, whether or not it was |
|
567e76c81b0c
* bytecomp.el: Declare unread-command-char an obsolete variable.
Jim Blandy <jimb@redhat.com>
parents:
1557
diff
changeset
|
150 ; compiled with multiple frame support. |
|
567e76c81b0c
* bytecomp.el: Declare unread-command-char an obsolete variable.
Jim Blandy <jimb@redhat.com>
parents:
1557
diff
changeset
|
151 ; (isearch-mode-map): Test isearch-gnu-emacs-events instead of |
|
567e76c81b0c
* bytecomp.el: Declare unread-command-char an obsolete variable.
Jim Blandy <jimb@redhat.com>
parents:
1557
diff
changeset
|
152 ; isearch-frames-exist to see if we should bind switch-frame events. |
|
567e76c81b0c
* bytecomp.el: Declare unread-command-char an obsolete variable.
Jim Blandy <jimb@redhat.com>
parents:
1557
diff
changeset
|
153 ; (isearch-update): Test isearch-gnu-emacs-events instead of |
|
567e76c81b0c
* bytecomp.el: Declare unread-command-char an obsolete variable.
Jim Blandy <jimb@redhat.com>
parents:
1557
diff
changeset
|
154 ; isearch-frames-exist to see if unread-command-char's quiescent |
|
567e76c81b0c
* bytecomp.el: Declare unread-command-char an obsolete variable.
Jim Blandy <jimb@redhat.com>
parents:
1557
diff
changeset
|
155 ; value is nil or -1. |
|
567e76c81b0c
* bytecomp.el: Declare unread-command-char an obsolete variable.
Jim Blandy <jimb@redhat.com>
parents:
1557
diff
changeset
|
156 ; |
|
1557
816bfa185671
* isearch.el (isearch-frames-exist): This isn't what we want -
Jim Blandy <jimb@redhat.com>
parents:
1534
diff
changeset
|
157 ; Revision 1.14 1992/11/01 22:10:59 rms |
|
816bfa185671
* isearch.el (isearch-frames-exist): This isn't what we want -
Jim Blandy <jimb@redhat.com>
parents:
1534
diff
changeset
|
158 ; (isearch-search): Handle all sorts of errors from regexp search. |
|
816bfa185671
* isearch.el (isearch-frames-exist): This isn't what we want -
Jim Blandy <jimb@redhat.com>
parents:
1534
diff
changeset
|
159 ; |
|
1534
dd292c7ef749
(isearch-search): Handle all sorts of errors from regexp search.
Richard M. Stallman <rms@gnu.org>
parents:
1480
diff
changeset
|
160 ; Revision 1.13 1992/10/27 04:11:46 rms |
|
dd292c7ef749
(isearch-search): Handle all sorts of errors from regexp search.
Richard M. Stallman <rms@gnu.org>
parents:
1480
diff
changeset
|
161 ; (isearch-edit-string): |
|
dd292c7ef749
(isearch-search): Handle all sorts of errors from regexp search.
Richard M. Stallman <rms@gnu.org>
parents:
1480
diff
changeset
|
162 ; Bind cursor-in-echo-area only around read-char/allocate-event. |
|
dd292c7ef749
(isearch-search): Handle all sorts of errors from regexp search.
Richard M. Stallman <rms@gnu.org>
parents:
1480
diff
changeset
|
163 ; |
| 1480 | 164 ; Revision 1.12 1992/10/20 21:21:47 rms |
| 165 ; (isearch-mode-map): Make the top-level keymap dense. | |
| 166 ; Explicitly bind control characters at that level. | |
| 167 ; | |
|
1458
ef32d654351e
(isearch-mode-map): Make the top-level keymap dense.
Richard M. Stallman <rms@gnu.org>
parents:
1380
diff
changeset
|
168 ; Revision 1.11 1992/10/11 05:25:11 rms |
|
ef32d654351e
(isearch-mode-map): Make the top-level keymap dense.
Richard M. Stallman <rms@gnu.org>
parents:
1380
diff
changeset
|
169 ; (isearch-ring-advance-edit): Delete spurious `)'. |
|
ef32d654351e
(isearch-mode-map): Make the top-level keymap dense.
Richard M. Stallman <rms@gnu.org>
parents:
1380
diff
changeset
|
170 ; |
|
1380
a7003e65eb66
(isearch-ring-advance-edit): Delete spurious `)'.
Richard M. Stallman <rms@gnu.org>
parents:
1184
diff
changeset
|
171 ; Revision 1.10 1992/09/21 08:28:43 rms |
|
a7003e65eb66
(isearch-ring-advance-edit): Delete spurious `)'.
Richard M. Stallman <rms@gnu.org>
parents:
1184
diff
changeset
|
172 ; entered into RCS |
|
a7003e65eb66
(isearch-ring-advance-edit): Delete spurious `)'.
Richard M. Stallman <rms@gnu.org>
parents:
1184
diff
changeset
|
173 ; |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
174 ;;; Revision 1.4 92/09/14 16:26:02 liberte |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
175 ;;; Added prefix args to isearch-forward, etc. to switch between |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
176 ;;; string and regular expression searching. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
177 ;;; Added some support for lemacs. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
178 ;;; Added general isearch-highlight option - but only for lemacs so far. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
179 ;;; Added support for frame switching in emacs 19. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
180 ;;; Added word search option to isearch-edit-string. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
181 ;;; Renamed isearch-quit to isearch-abort. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
182 ;;; Numerous changes to comments and doc strings. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
183 ;;; |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
184 ;;; Revision 1.3 92/06/29 13:10:08 liberte |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
185 ;;; Moved modal isearch-mode handling into isearch-mode. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
186 ;;; Got rid of buffer-local isearch variables. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
187 ;;; isearch-edit-string used by ring adjustments, completion, and |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
188 ;;; nonincremental searching. C-s and C-r are additional exit commands. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
189 ;;; Renamed all regex to regexp. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
190 ;;; Got rid of found-start and found-point globals. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
191 ;;; Generalized handling of upper-case chars. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
192 |
|
792
45d748a65f24
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
725
diff
changeset
|
193 ;;; Revision 1.2 92/05/27 11:33:57 liberte |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
194 ;;; Emacs version 19 has a search ring, which is supported here. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
195 ;;; Other fixes found in the version 19 isearch are included here. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
196 ;;; |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
197 ;;; Also see variables search-caps-disable-folding, |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
198 ;;; search-nonincremental-instead, search-whitespace-regexp, and |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
199 ;;; commands isearch-toggle-regexp, isearch-edit-string. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
200 ;;; |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
201 ;;; semi-modal isearching is supported. |
|
792
45d748a65f24
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
725
diff
changeset
|
202 |
|
45d748a65f24
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
725
diff
changeset
|
203 ;;; Changes for 1.1 |
|
45d748a65f24
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
725
diff
changeset
|
204 ;;; 3/18/92 Fixed invalid-regexp. |
|
45d748a65f24
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
725
diff
changeset
|
205 ;;; 3/18/92 Fixed yanking in regexps. |
|
45d748a65f24
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
725
diff
changeset
|
206 |
|
2230
6314334d7c2b
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2055
diff
changeset
|
207 ;;; Code: |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
208 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
209 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
210 ;;;========================================================================= |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
211 ;;; Emacs features |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
212 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
213 ;; isearch-mode takes advantage of the features provided by several |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
214 ;; different versions of emacs. Rather than testing the version of |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
215 ;; emacs, several constants are defined, one for each of the features. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
216 ;; Each of the tests below must work on any version of emacs. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
217 ;; (Perhaps provide and featurep could be used for this purpose.) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
218 |
|
1557
816bfa185671
* isearch.el (isearch-frames-exist): This isn't what we want -
Jim Blandy <jimb@redhat.com>
parents:
1534
diff
changeset
|
219 (defconst isearch-gnu-emacs-events (fboundp 'set-frame-height)) ;; emacs 19 |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
220 (defconst isearch-pre-command-hook-exists (boundp 'pre-command-hook)) ;; lemacs |
|
1146
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
221 (defconst isearch-event-data-type nil) ;; lemacs |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
222 |
|
1143
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
223 (defconst search-exit-option t |
|
1169
a40b54fcb2ff
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1162
diff
changeset
|
224 "*Non-nil means random control characters terminate incremental search.") |
| 725 | 225 |
|
1143
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
226 (defvar search-slow-window-lines 1 |
|
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
227 "*Number of lines in slow search display windows. |
|
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
228 These are the short windows used during incremental search on slow terminals. |
|
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
229 Negative means put the slow search window at the top (normally it's at bottom) |
|
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
230 and the value is minus the number of lines.") |
| 725 | 231 |
|
1143
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
232 (defvar search-slow-speed 1200 |
|
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
233 "*Highest terminal speed at which to use \"slow\" style incremental search. |
|
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
234 This is the style where a one-line window is created to show the line |
|
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
235 that the search has reached.") |
| 725 | 236 |
| 237 ;;;======================================================================== | |
| 238 ;;; Some additional options and constants. | |
| 239 | |
|
1143
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
240 (defvar search-upper-case t |
| 725 | 241 "*If non-nil, upper case chars disable case fold searching. |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
242 That is, upper and lower case chars must match exactly. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
243 This applies no matter where the chars come from, but does not |
|
1143
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
244 apply to chars in regexps that are prefixed with `\\'. |
|
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
245 If this value is `not-yanks', yanked text is always downcased.") |
| 725 | 246 |
| 247 (defvar search-nonincremental-instead t | |
| 248 "*If non-nil, do a nonincremental search instead if exiting immediately. | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
249 Actually, `isearch-edit-string' is called to let you enter the search |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
250 string, and RET terminates editing and does a nonincremental search.") |
| 725 | 251 |
| 252 (defconst search-whitespace-regexp "\\s-+" | |
| 253 "*If non-nil, regular expression to match a sequence of whitespace chars. | |
| 254 You might want to use something like \"[ \\t\\r\\n]+\" instead.") | |
| 255 | |
|
1169
a40b54fcb2ff
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1162
diff
changeset
|
256 ;; I removed the * from the doc string because highlighting is not |
|
a40b54fcb2ff
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1162
diff
changeset
|
257 ;; currently a clean thing to do. Once highlighting is made clean, |
|
a40b54fcb2ff
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1162
diff
changeset
|
258 ;; this feature can be re-enabled and advertised. |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
259 (defvar search-highlight nil |
|
1169
a40b54fcb2ff
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1162
diff
changeset
|
260 "Whether isearch and query-replace should highlight the text which |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
261 currently matches the search-string.") |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
262 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
263 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
264 (defvar isearch-mode-hook nil |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
265 "Function(s) to call after starting up an incremental search.") |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
266 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
267 (defvar isearch-mode-end-hook nil |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
268 "Function(s) to call after terminating an incremental search.") |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
269 |
| 725 | 270 ;;;================================================================== |
| 271 ;;; Search ring. | |
| 272 | |
| 273 (defvar search-ring nil | |
| 274 "List of search string sequences.") | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
275 (defvar regexp-search-ring nil |
| 725 | 276 "List of regular expression search string sequences.") |
| 277 | |
| 278 (defconst search-ring-max 16 | |
| 279 "*Maximum length of search ring before oldest elements are thrown away.") | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
280 (defconst regexp-search-ring-max 16 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
281 "*Maximum length of regexp search ring before oldest elements are thrown away.") |
| 725 | 282 |
| 283 (defvar search-ring-yank-pointer nil | |
|
1146
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
284 "Index in `search-ring' of last string reused. |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
285 nil if none yet.") |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
286 (defvar regexp-search-ring-yank-pointer nil |
|
1146
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
287 "Index in `regexp-search-ring' of last string reused. |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
288 nil if none yet.") |
| 725 | 289 |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
290 (defvar search-ring-update nil |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
291 "*Non-nil if advancing or retreating in the search ring should cause search. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
292 Default value, nil, means edit the string instead.") |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
293 |
| 725 | 294 ;;;==================================================== |
| 295 ;;; Define isearch-mode keymap. | |
| 296 | |
| 297 (defvar isearch-mode-map nil | |
| 298 "Keymap for isearch-mode.") | |
| 299 | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
300 (or isearch-mode-map |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
301 (let* ((i 0) |
|
1143
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
302 (map (make-keymap))) |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
303 |
|
1458
ef32d654351e
(isearch-mode-map): Make the top-level keymap dense.
Richard M. Stallman <rms@gnu.org>
parents:
1380
diff
changeset
|
304 ;; Make function keys, etc, exit the search. |
|
ef32d654351e
(isearch-mode-map): Make the top-level keymap dense.
Richard M. Stallman <rms@gnu.org>
parents:
1380
diff
changeset
|
305 (define-key map [t] 'isearch-other-control-char) |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
306 ;; Control chars, by default, end isearch mode transparently. |
|
1458
ef32d654351e
(isearch-mode-map): Make the top-level keymap dense.
Richard M. Stallman <rms@gnu.org>
parents:
1380
diff
changeset
|
307 ;; We need these explicit definitions because, in a dense keymap, |
|
ef32d654351e
(isearch-mode-map): Make the top-level keymap dense.
Richard M. Stallman <rms@gnu.org>
parents:
1380
diff
changeset
|
308 ;; the binding for t does not affect characters. |
|
ef32d654351e
(isearch-mode-map): Make the top-level keymap dense.
Richard M. Stallman <rms@gnu.org>
parents:
1380
diff
changeset
|
309 ;; We use a dense keymap to save space. |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
310 (while (< i ?\ ) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
311 (define-key map (make-string 1 i) 'isearch-other-control-char) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
312 (setq i (1+ i))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
313 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
314 ;; Printing chars extend the selection by default. |
|
1458
ef32d654351e
(isearch-mode-map): Make the top-level keymap dense.
Richard M. Stallman <rms@gnu.org>
parents:
1380
diff
changeset
|
315 (setq i ?\ ) |
|
1143
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
316 (while (< i 128) |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
317 (define-key map (make-string 1 i) 'isearch-printing-char) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
318 (setq i (1+ i))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
319 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
320 ;; Several non-printing chars change the searching behavior. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
321 (define-key map "\C-s" 'isearch-repeat-forward) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
322 (define-key map "\C-r" 'isearch-repeat-backward) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
323 (define-key map "\177" 'isearch-delete-char) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
324 (define-key map "\C-g" 'isearch-abort) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
325 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
326 (define-key map "\C-q" 'isearch-quote-char) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
327 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
328 (define-key map "\r" 'isearch-exit) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
329 (define-key map "\C-j" 'isearch-printing-char) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
330 (define-key map "\t" 'isearch-printing-char) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
331 (define-key map " " 'isearch-whitespace-chars) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
332 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
333 (define-key map "\C-w" 'isearch-yank-word) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
334 (define-key map "\C-y" 'isearch-yank-line) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
335 |
|
2055
9234ebe088c9
(isearch-other-meta-char): Call listify-key-sequence.
Richard M. Stallman <rms@gnu.org>
parents:
2042
diff
changeset
|
336 ;; Bind the ASCII-equivalent "function keys" explicitly |
|
9234ebe088c9
(isearch-other-meta-char): Call listify-key-sequence.
Richard M. Stallman <rms@gnu.org>
parents:
2042
diff
changeset
|
337 ;; if we bind their equivalents, |
|
9234ebe088c9
(isearch-other-meta-char): Call listify-key-sequence.
Richard M. Stallman <rms@gnu.org>
parents:
2042
diff
changeset
|
338 ;; since otherwise the default binding would override. |
|
9234ebe088c9
(isearch-other-meta-char): Call listify-key-sequence.
Richard M. Stallman <rms@gnu.org>
parents:
2042
diff
changeset
|
339 ;; We bind [escape] below. |
|
9234ebe088c9
(isearch-other-meta-char): Call listify-key-sequence.
Richard M. Stallman <rms@gnu.org>
parents:
2042
diff
changeset
|
340 (define-key map [tab] 'isearch-printing-char) |
|
9234ebe088c9
(isearch-other-meta-char): Call listify-key-sequence.
Richard M. Stallman <rms@gnu.org>
parents:
2042
diff
changeset
|
341 (define-key map [delete] 'isearch-delete-char) |
|
9234ebe088c9
(isearch-other-meta-char): Call listify-key-sequence.
Richard M. Stallman <rms@gnu.org>
parents:
2042
diff
changeset
|
342 (define-key map [backspace] 'isearch-delete-char) |
|
9234ebe088c9
(isearch-other-meta-char): Call listify-key-sequence.
Richard M. Stallman <rms@gnu.org>
parents:
2042
diff
changeset
|
343 (define-key map [return] 'isearch-exit) |
|
9234ebe088c9
(isearch-other-meta-char): Call listify-key-sequence.
Richard M. Stallman <rms@gnu.org>
parents:
2042
diff
changeset
|
344 (define-key map [newline] 'isearch-printing-char) |
|
9234ebe088c9
(isearch-other-meta-char): Call listify-key-sequence.
Richard M. Stallman <rms@gnu.org>
parents:
2042
diff
changeset
|
345 |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
346 ;; Define keys for regexp chars * ? |. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
347 ;; Nothing special for + because it matches at least once. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
348 (define-key map "*" 'isearch-*-char) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
349 (define-key map "?" 'isearch-*-char) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
350 (define-key map "|" 'isearch-|-char) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
351 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
352 ;; You can reenable global keys by binding them locally to nil. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
353 ;; For the help char this doesnt work quite as expected because |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
354 ;; isearch-mode is not a major mode. Also the echo area is not |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
355 ;; restored after the help command while isearch-mode is |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
356 ;; still active. Furthermore, we should not assume that the |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
357 ;; help-command is on C-h. But here is how it would be done: |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
358 ;; (define-key map "\C-h" nil) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
359 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
360 ;; Instead bind C-h to special help command for isearch-mode. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
361 (define-key map "\C-h" 'isearch-mode-help) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
362 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
363 ;; To handle local bindings with meta char prefix keys, define |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
364 ;; another full keymap. This must be done for any other prefix |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
365 ;; keys as well, one full keymap per char of the prefix key. It |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
366 ;; would be simpler to disable the global keymap, and/or have a |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
367 ;; default local key binding for any key not otherwise bound. |
|
2055
9234ebe088c9
(isearch-other-meta-char): Call listify-key-sequence.
Richard M. Stallman <rms@gnu.org>
parents:
2042
diff
changeset
|
368 (let ((meta-map (make-sparse-keymap))) |
|
9234ebe088c9
(isearch-other-meta-char): Call listify-key-sequence.
Richard M. Stallman <rms@gnu.org>
parents:
2042
diff
changeset
|
369 (define-key map (char-to-string meta-prefix-char) meta-map) |
|
9234ebe088c9
(isearch-other-meta-char): Call listify-key-sequence.
Richard M. Stallman <rms@gnu.org>
parents:
2042
diff
changeset
|
370 (define-key map [escape] meta-map)) |
|
1458
ef32d654351e
(isearch-mode-map): Make the top-level keymap dense.
Richard M. Stallman <rms@gnu.org>
parents:
1380
diff
changeset
|
371 (define-key map (vector meta-prefix-char t) 'isearch-other-meta-char) |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
372 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
373 (define-key map "\M-n" 'isearch-ring-advance) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
374 (define-key map "\M-p" 'isearch-ring-retreat) |
|
1557
816bfa185671
* isearch.el (isearch-frames-exist): This isn't what we want -
Jim Blandy <jimb@redhat.com>
parents:
1534
diff
changeset
|
375 |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
376 (define-key map "\M-\t" 'isearch-complete) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
377 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
378 ;; For emacs 19, switching frames should terminate isearch-mode |
|
1557
816bfa185671
* isearch.el (isearch-frames-exist): This isn't what we want -
Jim Blandy <jimb@redhat.com>
parents:
1534
diff
changeset
|
379 (if isearch-gnu-emacs-events |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
380 (define-key map [switch-frame] 'isearch-switch-frame-handler)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
381 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
382 (setq isearch-mode-map map) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
383 )) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
384 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
385 ;; Some bindings you may want to put in your isearch-mode-hook. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
386 ;; Suggest some alternates... |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
387 ;; (define-key isearch-mode-map "\C-t" 'isearch-toggle-regexp) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
388 ;; (define-key isearch-mode-map "\C-^" 'isearch-edit-string) |
| 725 | 389 |
| 390 | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
391 (defvar minibuffer-local-isearch-map nil |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
392 "Keymap for editing isearch strings in the minibuffer.") |
| 725 | 393 |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
394 (or minibuffer-local-isearch-map |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
395 (let ((map (copy-keymap minibuffer-local-map))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
396 (define-key map "\r" 'isearch-nonincremental-exit-minibuffer) |
| 1184 | 397 (define-key map "\M-n" 'isearch-ring-advance-edit) |
| 398 (define-key map "\M-p" 'isearch-ring-retreat-edit) | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
399 (define-key map "\M-\t" 'isearch-complete-edit) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
400 (define-key map "\C-s" 'isearch-forward-exit-minibuffer) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
401 (define-key map "\C-r" 'isearch-reverse-exit-minibuffer) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
402 (setq minibuffer-local-isearch-map map) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
403 )) |
| 725 | 404 |
| 405 ;;;======================================================== | |
| 406 ;; Internal variables declared globally for byte-compiler. | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
407 ;; These are all set with setq while isearching |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
408 ;; and bound locally while editing the search string. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
409 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
410 (defvar isearch-forward nil) ; Searching in the forward direction. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
411 (defvar isearch-regexp nil) ; Searching for a regexp. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
412 (defvar isearch-word nil) ; Searching for words. |
| 725 | 413 |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
414 (defvar isearch-cmds nil) ; Stack of search status sets. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
415 (defvar isearch-string "") ; The current search string. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
416 (defvar isearch-message "") ; text-char-description version of isearch-string |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
417 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
418 (defvar isearch-success t) ; Searching is currently successful. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
419 (defvar isearch-invalid-regexp nil) ; Regexp not well formed. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
420 (defvar isearch-other-end nil) ; Start (end) of match if forward (backward). |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
421 (defvar isearch-wrapped nil) ; Searching restarted from the top (bottom). |
| 725 | 422 (defvar isearch-barrier 0) |
| 423 | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
424 (defvar isearch-case-fold-search nil) ; case-fold-search while searching. |
| 725 | 425 |
| 426 (defvar isearch-adjusted nil) | |
| 427 (defvar isearch-slow-terminal-mode nil) | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
428 ;;; If t, using a small window. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
429 (defvar isearch-small-window nil) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
430 (defvar isearch-opoint 0) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
431 ;;; The window configuration active at the beginning of the search. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
432 (defvar isearch-window-configuration nil) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
433 (defvar isearch-old-local-map nil) |
| 725 | 434 |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
435 ;; Flag to indicate a yank occurred, so don't move the cursor. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
436 (defvar isearch-yank-flag nil) |
| 725 | 437 |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
438 ;;; A function to be called after each input character is processed. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
439 ;;; (It is not called after characters that exit the search.) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
440 ;;; It is only set from an optional argument to `isearch-mode'. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
441 (defvar isearch-op-fun nil) |
| 725 | 442 |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
443 ;;; Is isearch-mode in a recursive edit for modal searching. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
444 (defvar isearch-recursive-edit nil) |
| 725 | 445 |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
446 ;;; Should isearch be terminated after doing one search? |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
447 (defvar isearch-nonincremental nil) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
448 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
449 ;; New value of isearch-forward after isearch-edit-string. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
450 (defvar isearch-new-forward nil) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
451 |
| 725 | 452 |
| 453 ;;;============================================================== | |
| 454 ;; Minor-mode-alist changes - kind of redundant with the | |
| 455 ;; echo area, but if isearching in multiple windows, it can be useful. | |
| 456 | |
| 457 (or (assq 'isearch-mode minor-mode-alist) | |
| 458 (nconc minor-mode-alist | |
| 459 (list '(isearch-mode isearch-mode)))) | |
| 460 | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
461 (defvar isearch-mode nil) ;; Name of the minor mode, if non-nil. |
| 725 | 462 (make-variable-buffer-local 'isearch-mode) |
| 463 | |
|
1143
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
464 (define-key global-map "\C-s" 'isearch-forward) |
|
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
465 (define-key esc-map "\C-s" 'isearch-forward-regexp) |
|
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
466 (define-key global-map "\C-r" 'isearch-backward) |
|
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
467 (define-key esc-map "\C-r" 'isearch-backward-regexp) |
|
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
468 |
| 725 | 469 ;;;=============================================================== |
| 470 ;;; Entry points to isearch-mode. | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
471 ;;; These four functions should replace those in loaddefs.el |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
472 ;;; An alternative is to fset isearch-forward etc to isearch-mode, |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
473 ;;; and look at this-command to set the options accordingly. |
| 725 | 474 |
|
1883
b707809f29bb
(isearch-backward-regexp):
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
475 (defun isearch-forward (&optional regexp-p no-recursive-edit) |
| 725 | 476 "\ |
| 477 Do incremental search forward. | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
478 With a prefix argument, do an incremental regular expression search instead. |
| 725 | 479 \\<isearch-mode-map> |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
480 As you type characters, they add to the search string and are found. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
481 The following non-printing keys are bound in `isearch-mode-map'. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
482 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
483 Type \\[isearch-delete-char] to cancel characters from end of search string. |
| 725 | 484 Type \\[isearch-exit] to exit, leaving point at location found. |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
485 Type LFD (C-j) to match end of line. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
486 Type \\[isearch-repeat-forward] to search again forward,\ |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
487 \\[isearch-repeat-backward] to search again backward. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
488 Type \\[isearch-yank-word] to yank word from buffer onto end of search\ |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
489 string and search for it. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
490 Type \\[isearch-yank-line] to yank rest of line onto end of search string\ |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
491 and search for it. |
| 725 | 492 Type \\[isearch-quote-char] to quote control character to search for it. |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
493 Type \\[isearch-whitespace-chars] to match all whitespace chars in regexp. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
494 \\[isearch-abort] while searching or when search has failed cancels input\ |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
495 back to what has |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
496 been found successfully. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
497 \\[isearch-abort] when search is successful aborts and moves point to\ |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
498 starting point. |
| 725 | 499 |
| 500 Also supported is a search ring of the previous 16 search strings. | |
| 501 Type \\[isearch-ring-advance] to search for the next item in the search ring. | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
502 Type \\[isearch-ring-retreat] to search for the previous item in the search\ |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
503 ring. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
504 Type \\[isearch-complete] to complete the search string using the search ring. |
| 725 | 505 |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
506 The above keys, bound in `isearch-mode-map', are often controlled by |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
507 options; do M-x apropos on search-.* to find them. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
508 Other control and meta characters terminate the search |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
509 and are then executed normally (depending on `search-exit-option'). |
| 725 | 510 |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
511 If this function is called non-interactively, it does not return to |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
512 the calling function until the search is done." |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
513 |
|
1883
b707809f29bb
(isearch-backward-regexp):
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
514 (interactive "P\np") |
|
1885
9e79ffe97d5b
Fix minor bugs in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
1883
diff
changeset
|
515 (isearch-mode t (not (null regexp-p)) nil (not no-recursive-edit))) |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
516 |
|
1883
b707809f29bb
(isearch-backward-regexp):
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
517 (defun isearch-forward-regexp (&optional not-regexp no-recursive-edit) |
| 725 | 518 "\ |
| 519 Do incremental search forward for regular expression. | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
520 With a prefix argument, do a regular string search instead. |
| 725 | 521 Like ordinary incremental search except that your input |
| 522 is treated as a regexp. See \\[isearch-forward] for more info." | |
|
1883
b707809f29bb
(isearch-backward-regexp):
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
523 (interactive "P\np") |
|
1885
9e79ffe97d5b
Fix minor bugs in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
1883
diff
changeset
|
524 (isearch-mode t (null not-regexp) nil (not no-recursive-edit))) |
| 725 | 525 |
|
1883
b707809f29bb
(isearch-backward-regexp):
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
526 (defun isearch-backward (&optional regexp-p no-recursive-edit) |
| 725 | 527 "\ |
| 528 Do incremental search backward. | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
529 With a prefix argument, do a regular expression search instead. |
| 725 | 530 See \\[isearch-forward] for more information." |
|
1883
b707809f29bb
(isearch-backward-regexp):
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
531 (interactive "P\np") |
|
1885
9e79ffe97d5b
Fix minor bugs in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
1883
diff
changeset
|
532 (isearch-mode nil (not (null regexp-p)) nil (not no-recursive-edit))) |
| 725 | 533 |
|
1883
b707809f29bb
(isearch-backward-regexp):
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
534 (defun isearch-backward-regexp (&optional not-regexp no-recursive-edit) |
| 725 | 535 "\ |
| 536 Do incremental search backward for regular expression. | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
537 With a prefix argument, do a regular string search instead. |
| 725 | 538 Like ordinary incremental search except that your input |
| 539 is treated as a regexp. See \\[isearch-forward] for more info." | |
|
1883
b707809f29bb
(isearch-backward-regexp):
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
540 (interactive "P\np") |
|
1885
9e79ffe97d5b
Fix minor bugs in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
1883
diff
changeset
|
541 (isearch-mode nil (null not-regexp) nil (not no-recursive-edit))) |
| 725 | 542 |
| 543 | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
544 (defun isearch-mode-help () |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
545 (interactive) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
546 (describe-function 'isearch-forward) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
547 (isearch-update)) |
| 725 | 548 |
| 549 | |
| 550 ;;;================================================================== | |
| 551 ;; isearch-mode only sets up incremental search for the minor mode. | |
| 552 ;; All the work is done by the isearch-mode commands. | |
| 553 | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
554 ;; Not used yet: |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
555 ;;(defconst isearch-commands '(isearch-forward isearch-backward |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
556 ;; isearch-forward-regexp isearch-backward-regexp) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
557 ;; "List of commands for which isearch-mode does not recursive-edit.") |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
558 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
559 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
560 (defun isearch-mode (forward &optional regexp op-fun recursive-edit word-p) |
| 725 | 561 "Start isearch minor mode. Called by isearch-forward, etc." |
| 562 | |
| 563 ;; Initialize global vars. | |
| 564 (setq isearch-forward forward | |
| 565 isearch-regexp regexp | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
566 isearch-word word-p |
| 725 | 567 isearch-op-fun op-fun |
| 568 isearch-case-fold-search case-fold-search | |
| 569 isearch-string "" | |
| 570 isearch-message "" | |
| 571 isearch-cmds nil | |
| 572 isearch-success t | |
| 573 isearch-wrapped nil | |
| 574 isearch-barrier (point) | |
| 575 isearch-adjusted nil | |
| 576 isearch-yank-flag nil | |
| 577 isearch-invalid-regexp nil | |
| 1162 | 578 ;; Use (baud-rate) for now, for sake of other versions. |
| 579 isearch-slow-terminal-mode (and (<= (baud-rate) search-slow-speed) | |
| 725 | 580 (> (window-height) |
| 581 (* 4 search-slow-window-lines))) | |
| 582 isearch-other-end nil | |
| 583 isearch-small-window nil | |
| 584 | |
| 585 isearch-opoint (point) | |
| 586 isearch-window-configuration (current-window-configuration) | |
|
1146
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
587 isearch-old-local-map (current-local-map) |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
588 search-ring-yank-pointer nil |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
589 regexp-search-ring-yank-pointer nil) |
|
2042
bbf37b9a24af
(isearch-mode): Don't make a pre-command-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2035
diff
changeset
|
590 ;; This was for Lucid Emacs. But now that we have pre-command-hook, |
|
bbf37b9a24af
(isearch-mode): Don't make a pre-command-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2035
diff
changeset
|
591 ;; it causes trouble. |
|
bbf37b9a24af
(isearch-mode): Don't make a pre-command-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2035
diff
changeset
|
592 ;; (if isearch-pre-command-hook-exists |
|
bbf37b9a24af
(isearch-mode): Don't make a pre-command-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2035
diff
changeset
|
593 ;; (add-hook 'pre-command-hook 'isearch-pre-command-hook)) |
| 725 | 594 (setq isearch-mode " Isearch") ;; forward? regexp? |
| 595 (set-buffer-modified-p (buffer-modified-p)) ; update modeline | |
| 596 | |
| 597 (isearch-push-state) | |
| 598 | |
| 599 (use-local-map isearch-mode-map) | |
| 600 (isearch-update) | |
| 601 (run-hooks 'isearch-mode-hook) | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
602 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
603 ;; isearch-mode can be made modal (in the sense of not returning to |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
604 ;; the calling function until searching is completed) by entering |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
605 ;; a recursive-edit and exiting it when done isearching. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
606 (if recursive-edit (recursive-edit)) |
| 725 | 607 ) |
| 608 | |
| 609 | |
| 610 ;;;==================================================== | |
| 611 ;; Some high level utilities. Others below. | |
| 612 | |
| 613 (defun isearch-update () | |
| 614 ;; Called after each command to update the display. | |
|
1146
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
615 (if (if isearch-event-data-type |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
616 (null unread-command-event) |
|
1557
816bfa185671
* isearch.el (isearch-frames-exist): This isn't what we want -
Jim Blandy <jimb@redhat.com>
parents:
1534
diff
changeset
|
617 (if isearch-gnu-emacs-events |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1614
diff
changeset
|
618 (null unread-command-events) |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
619 (< unread-command-char 0))) |
| 725 | 620 (progn |
| 621 (if (not (input-pending-p)) | |
| 622 (isearch-message)) | |
| 623 (if (and isearch-slow-terminal-mode | |
| 624 (not (or isearch-small-window | |
| 625 (pos-visible-in-window-p)))) | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
626 (let ((found-point (point))) |
| 725 | 627 (setq isearch-small-window t) |
| 628 (move-to-window-line 0) | |
| 629 (let ((window-min-height 1)) | |
| 630 (split-window nil (if (< search-slow-window-lines 0) | |
| 631 (1+ (- search-slow-window-lines)) | |
| 632 (- (window-height) | |
| 633 (1+ search-slow-window-lines))))) | |
| 634 (if (< search-slow-window-lines 0) | |
| 635 (progn (vertical-motion (- 1 search-slow-window-lines)) | |
| 636 (set-window-start (next-window) (point)) | |
| 637 (set-window-hscroll (next-window) | |
| 638 (window-hscroll)) | |
| 639 (set-window-hscroll (selected-window) 0)) | |
| 640 (other-window 1)) | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
641 (goto-char found-point))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
642 (if isearch-other-end |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
643 (if (< isearch-other-end (point)) ; isearch-forward? |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
644 (isearch-highlight isearch-other-end (point)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
645 (isearch-highlight (point) isearch-other-end))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
646 )) |
| 725 | 647 (setq ;; quit-flag nil not for isearch-mode |
| 648 isearch-adjusted nil | |
| 649 isearch-yank-flag nil) | |
| 650 ) | |
| 651 | |
| 652 | |
| 1184 | 653 (defun isearch-done (&optional nopush) |
| 725 | 654 ;; Called by all commands that terminate isearch-mode. |
| 1184 | 655 ;; If NOPUSH is non-nil, we don't push the string on the search ring. |
| 725 | 656 (use-local-map isearch-old-local-map) |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
657 ;; (setq pre-command-hook isearch-old-pre-command-hook) ; for lemacs |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
658 (isearch-dehighlight t) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
659 (let ((found-start (window-start (selected-window))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
660 (found-point (point))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
661 (set-window-configuration isearch-window-configuration) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
662 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
663 ;; If there was movement, mark the starting position. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
664 ;; Maybe should test difference between and set mark iff > threshold. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
665 (if (/= (point) isearch-opoint) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
666 (push-mark isearch-opoint) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
667 ;; (message "") why is this needed? |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
668 ) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
669 (if isearch-small-window |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
670 (goto-char found-point) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
671 ;; Exiting the save-window-excursion clobbers window-start; restore it. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
672 (set-window-start (selected-window) found-start t))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
673 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
674 (setq isearch-mode nil) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
675 (set-buffer-modified-p (buffer-modified-p)) ;; update modeline |
| 725 | 676 |
| 1184 | 677 (if (and (> (length isearch-string) 0) (not nopush)) |
| 725 | 678 ;; Update the ring data. |
| 679 (if isearch-regexp | |
|
1169
a40b54fcb2ff
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1162
diff
changeset
|
680 (if (or (null regexp-search-ring) |
|
a40b54fcb2ff
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1162
diff
changeset
|
681 (not (string= isearch-string (car regexp-search-ring)))) |
| 725 | 682 (progn |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
683 (setq regexp-search-ring |
|
1146
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
684 (cons isearch-string regexp-search-ring)) |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
685 (if (> (length regexp-search-ring) regexp-search-ring-max) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
686 (setcdr (nthcdr (1- search-ring-max) regexp-search-ring) |
| 725 | 687 nil)))) |
|
1169
a40b54fcb2ff
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1162
diff
changeset
|
688 (if (or (null search-ring) |
|
a40b54fcb2ff
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1162
diff
changeset
|
689 (not (string= isearch-string (car search-ring)))) |
| 725 | 690 (progn |
|
1146
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
691 (setq search-ring (cons isearch-string search-ring)) |
| 725 | 692 (if (> (length search-ring) search-ring-max) |
| 693 (setcdr (nthcdr (1- search-ring-max) search-ring) nil)))))) | |
| 694 | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
695 (run-hooks 'isearch-mode-end-hook) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
696 (if isearch-recursive-edit (exit-recursive-edit))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
697 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
698 ;;;======================================================= |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
699 ;;; Switching buffers should first terminate isearch-mode. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
700 ;;; This is done quite differently for each varient of emacs. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
701 ;;; For lemacs, see Exiting in lemacs below |
| 725 | 702 |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
703 ;; For Emacs 19, the frame switch event is handled. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
704 (defun isearch-switch-frame-handler () |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
705 (interactive) ;; Is this necessary? |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
706 ;; First terminate isearch-mode. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
707 (isearch-done) |
|
2296
91fe00141e95
* isearch.el (isearch-switch-frame-handler): Call
Jim Blandy <jimb@redhat.com>
parents:
2233
diff
changeset
|
708 (handle-switch-frame (car (cdr (isearch-last-command-char))))) |
| 725 | 709 |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
710 ;;;======================================================== |
| 725 | 711 |
| 712 | |
| 713 ;;;==================================================== | |
| 714 ;; Commands active while inside of the isearch minor mode. | |
| 715 | |
| 716 (defun isearch-exit () | |
| 717 "Exit search normally. | |
| 718 However, if this is the first command after starting incremental | |
| 719 search and `search-nonincremental-instead' is non-nil, do a | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
720 nonincremental search instead via `isearch-edit-string'." |
| 725 | 721 (interactive) |
| 722 (if (and search-nonincremental-instead | |
| 723 (= 0 (length isearch-string))) | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
724 (let ((isearch-nonincremental t)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
725 (isearch-edit-string))) |
| 725 | 726 (isearch-done)) |
| 727 | |
| 728 | |
| 729 (defun isearch-edit-string () | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
730 "Edit the search string in the minibuffer. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
731 The following additional command keys are active while editing. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
732 \\<minibuffer-local-isearch-map> |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
733 \\[exit-minibuffer] to resume incremental searching with the edited string. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
734 \\[isearch-nonincremental-exit-minibuffer] to do one nonincremental search. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
735 \\[isearch-forward-exit-minibuffer] to resume isearching forward. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
736 \\[isearch-backward-exit-minibuffer] to resume isearching backward. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
737 \\[isearch-ring-advance-edit] to replace the search string with the next item in the search ring. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
738 \\[isearch-ring-retreat-edit] to replace the search string with the previou item in the search ring. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
739 \\[isearch-complete-edit] to complete the search string using the search ring. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
740 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
741 If first char entered is \\[isearch-yank-word], then do word search instead." |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
742 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
743 ;; This code is very hairy for several reasons, explained in the code. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
744 ;; Mainly, isearch-mode must be terminated while editing and then restarted. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
745 ;; If there were a way to catch any change of buffer from the minibuffer, |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
746 ;; this could be simplified greatly. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
747 ;; Editing doesnt back up the search point. Should it? |
| 725 | 748 (interactive) |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
749 (condition-case err |
|
1146
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
750 (let (isearch-nonincremental ; should search nonincrementally? |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
751 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
752 ;; Locally bind all isearch global variables to protect them |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
753 ;; from recursive isearching. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
754 ;; isearch-string -message and -forward are not bound |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
755 ;; so they may be changed. Instead, save the values. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
756 (isearch-new-string isearch-string) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
757 (isearch-new-message isearch-message) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
758 (isearch-new-forward isearch-forward) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
759 (isearch-new-word isearch-word) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
760 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
761 (isearch-regexp isearch-regexp) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
762 (isearch-op-fun isearch-op-fun) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
763 (isearch-cmds isearch-cmds) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
764 (isearch-success isearch-success) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
765 (isearch-wrapped isearch-wrapped) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
766 (isearch-barrier isearch-barrier) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
767 (isearch-adjusted isearch-adjusted) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
768 (isearch-yank-flag isearch-yank-flag) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
769 (isearch-invalid-regexp isearch-invalid-regexp) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
770 (isearch-other-end isearch-other-end) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
771 (isearch-opoint isearch-opoint) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
772 (isearch-slow-terminal-mode isearch-slow-terminal-mode) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
773 (isearch-small-window isearch-small-window) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
774 (isearch-recursive-edit isearch-recursive-edit) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
775 ;; Save current configuration so we can restore it here. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
776 (isearch-window-configuration (current-window-configuration)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
777 ) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
778 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
779 ;; Actually terminate isearching until editing is done. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
780 ;; This is so that the user can do anything without failure, |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
781 ;; like switch buffers and start another isearch, and return. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
782 (condition-case err |
| 1184 | 783 (isearch-done t) |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
784 (exit nil)) ; was recursive editing |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
785 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
786 (isearch-message) ;; for read-char |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
787 (unwind-protect |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
788 (let* (;; Why does following read-char echo? |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
789 ;;(echo-keystrokes 0) ;; not needed with above message |
| 1480 | 790 (e (let ((cursor-in-echo-area t)) |
| 791 (if isearch-event-data-type | |
| 792 (allocate-event) (read-char)))) | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
793 ;; Binding minibuffer-history-symbol to nil is a work-around |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
794 ;; for some incompatibility with gmhist. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
795 (minibuffer-history-symbol)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
796 ;; If the first character the user types when we prompt them |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
797 ;; for a string is the yank-word character, then go into |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
798 ;; word-search mode. Otherwise unread that character and |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
799 ;; read a key the normal way. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
800 ;; Word search does not apply (yet) to regexp searches, |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
801 ;; no check is made here. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
802 (message (isearch-message-prefix nil nil t)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
803 (if (eq 'isearch-yank-word |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
804 (lookup-key |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
805 isearch-mode-map |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
806 (char-to-string |
|
1146
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
807 (if isearch-event-data-type |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
808 (or (event-to-character (next-command-event e)) 0) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
809 e)))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
810 (setq isearch-word t ;; so message-prefix is right |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
811 isearch-new-word t) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
812 (isearch-unread e)) |
|
1146
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
813 (setq cursor-in-echo-area nil) |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
814 (setq isearch-new-string |
| 1184 | 815 (let (junk-ring) |
|
1146
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
816 (read-from-minibuffer (isearch-message-prefix) |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
817 isearch-string |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
818 minibuffer-local-isearch-map nil |
| 1184 | 819 'junk-ring)) |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
820 isearch-new-message (mapconcat 'text-char-description |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
821 isearch-new-string ""))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
822 ;; Always resume isearching by restarting it. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
823 (isearch-mode isearch-forward |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
824 isearch-regexp |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
825 isearch-op-fun |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
826 isearch-recursive-edit |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
827 isearch-word) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
828 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
829 ;; Copy new local values to isearch globals |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
830 (setq isearch-string isearch-new-string |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
831 isearch-message isearch-new-message |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
832 isearch-forward isearch-new-forward |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
833 isearch-word isearch-new-word)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
834 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
835 ;; Empty isearch-string means use default. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
836 (if (= 0 (length isearch-string)) |
|
1169
a40b54fcb2ff
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1162
diff
changeset
|
837 (setq isearch-string (car (if isearch-regexp regexp-search-ring |
|
a40b54fcb2ff
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1162
diff
changeset
|
838 search-ring))) |
|
a40b54fcb2ff
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1162
diff
changeset
|
839 ;; This used to set the last search string, |
|
a40b54fcb2ff
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1162
diff
changeset
|
840 ;; but I think it is not right to do that here. |
|
a40b54fcb2ff
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1162
diff
changeset
|
841 ;; Only the string actually used should be saved. |
|
a40b54fcb2ff
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1162
diff
changeset
|
842 ) |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
843 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
844 ;; Reinvoke the pending search. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
845 (isearch-push-state) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
846 (isearch-search) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
847 (isearch-update) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
848 (if isearch-nonincremental |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
849 (progn |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
850 ;; (sit-for 1) ;; needed if isearch-done does: (message "") |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
851 (isearch-done)))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
852 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
853 (quit ; handle abort-recursive-edit |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
854 (isearch-abort) ;; outside of let to restore outside global values |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
855 ))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
856 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
857 (defun isearch-nonincremental-exit-minibuffer () |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
858 (interactive) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
859 (setq isearch-nonincremental t) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
860 (exit-minibuffer)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
861 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
862 (defun isearch-forward-exit-minibuffer () |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
863 (interactive) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
864 (setq isearch-new-forward t) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
865 (exit-minibuffer)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
866 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
867 (defun isearch-reverse-exit-minibuffer () |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
868 (interactive) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
869 (setq isearch-new-forward nil) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
870 (exit-minibuffer)) |
| 725 | 871 |
| 872 | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
873 (defun isearch-abort () |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
874 "Abort incremental search mode if searching is successful, signalling quit. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
875 Otherwise, revert to previous successful search and continue searching. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
876 Use `isearch-exit' to quit without signalling." |
| 725 | 877 (interactive) |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
878 ;; (ding) signal instead below, if quiting |
| 725 | 879 (discard-input) |
| 880 (if isearch-success | |
| 881 ;; If search is successful, move back to starting point | |
| 882 ;; and really do quit. | |
| 883 (progn (goto-char isearch-opoint) | |
| 1184 | 884 (isearch-done t) ; exit isearch |
|
1146
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
885 (signal 'quit nil)) ; and pass on quit signal |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
886 ;; If search is failing, rub out until it is once more successful. |
| 725 | 887 (while (not isearch-success) (isearch-pop-state)) |
| 888 (isearch-update))) | |
| 889 | |
| 890 | |
| 891 (defun isearch-repeat (direction) | |
| 892 ;; Utility for isearch-repeat-forward and -backward. | |
| 893 (if (eq isearch-forward (eq direction 'forward)) | |
| 894 ;; C-s in forward or C-r in reverse. | |
| 895 (if (equal isearch-string "") | |
| 896 ;; If search string is empty, use last one. | |
| 897 (setq isearch-string | |
| 898 (or (if isearch-regexp | |
|
1146
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
899 (car regexp-search-ring) |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
900 (car search-ring)) |
| 725 | 901 "") |
| 902 isearch-message | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
903 (mapconcat 'isearch-text-char-description |
| 725 | 904 isearch-string "")) |
| 905 ;; If already have what to search for, repeat it. | |
| 906 (or isearch-success | |
| 907 (progn | |
| 908 | |
| 909 (goto-char (if isearch-forward (point-min) (point-max))) | |
| 910 (setq isearch-wrapped t)))) | |
| 911 ;; C-s in reverse or C-r in forward, change direction. | |
| 912 (setq isearch-forward (not isearch-forward))) | |
| 913 | |
| 914 (setq isearch-barrier (point)) ; For subsequent \| if regexp. | |
| 915 (setq isearch-success t) | |
| 916 (or (equal isearch-string "") | |
| 917 (progn | |
| 918 ;; If repeating a search that found | |
| 919 ;; an empty string, ensure we advance. | |
| 920 (if (equal (match-end 0) (match-beginning 0)) | |
| 921 (forward-char (if isearch-forward 1 -1))) | |
| 922 (isearch-search))) | |
| 923 (isearch-push-state) | |
| 924 (isearch-update)) | |
| 925 | |
| 926 (defun isearch-repeat-forward () | |
| 927 "Repeat incremental search forwards." | |
| 928 (interactive) | |
| 929 (isearch-repeat 'forward)) | |
| 930 | |
| 931 (defun isearch-repeat-backward () | |
| 932 "Repeat incremental search backwards." | |
| 933 (interactive) | |
| 934 (isearch-repeat 'backward)) | |
| 935 | |
| 936 (defun isearch-toggle-regexp () | |
| 937 "Toggle regexp searching on or off." | |
| 938 ;; The status stack is left unchanged. | |
| 939 (interactive) | |
| 940 (setq isearch-regexp (not isearch-regexp)) | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
941 (if isearch-regexp (setq isearch-word nil)) |
| 725 | 942 (isearch-update)) |
| 943 | |
| 944 (defun isearch-delete-char () | |
| 945 "Discard last input item and move point back. | |
| 946 If no previous match was done, just beep." | |
| 947 (interactive) | |
| 948 (if (null (cdr isearch-cmds)) | |
| 949 (ding) | |
| 950 (isearch-pop-state)) | |
| 951 (isearch-update)) | |
| 952 | |
| 953 | |
| 954 (defun isearch-yank (chunk) | |
| 955 ;; Helper for isearch-yank-word and isearch-yank-line | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
956 (let ((string (save-excursion |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
957 (and (not isearch-forward) isearch-other-end |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
958 (goto-char isearch-other-end)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
959 (buffer-substring |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
960 (point) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
961 (save-excursion |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
962 (cond |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
963 ((eq chunk 'word) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
964 (forward-word 1)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
965 ((eq chunk 'line) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
966 (end-of-line))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
967 (point)))))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
968 ;; Downcase the string if not supposed to case-fold yanked strings. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
969 (if (and isearch-case-fold-search |
|
1143
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
970 (eq 'not-yanks search-upper-case)) |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
971 (setq string (downcase string))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
972 (if isearch-regexp (setq string (regexp-quote string))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
973 (setq isearch-string (concat isearch-string string) |
| 725 | 974 isearch-message |
| 975 (concat isearch-message | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
976 (mapconcat 'isearch-text-char-description |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
977 string "")) |
| 725 | 978 ;; Don't move cursor in reverse search. |
| 979 isearch-yank-flag t)) | |
| 980 (isearch-search-and-update)) | |
| 981 | |
| 982 | |
| 983 (defun isearch-yank-word () | |
| 984 "Pull next word from buffer into search string." | |
| 985 (interactive) | |
| 986 (isearch-yank 'word)) | |
| 987 | |
| 988 (defun isearch-yank-line () | |
| 989 "Pull rest of line from buffer into search string." | |
| 990 (interactive) | |
| 991 (isearch-yank 'line)) | |
| 992 | |
| 993 | |
| 994 (defun isearch-search-and-update () | |
| 995 ;; Do the search and update the display. | |
| 996 (if (and (not isearch-success) | |
| 997 ;; unsuccessful regexp search may become | |
| 998 ;; successful by addition of characters which | |
| 999 ;; make isearch-string valid | |
| 1000 (not isearch-regexp)) | |
| 1001 nil | |
| 1002 ;; In reverse search, adding stuff at | |
| 1003 ;; the end may cause zero or many more chars to be | |
| 1004 ;; matched, in the string following point. | |
| 1005 ;; Allow all those possibilities without moving point as | |
| 1006 ;; long as the match does not extend past search origin. | |
| 1007 (if (and (not isearch-forward) (not isearch-adjusted) | |
| 1008 (condition-case () | |
| 1009 (looking-at (if isearch-regexp isearch-string | |
| 1010 (regexp-quote isearch-string))) | |
| 1011 (error nil)) | |
| 1012 (or isearch-yank-flag | |
| 1013 (<= (match-end 0) | |
| 1014 (min isearch-opoint isearch-barrier)))) | |
| 1015 (setq isearch-success t | |
| 1016 isearch-invalid-regexp nil | |
| 1017 isearch-other-end (match-end 0)) | |
| 1018 ;; Not regexp, not reverse, or no match at point. | |
| 1019 (if (and isearch-other-end (not isearch-adjusted)) | |
| 1020 (goto-char (if isearch-forward isearch-other-end | |
| 1021 (min isearch-opoint | |
| 1022 isearch-barrier | |
| 1023 (1+ isearch-other-end))))) | |
| 1024 (isearch-search) | |
| 1025 )) | |
| 1026 (isearch-push-state) | |
| 1027 (if isearch-op-fun (funcall isearch-op-fun)) | |
| 1028 (isearch-update)) | |
| 1029 | |
| 1030 | |
| 1031 ;; *, ?, and | chars can make a regexp more liberal. | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1032 ;; They can make a regexp match sooner or make it succeed instead of failing. |
| 725 | 1033 ;; So go back to place last successful search started |
| 1034 ;; or to the last ^S/^R (barrier), whichever is nearer. | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1035 ;; + needs no special handling because the string must match at least once. |
| 725 | 1036 |
| 1037 (defun isearch-*-char () | |
| 1038 "Handle * and ? specially in regexps." | |
| 1039 (interactive) | |
| 1040 (if isearch-regexp | |
| 1041 | |
| 1042 (progn | |
| 1043 (setq isearch-adjusted t) | |
| 1044 (let ((cs (nth (if isearch-forward | |
| 1045 5 ; isearch-other-end | |
| 1046 2) ; saved (point) | |
| 1047 (car (cdr isearch-cmds))))) | |
| 1048 ;; (car isearch-cmds) is after last search; | |
| 1049 ;; (car (cdr isearch-cmds)) is from before it. | |
| 1050 (setq cs (or cs isearch-barrier)) | |
| 1051 (goto-char | |
| 1052 (if isearch-forward | |
| 1053 (max cs isearch-barrier) | |
| 1054 (min cs isearch-barrier)))))) | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1055 (isearch-process-search-char (isearch-last-command-char))) |
| 725 | 1056 |
| 1057 | |
| 1058 (defun isearch-|-char () | |
| 1059 "If in regexp search, jump to the barrier." | |
| 1060 (interactive) | |
| 1061 (if isearch-regexp | |
| 1062 (progn | |
| 1063 (setq isearch-adjusted t) | |
| 1064 (goto-char isearch-barrier))) | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1065 (isearch-process-search-char (isearch-last-command-char))) |
| 725 | 1066 |
| 1067 | |
|
2031
f2dbfd43a1c5
(isearch-unread): Handle multiple args.
Richard M. Stallman <rms@gnu.org>
parents:
1885
diff
changeset
|
1068 (fset 'isearch-other-control-char 'isearch-other-meta-char) |
| 725 | 1069 |
| 1070 (defun isearch-other-meta-char () | |
|
2031
f2dbfd43a1c5
(isearch-unread): Handle multiple args.
Richard M. Stallman <rms@gnu.org>
parents:
1885
diff
changeset
|
1071 "Exit the search normally and reread this key sequence. |
| 1184 | 1072 But only if `search-exit-option' is non-nil, the default. |
| 1073 If it is the symbol `edit', the search string is edited in the minibuffer | |
| 1074 and the meta character is unread so that it applies to editing the string." | |
| 725 | 1075 (interactive) |
| 1184 | 1076 (cond ((eq search-exit-option 'edit) |
| 1077 (let ((key (this-command-keys))) | |
|
2055
9234ebe088c9
(isearch-other-meta-char): Call listify-key-sequence.
Richard M. Stallman <rms@gnu.org>
parents:
2042
diff
changeset
|
1078 (apply 'isearch-unread (listify-key-sequence key))) |
| 1184 | 1079 (isearch-edit-string)) |
| 1080 (search-exit-option | |
| 1081 (let ((key (this-command-keys))) | |
|
2055
9234ebe088c9
(isearch-other-meta-char): Call listify-key-sequence.
Richard M. Stallman <rms@gnu.org>
parents:
2042
diff
changeset
|
1082 (apply 'isearch-unread (listify-key-sequence key))) |
| 1184 | 1083 (isearch-done)) |
| 1084 (t;; otherwise nil | |
| 1085 (isearch-process-search-string (this-command-keys) | |
| 1086 (this-command-keys))))) | |
| 725 | 1087 |
| 1088 | |
| 1089 (defun isearch-quote-char () | |
| 1090 "Quote special characters for incremental search." | |
| 1091 (interactive) | |
| 1092 (isearch-process-search-char (read-quoted-char (isearch-message t)))) | |
| 1093 | |
| 1094 (defun isearch-return-char () | |
| 1095 "Convert return into newline for incremental search. | |
| 1096 Obsolete." | |
| 1097 (interactive) | |
| 1098 (isearch-process-search-char ?\n)) | |
| 1099 | |
| 1100 (defun isearch-printing-char () | |
| 1101 "Any other printing character => add it to the search string and search." | |
| 1102 (interactive) | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1103 (isearch-process-search-char (isearch-last-command-char))) |
| 725 | 1104 |
| 1105 (defun isearch-whitespace-chars () | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1106 "Match all whitespace chars, if in regexp mode. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1107 If not in regexp mode, activate word search." |
| 725 | 1108 (interactive) |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1109 (if isearch-regexp |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1110 (if search-whitespace-regexp |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1111 (isearch-process-search-string search-whitespace-regexp " ") |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1112 (isearch-printing-char)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1113 (progn |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1114 ;; This way of doing word search doesnt correctly extend current search. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1115 ;; (setq isearch-word t) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1116 ;; (setq isearch-adjusted t) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1117 ;; (goto-char isearch-barrier) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1118 (isearch-printing-char)))) |
| 725 | 1119 |
| 1120 (defun isearch-process-search-char (char) | |
| 1121 ;; Append the char to the search string, update the message and re-search. | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1122 (isearch-process-search-string |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1123 (isearch-char-to-string char) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1124 (isearch-text-char-description char))) |
| 725 | 1125 |
| 1126 (defun isearch-process-search-string (string message) | |
| 1127 (setq isearch-string (concat isearch-string string) | |
| 1128 isearch-message (concat isearch-message message)) | |
| 1129 (isearch-search-and-update)) | |
| 1130 | |
| 1131 | |
| 1132 ;;=========================================================== | |
| 1133 ;; Search Ring | |
| 1134 | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1135 (defun isearch-ring-adjust1 (advance) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1136 ;; Helper for isearch-ring-adjust |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1137 (let* ((ring (if isearch-regexp regexp-search-ring search-ring)) |
| 725 | 1138 (length (length ring)) |
| 1139 (yank-pointer-name (if isearch-regexp | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1140 'regexp-search-ring-yank-pointer |
| 725 | 1141 'search-ring-yank-pointer)) |
| 1142 (yank-pointer (eval yank-pointer-name))) | |
| 1143 (if (zerop length) | |
| 1144 () | |
| 1145 (set yank-pointer-name | |
| 1146 (setq yank-pointer | |
|
1146
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1147 (% (+ (or yank-pointer 0) |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1148 (if advance (1- length) 1)) |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1149 length))) |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1150 (setq isearch-string (nth yank-pointer ring) |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1151 isearch-message (mapconcat 'isearch-text-char-description |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1152 isearch-string ""))))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1153 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1154 (defun isearch-ring-adjust (advance) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1155 ;; Helper for isearch-ring-advance and isearch-ring-retreat |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1156 (if (cdr isearch-cmds) ;; is there more than one thing on stack? |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1157 (isearch-pop-state)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1158 (isearch-ring-adjust1 advance) |
| 725 | 1159 (isearch-push-state) |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1160 (if search-ring-update |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1161 (progn |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1162 (isearch-search) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1163 (isearch-update)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1164 (isearch-edit-string) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1165 )) |
| 725 | 1166 |
| 1167 (defun isearch-ring-advance () | |
| 1168 "Advance to the next search string in the ring." | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1169 ;; This could be more general to handle a prefix arg, but who would use it. |
| 725 | 1170 (interactive) |
| 1171 (isearch-ring-adjust 'advance)) | |
| 1172 | |
| 1173 (defun isearch-ring-retreat () | |
| 1174 "Retreat to the previous search string in the ring." | |
| 1175 (interactive) | |
| 1176 (isearch-ring-adjust nil)) | |
| 1177 | |
|
1146
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1178 (defun isearch-ring-advance-edit (n) |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1179 "Insert the next element of the search history into the minibuffer." |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1180 (interactive "p") |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1181 (let* ((yank-pointer-name (if isearch-regexp |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1182 'regexp-search-ring-yank-pointer |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1183 'search-ring-yank-pointer)) |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1184 (yank-pointer (eval yank-pointer-name)) |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1185 (ring (if isearch-regexp regexp-search-ring search-ring)) |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1186 (length (length ring))) |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1187 (if (zerop length) |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1188 () |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1189 (set yank-pointer-name |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1190 (setq yank-pointer |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1191 (% (+ (or yank-pointer 0) |
| 1184 | 1192 ;; Add LENGTH here to ensure a positive result. |
| 1193 length | |
| 1194 (% (- n) length)) | |
|
1146
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1195 length))) |
| 725 | 1196 |
|
1146
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1197 (erase-buffer) |
| 1184 | 1198 (insert (nth yank-pointer ring)) |
|
1380
a7003e65eb66
(isearch-ring-advance-edit): Delete spurious `)'.
Richard M. Stallman <rms@gnu.org>
parents:
1184
diff
changeset
|
1199 (goto-char (point-max))))) |
| 725 | 1200 |
|
1146
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1201 (defun isearch-ring-retreat-edit (n) |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1202 "Inserts the previous element of the search history into the minibuffer." |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1203 (interactive "p") |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1204 (isearch-ring-advance-edit (- n))) |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1205 |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1206 ;;(defun isearch-ring-adjust-edit (advance) |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1207 ;; "Use the next or previous search string in the ring while in minibuffer." |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1208 ;; (isearch-ring-adjust1 advance) |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1209 ;; (erase-buffer) |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1210 ;; (insert isearch-string)) |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1211 |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1212 ;;(defun isearch-ring-advance-edit () |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1213 ;; (interactive) |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1214 ;; (isearch-ring-adjust-edit 'advance)) |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1215 |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1216 ;;(defun isearch-ring-retreat-edit () |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1217 ;; "Retreat to the previous search string in the ring while in the minibuffer." |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1218 ;; (interactive) |
|
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1219 ;; (isearch-ring-adjust-edit nil)) |
| 725 | 1220 |
| 1221 | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1222 (defun isearch-complete1 () |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1223 ;; Helper for isearch-complete and isearch-complete-edit |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1224 ;; Return t if completion OK, nil if no completion exists. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1225 (let* ((ring (if isearch-regexp regexp-search-ring search-ring)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1226 (alist (mapcar (function (lambda (string) (list string))) ring)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1227 (completion-ignore-case case-fold-search) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1228 (completion (try-completion isearch-string alist))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1229 (cond |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1230 ((eq completion t) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1231 ;; isearch-string stays the same |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1232 t) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1233 ((or completion ; not nil, must be a string |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1234 (= 0 (length isearch-string))) ; shouldnt have to say this |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1235 (if (equal completion isearch-string) ;; no extension? |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1236 (if completion-auto-help |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1237 (with-output-to-temp-buffer "*Isearch completions*" |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1238 (display-completion-list |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1239 (all-completions isearch-string alist)))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1240 (setq isearch-string completion)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1241 t) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1242 (t |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1243 (message "No completion") ; waits a second if in minibuffer |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1244 nil)))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1245 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1246 (defun isearch-complete () |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1247 "Complete the search string from the strings on the search ring. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1248 The completed string is then editable in the minibuffer. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1249 If there is no completion possible, say so and continue searching." |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1250 (interactive) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1251 (if (isearch-complete1) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1252 (isearch-edit-string) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1253 ;; else |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1254 (sit-for 1) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1255 (isearch-update))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1256 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1257 (defun isearch-complete-edit () |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1258 "Same as `isearch-complete' except in the minibuffer." |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1259 (interactive) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1260 (setq isearch-string (buffer-string)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1261 (if (isearch-complete1) |
| 725 | 1262 (progn |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1263 (erase-buffer) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1264 (insert isearch-string)))) |
| 725 | 1265 |
| 1266 | |
| 1267 ;;;============================================================== | |
| 1268 ;; The search status stack (and isearch window-local variables, not used). | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1269 ;; Need a structure for this. |
| 725 | 1270 |
| 1271 (defun isearch-top-state () | |
| 1272 (let ((cmd (car isearch-cmds))) | |
| 1273 (setq isearch-string (car cmd) | |
| 1274 isearch-message (car (cdr cmd)) | |
| 1275 isearch-success (nth 3 cmd) | |
| 1276 isearch-forward (nth 4 cmd) | |
| 1277 isearch-other-end (nth 5 cmd) | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1278 isearch-word (nth 6 cmd) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1279 isearch-invalid-regexp (nth 7 cmd) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1280 isearch-wrapped (nth 8 cmd) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1281 isearch-barrier (nth 9 cmd)) |
| 725 | 1282 (goto-char (car (cdr (cdr cmd)))))) |
| 1283 | |
| 1284 (defun isearch-pop-state () | |
| 1285 (setq isearch-cmds (cdr isearch-cmds)) | |
| 1286 (isearch-top-state) | |
| 1287 ) | |
| 1288 | |
| 1289 (defun isearch-push-state () | |
| 1290 (setq isearch-cmds | |
| 1291 (cons (list isearch-string isearch-message (point) | |
| 1292 isearch-success isearch-forward isearch-other-end | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1293 isearch-word |
| 725 | 1294 isearch-invalid-regexp isearch-wrapped isearch-barrier) |
| 1295 isearch-cmds))) | |
| 1296 | |
| 1297 | |
| 1298 ;;;================================================================== | |
| 1299 ;; Message string | |
| 1300 | |
| 1301 (defun isearch-message (&optional c-q-hack ellipsis) | |
| 1302 ;; Generate and print the message string. | |
| 1303 (let ((cursor-in-echo-area ellipsis) | |
| 1304 (m (concat | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1305 (isearch-message-prefix c-q-hack ellipsis isearch-nonincremental) |
| 725 | 1306 isearch-message |
| 1307 (isearch-message-suffix c-q-hack ellipsis) | |
| 1308 ))) | |
| 1309 (if c-q-hack m (message "%s" m)))) | |
| 1310 | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1311 (defun isearch-message-prefix (&optional c-q-hack ellipsis nonincremental) |
| 725 | 1312 ;; If about to search, and previous search regexp was invalid, |
| 1313 ;; check that it still is. If it is valid now, | |
| 1314 ;; let the message we display while searching say that it is valid. | |
| 1315 (and isearch-invalid-regexp ellipsis | |
| 1316 (condition-case () | |
| 1317 (progn (re-search-forward isearch-string (point) t) | |
| 1318 (setq isearch-invalid-regexp nil)) | |
| 1319 (error nil))) | |
| 1320 ;; If currently failing, display no ellipsis. | |
| 1321 (or isearch-success (setq ellipsis nil)) | |
| 1322 (let ((m (concat (if isearch-success "" "failing ") | |
| 1323 (if isearch-wrapped "wrapped ") | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1324 (if isearch-word "word " "") |
| 725 | 1325 (if isearch-regexp "regexp " "") |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1326 (if nonincremental "search" "I-search") |
| 725 | 1327 (if isearch-forward ": " " backward: ") |
| 1328 ))) | |
| 1329 (aset m 0 (upcase (aref m 0))) | |
| 1330 m)) | |
| 1331 | |
| 1332 | |
| 1333 (defun isearch-message-suffix (&optional c-q-hack ellipsis) | |
| 1334 (concat (if c-q-hack "^Q" "") | |
| 1335 (if isearch-invalid-regexp | |
| 1336 (concat " [" isearch-invalid-regexp "]") | |
| 1337 ""))) | |
| 1338 | |
| 1339 | |
| 1340 ;;;======================================================== | |
| 1341 ;;; Searching | |
| 1342 | |
| 1343 (defun isearch-search () | |
| 1344 ;; Do the search with the current search string. | |
| 1345 (isearch-message nil t) | |
|
1143
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
1346 (if search-upper-case |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1347 (setq isearch-case-fold-search (isearch-no-upper-case-p isearch-string))) |
| 725 | 1348 (condition-case lossage |
| 1349 (let ((inhibit-quit nil) | |
| 1350 (case-fold-search isearch-case-fold-search)) | |
| 1351 (if isearch-regexp (setq isearch-invalid-regexp nil)) | |
| 1352 (setq isearch-success | |
| 1353 (funcall | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1354 (cond (isearch-word |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1355 (if isearch-forward |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1356 'word-search-forward 'word-search-backward)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1357 (isearch-regexp |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1358 (if isearch-forward |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1359 're-search-forward 're-search-backward)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1360 (t |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1361 (if isearch-forward 'search-forward 'search-backward))) |
| 725 | 1362 isearch-string nil t)) |
| 1363 (if isearch-success | |
| 1364 (setq isearch-other-end | |
| 1365 (if isearch-forward (match-beginning 0) (match-end 0))))) | |
| 1366 | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1367 (quit (isearch-unread ?\C-g) |
| 725 | 1368 (setq isearch-success nil)) |
| 1369 | |
| 1370 (invalid-regexp | |
| 1371 (setq isearch-invalid-regexp (car (cdr lossage))) | |
| 1372 (if (string-match | |
| 1373 "\\`Premature \\|\\`Unmatched \\|\\`Invalid " | |
| 1374 isearch-invalid-regexp) | |
|
1534
dd292c7ef749
(isearch-search): Handle all sorts of errors from regexp search.
Richard M. Stallman <rms@gnu.org>
parents:
1480
diff
changeset
|
1375 (setq isearch-invalid-regexp "incomplete input"))) |
|
dd292c7ef749
(isearch-search): Handle all sorts of errors from regexp search.
Richard M. Stallman <rms@gnu.org>
parents:
1480
diff
changeset
|
1376 (error |
|
dd292c7ef749
(isearch-search): Handle all sorts of errors from regexp search.
Richard M. Stallman <rms@gnu.org>
parents:
1480
diff
changeset
|
1377 ;; stack overflow in regexp search. |
|
dd292c7ef749
(isearch-search): Handle all sorts of errors from regexp search.
Richard M. Stallman <rms@gnu.org>
parents:
1480
diff
changeset
|
1378 (setq isearch-invalid-regexp (car (cdr lossage))))) |
| 725 | 1379 |
| 1380 (if isearch-success | |
| 1381 nil | |
| 1382 ;; Ding if failed this time after succeeding last time. | |
| 1383 (and (nth 3 (car isearch-cmds)) | |
| 1384 (ding)) | |
| 1385 (goto-char (nth 2 (car isearch-cmds))))) | |
| 1386 | |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1387 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1388 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1389 ;;;======================================================== |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1390 ;;; Highlighting |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1391 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1392 (defun isearch-highlight (begin end)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1393 (defun isearch-dehighlight (totally)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1394 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1395 ;; lemacs uses faces |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1396 '(progn |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1397 (defvar isearch-extent nil) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1398 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1399 (or (find-face 'isearch) ;; this face is initialized by x-faces.el |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1400 (make-face 'isearch)) ;; since isearch is preloaded |
| 725 | 1401 |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1402 (defun isearch-lemacs-highlight (begin end) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1403 (if (null isearch-highlight) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1404 nil |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1405 (if (and (extentp isearch-extent) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1406 (eq (extent-buffer isearch-extent) (current-buffer))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1407 (set-extent-endpoints isearch-extent begin end) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1408 (if (and (extentp isearch-extent) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1409 (bufferp (extent-buffer isearch-extent)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1410 (buffer-name (extent-buffer isearch-extent))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1411 (delete-extent isearch-extent)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1412 (setq isearch-extent (make-extent begin end (current-buffer)))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1413 (set-extent-face isearch-extent 'isearch))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1414 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1415 (defun isearch-lemacs-dehighlight (totally) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1416 (if (and isearch-highlight isearch-extent) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1417 (if totally |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1418 (let ((inhibit-quit t)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1419 (if (and (extentp isearch-extent) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1420 (bufferp (extent-buffer isearch-extent)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1421 (buffer-name (extent-buffer isearch-extent))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1422 (delete-extent isearch-extent)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1423 (setq isearch-extent nil)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1424 (if (and (extentp isearch-extent) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1425 (bufferp (extent-buffer isearch-extent)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1426 (buffer-name (extent-buffer isearch-extent))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1427 (set-extent-face isearch-extent 'default) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1428 (isearch-dehighlight t))))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1429 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1430 (fset 'isearch-highlight (symbol-function 'isearch-lemacs-highlight)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1431 (fset 'isearch-dehighlight (symbol-function 'isearch-lemacs-dehighlight)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1432 ) |
| 725 | 1433 |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1434 ;;;=========================================================== |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1435 ;;; General utilities |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1436 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1437 ;; (fset 'isearch-member-equal (symbol-function 'member)) ; for emacs 19 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1438 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1439 (defun isearch-member-equal (item list) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1440 "Return non-nil if ITEM is `equal' to some item in LIST. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1441 Actually return the list whose car is that item." |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1442 (while (and list (not (equal item (car list)))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1443 (setq list (cdr list))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1444 list) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1445 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1446 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1447 (defun isearch-no-upper-case-p (string) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1448 "Return t if there are no upper case chars in string. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1449 But upper case chars preceeded by \\ (but not \\\\) do not count since they |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1450 have special meaning in a regexp." |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1451 (let ((case-fold-search nil)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1452 (not (string-match "\\(^\\|\\\\\\\\\\|[^\\]\\)[A-Z]" string)))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1453 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1454 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1455 ;;;================================================= |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1456 ;;; Special functions for lemacs events. |
| 725 | 1457 |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1458 ;; To quiet the byte-compiler. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1459 (defvar unread-command-event) |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1614
diff
changeset
|
1460 (defvar unread-command-events) |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1461 (defvar last-command-event) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1462 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1463 (defun isearch-char-to-string (c) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1464 (if (integerp c) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1465 (make-string 1 c) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1466 (make-string 1 (event-to-character c)))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1467 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1468 (defun isearch-text-char-description (c) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1469 (isearch-char-to-string c)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1470 |
|
2031
f2dbfd43a1c5
(isearch-unread): Handle multiple args.
Richard M. Stallman <rms@gnu.org>
parents:
1885
diff
changeset
|
1471 (defun isearch-unread (&rest char-or-events) |
|
f2dbfd43a1c5
(isearch-unread): Handle multiple args.
Richard M. Stallman <rms@gnu.org>
parents:
1885
diff
changeset
|
1472 ;; General function to unread characters or events. |
|
f2dbfd43a1c5
(isearch-unread): Handle multiple args.
Richard M. Stallman <rms@gnu.org>
parents:
1885
diff
changeset
|
1473 (if isearch-gnu-emacs-events |
|
2055
9234ebe088c9
(isearch-other-meta-char): Call listify-key-sequence.
Richard M. Stallman <rms@gnu.org>
parents:
2042
diff
changeset
|
1474 (setq unread-command-events |
|
9234ebe088c9
(isearch-other-meta-char): Call listify-key-sequence.
Richard M. Stallman <rms@gnu.org>
parents:
2042
diff
changeset
|
1475 (append char-or-events unread-command-events)) |
|
2031
f2dbfd43a1c5
(isearch-unread): Handle multiple args.
Richard M. Stallman <rms@gnu.org>
parents:
1885
diff
changeset
|
1476 (let ((char (if (cdr char-or-events) |
|
2035
d59e199d4f6f
(isearch-unread): Find last list element by hand.
Richard M. Stallman <rms@gnu.org>
parents:
2031
diff
changeset
|
1477 (progn |
|
d59e199d4f6f
(isearch-unread): Find last list element by hand.
Richard M. Stallman <rms@gnu.org>
parents:
2031
diff
changeset
|
1478 (while (cdr char-or-events) |
|
d59e199d4f6f
(isearch-unread): Find last list element by hand.
Richard M. Stallman <rms@gnu.org>
parents:
2031
diff
changeset
|
1479 (setq char-or-events (cdr char-or-events))) |
|
d59e199d4f6f
(isearch-unread): Find last list element by hand.
Richard M. Stallman <rms@gnu.org>
parents:
2031
diff
changeset
|
1480 (+ 128 (car char-or-events))) |
|
2031
f2dbfd43a1c5
(isearch-unread): Handle multiple args.
Richard M. Stallman <rms@gnu.org>
parents:
1885
diff
changeset
|
1481 (car char-or-events)))) |
|
f2dbfd43a1c5
(isearch-unread): Handle multiple args.
Richard M. Stallman <rms@gnu.org>
parents:
1885
diff
changeset
|
1482 (if isearch-event-data-type |
|
f2dbfd43a1c5
(isearch-unread): Handle multiple args.
Richard M. Stallman <rms@gnu.org>
parents:
1885
diff
changeset
|
1483 (setq unread-command-event char) |
|
f2dbfd43a1c5
(isearch-unread): Handle multiple args.
Richard M. Stallman <rms@gnu.org>
parents:
1885
diff
changeset
|
1484 (setq unread-command-char char))))) |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1485 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1486 (defun isearch-last-command-char () |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1487 ;; General function to return the last command character. |
|
1146
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1488 (if isearch-event-data-type |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1489 last-command-event |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1490 last-command-char)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1491 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1492 |
| 725 | 1493 |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1494 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1495 ;;;======================================================== |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1496 ;;; Exiting in lemacs |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1497 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1498 ;; This is a large amount of code to support automatic termination of |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1499 ;; isearch-mode when a command (however it is invoked) is not an |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1500 ;; isearch command, or the buffer is switched out from under |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1501 ;; isearch-mode. Only later versions of lemacs have the pre-command-hook. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1502 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1503 ;;(if isearch-pre-command-hook-exists |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1504 ;;(progn |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1505 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1506 ;;;; This list must be modified whenever the available commands are modified. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1507 ;;(mapcar (function (lambda (command) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1508 ;; (put command 'isearch-command t))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1509 ;; '(isearch-printing-char |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1510 ;; isearch-return-char |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1511 ;; isearch-repeat-forward |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1512 ;; isearch-repeat-backward |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1513 ;; isearch-delete-char |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1514 ;; isearch-abort |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1515 ;; isearch-quote-char |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1516 ;; isearch-exit |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1517 ;; isearch-printing-char |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1518 ;; isearch-printing-char |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1519 ;; isearch-yank-word |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1520 ;; isearch-yank-line |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1521 ;; isearch-*-char |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1522 ;; isearch-*-char |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1523 ;; isearch-|-char |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1524 ;; isearch-toggle-regexp |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1525 ;; isearch-edit-string |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1526 ;; isearch-mode-help |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1527 ;; isearch-ring-advance |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1528 ;; isearch-ring-retreat |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1529 ;; isearch-ring-advance-edit |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1530 ;; isearch-ring-retreat-edit |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1531 ;; isearch-whitespace-chars |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1532 ;; isearch-complete |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1533 ;; isearch-complete-edit |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1534 ;; isearch-edit-string |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1535 ;; isearch-toggle-regexp |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1536 ;; ;; The following may not be needed since isearch-mode is off already. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1537 ;; isearch-forward-exit-minibuffer |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1538 ;; isearch-reverse-exit-minibuffer |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1539 ;; isearch-nonincremental-exit-minibuffer)) |
| 725 | 1540 |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1541 ;;(defun isearch-pre-command-hook () |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1542 ;; ;; |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1543 ;; ;; For use as the value of `pre-command-hook' when isearch-mode is active. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1544 ;; ;; If the command about to be executed is not one of the isearch commands, |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1545 ;; ;; then isearch-mode is turned off before that command is executed. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1546 ;; ;; |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1547 ;; ;; If the command about to be executed is self-insert-command, or is a |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1548 ;; ;; keyboard macro of a single key sequence which is bound to self-insert- |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1549 ;; ;; command, then we add those chars to the search ring instead of inserting |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1550 ;; ;; them in the buffer. In this way, the set of self-searching characters |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1551 ;; ;; need not be exhaustively enumerated, but is derived from other maps. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1552 ;; ;; |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1553 ;; (isearch-maybe-frob-keyboard-macros) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1554 ;; (if (and (symbolp this-command) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1555 ;; (get this-command 'isearch-command)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1556 ;; nil |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1557 ;; (isearch-done))) |
| 725 | 1558 |
|
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1559 ;;(defun isearch-maybe-frob-keyboard-macros () |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1560 ;; ;; |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1561 ;; ;; If the command about to be executed is `self-insert-command' then change |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1562 ;; ;; the command to `isearch-printing-char' instead, meaning add the last- |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1563 ;; ;; typed character to the search string. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1564 ;; ;; |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1565 ;; ;; If `this-command' is a string or a vector (that is, a keyboard macro) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1566 ;; ;; and it contains only one command, which is bound to self-insert-command, |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1567 ;; ;; then do the same thing as for self-inserting commands: arrange for that |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1568 ;; ;; character to be added to the search string. If we didn't do this, then |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1569 ;; ;; typing a compose sequence (a la x-compose.el) would terminate the search |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1570 ;; ;; and insert the character, instead of searching for that character. |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1571 ;; ;; |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1572 ;; (cond ((eq this-command 'self-insert-command) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1573 ;; (setq this-command 'isearch-printing-char)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1574 ;; ((and (stringp this-command) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1575 ;; (eq (key-binding this-command) 'self-insert-command)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1576 ;; (setq last-command-char (aref this-command 0) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1577 ;; last-command-event (character-to-event last-command-char) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1578 ;; this-command 'isearch-printing-char)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1579 ;; ((and (vectorp this-command) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1580 ;; (eq (key-binding this-command) 'self-insert-command)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1581 ;; (let* ((desc (aref this-command 0)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1582 ;; (code (cond ((integerp desc) desc) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1583 ;; ((symbolp desc) (get desc character-set-property)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1584 ;; ((consp desc) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1585 ;; (and (null (cdr desc)) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1586 ;; (get (car desc) character-set-property))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1587 ;; (t nil)))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1588 ;; (if code |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1589 ;; (setq last-command-char code |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1590 ;; last-command-event (character-to-event last-command-char) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1591 ;; this-command 'isearch-printing-char)))) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1592 ;; )) |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1593 |
|
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1594 ;;)) |
|
1885
9e79ffe97d5b
Fix minor bugs in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
1883
diff
changeset
|
1595 |
|
2230
6314334d7c2b
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2055
diff
changeset
|
1596 ;;; isearch.el ends here |
