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