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