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