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