Mercurial > emacs
annotate lisp/isearch.el @ 92057:878175a4c8f1
lisp/time.el: Fix compiler warning.
author | Michael Olson <mwolson@gnu.org> |
---|---|
date | Thu, 21 Feb 2008 20:28:12 +0000 |
parents | eb602dd246b2 |
children | f991f10f15ec |
rev | line source |
---|---|
78108
18c20c490279
Remove dashes from front of first line.
Jason Rumney <jasonr@gnu.org>
parents:
78092
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 |
64762
41bb365f41c4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64665
diff
changeset
|
3 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000, |
79721 | 4 ;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
792
diff
changeset
|
5 |
2230
6314334d7c2b
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2055
diff
changeset
|
6 ;; 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
|
7 ;; Maintainer: FSF |
25823
4cecefebde6f
(isearch): Add :links in defgroup.
Dave Love <fx@gnu.org>
parents:
25644
diff
changeset
|
8 ;; Keywords: matching |
725 | 9 |
4839 | 10 ;; This file is part of GNU Emacs. |
725 | 11 |
6736
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
5649
diff
changeset
|
12 ;; 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
|
13 ;; it under the terms of the GNU General Public License as published by |
78236
9355f9b7bbff
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
78190
diff
changeset
|
14 ;; the Free Software Foundation; either version 3, or (at your option) |
6736
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
5649
diff
changeset
|
15 ;; any later version. |
725 | 16 |
6736
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
5649
diff
changeset
|
17 ;; 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
|
18 ;; 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
|
19 ;; 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
|
20 ;; 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
|
21 |
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
5649
diff
changeset
|
22 ;; You should have received a copy of the GNU General Public License |
14169 | 23 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64091 | 24 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
25 ;; Boston, MA 02110-1301, USA. | |
725 | 26 |
2230
6314334d7c2b
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2055
diff
changeset
|
27 ;;; Commentary: |
6314334d7c2b
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2055
diff
changeset
|
28 |
725 | 29 ;; Instructions |
30 | |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
31 ;; For programmed use of isearch-mode, e.g. calling (isearch-forward), |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
32 ;; isearch-mode behaves modally and does not return until the search |
25823
4cecefebde6f
(isearch): Add :links in defgroup.
Dave Love <fx@gnu.org>
parents:
25644
diff
changeset
|
33 ;; is completed. It uses a recursive-edit to behave this way. |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
34 |
725 | 35 ;; 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
|
36 ;; `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
|
37 ;; characters of the original isearch.el. With `isearch-mode', |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
38 ;; 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
|
39 ;; 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
|
40 ;; 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
|
41 ;; for bindings active during `isearch-edit-string'. |
725 | 42 |
25823
4cecefebde6f
(isearch): Add :links in defgroup.
Dave Love <fx@gnu.org>
parents:
25644
diff
changeset
|
43 ;; isearch-mode should work even if you switch windows with the mouse, |
4cecefebde6f
(isearch): Add :links in defgroup.
Dave Love <fx@gnu.org>
parents:
25644
diff
changeset
|
44 ;; in which case isearch-mode is terminated automatically before the |
4cecefebde6f
(isearch): Add :links in defgroup.
Dave Love <fx@gnu.org>
parents:
25644
diff
changeset
|
45 ;; switch. |
725 | 46 |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
47 ;; The search ring and completion commands automatically put you in |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
48 ;; 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
|
49 ;; modify the search string before executing the search. There are |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
50 ;; 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
|
51 ;; minibuffer and search forward and reverse respectively, while C-m |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
52 ;; exits and does a nonincremental search. |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
53 |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
54 ;; Exiting immediately from isearch uses isearch-edit-string instead |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
55 ;; of nonincremental-search, if search-nonincremental-instead is non-nil. |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
56 ;; 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
|
57 ;; keep the behavior. No point in forcing nonincremental search until |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
58 ;; the last possible moment. |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
59 |
2230
6314334d7c2b
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2055
diff
changeset
|
60 ;;; Code: |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
61 |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
62 |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
63 ;; Some additional options and constants. |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
64 |
17637
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
65 (defgroup isearch nil |
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
66 "Incremental search minor mode." |
25823
4cecefebde6f
(isearch): Add :links in defgroup.
Dave Love <fx@gnu.org>
parents:
25644
diff
changeset
|
67 :link '(emacs-commentary-link "isearch") |
4cecefebde6f
(isearch): Add :links in defgroup.
Dave Love <fx@gnu.org>
parents:
25644
diff
changeset
|
68 :link '(custom-manual "(emacs)Incremental Search") |
17637
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
69 :prefix "isearch-" |
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
70 :prefix "search-" |
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
71 :group 'matching) |
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
72 |
725 | 73 |
17637
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
74 (defcustom search-exit-option t |
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
75 "*Non-nil means random control characters terminate incremental search." |
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
76 :type 'boolean |
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
77 :group 'isearch) |
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
78 |
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
79 (defcustom search-slow-window-lines 1 |
1143
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
80 "*Number of lines in slow search display windows. |
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
81 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
|
82 Negative means put the slow search window at the top (normally it's at bottom) |
17637
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
83 and the value is minus the number of lines." |
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
84 :type 'integer |
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
85 :group 'isearch) |
725 | 86 |
17637
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
87 (defcustom search-slow-speed 1200 |
1143
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
88 "*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
|
89 This is the style where a one-line window is created to show the line |
17637
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
90 that the search has reached." |
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
91 :type 'integer |
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
92 :group 'isearch) |
725 | 93 |
17637
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
94 (defcustom search-upper-case 'not-yanks |
725 | 95 "*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
|
96 That is, upper and lower case chars must match exactly. |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
97 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
|
98 apply to chars in regexps that are prefixed with `\\'. |
87212
80f24a97ade8
(search-upper-case): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
86027
diff
changeset
|
99 If this value is `not-yanks', text yanked into the search string |
80f24a97ade8
(search-upper-case): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
86027
diff
changeset
|
100 in Isearch mode is always downcased." |
17637
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
101 :type '(choice (const :tag "off" nil) |
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
102 (const not-yanks) |
22587
5fe3766ec1a8
(search-upper-case): Use `other' widget type.
Andreas Schwab <schwab@suse.de>
parents:
22517
diff
changeset
|
103 (other :tag "on" t)) |
17637
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
104 :group 'isearch) |
725 | 105 |
17637
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
106 (defcustom search-nonincremental-instead t |
725 | 107 "*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
|
108 Actually, `isearch-edit-string' is called to let you enter the search |
17637
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
109 string, and RET terminates editing and does a nonincremental search." |
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
110 :type 'boolean |
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
111 :group 'isearch) |
725 | 112 |
58744
5eaafc3a7357
(search-whitespace-regexp): Remove the group. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57380
diff
changeset
|
113 (defcustom search-whitespace-regexp "\\s-+" |
725 | 114 "*If non-nil, regular expression to match a sequence of whitespace chars. |
19769
4c2159c165e5
(search-whitespace-regexp): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19587
diff
changeset
|
115 This applies to regular expression incremental search. |
58744
5eaafc3a7357
(search-whitespace-regexp): Remove the group. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57380
diff
changeset
|
116 When you put a space or spaces in the incremental regexp, it stands for |
5eaafc3a7357
(search-whitespace-regexp): Remove the group. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57380
diff
changeset
|
117 this, unless it is inside of a regexp construct such as [...] or *, + or ?. |
5eaafc3a7357
(search-whitespace-regexp): Remove the group. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57380
diff
changeset
|
118 You might want to use something like \"[ \\t\\r\\n]+\" instead. |
5eaafc3a7357
(search-whitespace-regexp): Remove the group. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57380
diff
changeset
|
119 In the Customization buffer, that is `[' followed by a space, |
69078
fba8c045e2a0
(search-whitespace-regexp): Fix custom type.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
120 a tab, a carriage return (control-M), a newline, and `]+'. |
fba8c045e2a0
(search-whitespace-regexp): Fix custom type.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
121 |
fba8c045e2a0
(search-whitespace-regexp): Fix custom type.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
122 When this is nil, each space you type matches literally, against one space." |
fba8c045e2a0
(search-whitespace-regexp): Fix custom type.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
123 :type '(choice (const :tag "Find Spaces Literally" nil) |
fba8c045e2a0
(search-whitespace-regexp): Fix custom type.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
124 regexp) |
17637
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
125 :group 'isearch) |
725 | 126 |
18236
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
127 (defcustom search-invisible 'open |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
128 "If t incremental search can match hidden text. |
64665
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
129 A nil value means don't match invisible text. |
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
130 When the value is `open', if the text matched is made invisible by |
18236
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
131 an overlay having an `invisible' property and that overlay has a property |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
132 `isearch-open-invisible', then incremental search will show the contents. |
48201
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
133 \(This applies when using `outline.el' and `hideshow.el'.) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
134 See also `reveal-mode' if you want overlays to automatically be opened |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
135 whenever point is in one of them." |
18236
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
136 :type '(choice (const :tag "Match hidden text" t) |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
137 (const :tag "Open overlays" open) |
18866
04d56f77da0d
(search-invisible): Fix typo.
Richard M. Stallman <rms@gnu.org>
parents:
18783
diff
changeset
|
138 (const :tag "Don't match hidden text" nil)) |
18236
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
139 :group 'isearch) |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
140 |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
141 (defcustom isearch-hide-immediately t |
19069
e132d9bcfd5d
(isearch-hide-immediately): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18866
diff
changeset
|
142 "If non-nil, re-hide an invisible match right away. |
e132d9bcfd5d
(isearch-hide-immediately): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18866
diff
changeset
|
143 This variable makes a difference when `search-invisible' is set to `open'. |
e132d9bcfd5d
(isearch-hide-immediately): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18866
diff
changeset
|
144 It means that after search makes some invisible text visible |
e132d9bcfd5d
(isearch-hide-immediately): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18866
diff
changeset
|
145 to show the match, it makes the text invisible again when the match moves. |
49420
07a876ca33f0
(isearch-forward): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
49069
diff
changeset
|
146 Ordinarily the text becomes invisible again at the end of the search." |
07a876ca33f0
(isearch-forward): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
49069
diff
changeset
|
147 :type 'boolean |
18236
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
148 :group 'isearch) |
16990
a2fc2ef460e3
(isearch-search): Refuse to match invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
16737
diff
changeset
|
149 |
57083
a74474ba690a
(isearch-resume-in-command-history): Rename from
Kim F. Storm <storm@cua.dk>
parents:
57025
diff
changeset
|
150 (defcustom isearch-resume-in-command-history nil |
a74474ba690a
(isearch-resume-in-command-history): Rename from
Kim F. Storm <storm@cua.dk>
parents:
57025
diff
changeset
|
151 "*If non-nil, `isearch-resume' commands are added to the command history. |
a74474ba690a
(isearch-resume-in-command-history): Rename from
Kim F. Storm <storm@cua.dk>
parents:
57025
diff
changeset
|
152 This allows you to resume earlier isearch sessions through the |
a74474ba690a
(isearch-resume-in-command-history): Rename from
Kim F. Storm <storm@cua.dk>
parents:
57025
diff
changeset
|
153 command history." |
41755
3b56f11dd4b6
(isearch-resume-enabled): New variable.
Kim F. Storm <storm@cua.dk>
parents:
41648
diff
changeset
|
154 :type 'boolean |
3b56f11dd4b6
(isearch-resume-enabled): New variable.
Kim F. Storm <storm@cua.dk>
parents:
41648
diff
changeset
|
155 :group 'isearch) |
3b56f11dd4b6
(isearch-resume-enabled): New variable.
Kim F. Storm <storm@cua.dk>
parents:
41648
diff
changeset
|
156 |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
157 (defvar isearch-mode-hook nil |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
158 "Function(s) to call after starting up an incremental search.") |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
159 |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
160 (defvar isearch-mode-end-hook nil |
64399
d41de3ff06c8
(isearch-mode-end-hook-quit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
64091
diff
changeset
|
161 "Function(s) to call after terminating an incremental search. |
d41de3ff06c8
(isearch-mode-end-hook-quit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
64091
diff
changeset
|
162 When these functions are called, `isearch-mode-end-hook-quit' |
86027
f194d32fb97d
(isearch-mode-end-hook, isearch-mode-end-hook-quit):
Juri Linkov <juri@jurta.org>
parents:
85720
diff
changeset
|
163 is non-nil if the user quits the search.") |
64399
d41de3ff06c8
(isearch-mode-end-hook-quit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
64091
diff
changeset
|
164 |
d41de3ff06c8
(isearch-mode-end-hook-quit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
64091
diff
changeset
|
165 (defvar isearch-mode-end-hook-quit nil |
86027
f194d32fb97d
(isearch-mode-end-hook, isearch-mode-end-hook-quit):
Juri Linkov <juri@jurta.org>
parents:
85720
diff
changeset
|
166 "Non-nil while running `isearch-mode-end-hook' if the user quits the search.") |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
167 |
82060
d22a586b6032
(isearch-message-function): New variable.
Juri Linkov <juri@jurta.org>
parents:
82039
diff
changeset
|
168 (defvar isearch-message-function nil |
d22a586b6032
(isearch-message-function): New variable.
Juri Linkov <juri@jurta.org>
parents:
82039
diff
changeset
|
169 "Function to call to display the search prompt. |
d22a586b6032
(isearch-message-function): New variable.
Juri Linkov <juri@jurta.org>
parents:
82039
diff
changeset
|
170 If nil, use `isearch-message'.") |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
171 |
56868
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
172 (defvar isearch-wrap-function nil |
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
173 "Function to call to wrap the search when search is failed. |
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
174 If nil, move point to the beginning of the buffer for a forward search, |
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
175 or to the end of the buffer for a backward search.") |
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
176 |
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
177 (defvar isearch-push-state-function nil |
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
178 "Function to save a function restoring the mode-specific isearch state |
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
179 to the search status stack.") |
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
180 |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
181 ;; Search ring. |
725 | 182 |
183 (defvar search-ring nil | |
184 "List of search string sequences.") | |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
185 (defvar regexp-search-ring nil |
725 | 186 "List of regular expression search string sequences.") |
187 | |
17637
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
188 (defcustom search-ring-max 16 |
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
189 "*Maximum length of search ring before oldest elements are thrown away." |
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
190 :type 'integer |
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
191 :group 'isearch) |
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
192 (defcustom regexp-search-ring-max 16 |
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
193 "*Maximum length of regexp search ring before oldest elements are thrown away." |
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
194 :type 'integer |
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
195 :group 'isearch) |
725 | 196 |
197 (defvar search-ring-yank-pointer nil | |
1146
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
198 "Index in `search-ring' of last string reused. |
64665
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
199 It is nil if none yet.") |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
200 (defvar regexp-search-ring-yank-pointer nil |
1146
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
201 "Index in `regexp-search-ring' of last string reused. |
64665
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
202 It is nil if none yet.") |
725 | 203 |
17637
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
204 (defcustom search-ring-update nil |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
205 "*Non-nil if advancing or retreating in the search ring should cause search. |
17637
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
206 Default value, nil, means edit the string instead." |
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
207 :type 'boolean |
b63c3782cb4c
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17139
diff
changeset
|
208 :group 'isearch) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
209 |
59478
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
210 ;;; isearch highlight customization. |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
211 |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
212 (defcustom search-highlight t |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
213 "*Non-nil means incremental search highlights the current match." |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
214 :type 'boolean |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
215 :group 'isearch) |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
216 |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
217 (defface isearch |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
218 '((((class color) (min-colors 88) (background light)) |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
219 ;; The background must not be too dark, for that means |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
220 ;; the character is hard to see when the cursor is there. |
64502
1e7ae6f38b3a
(isearch): Use not-too-dark magenta3 instead of too-light magenta2.
Juri Linkov <juri@jurta.org>
parents:
64436
diff
changeset
|
221 (:background "magenta3" :foreground "lightskyblue1")) |
59478
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
222 (((class color) (min-colors 88) (background dark)) |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
223 (:background "palevioletred2" :foreground "brown4")) |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
224 (((class color) (min-colors 16)) |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
225 (:background "magenta4" :foreground "cyan1")) |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
226 (((class color) (min-colors 8)) |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
227 (:background "magenta4" :foreground "cyan1")) |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
228 (t (:inverse-video t))) |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
229 "Face for highlighting Isearch matches." |
65731
36c67f52422a
(isearch, lazy-highlight): Add group `basic-faces'.
Juri Linkov <juri@jurta.org>
parents:
65702
diff
changeset
|
230 :group 'isearch |
36c67f52422a
(isearch, lazy-highlight): Add group `basic-faces'.
Juri Linkov <juri@jurta.org>
parents:
65702
diff
changeset
|
231 :group 'basic-faces) |
59478
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
232 (defvar isearch 'isearch) |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
233 |
91785 | 234 (defface isearch-fail '((t (:foreground "Black" :background "Plum"))) |
235 "Face for highlighting failed part in Isearch echo-area message." | |
236 :group 'isearch) | |
237 | |
59478
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
238 (defcustom isearch-lazy-highlight t |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
239 "*Controls the lazy-highlighting during incremental search. |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
240 When non-nil, all text in the buffer matching the current search |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
241 string is highlighted lazily (see `lazy-highlight-initial-delay' |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
242 and `lazy-highlight-interval')." |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
243 :type 'boolean |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
244 :group 'lazy-highlight |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
245 :group 'isearch) |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
246 |
59340
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
247 ;;; Lazy highlight customization. |
59478
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
248 |
59340
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
249 (defgroup lazy-highlight nil |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
250 "Lazy highlighting feature for matching strings." |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
251 :prefix "lazy-highlight-" |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
252 :version "21.1" |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
253 :group 'isearch |
59478
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
254 :group 'matching) |
59340
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
255 |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
256 (defcustom lazy-highlight-cleanup t |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
257 "*Controls whether to remove extra highlighting after a search. |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
258 If this is nil, extra highlighting can be \"manually\" removed with |
60706
c102b0eb3db5
(lazy-highlight-cleanup) <command>: Rename from
Juri Linkov <juri@jurta.org>
parents:
60672
diff
changeset
|
259 \\[lazy-highlight-cleanup]." |
59340
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
260 :type 'boolean |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
261 :group 'lazy-highlight) |
64665
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
262 (define-obsolete-variable-alias 'isearch-lazy-highlight-cleanup |
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
263 'lazy-highlight-cleanup |
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
264 "22.1") |
59340
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
265 |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
266 (defcustom lazy-highlight-initial-delay 0.25 |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
267 "*Seconds to wait before beginning to lazily highlight all matches." |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
268 :type 'number |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
269 :group 'lazy-highlight) |
64665
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
270 (define-obsolete-variable-alias 'isearch-lazy-highlight-initial-delay |
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
271 'lazy-highlight-initial-delay |
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
272 "22.1") |
59340
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
273 |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
274 (defcustom lazy-highlight-interval 0 ; 0.0625 |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
275 "*Seconds between lazily highlighting successive matches." |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
276 :type 'number |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
277 :group 'lazy-highlight) |
64665
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
278 (define-obsolete-variable-alias 'isearch-lazy-highlight-interval |
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
279 'lazy-highlight-interval |
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
280 "22.1") |
59340
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
281 |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
282 (defcustom lazy-highlight-max-at-a-time 20 |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
283 "*Maximum matches to highlight at a time (for `lazy-highlight'). |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
284 Larger values may reduce isearch's responsiveness to user input; |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
285 smaller values make matches highlight slowly. |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
286 A value of nil means highlight all matches." |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
287 :type '(choice (const :tag "All" nil) |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
288 (integer :tag "Some")) |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
289 :group 'lazy-highlight) |
64665
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
290 (define-obsolete-variable-alias 'isearch-lazy-highlight-max-at-a-time |
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
291 'lazy-highlight-max-at-a-time |
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
292 "22.1") |
59340
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
293 |
59386
89c73b450bcc
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-12
Miles Bader <miles@gnu.org>
parents:
59379
diff
changeset
|
294 (defface lazy-highlight |
59340
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
295 '((((class color) (min-colors 88) (background light)) |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
296 (:background "paleturquoise")) |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
297 (((class color) (min-colors 88) (background dark)) |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
298 (:background "paleturquoise4")) |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
299 (((class color) (min-colors 16)) |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
300 (:background "turquoise3")) |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
301 (((class color) (min-colors 8)) |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
302 (:background "turquoise3")) |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
303 (t (:underline t))) |
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
304 "Face for lazy highlighting of matches other than the current one." |
65731
36c67f52422a
(isearch, lazy-highlight): Add group `basic-faces'.
Juri Linkov <juri@jurta.org>
parents:
65702
diff
changeset
|
305 :group 'lazy-highlight |
36c67f52422a
(isearch, lazy-highlight): Add group `basic-faces'.
Juri Linkov <juri@jurta.org>
parents:
65702
diff
changeset
|
306 :group 'basic-faces) |
59478
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
307 (put 'isearch-lazy-highlight-face 'face-alias 'lazy-highlight) |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
308 (defvar lazy-highlight-face 'lazy-highlight) |
64665
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
309 (define-obsolete-variable-alias 'isearch-lazy-highlight-face |
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
310 'lazy-highlight-face |
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
311 "22.1") |
59340
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
312 |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
313 ;; Define isearch-mode keymap. |
725 | 314 |
33704
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
315 (defvar isearch-mode-map |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
316 (let* ((i 0) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
317 (map (make-keymap))) |
89483 | 318 (or (char-table-p (nth 1 map)) |
33704
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
319 (error "The initialization of isearch-mode-map must be updated")) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
320 ;; Make all multibyte characters search for themselves. |
89909 | 321 (set-char-table-range (nth 1 map) (cons #x100 (max-char)) |
88398
d8c9fc60016e
(isearch-mode-map): Call set-char-table-range to bind
Kenichi Handa <handa@m17n.org>
parents:
43129
diff
changeset
|
322 'isearch-printing-char) |
52965
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
323 ;; Make function keys, etc, which aren't bound to a scrolling-function |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
324 ;; exit the search. |
33704
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
325 (define-key map [t] 'isearch-other-control-char) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
326 ;; Control chars, by default, end isearch mode transparently. |
49420
07a876ca33f0
(isearch-forward): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
49069
diff
changeset
|
327 ;; We need these explicit definitions because, in a dense keymap, |
33704
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
328 ;; the binding for t does not affect characters. |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
329 ;; We use a dense keymap to save space. |
64665
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
330 (while (< i ?\s) |
33704
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
331 (define-key map (make-string 1 i) 'isearch-other-control-char) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
332 (setq i (1+ i))) |
725 | 333 |
33704
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
334 ;; Single-byte printing chars extend the search string by default. |
64665
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
335 (setq i ?\s) |
33704
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
336 (while (< i 256) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
337 (define-key map (vector i) 'isearch-printing-char) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
338 (setq i (1+ i))) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
339 |
33704
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
340 ;; To handle local bindings with meta char prefix keys, define |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
341 ;; another full keymap. This must be done for any other prefix |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
342 ;; keys as well, one full keymap per char of the prefix key. It |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
343 ;; would be simpler to disable the global keymap, and/or have a |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
344 ;; default local key binding for any key not otherwise bound. |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
345 (let ((meta-map (make-sparse-keymap))) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
346 (define-key map (char-to-string meta-prefix-char) meta-map) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
347 (define-key map [escape] meta-map)) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
348 (define-key map (vector meta-prefix-char t) 'isearch-other-meta-char) |
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
|
349 |
33704
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
350 ;; Several non-printing chars change the searching behavior. |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
351 (define-key map "\C-s" 'isearch-repeat-forward) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
352 (define-key map "\C-r" 'isearch-repeat-backward) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
353 ;; Define M-C-s and M-C-r like C-s and C-r so that the same key |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
354 ;; combinations can be used to repeat regexp isearches that can |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
355 ;; be used to start these searches. |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
356 (define-key map "\M-\C-s" 'isearch-repeat-forward) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
357 (define-key map "\M-\C-r" 'isearch-repeat-backward) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
358 (define-key map "\177" 'isearch-delete-char) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
359 (define-key map "\C-g" 'isearch-abort) |
35083
cfac1ece4f23
(isearch-old-signal-hook): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
35012
diff
changeset
|
360 |
33704
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
361 ;; This assumes \e is the meta-prefix-char. |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
362 (or (= ?\e meta-prefix-char) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
363 (error "Inconsistency in isearch.el")) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
364 (define-key map "\e\e\e" 'isearch-cancel) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
365 (define-key map [escape escape escape] 'isearch-cancel) |
49420
07a876ca33f0
(isearch-forward): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
49069
diff
changeset
|
366 |
33704
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
367 (define-key map "\C-q" 'isearch-quote-char) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
368 |
33704
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
369 (define-key map "\r" 'isearch-exit) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
370 (define-key map "\C-j" 'isearch-printing-char) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
371 (define-key map "\t" 'isearch-printing-char) |
58876
a804ec066ee7
(isearch-mode-map): Treat S-SPC like SPC.
Richard M. Stallman <rms@gnu.org>
parents:
58840
diff
changeset
|
372 (define-key map [?\S-\ ] 'isearch-printing-char) |
49420
07a876ca33f0
(isearch-forward): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
49069
diff
changeset
|
373 |
56303
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
374 (define-key map "\C-w" 'isearch-yank-word-or-char) |
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
375 (define-key map "\M-\C-w" 'isearch-del-char) |
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
376 (define-key map "\M-\C-y" 'isearch-yank-char) |
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
377 (define-key map "\C-y" 'isearch-yank-line) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
378 |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
379 ;; Turned off because I find I expect to get the global definition--rms. |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
380 ;; ;; Instead bind C-h to special help command for isearch-mode. |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
381 ;; (define-key map "\C-h" 'isearch-mode-help) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
382 |
33704
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
383 (define-key map "\M-n" 'isearch-ring-advance) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
384 (define-key map "\M-p" 'isearch-ring-retreat) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
385 (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
|
386 |
33704
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
387 (define-key map "\M-\t" 'isearch-complete) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
388 |
33704
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
389 ;; Pass frame events transparently so they won't exit the search. |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
390 ;; In particular, if we have more than one display open, then a |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
391 ;; switch-frame might be generated by someone typing at another keyboard. |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
392 (define-key map [switch-frame] nil) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
393 (define-key map [delete-frame] nil) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
394 (define-key map [iconify-frame] nil) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
395 (define-key map [make-frame-visible] nil) |
40026
04c835f1c6de
(isearch-mode-map): Bind `mouse-movement' to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
39555
diff
changeset
|
396 (define-key map [mouse-movement] nil) |
67229
25a39a23b428
(isearch-mode-map): Avoid exiting search on language-change event.
Jason Rumney <jasonr@gnu.org>
parents:
67103
diff
changeset
|
397 (define-key map [language-change] nil) |
25a39a23b428
(isearch-mode-map): Avoid exiting search on language-change event.
Jason Rumney <jasonr@gnu.org>
parents:
67103
diff
changeset
|
398 |
33704
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
399 ;; For searching multilingual text. |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
400 (define-key map "\C-\\" 'isearch-toggle-input-method) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
401 (define-key map "\C-^" 'isearch-toggle-specified-input-method) |
12284
07a76f045154
(isearch-mode-map): Bind frame events to nil.
Karl Heuer <kwzh@gnu.org>
parents:
12265
diff
changeset
|
402 |
33704
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
403 ;; People expect to be able to paste with the mouse. |
39047
d177c68813c0
(isearch-mouse-2): Renamed from isearch-mouse-yank.
Gerd Moellmann <gerd@gnu.org>
parents:
38778
diff
changeset
|
404 (define-key map [mouse-2] #'isearch-mouse-2) |
33704
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
405 (define-key map [down-mouse-2] nil) |
25572 | 406 |
33704
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
407 ;; Some bindings you may want to put in your isearch-mode-hook. |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
408 ;; Suggest some alternates... |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
409 (define-key map "\M-c" 'isearch-toggle-case-fold) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
410 (define-key map "\M-r" 'isearch-toggle-regexp) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
411 (define-key map "\M-e" 'isearch-edit-string) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
412 |
56352
f0e5e08dd63e
(isearch-query-replace): Pass the regexp-ness and delimited-ness of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56349
diff
changeset
|
413 (define-key map [?\M-%] 'isearch-query-replace) |
f0e5e08dd63e
(isearch-query-replace): Pass the regexp-ness and delimited-ness of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56349
diff
changeset
|
414 (define-key map [?\C-\M-%] 'isearch-query-replace-regexp) |
87212
80f24a97ade8
(search-upper-case): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
86027
diff
changeset
|
415 (define-key map "\M-so" 'isearch-occur) |
56303
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
416 |
33704
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
417 map) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
418 "Keymap for `isearch-mode'.") |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
419 |
33704
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
420 (defvar minibuffer-local-isearch-map |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
421 (let ((map (make-sparse-keymap))) |
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
422 (set-keymap-parent map minibuffer-local-map) |
56303
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
423 (define-key map "\r" 'isearch-nonincremental-exit-minibuffer) |
33704
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
424 (define-key map "\M-\t" 'isearch-complete-edit) |
56303
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
425 (define-key map "\C-s" 'isearch-forward-exit-minibuffer) |
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
426 (define-key map "\C-r" 'isearch-reverse-exit-minibuffer) |
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
427 (define-key map "\C-f" 'isearch-yank-char-in-minibuffer) |
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
428 (define-key map [right] 'isearch-yank-char-in-minibuffer) |
33704
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
429 map) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
430 "Keymap for editing isearch strings in the minibuffer.") |
725 | 431 |
432 ;; Internal variables declared globally for byte-compiler. | |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
433 ;; These are all set with setq while isearching |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
434 ;; and bound locally while editing the search string. |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
435 |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
436 (defvar isearch-forward nil) ; Searching in the forward direction. |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
437 (defvar isearch-regexp nil) ; Searching for a regexp. |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
438 (defvar isearch-word nil) ; Searching for words. |
48201
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
439 (defvar isearch-hidden nil) ; Non-nil if the string exists but is invisible. |
725 | 440 |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
441 (defvar isearch-cmds nil |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
442 "Stack of search status sets. |
56668
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
443 Each set is a vector of the form: |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
444 [STRING MESSAGE POINT SUCCESS FORWARD OTHER-END WORD |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
445 INVALID-REGEXP WRAPPED BARRIER WITHIN-BRACKETS CASE-FOLD-SEARCH]") |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
446 |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
447 (defvar isearch-string "") ; The current search string. |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
448 (defvar isearch-message "") ; text-char-description version of isearch-string |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
449 |
60614
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
450 (defvar isearch-success t) ; Searching is currently successful. |
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
451 (defvar isearch-error nil) ; Error message for failed search. |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
452 (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
|
453 (defvar isearch-wrapped nil) ; Searching restarted from the top (bottom). |
725 | 454 (defvar isearch-barrier 0) |
13799
49b7cd70c43c
(isearch-done): Use executing-kbd-macro.
Karl Heuer <kwzh@gnu.org>
parents:
13682
diff
changeset
|
455 (defvar isearch-just-started nil) |
42067
f38a270798ca
(isearch-start-hscroll): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
42066
diff
changeset
|
456 (defvar isearch-start-hscroll 0) ; hscroll when starting the search. |
725 | 457 |
7294
4ff0c1e7c8e2
(isearch-case-fold-search): new possible value `yes'
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
458 ; case-fold-search while searching. |
4ff0c1e7c8e2
(isearch-case-fold-search): new possible value `yes'
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
459 ; 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
|
460 ; 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
|
461 (defvar isearch-case-fold-search nil) |
725 | 462 |
39555
8f03c11f64ef
(isearch-last-case-fold-search): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39256
diff
changeset
|
463 (defvar isearch-last-case-fold-search nil) |
8f03c11f64ef
(isearch-last-case-fold-search): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39256
diff
changeset
|
464 |
33725
687b166e4a49
(isearch-original-minibuffer-message-timeout): New var.
Miles Bader <miles@gnu.org>
parents:
33704
diff
changeset
|
465 ;; Used to save default value while isearch is active |
687b166e4a49
(isearch-original-minibuffer-message-timeout): New var.
Miles Bader <miles@gnu.org>
parents:
33704
diff
changeset
|
466 (defvar isearch-original-minibuffer-message-timeout nil) |
687b166e4a49
(isearch-original-minibuffer-message-timeout): New var.
Miles Bader <miles@gnu.org>
parents:
33704
diff
changeset
|
467 |
725 | 468 (defvar isearch-adjusted nil) |
469 (defvar isearch-slow-terminal-mode nil) | |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
470 ;; If t, using a small window. |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
471 (defvar isearch-small-window nil) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
472 (defvar isearch-opoint 0) |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
473 ;; The window configuration active at the beginning of the search. |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
474 (defvar isearch-window-configuration nil) |
725 | 475 |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
476 ;; 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
|
477 (defvar isearch-yank-flag nil) |
725 | 478 |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
479 ;; A function to be called after each input character is processed. |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
480 ;; (It is not called after characters that exit the search.) |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
481 ;; It is only set from an optional argument to `isearch-mode'. |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
482 (defvar isearch-op-fun nil) |
725 | 483 |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
484 ;; Is isearch-mode in a recursive edit for modal searching. |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
485 (defvar isearch-recursive-edit nil) |
725 | 486 |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
487 ;; Should isearch be terminated after doing one search? |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
488 (defvar isearch-nonincremental nil) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
489 |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
490 ;; New value of isearch-forward after isearch-edit-string. |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
491 (defvar isearch-new-forward nil) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
492 |
18236
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
493 ;; Accumulate here the overlays opened during searching. |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
494 (defvar isearch-opened-overlays nil) |
725 | 495 |
22775
ede5d8c1f929
(isearch-input-method-function): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22704
diff
changeset
|
496 ;; The value of input-method-function when isearch is invoked. |
ede5d8c1f929
(isearch-input-method-function): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22704
diff
changeset
|
497 (defvar isearch-input-method-function nil) |
ede5d8c1f929
(isearch-input-method-function): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22704
diff
changeset
|
498 |
ede5d8c1f929
(isearch-input-method-function): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22704
diff
changeset
|
499 ;; A flag to tell if input-method-function is locally bound when |
ede5d8c1f929
(isearch-input-method-function): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22704
diff
changeset
|
500 ;; isearch is invoked. |
ede5d8c1f929
(isearch-input-method-function): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22704
diff
changeset
|
501 (defvar isearch-input-method-local-p nil) |
ede5d8c1f929
(isearch-input-method-function): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22704
diff
changeset
|
502 |
725 | 503 ;; Minor-mode-alist changes - kind of redundant with the |
504 ;; echo area, but if isearching in multiple windows, it can be useful. | |
505 | |
506 (or (assq 'isearch-mode minor-mode-alist) | |
507 (nconc minor-mode-alist | |
508 (list '(isearch-mode isearch-mode)))) | |
509 | |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
510 (defvar isearch-mode nil) ;; Name of the minor mode, if non-nil. |
725 | 511 (make-variable-buffer-local 'isearch-mode) |
512 | |
1143
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
513 (define-key global-map "\C-s" 'isearch-forward) |
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
514 (define-key esc-map "\C-s" 'isearch-forward-regexp) |
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
515 (define-key global-map "\C-r" 'isearch-backward) |
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
516 (define-key esc-map "\C-r" 'isearch-backward-regexp) |
0b4552590bb8
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1142
diff
changeset
|
517 |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
518 ;; Entry points to isearch-mode. |
725 | 519 |
1883
b707809f29bb
(isearch-backward-regexp):
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
520 (defun isearch-forward (&optional regexp-p no-recursive-edit) |
725 | 521 "\ |
522 Do incremental search forward. | |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
523 With a prefix argument, do an incremental regular expression search instead. |
725 | 524 \\<isearch-mode-map> |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
525 As you type characters, they add to the search string and are found. |
49420
07a876ca33f0
(isearch-forward): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
49069
diff
changeset
|
526 The following non-printing keys are bound in `isearch-mode-map'. |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
527 |
55226
e3dae0e8c99e
(isearch-mode-map): Bind \C-w to isearch-yank-word instead of isearch-yank-word-or-char.
Juri Linkov <juri@jurta.org>
parents:
54256
diff
changeset
|
528 Type \\[isearch-delete-char] to cancel last input item from end of search string. |
725 | 529 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
|
530 Type LFD (C-j) to match end of line. |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
531 Type \\[isearch-repeat-forward] to search again forward,\ |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
532 \\[isearch-repeat-backward] to search again backward. |
68268
627ba9ac2b0f
(isearch-forward): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67567
diff
changeset
|
533 Type \\[isearch-yank-word-or-char] to yank next word or character in buffer |
627ba9ac2b0f
(isearch-forward): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67567
diff
changeset
|
534 onto the end of the search string, and search for it. |
56303
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
535 Type \\[isearch-del-char] to delete character from end of search string. |
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
536 Type \\[isearch-yank-char] to yank char from buffer onto end of search\ |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
537 string and search for it. |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
538 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
|
539 and search for it. |
76974
a79dc3730ce6
(isearch-forward): Revert 1998-08-26 doc change.
Chong Yidong <cyd@stupidchicken.com>
parents:
76362
diff
changeset
|
540 Type \\[isearch-yank-kill] to yank the last string of killed text. |
725 | 541 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
|
542 \\[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
|
543 back to what has |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
544 been found successfully. |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
545 \\[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
|
546 starting point. |
725 | 547 |
65697
b89731597db3
(isearch-forward, isearch-forward-regexp): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
65582
diff
changeset
|
548 If you try to exit with the search string still empty, it invokes |
b89731597db3
(isearch-forward, isearch-forward-regexp): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
65582
diff
changeset
|
549 nonincremental search. |
b89731597db3
(isearch-forward, isearch-forward-regexp): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
65582
diff
changeset
|
550 |
60173
6e0cd1315a6f
(isearch-forward): Document isearch-query-replace and
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60098
diff
changeset
|
551 Type \\[isearch-query-replace] to start `query-replace' with string to\ |
61750
d8f3865ed9a2
(isearch-forward): Doc fix.
Andreas Schwab <schwab@suse.de>
parents:
61643
diff
changeset
|
552 replace from last search string. |
60173
6e0cd1315a6f
(isearch-forward): Document isearch-query-replace and
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60098
diff
changeset
|
553 Type \\[isearch-query-replace-regexp] to start `query-replace-regexp'\ |
64665
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
554 with string to replace from last search string. |
60173
6e0cd1315a6f
(isearch-forward): Document isearch-query-replace and
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60098
diff
changeset
|
555 |
35435
1269a53f8f5f
(isearch-forward): Add isearch-toggle-case-fold,
Eli Zaretskii <eliz@gnu.org>
parents:
35363
diff
changeset
|
556 Type \\[isearch-toggle-case-fold] to toggle search case-sensitivity. |
1269a53f8f5f
(isearch-forward): Add isearch-toggle-case-fold,
Eli Zaretskii <eliz@gnu.org>
parents:
35363
diff
changeset
|
557 Type \\[isearch-toggle-regexp] to toggle regular-expression mode. |
1269a53f8f5f
(isearch-forward): Add isearch-toggle-case-fold,
Eli Zaretskii <eliz@gnu.org>
parents:
35363
diff
changeset
|
558 Type \\[isearch-edit-string] to edit the search string in the minibuffer. |
1269a53f8f5f
(isearch-forward): Add isearch-toggle-case-fold,
Eli Zaretskii <eliz@gnu.org>
parents:
35363
diff
changeset
|
559 |
725 | 560 Also supported is a search ring of the previous 16 search strings. |
561 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
|
562 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
|
563 ring. |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
564 Type \\[isearch-complete] to complete the search string using the search ring. |
725 | 565 |
35905 | 566 If an input method is turned on in the current buffer, that input |
49420
07a876ca33f0
(isearch-forward): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
49069
diff
changeset
|
567 method is also active while you are typing characters to search. To |
35881
d72bdac750d6
(isearch-forward): Add description about input method in the docsting.
Kenichi Handa <handa@m17n.org>
parents:
35661
diff
changeset
|
568 toggle the input method, type \\[isearch-toggle-input-method]. It |
d72bdac750d6
(isearch-forward): Add description about input method in the docsting.
Kenichi Handa <handa@m17n.org>
parents:
35661
diff
changeset
|
569 also toggles the input method in the current buffer. |
d72bdac750d6
(isearch-forward): Add description about input method in the docsting.
Kenichi Handa <handa@m17n.org>
parents:
35661
diff
changeset
|
570 |
d72bdac750d6
(isearch-forward): Add description about input method in the docsting.
Kenichi Handa <handa@m17n.org>
parents:
35661
diff
changeset
|
571 To use a different input method for searching, type |
35905 | 572 \\[isearch-toggle-specified-input-method], and specify an input method |
35881
d72bdac750d6
(isearch-forward): Add description about input method in the docsting.
Kenichi Handa <handa@m17n.org>
parents:
35661
diff
changeset
|
573 you want to use. |
d72bdac750d6
(isearch-forward): Add description about input method in the docsting.
Kenichi Handa <handa@m17n.org>
parents:
35661
diff
changeset
|
574 |
49420
07a876ca33f0
(isearch-forward): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
49069
diff
changeset
|
575 The above keys, bound in `isearch-mode-map', are often controlled by |
55226
e3dae0e8c99e
(isearch-mode-map): Bind \C-w to isearch-yank-word instead of isearch-yank-word-or-char.
Juri Linkov <juri@jurta.org>
parents:
54256
diff
changeset
|
576 options; do \\[apropos] on search-.* to find them. |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
577 Other control and meta characters terminate the search |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
578 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
|
579 Likewise for function keys and mouse button events. |
725 | 580 |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
581 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
|
582 the calling function until the search is done." |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
583 |
1883
b707809f29bb
(isearch-backward-regexp):
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
584 (interactive "P\np") |
1885
9e79ffe97d5b
Fix minor bugs in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
1883
diff
changeset
|
585 (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
|
586 |
1883
b707809f29bb
(isearch-backward-regexp):
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
587 (defun isearch-forward-regexp (&optional not-regexp no-recursive-edit) |
725 | 588 "\ |
589 Do incremental search forward for regular expression. | |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
590 With a prefix argument, do a regular string search instead. |
725 | 591 Like ordinary incremental search except that your input |
58744
5eaafc3a7357
(search-whitespace-regexp): Remove the group. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57380
diff
changeset
|
592 is treated as a regexp. See \\[isearch-forward] for more info. |
5eaafc3a7357
(search-whitespace-regexp): Remove the group. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57380
diff
changeset
|
593 |
5eaafc3a7357
(search-whitespace-regexp): Remove the group. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57380
diff
changeset
|
594 In regexp incremental searches, a space or spaces normally matches |
5eaafc3a7357
(search-whitespace-regexp): Remove the group. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57380
diff
changeset
|
595 any whitespace (the variable `search-whitespace-regexp' controls |
5eaafc3a7357
(search-whitespace-regexp): Remove the group. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57380
diff
changeset
|
596 precisely what that means). If you want to search for a literal space |
65702
5f9322399c91
(isearch-forward-regexp): Close doc string.
Romain Francoise <romain@orebokech.com>
parents:
65697
diff
changeset
|
597 and nothing else, enter C-q SPC." |
1883
b707809f29bb
(isearch-backward-regexp):
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
598 (interactive "P\np") |
1885
9e79ffe97d5b
Fix minor bugs in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
1883
diff
changeset
|
599 (isearch-mode t (null not-regexp) nil (not no-recursive-edit))) |
725 | 600 |
1883
b707809f29bb
(isearch-backward-regexp):
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
601 (defun isearch-backward (&optional regexp-p no-recursive-edit) |
725 | 602 "\ |
603 Do incremental search backward. | |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
604 With a prefix argument, do a regular expression search instead. |
725 | 605 See \\[isearch-forward] for more information." |
1883
b707809f29bb
(isearch-backward-regexp):
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
606 (interactive "P\np") |
1885
9e79ffe97d5b
Fix minor bugs in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
1883
diff
changeset
|
607 (isearch-mode nil (not (null regexp-p)) nil (not no-recursive-edit))) |
725 | 608 |
1883
b707809f29bb
(isearch-backward-regexp):
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
609 (defun isearch-backward-regexp (&optional not-regexp no-recursive-edit) |
725 | 610 "\ |
611 Do incremental search backward for regular expression. | |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
612 With a prefix argument, do a regular string search instead. |
725 | 613 Like ordinary incremental search except that your input |
614 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
|
615 (interactive "P\np") |
1885
9e79ffe97d5b
Fix minor bugs in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
1883
diff
changeset
|
616 (isearch-mode nil (null not-regexp) nil (not no-recursive-edit))) |
725 | 617 |
618 | |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
619 (defun isearch-mode-help () |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
620 (interactive) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
621 (describe-function 'isearch-forward) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
622 (isearch-update)) |
725 | 623 |
624 | |
625 ;; isearch-mode only sets up incremental search for the minor mode. | |
626 ;; All the work is done by the isearch-mode commands. | |
627 | |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
628 ;; Not used yet: |
16687
049c87a96dca
Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16635
diff
changeset
|
629 ;;(defvar isearch-commands '(isearch-forward isearch-backward |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
630 ;; isearch-forward-regexp isearch-backward-regexp) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
631 ;; "List of commands for which isearch-mode does not recursive-edit.") |
49420
07a876ca33f0
(isearch-forward): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
49069
diff
changeset
|
632 |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
633 |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
634 (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
|
635 "Start isearch minor mode. Called by `isearch-forward', etc. |
5f7440c4c0de
(isearch-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11579
diff
changeset
|
636 |
5f7440c4c0de
(isearch-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11579
diff
changeset
|
637 \\{isearch-mode-map}" |
725 | 638 |
639 ;; Initialize global vars. | |
640 (setq isearch-forward forward | |
641 isearch-regexp regexp | |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
642 isearch-word word-p |
725 | 643 isearch-op-fun op-fun |
39555
8f03c11f64ef
(isearch-last-case-fold-search): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
39256
diff
changeset
|
644 isearch-last-case-fold-search isearch-case-fold-search |
725 | 645 isearch-case-fold-search case-fold-search |
646 isearch-string "" | |
647 isearch-message "" | |
648 isearch-cmds nil | |
649 isearch-success t | |
650 isearch-wrapped nil | |
651 isearch-barrier (point) | |
652 isearch-adjusted nil | |
653 isearch-yank-flag nil | |
60614
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
654 isearch-error nil |
9940
4a06fd6dcbff
(isearch-other-meta-char): Delete debugging code.
Richard M. Stallman <rms@gnu.org>
parents:
9935
diff
changeset
|
655 isearch-slow-terminal-mode (and (<= baud-rate search-slow-speed) |
725 | 656 (> (window-height) |
41014
fcd14406bac3
(isearch-mode): Handle negative search-slow-window-lines correctly.
Richard M. Stallman <rms@gnu.org>
parents:
40026
diff
changeset
|
657 (* 4 |
fcd14406bac3
(isearch-mode): Handle negative search-slow-window-lines correctly.
Richard M. Stallman <rms@gnu.org>
parents:
40026
diff
changeset
|
658 (abs search-slow-window-lines)))) |
725 | 659 isearch-other-end nil |
660 isearch-small-window nil | |
13799
49b7cd70c43c
(isearch-done): Use executing-kbd-macro.
Karl Heuer <kwzh@gnu.org>
parents:
13682
diff
changeset
|
661 isearch-just-started t |
42067
f38a270798ca
(isearch-start-hscroll): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
42066
diff
changeset
|
662 isearch-start-hscroll (window-hscroll) |
725 | 663 |
664 isearch-opoint (point) | |
1146
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
665 search-ring-yank-pointer nil |
18236
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
666 isearch-opened-overlays nil |
22775
ede5d8c1f929
(isearch-input-method-function): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22704
diff
changeset
|
667 isearch-input-method-function input-method-function |
ede5d8c1f929
(isearch-input-method-function): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22704
diff
changeset
|
668 isearch-input-method-local-p (local-variable-p 'input-method-function) |
33725
687b166e4a49
(isearch-original-minibuffer-message-timeout): New var.
Miles Bader <miles@gnu.org>
parents:
33704
diff
changeset
|
669 regexp-search-ring-yank-pointer nil |
687b166e4a49
(isearch-original-minibuffer-message-timeout): New var.
Miles Bader <miles@gnu.org>
parents:
33704
diff
changeset
|
670 |
687b166e4a49
(isearch-original-minibuffer-message-timeout): New var.
Miles Bader <miles@gnu.org>
parents:
33704
diff
changeset
|
671 ;; Save the original value of `minibuffer-message-timeout', and |
687b166e4a49
(isearch-original-minibuffer-message-timeout): New var.
Miles Bader <miles@gnu.org>
parents:
33704
diff
changeset
|
672 ;; set it to nil so that isearch's messages don't get timed out. |
687b166e4a49
(isearch-original-minibuffer-message-timeout): New var.
Miles Bader <miles@gnu.org>
parents:
33704
diff
changeset
|
673 isearch-original-minibuffer-message-timeout minibuffer-message-timeout |
687b166e4a49
(isearch-original-minibuffer-message-timeout): New var.
Miles Bader <miles@gnu.org>
parents:
33704
diff
changeset
|
674 minibuffer-message-timeout nil) |
22775
ede5d8c1f929
(isearch-input-method-function): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22704
diff
changeset
|
675 |
ede5d8c1f929
(isearch-input-method-function): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22704
diff
changeset
|
676 ;; We must bypass input method while reading key. When a user type |
ede5d8c1f929
(isearch-input-method-function): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22704
diff
changeset
|
677 ;; printable character, appropriate input method is turned on in |
35098
63af2c5d55f9
(isearch-lazy-highlight-remove-overlays): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
35083
diff
changeset
|
678 ;; minibuffer to read multibyte characters. |
22775
ede5d8c1f929
(isearch-input-method-function): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22704
diff
changeset
|
679 (or isearch-input-method-local-p |
ede5d8c1f929
(isearch-input-method-function): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22704
diff
changeset
|
680 (make-local-variable 'input-method-function)) |
ede5d8c1f929
(isearch-input-method-function): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22704
diff
changeset
|
681 (setq input-method-function nil) |
ede5d8c1f929
(isearch-input-method-function): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22704
diff
changeset
|
682 |
13799
49b7cd70c43c
(isearch-done): Use executing-kbd-macro.
Karl Heuer <kwzh@gnu.org>
parents:
13682
diff
changeset
|
683 (looking-at "") |
5554
0ac0776c23af
(isearch-mode): If not slow, clear isearch-window-configuration.
Richard M. Stallman <rms@gnu.org>
parents:
5411
diff
changeset
|
684 (setq isearch-window-configuration |
0ac0776c23af
(isearch-mode): If not slow, clear isearch-window-configuration.
Richard M. Stallman <rms@gnu.org>
parents:
5411
diff
changeset
|
685 (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
|
686 |
16620
c3a095290ec4
(isearch-mode): Maybe make minibuffer frame visible and/or raise it.
Richard M. Stallman <rms@gnu.org>
parents:
16566
diff
changeset
|
687 ;; Maybe make minibuffer frame visible and/or raise it. |
c3a095290ec4
(isearch-mode): Maybe make minibuffer frame visible and/or raise it.
Richard M. Stallman <rms@gnu.org>
parents:
16566
diff
changeset
|
688 (let ((frame (window-frame (minibuffer-window)))) |
44472
9d117150b0a2
(isearch-mode): Don't call make-frame-visible
Richard M. Stallman <rms@gnu.org>
parents:
44457
diff
changeset
|
689 (unless (memq (frame-live-p frame) '(nil t)) |
9d117150b0a2
(isearch-mode): Don't call make-frame-visible
Richard M. Stallman <rms@gnu.org>
parents:
44457
diff
changeset
|
690 (unless (frame-visible-p frame) |
9d117150b0a2
(isearch-mode): Don't call make-frame-visible
Richard M. Stallman <rms@gnu.org>
parents:
44457
diff
changeset
|
691 (make-frame-visible frame)) |
9d117150b0a2
(isearch-mode): Don't call make-frame-visible
Richard M. Stallman <rms@gnu.org>
parents:
44457
diff
changeset
|
692 (if minibuffer-auto-raise |
9d117150b0a2
(isearch-mode): Don't call make-frame-visible
Richard M. Stallman <rms@gnu.org>
parents:
44457
diff
changeset
|
693 (raise-frame frame)))) |
16620
c3a095290ec4
(isearch-mode): Maybe make minibuffer frame visible and/or raise it.
Richard M. Stallman <rms@gnu.org>
parents:
16566
diff
changeset
|
694 |
725 | 695 (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
|
696 (force-mode-line-update) |
725 | 697 |
698 (isearch-push-state) | |
699 | |
12265
1d2296cfa1e3
(isearch-mode): Use overriding-terminal-local-map, not overriding-local-map.
Karl Heuer <kwzh@gnu.org>
parents:
12106
diff
changeset
|
700 (setq overriding-terminal-local-map isearch-mode-map) |
725 | 701 (isearch-update) |
702 (run-hooks 'isearch-mode-hook) | |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
703 |
14939
c0e8ab5d23fc
(isearch-mode): Use add-hook for mouse-leave-buffer-hook.
Richard M. Stallman <rms@gnu.org>
parents:
14288
diff
changeset
|
704 (add-hook 'mouse-leave-buffer-hook 'isearch-done) |
35120
ec6003a7be16
(isearch-old-signal-hook): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35098
diff
changeset
|
705 (add-hook 'kbd-macro-termination-hook 'isearch-done) |
10257
d530ba7eb471
(isearch-mode): Set mouse-leave-buffer-hook.
Richard M. Stallman <rms@gnu.org>
parents:
10183
diff
changeset
|
706 |
49420
07a876ca33f0
(isearch-forward): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
49069
diff
changeset
|
707 ;; isearch-mode can be made modal (in the sense of not returning to |
07a876ca33f0
(isearch-forward): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
49069
diff
changeset
|
708 ;; the calling function until searching is completed) by entering |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
709 ;; 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
|
710 (if recursive-edit |
1ea5ec97ae18
(isearch-mode): If enter recursive-edit,
Richard M. Stallman <rms@gnu.org>
parents:
3250
diff
changeset
|
711 (let ((isearch-recursive-edit t)) |
1ea5ec97ae18
(isearch-mode): If enter recursive-edit,
Richard M. Stallman <rms@gnu.org>
parents:
3250
diff
changeset
|
712 (recursive-edit))) |
8663
3f7bd8c32c9a
(isearch-edit-string): In the isearch-recursive-edit case,
Richard M. Stallman <rms@gnu.org>
parents:
8455
diff
changeset
|
713 isearch-success) |
725 | 714 |
715 | |
716 ;; Some high level utilities. Others below. | |
717 | |
718 (defun isearch-update () | |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
719 ;; Called after each command to update the display. |
43129
67d86dad5454
(isearch-update): Don't update display in kbd macro.
Richard M. Stallman <rms@gnu.org>
parents:
42196
diff
changeset
|
720 (if (and (null unread-command-events) |
67d86dad5454
(isearch-update): Don't update display in kbd macro.
Richard M. Stallman <rms@gnu.org>
parents:
42196
diff
changeset
|
721 (null executing-kbd-macro)) |
725 | 722 (progn |
35362
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
723 (if (not (input-pending-p)) |
82060
d22a586b6032
(isearch-message-function): New variable.
Juri Linkov <juri@jurta.org>
parents:
82039
diff
changeset
|
724 (if isearch-message-function |
d22a586b6032
(isearch-message-function): New variable.
Juri Linkov <juri@jurta.org>
parents:
82039
diff
changeset
|
725 (funcall isearch-message-function) |
d22a586b6032
(isearch-message-function): New variable.
Juri Linkov <juri@jurta.org>
parents:
82039
diff
changeset
|
726 (isearch-message))) |
35362
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
727 (if (and isearch-slow-terminal-mode |
49420
07a876ca33f0
(isearch-forward): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
49069
diff
changeset
|
728 (not (or isearch-small-window |
35362
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
729 (pos-visible-in-window-p)))) |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
730 (let ((found-point (point))) |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
731 (setq isearch-small-window t) |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
732 (move-to-window-line 0) |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
733 (let ((window-min-height 1)) |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
734 (split-window nil (if (< search-slow-window-lines 0) |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
735 (1+ (- search-slow-window-lines)) |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
736 (- (window-height) |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
737 (1+ search-slow-window-lines))))) |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
738 (if (< search-slow-window-lines 0) |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
739 (progn (vertical-motion (- 1 search-slow-window-lines)) |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
740 (set-window-start (next-window) (point)) |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
741 (set-window-hscroll (next-window) |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
742 (window-hscroll)) |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
743 (set-window-hscroll (selected-window) 0)) |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
744 (other-window 1)) |
42067
f38a270798ca
(isearch-start-hscroll): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
42066
diff
changeset
|
745 (goto-char found-point)) |
f38a270798ca
(isearch-start-hscroll): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
42066
diff
changeset
|
746 ;; Keep same hscrolling as at the start of the search when possible |
f38a270798ca
(isearch-start-hscroll): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
42066
diff
changeset
|
747 (let ((current-scroll (window-hscroll))) |
f38a270798ca
(isearch-start-hscroll): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
42066
diff
changeset
|
748 (set-window-hscroll (selected-window) isearch-start-hscroll) |
f38a270798ca
(isearch-start-hscroll): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
42066
diff
changeset
|
749 (unless (pos-visible-in-window-p) |
f38a270798ca
(isearch-start-hscroll): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
42066
diff
changeset
|
750 (set-window-hscroll (selected-window) current-scroll)))) |
f38a270798ca
(isearch-start-hscroll): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
42066
diff
changeset
|
751 (if isearch-other-end |
35362
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
752 (if (< isearch-other-end (point)) ; isearch-forward? |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
753 (isearch-highlight isearch-other-end (point)) |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
754 (isearch-highlight (point) isearch-other-end)) |
59379
b9bf38399e43
(isearch-dehighlight): Remove unused arg `totally'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59340
diff
changeset
|
755 (isearch-dehighlight)) |
35362
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
756 )) |
725 | 757 (setq ;; quit-flag nil not for isearch-mode |
758 isearch-adjusted nil | |
759 isearch-yank-flag nil) | |
60098
adba0765157c
(isearch-lazy-highlight-start-limit)
Richard M. Stallman <rms@gnu.org>
parents:
59478
diff
changeset
|
760 (when isearch-lazy-highlight |
60712
d37e83a20683
(isearch-lazy-highlight-new-loop):
Juri Linkov <juri@jurta.org>
parents:
60706
diff
changeset
|
761 (isearch-lazy-highlight-new-loop)) |
29358
9a6d0cf1e313
(isearch-update): Set disable-point-adjustment to t
Kenichi Handa <handa@m17n.org>
parents:
29325
diff
changeset
|
762 ;; We must prevent the point moving to the end of composition when a |
9a6d0cf1e313
(isearch-update): Set disable-point-adjustment to t
Kenichi Handa <handa@m17n.org>
parents:
29325
diff
changeset
|
763 ;; part of the composition has just been searched. |
9a6d0cf1e313
(isearch-update): Set disable-point-adjustment to t
Kenichi Handa <handa@m17n.org>
parents:
29325
diff
changeset
|
764 (setq disable-point-adjustment t)) |
725 | 765 |
8663
3f7bd8c32c9a
(isearch-edit-string): In the isearch-recursive-edit case,
Richard M. Stallman <rms@gnu.org>
parents:
8455
diff
changeset
|
766 (defun isearch-done (&optional nopush edit) |
64399
d41de3ff06c8
(isearch-mode-end-hook-quit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
64091
diff
changeset
|
767 "Exit Isearch mode. |
d41de3ff06c8
(isearch-mode-end-hook-quit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
64091
diff
changeset
|
768 For successful search, pass no args. |
d41de3ff06c8
(isearch-mode-end-hook-quit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
64091
diff
changeset
|
769 For a failing search, NOPUSH is t. |
d41de3ff06c8
(isearch-mode-end-hook-quit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
64091
diff
changeset
|
770 For going to the minibuffer to edit the search string, |
d41de3ff06c8
(isearch-mode-end-hook-quit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
64091
diff
changeset
|
771 NOPUSH is t and EDIT is t." |
d41de3ff06c8
(isearch-mode-end-hook-quit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
64091
diff
changeset
|
772 |
57083
a74474ba690a
(isearch-resume-in-command-history): Rename from
Kim F. Storm <storm@cua.dk>
parents:
57025
diff
changeset
|
773 (if isearch-resume-in-command-history |
41755
3b56f11dd4b6
(isearch-resume-enabled): New variable.
Kim F. Storm <storm@cua.dk>
parents:
41648
diff
changeset
|
774 (let ((command `(isearch-resume ,isearch-string ,isearch-regexp |
3b56f11dd4b6
(isearch-resume-enabled): New variable.
Kim F. Storm <storm@cua.dk>
parents:
41648
diff
changeset
|
775 ,isearch-word ,isearch-forward |
3b56f11dd4b6
(isearch-resume-enabled): New variable.
Kim F. Storm <storm@cua.dk>
parents:
41648
diff
changeset
|
776 ,isearch-message |
3b56f11dd4b6
(isearch-resume-enabled): New variable.
Kim F. Storm <storm@cua.dk>
parents:
41648
diff
changeset
|
777 ',isearch-case-fold-search))) |
3b56f11dd4b6
(isearch-resume-enabled): New variable.
Kim F. Storm <storm@cua.dk>
parents:
41648
diff
changeset
|
778 (unless (equal (car command-history) command) |
3b56f11dd4b6
(isearch-resume-enabled): New variable.
Kim F. Storm <storm@cua.dk>
parents:
41648
diff
changeset
|
779 (setq command-history (cons command command-history))))) |
30476
26fe451fc5f7
(isearch-resume): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29377
diff
changeset
|
780 |
14939
c0e8ab5d23fc
(isearch-mode): Use add-hook for mouse-leave-buffer-hook.
Richard M. Stallman <rms@gnu.org>
parents:
14288
diff
changeset
|
781 (remove-hook 'mouse-leave-buffer-hook 'isearch-done) |
35120
ec6003a7be16
(isearch-old-signal-hook): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35098
diff
changeset
|
782 (remove-hook 'kbd-macro-termination-hook 'isearch-done) |
35212
0b2d36d2a4ea
(isearch-done): Set isearch-lazy-highlight-start
Gerd Moellmann <gerd@gnu.org>
parents:
35158
diff
changeset
|
783 (setq isearch-lazy-highlight-start nil) |
0b2d36d2a4ea
(isearch-done): Set isearch-lazy-highlight-start
Gerd Moellmann <gerd@gnu.org>
parents:
35158
diff
changeset
|
784 |
725 | 785 ;; Called by all commands that terminate isearch-mode. |
1184 | 786 ;; 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
|
787 (setq overriding-terminal-local-map nil) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
788 ;; (setq pre-command-hook isearch-old-pre-command-hook) ; for lemacs |
33725
687b166e4a49
(isearch-original-minibuffer-message-timeout): New var.
Miles Bader <miles@gnu.org>
parents:
33704
diff
changeset
|
789 (setq minibuffer-message-timeout isearch-original-minibuffer-message-timeout) |
59379
b9bf38399e43
(isearch-dehighlight): Remove unused arg `totally'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59340
diff
changeset
|
790 (isearch-dehighlight) |
60706
c102b0eb3db5
(lazy-highlight-cleanup) <command>: Rename from
Juri Linkov <juri@jurta.org>
parents:
60672
diff
changeset
|
791 (lazy-highlight-cleanup lazy-highlight-cleanup) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
792 (let ((found-start (window-start (selected-window))) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
793 (found-point (point))) |
75025
edd6516d483d
(isearch-done): Use FOUND-POINT or FOUND-START
Richard M. Stallman <rms@gnu.org>
parents:
73233
diff
changeset
|
794 (when isearch-window-configuration |
edd6516d483d
(isearch-done): Use FOUND-POINT or FOUND-START
Richard M. Stallman <rms@gnu.org>
parents:
73233
diff
changeset
|
795 (set-window-configuration isearch-window-configuration) |
edd6516d483d
(isearch-done): Use FOUND-POINT or FOUND-START
Richard M. Stallman <rms@gnu.org>
parents:
73233
diff
changeset
|
796 (if isearch-small-window |
edd6516d483d
(isearch-done): Use FOUND-POINT or FOUND-START
Richard M. Stallman <rms@gnu.org>
parents:
73233
diff
changeset
|
797 (goto-char found-point) |
edd6516d483d
(isearch-done): Use FOUND-POINT or FOUND-START
Richard M. Stallman <rms@gnu.org>
parents:
73233
diff
changeset
|
798 ;; set-window-configuration clobbers window-start; restore it. |
edd6516d483d
(isearch-done): Use FOUND-POINT or FOUND-START
Richard M. Stallman <rms@gnu.org>
parents:
73233
diff
changeset
|
799 ;; This has an annoying side effect of clearing the last_modiff |
edd6516d483d
(isearch-done): Use FOUND-POINT or FOUND-START
Richard M. Stallman <rms@gnu.org>
parents:
73233
diff
changeset
|
800 ;; field of the window, which can cause unwanted scrolling, |
edd6516d483d
(isearch-done): Use FOUND-POINT or FOUND-START
Richard M. Stallman <rms@gnu.org>
parents:
73233
diff
changeset
|
801 ;; so don't do it unless truly necessary. |
edd6516d483d
(isearch-done): Use FOUND-POINT or FOUND-START
Richard M. Stallman <rms@gnu.org>
parents:
73233
diff
changeset
|
802 (set-window-start (selected-window) found-start t)))) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
803 |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
804 (setq isearch-mode nil) |
22775
ede5d8c1f929
(isearch-input-method-function): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22704
diff
changeset
|
805 (if isearch-input-method-local-p |
ede5d8c1f929
(isearch-input-method-function): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22704
diff
changeset
|
806 (setq input-method-function isearch-input-method-function) |
ede5d8c1f929
(isearch-input-method-function): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22704
diff
changeset
|
807 (kill-local-variable 'input-method-function)) |
ede5d8c1f929
(isearch-input-method-function): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22704
diff
changeset
|
808 |
11579
28e4495a9e8f
(isearch-mode, isearch-done): Use force-mode-line-update.
Karl Heuer <kwzh@gnu.org>
parents:
11526
diff
changeset
|
809 (force-mode-line-update) |
725 | 810 |
24919
7b31dd5d71bb
(isearch-done): If search ends in middle of intangible
Richard M. Stallman <rms@gnu.org>
parents:
24788
diff
changeset
|
811 ;; If we ended in the middle of some intangible text, |
7b31dd5d71bb
(isearch-done): If search ends in middle of intangible
Richard M. Stallman <rms@gnu.org>
parents:
24788
diff
changeset
|
812 ;; move to the further end of that intangible text. |
7b31dd5d71bb
(isearch-done): If search ends in middle of intangible
Richard M. Stallman <rms@gnu.org>
parents:
24788
diff
changeset
|
813 (let ((after (if (eobp) nil |
7b31dd5d71bb
(isearch-done): If search ends in middle of intangible
Richard M. Stallman <rms@gnu.org>
parents:
24788
diff
changeset
|
814 (get-text-property (point) 'intangible))) |
7b31dd5d71bb
(isearch-done): If search ends in middle of intangible
Richard M. Stallman <rms@gnu.org>
parents:
24788
diff
changeset
|
815 (before (if (bobp) nil |
7b31dd5d71bb
(isearch-done): If search ends in middle of intangible
Richard M. Stallman <rms@gnu.org>
parents:
24788
diff
changeset
|
816 (get-text-property (1- (point)) 'intangible)))) |
7b31dd5d71bb
(isearch-done): If search ends in middle of intangible
Richard M. Stallman <rms@gnu.org>
parents:
24788
diff
changeset
|
817 (when (and before after (eq before after)) |
7b31dd5d71bb
(isearch-done): If search ends in middle of intangible
Richard M. Stallman <rms@gnu.org>
parents:
24788
diff
changeset
|
818 (if isearch-forward |
7b31dd5d71bb
(isearch-done): If search ends in middle of intangible
Richard M. Stallman <rms@gnu.org>
parents:
24788
diff
changeset
|
819 (goto-char (next-single-property-change (point) 'intangible)) |
7b31dd5d71bb
(isearch-done): If search ends in middle of intangible
Richard M. Stallman <rms@gnu.org>
parents:
24788
diff
changeset
|
820 (goto-char (previous-single-property-change (point) 'intangible))))) |
7b31dd5d71bb
(isearch-done): If search ends in middle of intangible
Richard M. Stallman <rms@gnu.org>
parents:
24788
diff
changeset
|
821 |
1184 | 822 (if (and (> (length isearch-string) 0) (not nopush)) |
725 | 823 ;; Update the ring data. |
11100
2ad1ba0ac825
(isearch-update-ring): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
11061
diff
changeset
|
824 (isearch-update-ring isearch-string isearch-regexp)) |
725 | 825 |
64399
d41de3ff06c8
(isearch-mode-end-hook-quit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
64091
diff
changeset
|
826 (let ((isearch-mode-end-hook-quit (and nopush (not edit)))) |
d41de3ff06c8
(isearch-mode-end-hook-quit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
64091
diff
changeset
|
827 (run-hooks 'isearch-mode-end-hook)) |
57328
e2c34e75e585
(isearch-done): Set mark after running hook.
Juri Linkov <juri@jurta.org>
parents:
57083
diff
changeset
|
828 |
e2c34e75e585
(isearch-done): Set mark after running hook.
Juri Linkov <juri@jurta.org>
parents:
57083
diff
changeset
|
829 ;; If there was movement, mark the starting position. |
78492
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
830 ;; Maybe should test difference between and set mark only if > threshold. |
57328
e2c34e75e585
(isearch-done): Set mark after running hook.
Juri Linkov <juri@jurta.org>
parents:
57083
diff
changeset
|
831 (if (/= (point) isearch-opoint) |
e2c34e75e585
(isearch-done): Set mark after running hook.
Juri Linkov <juri@jurta.org>
parents:
57083
diff
changeset
|
832 (or (and transient-mark-mode mark-active) |
e2c34e75e585
(isearch-done): Set mark after running hook.
Juri Linkov <juri@jurta.org>
parents:
57083
diff
changeset
|
833 (progn |
e2c34e75e585
(isearch-done): Set mark after running hook.
Juri Linkov <juri@jurta.org>
parents:
57083
diff
changeset
|
834 (push-mark isearch-opoint t) |
e2c34e75e585
(isearch-done): Set mark after running hook.
Juri Linkov <juri@jurta.org>
parents:
57083
diff
changeset
|
835 (or executing-kbd-macro (> (minibuffer-depth) 0) |
e2c34e75e585
(isearch-done): Set mark after running hook.
Juri Linkov <juri@jurta.org>
parents:
57083
diff
changeset
|
836 (message "Mark saved where search started"))))) |
e2c34e75e585
(isearch-done): Set mark after running hook.
Juri Linkov <juri@jurta.org>
parents:
57083
diff
changeset
|
837 |
8663
3f7bd8c32c9a
(isearch-edit-string): In the isearch-recursive-edit case,
Richard M. Stallman <rms@gnu.org>
parents:
8455
diff
changeset
|
838 (and (not edit) isearch-recursive-edit (exit-recursive-edit))) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
839 |
11100
2ad1ba0ac825
(isearch-update-ring): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
11061
diff
changeset
|
840 (defun isearch-update-ring (string &optional regexp) |
2ad1ba0ac825
(isearch-update-ring): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
11061
diff
changeset
|
841 "Add STRING to the beginning of the search ring. |
70364
2d1eae31fcd1
(isearch-update-ring): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70352
diff
changeset
|
842 REGEXP if non-nil says use the regexp search ring." |
70418
4e1a43edc7bc
* isearch.el (isearch-update-ring): Use add-to-history.
Kim F. Storm <storm@cua.dk>
parents:
70364
diff
changeset
|
843 (add-to-history |
4e1a43edc7bc
* isearch.el (isearch-update-ring): Use add-to-history.
Kim F. Storm <storm@cua.dk>
parents:
70364
diff
changeset
|
844 (if regexp 'regexp-search-ring 'search-ring) |
4e1a43edc7bc
* isearch.el (isearch-update-ring): Use add-to-history.
Kim F. Storm <storm@cua.dk>
parents:
70364
diff
changeset
|
845 string |
4e1a43edc7bc
* isearch.el (isearch-update-ring): Use add-to-history.
Kim F. Storm <storm@cua.dk>
parents:
70364
diff
changeset
|
846 (if regexp regexp-search-ring-max search-ring-max))) |
11100
2ad1ba0ac825
(isearch-update-ring): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
11061
diff
changeset
|
847 |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
848 ;; Switching buffers should first terminate isearch-mode. |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
849 ;; ;; For Emacs 19, the frame switch event is handled. |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
850 ;; (defun isearch-switch-frame-handler () |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
851 ;; (interactive) ;; Is this necessary? |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
852 ;; ;; First terminate isearch-mode. |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
853 ;; (isearch-done) |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
854 ;; (isearch-clean-overlays) |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
855 ;; (handle-switch-frame (car (cdr last-command-char)))) |
725 | 856 |
857 | |
56668
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
858 ;; The search status structure and stack. |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
859 |
56867
16f3ec82330a
Remove ancient Change Log section.
Juri Linkov <juri@jurta.org>
parents:
56681
diff
changeset
|
860 (defsubst isearch-string-state (frame) |
56668
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
861 "Return the search string in FRAME." |
56681
1f4ff211cbeb
(isearch-string, isearch-message-string, isearch-point)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56668
diff
changeset
|
862 (aref frame 0)) |
56867
16f3ec82330a
Remove ancient Change Log section.
Juri Linkov <juri@jurta.org>
parents:
56681
diff
changeset
|
863 (defsubst isearch-message-state (frame) |
56668
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
864 "Return the search string to display to the user in FRAME." |
56681
1f4ff211cbeb
(isearch-string, isearch-message-string, isearch-point)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56668
diff
changeset
|
865 (aref frame 1)) |
56867
16f3ec82330a
Remove ancient Change Log section.
Juri Linkov <juri@jurta.org>
parents:
56681
diff
changeset
|
866 (defsubst isearch-point-state (frame) |
56668
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
867 "Return the point in FRAME." |
56681
1f4ff211cbeb
(isearch-string, isearch-message-string, isearch-point)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56668
diff
changeset
|
868 (aref frame 2)) |
56867
16f3ec82330a
Remove ancient Change Log section.
Juri Linkov <juri@jurta.org>
parents:
56681
diff
changeset
|
869 (defsubst isearch-success-state (frame) |
56668
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
870 "Return the success flag in FRAME." |
56681
1f4ff211cbeb
(isearch-string, isearch-message-string, isearch-point)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56668
diff
changeset
|
871 (aref frame 3)) |
56867
16f3ec82330a
Remove ancient Change Log section.
Juri Linkov <juri@jurta.org>
parents:
56681
diff
changeset
|
872 (defsubst isearch-forward-state (frame) |
56668
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
873 "Return the searching-forward flag in FRAME." |
56681
1f4ff211cbeb
(isearch-string, isearch-message-string, isearch-point)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56668
diff
changeset
|
874 (aref frame 4)) |
56867
16f3ec82330a
Remove ancient Change Log section.
Juri Linkov <juri@jurta.org>
parents:
56681
diff
changeset
|
875 (defsubst isearch-other-end-state (frame) |
56668
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
876 "Return the other end of the match in FRAME." |
56681
1f4ff211cbeb
(isearch-string, isearch-message-string, isearch-point)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56668
diff
changeset
|
877 (aref frame 5)) |
56867
16f3ec82330a
Remove ancient Change Log section.
Juri Linkov <juri@jurta.org>
parents:
56681
diff
changeset
|
878 (defsubst isearch-word-state (frame) |
56668
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
879 "Return the search-by-word flag in FRAME." |
56681
1f4ff211cbeb
(isearch-string, isearch-message-string, isearch-point)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56668
diff
changeset
|
880 (aref frame 6)) |
60614
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
881 (defsubst isearch-error-state (frame) |
56668
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
882 "Return the regexp error message in FRAME, or nil if its regexp is valid." |
56681
1f4ff211cbeb
(isearch-string, isearch-message-string, isearch-point)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56668
diff
changeset
|
883 (aref frame 7)) |
56867
16f3ec82330a
Remove ancient Change Log section.
Juri Linkov <juri@jurta.org>
parents:
56681
diff
changeset
|
884 (defsubst isearch-wrapped-state (frame) |
56668
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
885 "Return the search-wrapped flag in FRAME." |
56681
1f4ff211cbeb
(isearch-string, isearch-message-string, isearch-point)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56668
diff
changeset
|
886 (aref frame 8)) |
56867
16f3ec82330a
Remove ancient Change Log section.
Juri Linkov <juri@jurta.org>
parents:
56681
diff
changeset
|
887 (defsubst isearch-barrier-state (frame) |
56668
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
888 "Return the barrier value in FRAME." |
56681
1f4ff211cbeb
(isearch-string, isearch-message-string, isearch-point)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56668
diff
changeset
|
889 (aref frame 9)) |
56867
16f3ec82330a
Remove ancient Change Log section.
Juri Linkov <juri@jurta.org>
parents:
56681
diff
changeset
|
890 (defsubst isearch-case-fold-search-state (frame) |
56668
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
891 "Return the case-folding flag in FRAME." |
60614
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
892 (aref frame 10)) |
56868
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
893 (defsubst isearch-pop-fun-state (frame) |
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
894 "Return the function restoring the mode-specific isearch state in FRAME." |
60614
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
895 (aref frame 11)) |
56668
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
896 |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
897 (defun isearch-top-state () |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
898 (let ((cmd (car isearch-cmds))) |
56867
16f3ec82330a
Remove ancient Change Log section.
Juri Linkov <juri@jurta.org>
parents:
56681
diff
changeset
|
899 (setq isearch-string (isearch-string-state cmd) |
16f3ec82330a
Remove ancient Change Log section.
Juri Linkov <juri@jurta.org>
parents:
56681
diff
changeset
|
900 isearch-message (isearch-message-state cmd) |
16f3ec82330a
Remove ancient Change Log section.
Juri Linkov <juri@jurta.org>
parents:
56681
diff
changeset
|
901 isearch-success (isearch-success-state cmd) |
16f3ec82330a
Remove ancient Change Log section.
Juri Linkov <juri@jurta.org>
parents:
56681
diff
changeset
|
902 isearch-forward (isearch-forward-state cmd) |
16f3ec82330a
Remove ancient Change Log section.
Juri Linkov <juri@jurta.org>
parents:
56681
diff
changeset
|
903 isearch-other-end (isearch-other-end-state cmd) |
16f3ec82330a
Remove ancient Change Log section.
Juri Linkov <juri@jurta.org>
parents:
56681
diff
changeset
|
904 isearch-word (isearch-word-state cmd) |
60614
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
905 isearch-error (isearch-error-state cmd) |
56867
16f3ec82330a
Remove ancient Change Log section.
Juri Linkov <juri@jurta.org>
parents:
56681
diff
changeset
|
906 isearch-wrapped (isearch-wrapped-state cmd) |
16f3ec82330a
Remove ancient Change Log section.
Juri Linkov <juri@jurta.org>
parents:
56681
diff
changeset
|
907 isearch-barrier (isearch-barrier-state cmd) |
16f3ec82330a
Remove ancient Change Log section.
Juri Linkov <juri@jurta.org>
parents:
56681
diff
changeset
|
908 isearch-case-fold-search (isearch-case-fold-search-state cmd)) |
56868
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
909 (if (functionp (isearch-pop-fun-state cmd)) |
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
910 (funcall (isearch-pop-fun-state cmd) cmd)) |
56867
16f3ec82330a
Remove ancient Change Log section.
Juri Linkov <juri@jurta.org>
parents:
56681
diff
changeset
|
911 (goto-char (isearch-point-state cmd)))) |
56668
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
912 |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
913 (defun isearch-pop-state () |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
914 (setq isearch-cmds (cdr isearch-cmds)) |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
915 (isearch-top-state)) |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
916 |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
917 (defun isearch-push-state () |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
918 (setq isearch-cmds |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
919 (cons (vector isearch-string isearch-message (point) |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
920 isearch-success isearch-forward isearch-other-end |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
921 isearch-word |
60614
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
922 isearch-error isearch-wrapped isearch-barrier |
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
923 isearch-case-fold-search |
56868
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
924 (if isearch-push-state-function |
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
925 (funcall isearch-push-state-function))) |
56668
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
926 isearch-cmds))) |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
927 |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
928 |
725 | 929 ;; Commands active while inside of the isearch minor mode. |
930 | |
931 (defun isearch-exit () | |
932 "Exit search normally. | |
933 However, if this is the first command after starting incremental | |
934 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
|
935 nonincremental search instead via `isearch-edit-string'." |
725 | 936 (interactive) |
49420
07a876ca33f0
(isearch-forward): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
49069
diff
changeset
|
937 (if (and search-nonincremental-instead |
725 | 938 (= 0 (length isearch-string))) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
939 (let ((isearch-nonincremental t)) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
940 (isearch-edit-string))) |
18236
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
941 (isearch-done) |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
942 (isearch-clean-overlays)) |
725 | 943 |
944 | |
945 (defun isearch-edit-string () | |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
946 "Edit the search string in the minibuffer. |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
947 The following additional command keys are active while editing. |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
948 \\<minibuffer-local-isearch-map> |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
949 \\[exit-minibuffer] to resume incremental searching with the edited string. |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
950 \\[isearch-nonincremental-exit-minibuffer] to do one nonincremental search. |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
951 \\[isearch-forward-exit-minibuffer] to resume isearching forward. |
7378 | 952 \\[isearch-reverse-exit-minibuffer] to resume isearching backward. |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
953 \\[isearch-complete-edit] to complete the search string using the search ring. |
7378 | 954 \\<isearch-mode-map> |
56303
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
955 If first char entered is \\[isearch-yank-word-or-char], then do word search instead." |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
956 |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
957 ;; 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
|
958 ;; 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
|
959 ;; 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
|
960 ;; this could be simplified greatly. |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3526
diff
changeset
|
961 ;; Editing doesn't back up the search point. Should it? |
725 | 962 (interactive) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
963 (condition-case err |
16737
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
964 (progn |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
965 (let ((isearch-nonincremental isearch-nonincremental) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
966 |
16737
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
967 ;; Locally bind all isearch global variables to protect them |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
968 ;; from recursive isearching. |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
969 ;; isearch-string -message and -forward are not bound |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
970 ;; so they may be changed. Instead, save the values. |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
971 (isearch-new-string isearch-string) |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
972 (isearch-new-message isearch-message) |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
973 (isearch-new-forward isearch-forward) |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
974 (isearch-new-word isearch-word) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
975 |
16737
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
976 (isearch-regexp isearch-regexp) |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
977 (isearch-op-fun isearch-op-fun) |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
978 (isearch-cmds isearch-cmds) |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
979 (isearch-success isearch-success) |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
980 (isearch-wrapped isearch-wrapped) |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
981 (isearch-barrier isearch-barrier) |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
982 (isearch-adjusted isearch-adjusted) |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
983 (isearch-yank-flag isearch-yank-flag) |
60614
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
984 (isearch-error isearch-error) |
16737
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
985 ;;; Don't bind this. We want isearch-search, below, to set it. |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
986 ;;; And the old value won't matter after that. |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
987 ;;; (isearch-other-end isearch-other-end) |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
988 ;;; Perhaps some of these other variables should be bound for a |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
989 ;;; shorter period, ending before the next isearch-search. |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
990 ;;; But there doesn't seem to be a real bug, so let's not risk it now. |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
991 (isearch-opoint isearch-opoint) |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
992 (isearch-slow-terminal-mode isearch-slow-terminal-mode) |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
993 (isearch-small-window isearch-small-window) |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
994 (isearch-recursive-edit isearch-recursive-edit) |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
995 ;; Save current configuration so we can restore it here. |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
996 (isearch-window-configuration (current-window-configuration)) |
33725
687b166e4a49
(isearch-original-minibuffer-message-timeout): New var.
Miles Bader <miles@gnu.org>
parents:
33704
diff
changeset
|
997 |
687b166e4a49
(isearch-original-minibuffer-message-timeout): New var.
Miles Bader <miles@gnu.org>
parents:
33704
diff
changeset
|
998 ;; Temporarily restore `minibuffer-message-timeout'. |
687b166e4a49
(isearch-original-minibuffer-message-timeout): New var.
Miles Bader <miles@gnu.org>
parents:
33704
diff
changeset
|
999 (minibuffer-message-timeout |
687b166e4a49
(isearch-original-minibuffer-message-timeout): New var.
Miles Bader <miles@gnu.org>
parents:
33704
diff
changeset
|
1000 isearch-original-minibuffer-message-timeout) |
687b166e4a49
(isearch-original-minibuffer-message-timeout): New var.
Miles Bader <miles@gnu.org>
parents:
33704
diff
changeset
|
1001 (isearch-original-minibuffer-message-timeout |
687b166e4a49
(isearch-original-minibuffer-message-timeout): New var.
Miles Bader <miles@gnu.org>
parents:
33704
diff
changeset
|
1002 isearch-original-minibuffer-message-timeout) |
78190
1837795ece51
(isearch-edit-string): Save old point and
Juri Linkov <juri@jurta.org>
parents:
78132
diff
changeset
|
1003 old-point old-other-end) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1004 |
16737
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1005 ;; Actually terminate isearching until editing is done. |
49420
07a876ca33f0
(isearch-forward): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
49069
diff
changeset
|
1006 ;; This is so that the user can do anything without failure, |
16737
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1007 ;; like switch buffers and start another isearch, and return. |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1008 (condition-case err |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1009 (isearch-done t t) |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1010 (exit nil)) ; was recursive editing |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1011 |
78190
1837795ece51
(isearch-edit-string): Save old point and
Juri Linkov <juri@jurta.org>
parents:
78132
diff
changeset
|
1012 ;; Save old point and isearch-other-end before reading from minibuffer |
1837795ece51
(isearch-edit-string): Save old point and
Juri Linkov <juri@jurta.org>
parents:
78132
diff
changeset
|
1013 ;; that can change their values. |
1837795ece51
(isearch-edit-string): Save old point and
Juri Linkov <juri@jurta.org>
parents:
78132
diff
changeset
|
1014 (setq old-point (point) old-other-end isearch-other-end) |
1837795ece51
(isearch-edit-string): Save old point and
Juri Linkov <juri@jurta.org>
parents:
78132
diff
changeset
|
1015 |
16737
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1016 (isearch-message) ;; for read-char |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1017 (unwind-protect |
49420
07a876ca33f0
(isearch-forward): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
49069
diff
changeset
|
1018 (let* (;; Why does following read-char echo? |
16737
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1019 ;;(echo-keystrokes 0) ;; not needed with above message |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1020 (e (let ((cursor-in-echo-area t)) |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1021 (read-event))) |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1022 ;; Binding minibuffer-history-symbol to nil is a work-around |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1023 ;; for some incompatibility with gmhist. |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1024 (minibuffer-history-symbol) |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1025 (message-log-max nil)) |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1026 ;; If the first character the user types when we prompt them |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1027 ;; for a string is the yank-word character, then go into |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1028 ;; word-search mode. Otherwise unread that character and |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1029 ;; read a key the normal way. |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1030 ;; Word search does not apply (yet) to regexp searches, |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1031 ;; no check is made here. |
65582
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
65115
diff
changeset
|
1032 (message "%s" (isearch-message-prefix nil nil t)) |
42066 | 1033 (if (memq (lookup-key isearch-mode-map (vector e)) |
1034 '(isearch-yank-word | |
1035 isearch-yank-word-or-char)) | |
16737
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1036 (setq isearch-word t;; so message-prefix is right |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1037 isearch-new-word t) |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1038 (cancel-kbd-macro-events) |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1039 (isearch-unread e)) |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1040 (setq cursor-in-echo-area nil) |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1041 (setq isearch-new-string |
61643
7508a279dc7a
(isearch-edit-string): Make the search-ring available for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60712
diff
changeset
|
1042 (read-from-minibuffer |
7508a279dc7a
(isearch-edit-string): Make the search-ring available for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60712
diff
changeset
|
1043 (isearch-message-prefix nil nil isearch-nonincremental) |
7508a279dc7a
(isearch-edit-string): Make the search-ring available for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60712
diff
changeset
|
1044 isearch-string |
7508a279dc7a
(isearch-edit-string): Make the search-ring available for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60712
diff
changeset
|
1045 minibuffer-local-isearch-map nil |
7508a279dc7a
(isearch-edit-string): Make the search-ring available for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60712
diff
changeset
|
1046 (if isearch-regexp 'regexp-search-ring 'search-ring) |
7508a279dc7a
(isearch-edit-string): Make the search-ring available for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60712
diff
changeset
|
1047 nil t) |
16737
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1048 isearch-new-message |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1049 (mapconcat 'isearch-text-char-description |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1050 isearch-new-string ""))) |
78190
1837795ece51
(isearch-edit-string): Save old point and
Juri Linkov <juri@jurta.org>
parents:
78132
diff
changeset
|
1051 |
1837795ece51
(isearch-edit-string): Save old point and
Juri Linkov <juri@jurta.org>
parents:
78132
diff
changeset
|
1052 ;; Set point at the start (end) of old match if forward (backward), |
1837795ece51
(isearch-edit-string): Save old point and
Juri Linkov <juri@jurta.org>
parents:
78132
diff
changeset
|
1053 ;; so after exiting minibuffer isearch resumes at the start (end) |
1837795ece51
(isearch-edit-string): Save old point and
Juri Linkov <juri@jurta.org>
parents:
78132
diff
changeset
|
1054 ;; of this match and can find it again. |
1837795ece51
(isearch-edit-string): Save old point and
Juri Linkov <juri@jurta.org>
parents:
78132
diff
changeset
|
1055 (if (and old-other-end (eq old-point (point)) |
1837795ece51
(isearch-edit-string): Save old point and
Juri Linkov <juri@jurta.org>
parents:
78132
diff
changeset
|
1056 (eq isearch-forward isearch-new-forward)) |
1837795ece51
(isearch-edit-string): Save old point and
Juri Linkov <juri@jurta.org>
parents:
78132
diff
changeset
|
1057 (goto-char old-other-end)) |
1837795ece51
(isearch-edit-string): Save old point and
Juri Linkov <juri@jurta.org>
parents:
78132
diff
changeset
|
1058 |
16737
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1059 ;; Always resume isearching by restarting it. |
49420
07a876ca33f0
(isearch-forward): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
49069
diff
changeset
|
1060 (isearch-mode isearch-forward |
07a876ca33f0
(isearch-forward): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
49069
diff
changeset
|
1061 isearch-regexp |
07a876ca33f0
(isearch-forward): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
49069
diff
changeset
|
1062 isearch-op-fun |
16737
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1063 nil |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1064 isearch-word) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1065 |
16737
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1066 ;; Copy new local values to isearch globals |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1067 (setq isearch-string isearch-new-string |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1068 isearch-message isearch-new-message |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1069 isearch-forward isearch-new-forward |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1070 isearch-word isearch-new-word)) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1071 |
16737
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1072 ;; Empty isearch-string means use default. |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1073 (if (= 0 (length isearch-string)) |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1074 (setq isearch-string (or (car (if isearch-regexp |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1075 regexp-search-ring |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1076 search-ring)) |
42093
a2dac1893064
(isearch-edit-string): When we set isearch-string
Richard M. Stallman <rms@gnu.org>
parents:
42067
diff
changeset
|
1077 "") |
a2dac1893064
(isearch-edit-string): When we set isearch-string
Richard M. Stallman <rms@gnu.org>
parents:
42067
diff
changeset
|
1078 |
a2dac1893064
(isearch-edit-string): When we set isearch-string
Richard M. Stallman <rms@gnu.org>
parents:
42067
diff
changeset
|
1079 isearch-message |
a2dac1893064
(isearch-edit-string): When we set isearch-string
Richard M. Stallman <rms@gnu.org>
parents:
42067
diff
changeset
|
1080 (mapconcat 'isearch-text-char-description |
a2dac1893064
(isearch-edit-string): When we set isearch-string
Richard M. Stallman <rms@gnu.org>
parents:
42067
diff
changeset
|
1081 isearch-string "")) |
16737
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1082 ;; This used to set the last search string, |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1083 ;; but I think it is not right to do that here. |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1084 ;; Only the string actually used should be saved. |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1085 )) |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1086 |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1087 ;; Push the state as of before this C-s. |
f93f805e86da
(isearch-edit-string): When we try the search
Richard M. Stallman <rms@gnu.org>
parents:
16711
diff
changeset
|
1088 (isearch-push-state) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1089 |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1090 ;; Reinvoke the pending search. |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1091 (isearch-search) |
78092
62da6841fa4c
(isearch-edit-string): Call to isearch-push-state after the search.
Richard M. Stallman <rms@gnu.org>
parents:
76974
diff
changeset
|
1092 (isearch-push-state) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1093 (isearch-update) |
49420
07a876ca33f0
(isearch-forward): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
49069
diff
changeset
|
1094 (if isearch-nonincremental |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1095 (progn |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1096 ;; (sit-for 1) ;; needed if isearch-done does: (message "") |
65115
b66a53128ca5
(isearch-edit-string): Erase the Search prompt
Richard M. Stallman <rms@gnu.org>
parents:
64821
diff
changeset
|
1097 (isearch-done) |
b66a53128ca5
(isearch-edit-string): Erase the Search prompt
Richard M. Stallman <rms@gnu.org>
parents:
64821
diff
changeset
|
1098 ;; The search done message is confusing when the string |
b66a53128ca5
(isearch-edit-string): Erase the Search prompt
Richard M. Stallman <rms@gnu.org>
parents:
64821
diff
changeset
|
1099 ;; is empty, so erase it. |
b66a53128ca5
(isearch-edit-string): Erase the Search prompt
Richard M. Stallman <rms@gnu.org>
parents:
64821
diff
changeset
|
1100 (if (equal isearch-string "") |
b66a53128ca5
(isearch-edit-string): Erase the Search prompt
Richard M. Stallman <rms@gnu.org>
parents:
64821
diff
changeset
|
1101 (message ""))))) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1102 |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1103 (quit ; handle abort-recursive-edit |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1104 (isearch-abort) ;; outside of let to restore outside global values |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1105 ))) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1106 |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1107 (defun isearch-nonincremental-exit-minibuffer () |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1108 (interactive) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1109 (setq isearch-nonincremental t) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1110 (exit-minibuffer)) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1111 |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1112 (defun isearch-forward-exit-minibuffer () |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1113 (interactive) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1114 (setq isearch-new-forward t) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1115 (exit-minibuffer)) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1116 |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1117 (defun isearch-reverse-exit-minibuffer () |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1118 (interactive) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1119 (setq isearch-new-forward nil) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1120 (exit-minibuffer)) |
725 | 1121 |
10117
413a1fd0f7c4
(isearch-cancel): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9940
diff
changeset
|
1122 (defun isearch-cancel () |
413a1fd0f7c4
(isearch-cancel): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9940
diff
changeset
|
1123 "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
|
1124 (interactive) |
56868
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
1125 (if (functionp (isearch-pop-fun-state (car (last isearch-cmds)))) |
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
1126 (funcall (isearch-pop-fun-state (car (last isearch-cmds))) |
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
1127 (car (last isearch-cmds)))) |
10117
413a1fd0f7c4
(isearch-cancel): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9940
diff
changeset
|
1128 (goto-char isearch-opoint) |
56868
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
1129 (isearch-done t) ; exit isearch |
18236
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
1130 (isearch-clean-overlays) |
56868
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
1131 (signal 'quit nil)) ; and pass on quit signal |
725 | 1132 |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1133 (defun isearch-abort () |
13991
0297cd54b530
(isearch-abort, isearch-no-upper-case-p): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
13799
diff
changeset
|
1134 "Abort incremental search mode if searching is successful, signaling quit. |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1135 Otherwise, revert to previous successful search and continue searching. |
13991
0297cd54b530
(isearch-abort, isearch-no-upper-case-p): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
13799
diff
changeset
|
1136 Use `isearch-exit' to quit without signaling." |
725 | 1137 (interactive) |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3526
diff
changeset
|
1138 ;; (ding) signal instead below, if quitting |
725 | 1139 (discard-input) |
1140 (if isearch-success | |
1141 ;; If search is successful, move back to starting point | |
1142 ;; and really do quit. | |
56868
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
1143 (progn |
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
1144 (setq isearch-success nil) |
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
1145 (isearch-cancel)) |
11061
2f41090c58b3
(isearch-abort): Treat "incomplete regexp"
Richard M. Stallman <rms@gnu.org>
parents:
11046
diff
changeset
|
1146 ;; 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
|
1147 ;; rub out until it is once more successful. |
60614
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
1148 (while (or (not isearch-success) isearch-error) |
11061
2f41090c58b3
(isearch-abort): Treat "incomplete regexp"
Richard M. Stallman <rms@gnu.org>
parents:
11046
diff
changeset
|
1149 (isearch-pop-state)) |
725 | 1150 (isearch-update))) |
1151 | |
1152 (defun isearch-repeat (direction) | |
1153 ;; Utility for isearch-repeat-forward and -backward. | |
1154 (if (eq isearch-forward (eq direction 'forward)) | |
1155 ;; C-s in forward or C-r in reverse. | |
1156 (if (equal isearch-string "") | |
1157 ;; If search string is empty, use last one. | |
67103
27f5bb6b18ad
(isearch-repeat): With empty search ring set `isearch-error' to the
Juri Linkov <juri@jurta.org>
parents:
65731
diff
changeset
|
1158 (if (null (if isearch-regexp regexp-search-ring search-ring)) |
27f5bb6b18ad
(isearch-repeat): With empty search ring set `isearch-error' to the
Juri Linkov <juri@jurta.org>
parents:
65731
diff
changeset
|
1159 (setq isearch-error "No previous search string") |
27f5bb6b18ad
(isearch-repeat): With empty search ring set `isearch-error' to the
Juri Linkov <juri@jurta.org>
parents:
65731
diff
changeset
|
1160 (setq isearch-string |
27f5bb6b18ad
(isearch-repeat): With empty search ring set `isearch-error' to the
Juri Linkov <juri@jurta.org>
parents:
65731
diff
changeset
|
1161 (if isearch-regexp |
27f5bb6b18ad
(isearch-repeat): With empty search ring set `isearch-error' to the
Juri Linkov <juri@jurta.org>
parents:
65731
diff
changeset
|
1162 (car regexp-search-ring) |
27f5bb6b18ad
(isearch-repeat): With empty search ring set `isearch-error' to the
Juri Linkov <juri@jurta.org>
parents:
65731
diff
changeset
|
1163 (car search-ring)) |
27f5bb6b18ad
(isearch-repeat): With empty search ring set `isearch-error' to the
Juri Linkov <juri@jurta.org>
parents:
65731
diff
changeset
|
1164 isearch-message |
27f5bb6b18ad
(isearch-repeat): With empty search ring set `isearch-error' to the
Juri Linkov <juri@jurta.org>
parents:
65731
diff
changeset
|
1165 (mapconcat 'isearch-text-char-description |
27f5bb6b18ad
(isearch-repeat): With empty search ring set `isearch-error' to the
Juri Linkov <juri@jurta.org>
parents:
65731
diff
changeset
|
1166 isearch-string "") |
27f5bb6b18ad
(isearch-repeat): With empty search ring set `isearch-error' to the
Juri Linkov <juri@jurta.org>
parents:
65731
diff
changeset
|
1167 isearch-case-fold-search isearch-last-case-fold-search)) |
725 | 1168 ;; If already have what to search for, repeat it. |
1169 (or isearch-success | |
33704
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
1170 (progn |
60614
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
1171 ;; Set isearch-wrapped before calling isearch-wrap-function |
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
1172 (setq isearch-wrapped t) |
56868
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
1173 (if isearch-wrap-function |
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
1174 (funcall isearch-wrap-function) |
60614
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
1175 (goto-char (if isearch-forward (point-min) (point-max))))))) |
725 | 1176 ;; C-s in reverse or C-r in forward, change direction. |
64821
ff78c70a52e2
(isearch-repeat): When changing direction, mark search successful.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
1177 (setq isearch-forward (not isearch-forward) |
ff78c70a52e2
(isearch-repeat): When changing direction, mark search successful.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
1178 isearch-success t)) |
725 | 1179 |
1180 (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
|
1181 |
c002b55b9cac
(isearch-repeat): If we matched a null string and there's
Richard M. Stallman <rms@gnu.org>
parents:
5344
diff
changeset
|
1182 (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
|
1183 (setq isearch-success t) |
56170
b3821f47a6d4
(isearch-repeat): Avoid testing old match data.
Richard M. Stallman <rms@gnu.org>
parents:
55950
diff
changeset
|
1184 (if (and isearch-success |
b3821f47a6d4
(isearch-repeat): Avoid testing old match data.
Richard M. Stallman <rms@gnu.org>
parents:
55950
diff
changeset
|
1185 (equal (point) isearch-other-end) |
13799
49b7cd70c43c
(isearch-done): Use executing-kbd-macro.
Karl Heuer <kwzh@gnu.org>
parents:
13682
diff
changeset
|
1186 (not isearch-just-started)) |
725 | 1187 ;; If repeating a search that found |
1188 ;; 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
|
1189 (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
|
1190 ;; 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
|
1191 (progn |
c002b55b9cac
(isearch-repeat): If we matched a null string and there's
Richard M. Stallman <rms@gnu.org>
parents:
5344
diff
changeset
|
1192 (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
|
1193 (ding)) |
c002b55b9cac
(isearch-repeat): If we matched a null string and there's
Richard M. Stallman <rms@gnu.org>
parents:
5344
diff
changeset
|
1194 (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
|
1195 (isearch-search)) |
c002b55b9cac
(isearch-repeat): If we matched a null string and there's
Richard M. Stallman <rms@gnu.org>
parents:
5344
diff
changeset
|
1196 (isearch-search))) |
c002b55b9cac
(isearch-repeat): If we matched a null string and there's
Richard M. Stallman <rms@gnu.org>
parents:
5344
diff
changeset
|
1197 |
725 | 1198 (isearch-push-state) |
1199 (isearch-update)) | |
1200 | |
1201 (defun isearch-repeat-forward () | |
1202 "Repeat incremental search forwards." | |
1203 (interactive) | |
1204 (isearch-repeat 'forward)) | |
1205 | |
1206 (defun isearch-repeat-backward () | |
1207 "Repeat incremental search backwards." | |
1208 (interactive) | |
1209 (isearch-repeat 'backward)) | |
1210 | |
1211 (defun isearch-toggle-regexp () | |
1212 "Toggle regexp searching on or off." | |
1213 ;; The status stack is left unchanged. | |
1214 (interactive) | |
1215 (setq isearch-regexp (not isearch-regexp)) | |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1216 (if isearch-regexp (setq isearch-word nil)) |
56905
661d52db56de
(isearch-toggle-regexp): Set `isearch-success' and `isearch-adjusted' to `t'.
Juri Linkov <juri@jurta.org>
parents:
56868
diff
changeset
|
1217 (setq isearch-success t isearch-adjusted t) |
725 | 1218 (isearch-update)) |
1219 | |
7294
4ff0c1e7c8e2
(isearch-case-fold-search): new possible value `yes'
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1220 (defun isearch-toggle-case-fold () |
4ff0c1e7c8e2
(isearch-case-fold-search): new possible value `yes'
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1221 "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
|
1222 (interactive) |
4ff0c1e7c8e2
(isearch-case-fold-search): new possible value `yes'
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1223 (setq isearch-case-fold-search |
4ff0c1e7c8e2
(isearch-case-fold-search): new possible value `yes'
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1224 (if isearch-case-fold-search nil 'yes)) |
10397
8fe0c72ba336
(isearch-edit-string): Disable message logging.
Karl Heuer <kwzh@gnu.org>
parents:
10257
diff
changeset
|
1225 (let ((message-log-max nil)) |
8fe0c72ba336
(isearch-edit-string): Disable message logging.
Karl Heuer <kwzh@gnu.org>
parents:
10257
diff
changeset
|
1226 (message "%s%s [case %ssensitive]" |
8fe0c72ba336
(isearch-edit-string): Disable message logging.
Karl Heuer <kwzh@gnu.org>
parents:
10257
diff
changeset
|
1227 (isearch-message-prefix nil nil isearch-nonincremental) |
8fe0c72ba336
(isearch-edit-string): Disable message logging.
Karl Heuer <kwzh@gnu.org>
parents:
10257
diff
changeset
|
1228 isearch-message |
8fe0c72ba336
(isearch-edit-string): Disable message logging.
Karl Heuer <kwzh@gnu.org>
parents:
10257
diff
changeset
|
1229 (if isearch-case-fold-search "in" ""))) |
56905
661d52db56de
(isearch-toggle-regexp): Set `isearch-success' and `isearch-adjusted' to `t'.
Juri Linkov <juri@jurta.org>
parents:
56868
diff
changeset
|
1230 (setq isearch-success t isearch-adjusted t) |
7294
4ff0c1e7c8e2
(isearch-case-fold-search): new possible value `yes'
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1231 (sit-for 1) |
4ff0c1e7c8e2
(isearch-case-fold-search): new possible value `yes'
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1232 (isearch-update)) |
4ff0c1e7c8e2
(isearch-case-fold-search): new possible value `yes'
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
1233 |
56905
661d52db56de
(isearch-toggle-regexp): Set `isearch-success' and `isearch-adjusted' to `t'.
Juri Linkov <juri@jurta.org>
parents:
56868
diff
changeset
|
1234 (defun isearch-query-replace (&optional regexp-flag) |
87212
80f24a97ade8
(search-upper-case): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
86027
diff
changeset
|
1235 "Start `query-replace' with string to replace from last search string." |
56303
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1236 (interactive) |
56352
f0e5e08dd63e
(isearch-query-replace): Pass the regexp-ness and delimited-ness of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56349
diff
changeset
|
1237 (barf-if-buffer-read-only) |
56905
661d52db56de
(isearch-toggle-regexp): Set `isearch-success' and `isearch-adjusted' to `t'.
Juri Linkov <juri@jurta.org>
parents:
56868
diff
changeset
|
1238 (if regexp-flag (setq isearch-regexp t)) |
87212
80f24a97ade8
(search-upper-case): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
86027
diff
changeset
|
1239 (let ((case-fold-search isearch-case-fold-search) |
80f24a97ade8
(search-upper-case): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
86027
diff
changeset
|
1240 ;; set `search-upper-case' to nil to not call |
80f24a97ade8
(search-upper-case): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
86027
diff
changeset
|
1241 ;; `isearch-no-upper-case-p' in `perform-replace' |
80f24a97ade8
(search-upper-case): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
86027
diff
changeset
|
1242 (search-upper-case nil)) |
56303
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1243 (isearch-done) |
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1244 (isearch-clean-overlays) |
67565
72450e5d47ba
(isearch-query-replace): Check for isearch-other-end.
Juri Linkov <juri@jurta.org>
parents:
67447
diff
changeset
|
1245 (if (and isearch-other-end |
72450e5d47ba
(isearch-query-replace): Check for isearch-other-end.
Juri Linkov <juri@jurta.org>
parents:
67447
diff
changeset
|
1246 (< isearch-other-end (point)) |
56905
661d52db56de
(isearch-toggle-regexp): Set `isearch-success' and `isearch-adjusted' to `t'.
Juri Linkov <juri@jurta.org>
parents:
56868
diff
changeset
|
1247 (not (and transient-mark-mode mark-active |
67567
4b2351f7912e
(isearch-query-replace): Use (mark) instead of
Juri Linkov <juri@jurta.org>
parents:
67565
diff
changeset
|
1248 (< (mark) (point))))) |
56905
661d52db56de
(isearch-toggle-regexp): Set `isearch-success' and `isearch-adjusted' to `t'.
Juri Linkov <juri@jurta.org>
parents:
56868
diff
changeset
|
1249 (goto-char isearch-other-end)) |
661d52db56de
(isearch-toggle-regexp): Set `isearch-success' and `isearch-adjusted' to `t'.
Juri Linkov <juri@jurta.org>
parents:
56868
diff
changeset
|
1250 (set query-replace-from-history-variable |
661d52db56de
(isearch-toggle-regexp): Set `isearch-success' and `isearch-adjusted' to `t'.
Juri Linkov <juri@jurta.org>
parents:
56868
diff
changeset
|
1251 (cons isearch-string |
661d52db56de
(isearch-toggle-regexp): Set `isearch-success' and `isearch-adjusted' to `t'.
Juri Linkov <juri@jurta.org>
parents:
56868
diff
changeset
|
1252 (symbol-value query-replace-from-history-variable))) |
56352
f0e5e08dd63e
(isearch-query-replace): Pass the regexp-ness and delimited-ness of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56349
diff
changeset
|
1253 (perform-replace |
f0e5e08dd63e
(isearch-query-replace): Pass the regexp-ness and delimited-ness of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56349
diff
changeset
|
1254 isearch-string |
56905
661d52db56de
(isearch-toggle-regexp): Set `isearch-success' and `isearch-adjusted' to `t'.
Juri Linkov <juri@jurta.org>
parents:
56868
diff
changeset
|
1255 (query-replace-read-to |
661d52db56de
(isearch-toggle-regexp): Set `isearch-success' and `isearch-adjusted' to `t'.
Juri Linkov <juri@jurta.org>
parents:
56868
diff
changeset
|
1256 isearch-string |
661d52db56de
(isearch-toggle-regexp): Set `isearch-success' and `isearch-adjusted' to `t'.
Juri Linkov <juri@jurta.org>
parents:
56868
diff
changeset
|
1257 (if isearch-regexp "Query replace regexp" "Query replace") |
661d52db56de
(isearch-toggle-regexp): Set `isearch-success' and `isearch-adjusted' to `t'.
Juri Linkov <juri@jurta.org>
parents:
56868
diff
changeset
|
1258 isearch-regexp) |
661d52db56de
(isearch-toggle-regexp): Set `isearch-success' and `isearch-adjusted' to `t'.
Juri Linkov <juri@jurta.org>
parents:
56868
diff
changeset
|
1259 t isearch-regexp isearch-word nil nil |
661d52db56de
(isearch-toggle-regexp): Set `isearch-success' and `isearch-adjusted' to `t'.
Juri Linkov <juri@jurta.org>
parents:
56868
diff
changeset
|
1260 (if (and transient-mark-mode mark-active) (region-beginning)) |
661d52db56de
(isearch-toggle-regexp): Set `isearch-success' and `isearch-adjusted' to `t'.
Juri Linkov <juri@jurta.org>
parents:
56868
diff
changeset
|
1261 (if (and transient-mark-mode mark-active) (region-end))))) |
56303
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1262 |
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1263 (defun isearch-query-replace-regexp () |
87212
80f24a97ade8
(search-upper-case): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
86027
diff
changeset
|
1264 "Start `query-replace-regexp' with string to replace from last search string." |
56303
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1265 (interactive) |
56905
661d52db56de
(isearch-toggle-regexp): Set `isearch-success' and `isearch-adjusted' to `t'.
Juri Linkov <juri@jurta.org>
parents:
56868
diff
changeset
|
1266 (isearch-query-replace t)) |
56303
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1267 |
87212
80f24a97ade8
(search-upper-case): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
86027
diff
changeset
|
1268 (defun isearch-occur (regexp &optional nlines) |
80f24a97ade8
(search-upper-case): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
86027
diff
changeset
|
1269 "Run `occur' with regexp to search from the current search string. |
80f24a97ade8
(search-upper-case): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
86027
diff
changeset
|
1270 Interactively, REGEXP is the current search regexp or a quoted search |
80f24a97ade8
(search-upper-case): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
86027
diff
changeset
|
1271 string. NLINES has the same meaning as in `occur'." |
80f24a97ade8
(search-upper-case): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
86027
diff
changeset
|
1272 (interactive |
80f24a97ade8
(search-upper-case): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
86027
diff
changeset
|
1273 (list |
80f24a97ade8
(search-upper-case): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
86027
diff
changeset
|
1274 (if isearch-regexp isearch-string (regexp-quote isearch-string)) |
80f24a97ade8
(search-upper-case): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
86027
diff
changeset
|
1275 (if current-prefix-arg (prefix-numeric-value current-prefix-arg)))) |
80f24a97ade8
(search-upper-case): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
86027
diff
changeset
|
1276 (let ((case-fold-search isearch-case-fold-search) |
80f24a97ade8
(search-upper-case): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
86027
diff
changeset
|
1277 ;; set `search-upper-case' to nil to not call |
80f24a97ade8
(search-upper-case): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
86027
diff
changeset
|
1278 ;; `isearch-no-upper-case-p' in `occur-1' |
80f24a97ade8
(search-upper-case): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
86027
diff
changeset
|
1279 (search-upper-case nil)) |
80f24a97ade8
(search-upper-case): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
86027
diff
changeset
|
1280 (occur regexp nlines))) |
80f24a97ade8
(search-upper-case): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
86027
diff
changeset
|
1281 |
56303
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1282 |
725 | 1283 (defun isearch-delete-char () |
41801
1649eae224df
Remove unnecessary spaces in doc-string.
Pavel Janík <Pavel@Janik.cz>
parents:
41755
diff
changeset
|
1284 "Discard last input item and move point back. |
725 | 1285 If no previous match was done, just beep." |
1286 (interactive) | |
1287 (if (null (cdr isearch-cmds)) | |
1288 (ding) | |
1289 (isearch-pop-state)) | |
1290 (isearch-update)) | |
1291 | |
56303
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1292 (defun isearch-del-char (&optional arg) |
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1293 "Delete character from end of search string and search again. |
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1294 If search string is empty, just beep." |
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1295 (interactive "p") |
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1296 (if (= 0 (length isearch-string)) |
55226
e3dae0e8c99e
(isearch-mode-map): Bind \C-w to isearch-yank-word instead of isearch-yank-word-or-char.
Juri Linkov <juri@jurta.org>
parents:
54256
diff
changeset
|
1297 (ding) |
56303
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1298 (setq isearch-string (substring isearch-string 0 (- (or arg 1))) |
55226
e3dae0e8c99e
(isearch-mode-map): Bind \C-w to isearch-yank-word instead of isearch-yank-word-or-char.
Juri Linkov <juri@jurta.org>
parents:
54256
diff
changeset
|
1299 isearch-message (mapconcat 'isearch-text-char-description |
78190
1837795ece51
(isearch-edit-string): Save old point and
Juri Linkov <juri@jurta.org>
parents:
78132
diff
changeset
|
1300 isearch-string ""))) |
1837795ece51
(isearch-edit-string): Save old point and
Juri Linkov <juri@jurta.org>
parents:
78132
diff
changeset
|
1301 ;; Use the isearch-other-end as new starting point to be able |
1837795ece51
(isearch-edit-string): Save old point and
Juri Linkov <juri@jurta.org>
parents:
78132
diff
changeset
|
1302 ;; to find the remaining part of the search string again. |
1837795ece51
(isearch-edit-string): Save old point and
Juri Linkov <juri@jurta.org>
parents:
78132
diff
changeset
|
1303 (if isearch-other-end (goto-char isearch-other-end)) |
1837795ece51
(isearch-edit-string): Save old point and
Juri Linkov <juri@jurta.org>
parents:
78132
diff
changeset
|
1304 (isearch-search) |
1837795ece51
(isearch-edit-string): Save old point and
Juri Linkov <juri@jurta.org>
parents:
78132
diff
changeset
|
1305 (isearch-push-state) |
1837795ece51
(isearch-edit-string): Save old point and
Juri Linkov <juri@jurta.org>
parents:
78132
diff
changeset
|
1306 (isearch-update)) |
725 | 1307 |
20275
0e102e83c51d
(isearch-yank-string): New helper function.
Karl Heuer <kwzh@gnu.org>
parents:
20056
diff
changeset
|
1308 (defun isearch-yank-string (string) |
0e102e83c51d
(isearch-yank-string): New helper function.
Karl Heuer <kwzh@gnu.org>
parents:
20056
diff
changeset
|
1309 "Pull STRING into search string." |
0e102e83c51d
(isearch-yank-string): New helper function.
Karl Heuer <kwzh@gnu.org>
parents:
20056
diff
changeset
|
1310 ;; Downcase the string if not supposed to case-fold yanked strings. |
0e102e83c51d
(isearch-yank-string): New helper function.
Karl Heuer <kwzh@gnu.org>
parents:
20056
diff
changeset
|
1311 (if (and isearch-case-fold-search |
0e102e83c51d
(isearch-yank-string): New helper function.
Karl Heuer <kwzh@gnu.org>
parents:
20056
diff
changeset
|
1312 (eq 'not-yanks search-upper-case)) |
0e102e83c51d
(isearch-yank-string): New helper function.
Karl Heuer <kwzh@gnu.org>
parents:
20056
diff
changeset
|
1313 (setq string (downcase string))) |
0e102e83c51d
(isearch-yank-string): New helper function.
Karl Heuer <kwzh@gnu.org>
parents:
20056
diff
changeset
|
1314 (if isearch-regexp (setq string (regexp-quote string))) |
0e102e83c51d
(isearch-yank-string): New helper function.
Karl Heuer <kwzh@gnu.org>
parents:
20056
diff
changeset
|
1315 (setq isearch-string (concat isearch-string string) |
0e102e83c51d
(isearch-yank-string): New helper function.
Karl Heuer <kwzh@gnu.org>
parents:
20056
diff
changeset
|
1316 isearch-message |
0e102e83c51d
(isearch-yank-string): New helper function.
Karl Heuer <kwzh@gnu.org>
parents:
20056
diff
changeset
|
1317 (concat isearch-message |
0e102e83c51d
(isearch-yank-string): New helper function.
Karl Heuer <kwzh@gnu.org>
parents:
20056
diff
changeset
|
1318 (mapconcat 'isearch-text-char-description |
0e102e83c51d
(isearch-yank-string): New helper function.
Karl Heuer <kwzh@gnu.org>
parents:
20056
diff
changeset
|
1319 string "")) |
0e102e83c51d
(isearch-yank-string): New helper function.
Karl Heuer <kwzh@gnu.org>
parents:
20056
diff
changeset
|
1320 ;; Don't move cursor in reverse search. |
0e102e83c51d
(isearch-yank-string): New helper function.
Karl Heuer <kwzh@gnu.org>
parents:
20056
diff
changeset
|
1321 isearch-yank-flag t) |
725 | 1322 (isearch-search-and-update)) |
1323 | |
4876
8ddcaee25a73
(isearch-yank): Handle `kill' as chunk type.
Richard M. Stallman <rms@gnu.org>
parents:
4840
diff
changeset
|
1324 (defun isearch-yank-kill () |
8ddcaee25a73
(isearch-yank): Handle `kill' as chunk type.
Richard M. Stallman <rms@gnu.org>
parents:
4840
diff
changeset
|
1325 "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
|
1326 (interactive) |
20275
0e102e83c51d
(isearch-yank-string): New helper function.
Karl Heuer <kwzh@gnu.org>
parents:
20056
diff
changeset
|
1327 (isearch-yank-string (current-kill 0))) |
0e102e83c51d
(isearch-yank-string): New helper function.
Karl Heuer <kwzh@gnu.org>
parents:
20056
diff
changeset
|
1328 |
0e102e83c51d
(isearch-yank-string): New helper function.
Karl Heuer <kwzh@gnu.org>
parents:
20056
diff
changeset
|
1329 (defun isearch-yank-x-selection () |
25823
4cecefebde6f
(isearch): Add :links in defgroup.
Dave Love <fx@gnu.org>
parents:
25644
diff
changeset
|
1330 "Pull current X selection into search string." |
20275
0e102e83c51d
(isearch-yank-string): New helper function.
Karl Heuer <kwzh@gnu.org>
parents:
20056
diff
changeset
|
1331 (interactive) |
0e102e83c51d
(isearch-yank-string): New helper function.
Karl Heuer <kwzh@gnu.org>
parents:
20056
diff
changeset
|
1332 (isearch-yank-string (x-get-selection))) |
725 | 1333 |
39047
d177c68813c0
(isearch-mouse-2): Renamed from isearch-mouse-yank.
Gerd Moellmann <gerd@gnu.org>
parents:
38778
diff
changeset
|
1334 |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
1335 (defun isearch-mouse-2 (click) |
39047
d177c68813c0
(isearch-mouse-2): Renamed from isearch-mouse-yank.
Gerd Moellmann <gerd@gnu.org>
parents:
38778
diff
changeset
|
1336 "Handle mouse-2 in Isearch mode. |
25823
4cecefebde6f
(isearch): Add :links in defgroup.
Dave Love <fx@gnu.org>
parents:
25644
diff
changeset
|
1337 For a click in the echo area, invoke `isearch-yank-x-selection'. |
73233
b4697c34c8fd
* help.el (describe-mode): For clicks on mode-line, use "@"
David Kastrup <dak@gnu.org>
parents:
73008
diff
changeset
|
1338 Otherwise invoke whatever the calling mouse-2 command sequence |
b4697c34c8fd
* help.el (describe-mode): For clicks on mode-line, use "@"
David Kastrup <dak@gnu.org>
parents:
73008
diff
changeset
|
1339 is bound to outside of Isearch." |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
1340 (interactive "e") |
39047
d177c68813c0
(isearch-mouse-2): Renamed from isearch-mouse-yank.
Gerd Moellmann <gerd@gnu.org>
parents:
38778
diff
changeset
|
1341 (let* ((w (posn-window (event-start click))) |
d177c68813c0
(isearch-mouse-2): Renamed from isearch-mouse-yank.
Gerd Moellmann <gerd@gnu.org>
parents:
38778
diff
changeset
|
1342 (overriding-terminal-local-map nil) |
73233
b4697c34c8fd
* help.el (describe-mode): For clicks on mode-line, use "@"
David Kastrup <dak@gnu.org>
parents:
73008
diff
changeset
|
1343 (binding (key-binding (this-command-keys-vector) t))) |
25823
4cecefebde6f
(isearch): Add :links in defgroup.
Dave Love <fx@gnu.org>
parents:
25644
diff
changeset
|
1344 (if (and (window-minibuffer-p w) |
4cecefebde6f
(isearch): Add :links in defgroup.
Dave Love <fx@gnu.org>
parents:
25644
diff
changeset
|
1345 (not (minibuffer-window-active-p w))) ; in echo area |
4cecefebde6f
(isearch): Add :links in defgroup.
Dave Love <fx@gnu.org>
parents:
25644
diff
changeset
|
1346 (isearch-yank-x-selection) |
48201
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
1347 (when (functionp binding) |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
1348 (call-interactively binding))))) |
39047
d177c68813c0
(isearch-mouse-2): Renamed from isearch-mouse-yank.
Gerd Moellmann <gerd@gnu.org>
parents:
38778
diff
changeset
|
1349 |
41648
42271b6bfe3d
(isearch-yank-internal): New helper function.
Karl Fogel <kfogel@red-bean.com>
parents:
41255
diff
changeset
|
1350 (defun isearch-yank-internal (jumpform) |
42271b6bfe3d
(isearch-yank-internal): New helper function.
Karl Fogel <kfogel@red-bean.com>
parents:
41255
diff
changeset
|
1351 "Pull the text from point to the point reached by JUMPFORM. |
42271b6bfe3d
(isearch-yank-internal): New helper function.
Karl Fogel <kfogel@red-bean.com>
parents:
41255
diff
changeset
|
1352 JUMPFORM is a lambda expression that takes no arguments and returns a |
42271b6bfe3d
(isearch-yank-internal): New helper function.
Karl Fogel <kfogel@red-bean.com>
parents:
41255
diff
changeset
|
1353 buffer position, possibly having moved point to that position. For |
42271b6bfe3d
(isearch-yank-internal): New helper function.
Karl Fogel <kfogel@red-bean.com>
parents:
41255
diff
changeset
|
1354 example, it might move point forward by a word and return point, or it |
42271b6bfe3d
(isearch-yank-internal): New helper function.
Karl Fogel <kfogel@red-bean.com>
parents:
41255
diff
changeset
|
1355 might return the position of the end of the line." |
20275
0e102e83c51d
(isearch-yank-string): New helper function.
Karl Heuer <kwzh@gnu.org>
parents:
20056
diff
changeset
|
1356 (isearch-yank-string |
0e102e83c51d
(isearch-yank-string): New helper function.
Karl Heuer <kwzh@gnu.org>
parents:
20056
diff
changeset
|
1357 (save-excursion |
0e102e83c51d
(isearch-yank-string): New helper function.
Karl Heuer <kwzh@gnu.org>
parents:
20056
diff
changeset
|
1358 (and (not isearch-forward) isearch-other-end |
0e102e83c51d
(isearch-yank-string): New helper function.
Karl Heuer <kwzh@gnu.org>
parents:
20056
diff
changeset
|
1359 (goto-char isearch-other-end)) |
41648
42271b6bfe3d
(isearch-yank-internal): New helper function.
Karl Fogel <kfogel@red-bean.com>
parents:
41255
diff
changeset
|
1360 (buffer-substring-no-properties (point) (funcall jumpform))))) |
42271b6bfe3d
(isearch-yank-internal): New helper function.
Karl Fogel <kfogel@red-bean.com>
parents:
41255
diff
changeset
|
1361 |
56303
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1362 (defun isearch-yank-char-in-minibuffer (&optional arg) |
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1363 "Pull next character from buffer into end of search string in minibuffer." |
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1364 (interactive "p") |
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1365 (if (eobp) |
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1366 (insert |
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1367 (save-excursion |
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1368 (set-buffer (cadr (buffer-list))) |
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1369 (buffer-substring-no-properties |
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1370 (point) (progn (forward-char arg) (point))))) |
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1371 (forward-char arg))) |
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1372 |
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1373 (defun isearch-yank-char (&optional arg) |
55226
e3dae0e8c99e
(isearch-mode-map): Bind \C-w to isearch-yank-word instead of isearch-yank-word-or-char.
Juri Linkov <juri@jurta.org>
parents:
54256
diff
changeset
|
1374 "Pull next character from buffer into search string." |
56303
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1375 (interactive "p") |
d86ec00a8470
(isearch-mode-map): Bind C-M-w to isearch-del-char,
Juri Linkov <juri@jurta.org>
parents:
56170
diff
changeset
|
1376 (isearch-yank-internal (lambda () (forward-char arg) (point)))) |
41648
42271b6bfe3d
(isearch-yank-internal): New helper function.
Karl Fogel <kfogel@red-bean.com>
parents:
41255
diff
changeset
|
1377 |
41927
c1669b7ec455
(isearch-yank-word-or-char): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41801
diff
changeset
|
1378 (defun isearch-yank-word-or-char () |
c1669b7ec455
(isearch-yank-word-or-char): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41801
diff
changeset
|
1379 "Pull next character or word from buffer into search string." |
c1669b7ec455
(isearch-yank-word-or-char): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41801
diff
changeset
|
1380 (interactive) |
42196
36ab766521c0
(isearch-forward, isearch-edit-string): Make doc
Karl Fogel <kfogel@red-bean.com>
parents:
42093
diff
changeset
|
1381 (isearch-yank-internal |
49420
07a876ca33f0
(isearch-forward): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
49069
diff
changeset
|
1382 (lambda () |
42196
36ab766521c0
(isearch-forward, isearch-edit-string): Make doc
Karl Fogel <kfogel@red-bean.com>
parents:
42093
diff
changeset
|
1383 (if (or (= (char-syntax (or (char-after) 0)) ?w) |
36ab766521c0
(isearch-forward, isearch-edit-string): Make doc
Karl Fogel <kfogel@red-bean.com>
parents:
42093
diff
changeset
|
1384 (= (char-syntax (or (char-after (1+ (point))) 0)) ?w)) |
36ab766521c0
(isearch-forward, isearch-edit-string): Make doc
Karl Fogel <kfogel@red-bean.com>
parents:
42093
diff
changeset
|
1385 (forward-word 1) |
36ab766521c0
(isearch-forward, isearch-edit-string): Make doc
Karl Fogel <kfogel@red-bean.com>
parents:
42093
diff
changeset
|
1386 (forward-char 1)) (point)))) |
41927
c1669b7ec455
(isearch-yank-word-or-char): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41801
diff
changeset
|
1387 |
41648
42271b6bfe3d
(isearch-yank-internal): New helper function.
Karl Fogel <kfogel@red-bean.com>
parents:
41255
diff
changeset
|
1388 (defun isearch-yank-word () |
42271b6bfe3d
(isearch-yank-internal): New helper function.
Karl Fogel <kfogel@red-bean.com>
parents:
41255
diff
changeset
|
1389 "Pull next word from buffer into search string." |
42271b6bfe3d
(isearch-yank-internal): New helper function.
Karl Fogel <kfogel@red-bean.com>
parents:
41255
diff
changeset
|
1390 (interactive) |
42271b6bfe3d
(isearch-yank-internal): New helper function.
Karl Fogel <kfogel@red-bean.com>
parents:
41255
diff
changeset
|
1391 (isearch-yank-internal (lambda () (forward-word 1) (point)))) |
725 | 1392 |
1393 (defun isearch-yank-line () | |
1394 "Pull rest of line from buffer into search string." | |
1395 (interactive) | |
57380
a3021a22f48b
(isearch-yank-line): C-y yanks to next EOL, not end of current line.
Eli Zaretskii <eliz@gnu.org>
parents:
57328
diff
changeset
|
1396 (isearch-yank-internal |
71737
efe1646601d6
(isearch-yank-line): Let-bind `inhibit-field-text-motion' to t.
Romain Francoise <romain@orebokech.com>
parents:
70418
diff
changeset
|
1397 (lambda () (let ((inhibit-field-text-motion t)) |
efe1646601d6
(isearch-yank-line): Let-bind `inhibit-field-text-motion' to t.
Romain Francoise <romain@orebokech.com>
parents:
70418
diff
changeset
|
1398 (line-end-position (if (eolp) 2 1)))))) |
725 | 1399 |
1400 (defun isearch-search-and-update () | |
1401 ;; Do the search and update the display. | |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
1402 (when (or isearch-success |
55226
e3dae0e8c99e
(isearch-mode-map): Bind \C-w to isearch-yank-word instead of isearch-yank-word-or-char.
Juri Linkov <juri@jurta.org>
parents:
54256
diff
changeset
|
1403 ;; Unsuccessful regexp search may become successful by |
e3dae0e8c99e
(isearch-mode-map): Bind \C-w to isearch-yank-word instead of isearch-yank-word-or-char.
Juri Linkov <juri@jurta.org>
parents:
54256
diff
changeset
|
1404 ;; addition of characters which make isearch-string valid |
48201
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
1405 isearch-regexp |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
1406 ;; If the string was found but was completely invisible, |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
1407 ;; it might now be partly visible, so try again. |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
1408 (prog1 isearch-hidden (setq isearch-hidden nil))) |
725 | 1409 ;; In reverse search, adding stuff at |
1410 ;; the end may cause zero or many more chars to be | |
1411 ;; matched, in the string following point. | |
1412 ;; Allow all those possibilities without moving point as | |
1413 ;; long as the match does not extend past search origin. | |
1414 (if (and (not isearch-forward) (not isearch-adjusted) | |
1415 (condition-case () | |
13799
49b7cd70c43c
(isearch-done): Use executing-kbd-macro.
Karl Heuer <kwzh@gnu.org>
parents:
13682
diff
changeset
|
1416 (let ((case-fold-search isearch-case-fold-search)) |
23318
102eb438b2e1
(isearch-search-and-update): Properly
Karl Heuer <kwzh@gnu.org>
parents:
23102
diff
changeset
|
1417 (if (and (eq case-fold-search t) search-upper-case) |
102eb438b2e1
(isearch-search-and-update): Properly
Karl Heuer <kwzh@gnu.org>
parents:
23102
diff
changeset
|
1418 (setq case-fold-search |
102eb438b2e1
(isearch-search-and-update): Properly
Karl Heuer <kwzh@gnu.org>
parents:
23102
diff
changeset
|
1419 (isearch-no-upper-case-p isearch-string isearch-regexp))) |
13799
49b7cd70c43c
(isearch-done): Use executing-kbd-macro.
Karl Heuer <kwzh@gnu.org>
parents:
13682
diff
changeset
|
1420 (looking-at (if isearch-regexp isearch-string |
49b7cd70c43c
(isearch-done): Use executing-kbd-macro.
Karl Heuer <kwzh@gnu.org>
parents:
13682
diff
changeset
|
1421 (regexp-quote isearch-string)))) |
725 | 1422 (error nil)) |
21070
f88e08d192a8
(isearch-*-char): Do nothing special if quoted with \.
Richard M. Stallman <rms@gnu.org>
parents:
20812
diff
changeset
|
1423 (or isearch-yank-flag |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
1424 (<= (match-end 0) |
21070
f88e08d192a8
(isearch-*-char): Do nothing special if quoted with \.
Richard M. Stallman <rms@gnu.org>
parents:
20812
diff
changeset
|
1425 (min isearch-opoint isearch-barrier)))) |
18440
a94d8b31ae3d
(isearch-search-and-update): When a reverse search
Richard M. Stallman <rms@gnu.org>
parents:
18236
diff
changeset
|
1426 (progn |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
1427 (setq isearch-success t |
60614
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
1428 isearch-error nil |
18440
a94d8b31ae3d
(isearch-search-and-update): When a reverse search
Richard M. Stallman <rms@gnu.org>
parents:
18236
diff
changeset
|
1429 isearch-other-end (match-end 0)) |
a94d8b31ae3d
(isearch-search-and-update): When a reverse search
Richard M. Stallman <rms@gnu.org>
parents:
18236
diff
changeset
|
1430 (if (and (eq isearch-case-fold-search t) search-upper-case) |
a94d8b31ae3d
(isearch-search-and-update): When a reverse search
Richard M. Stallman <rms@gnu.org>
parents:
18236
diff
changeset
|
1431 (setq isearch-case-fold-search |
a94d8b31ae3d
(isearch-search-and-update): When a reverse search
Richard M. Stallman <rms@gnu.org>
parents:
18236
diff
changeset
|
1432 (isearch-no-upper-case-p isearch-string isearch-regexp)))) |
725 | 1433 ;; Not regexp, not reverse, or no match at point. |
1434 (if (and isearch-other-end (not isearch-adjusted)) | |
1435 (goto-char (if isearch-forward isearch-other-end | |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
1436 (min isearch-opoint |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
1437 isearch-barrier |
725 | 1438 (1+ isearch-other-end))))) |
1439 (isearch-search) | |
1440 )) | |
1441 (isearch-push-state) | |
1442 (if isearch-op-fun (funcall isearch-op-fun)) | |
1443 (isearch-update)) | |
1444 | |
1445 | |
56668
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1446 ;; *, ?, }, and | chars can make a regexp more liberal. |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1447 ;; They can make a regexp match sooner or make it succeed instead of failing. |
725 | 1448 ;; So go back to place last successful search started |
1449 ;; 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
|
1450 ;; + needs no special handling because the string must match at least once. |
725 | 1451 |
56668
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1452 (defun isearch-backslash (str) |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1453 "Return t if STR ends in an odd number of backslashes." |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1454 (= (mod (- (length str) (string-match "\\\\*\\'" str)) 2) 1)) |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1455 |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1456 (defun isearch-fallback (want-backslash &optional allow-invalid to-barrier) |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1457 "Return point to previous successful match to allow regexp liberalization. |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1458 \\<isearch-mode-map> |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1459 Respects \\[isearch-repeat-forward] and \\[isearch-repeat-backward] by |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1460 stopping at `isearch-barrier' as needed. |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1461 |
64436
8c591f014cf5
(isearch-mode-map): Remove key bindings for regexp chars * ? } |.
Juri Linkov <juri@jurta.org>
parents:
64399
diff
changeset
|
1462 Do nothing if a backslash is escaping the liberalizing character. |
8c591f014cf5
(isearch-mode-map): Remove key bindings for regexp chars * ? } |.
Juri Linkov <juri@jurta.org>
parents:
64399
diff
changeset
|
1463 If WANT-BACKSLASH is non-nil, invert this behavior (for \\} and \\|). |
56668
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1464 |
64436
8c591f014cf5
(isearch-mode-map): Remove key bindings for regexp chars * ? } |.
Juri Linkov <juri@jurta.org>
parents:
64399
diff
changeset
|
1465 Do nothing if regexp has recently been invalid unless optional |
8c591f014cf5
(isearch-mode-map): Remove key bindings for regexp chars * ? } |.
Juri Linkov <juri@jurta.org>
parents:
64399
diff
changeset
|
1466 ALLOW-INVALID non-nil. |
56668
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1467 |
64436
8c591f014cf5
(isearch-mode-map): Remove key bindings for regexp chars * ? } |.
Juri Linkov <juri@jurta.org>
parents:
64399
diff
changeset
|
1468 If optional TO-BARRIER non-nil, ignore previous matches and go exactly |
8c591f014cf5
(isearch-mode-map): Remove key bindings for regexp chars * ? } |.
Juri Linkov <juri@jurta.org>
parents:
64399
diff
changeset
|
1469 to the barrier." |
56668
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1470 ;; (eq (not a) (not b)) makes all non-nil values equivalent |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1471 (when (and isearch-regexp (eq (not (isearch-backslash isearch-string)) |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1472 (not want-backslash)) |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1473 ;; We have to check 2 stack frames because the last might be |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1474 ;; invalid just because of a backslash. |
60614
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
1475 (or (not isearch-error) |
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
1476 (not (isearch-error-state (cadr isearch-cmds))) |
56668
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1477 allow-invalid)) |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1478 (if to-barrier |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1479 (progn (goto-char isearch-barrier) |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1480 (setq isearch-adjusted t)) |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1481 (let* ((stack isearch-cmds) |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1482 (previous (cdr stack)) ; lookbelow in the stack |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1483 (frame (car stack))) |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1484 ;; Walk down the stack looking for a valid regexp (as of course only |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1485 ;; they can be the previous successful match); this conveniently |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1486 ;; removes all bracket-sets and groups that might be in the way, as |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1487 ;; well as partial \{\} constructs that the code below leaves behind. |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1488 ;; Also skip over postfix operators -- though horrid, |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1489 ;; 'ab?\{5,6\}+\{1,2\}*' is perfectly legal. |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1490 (while (and previous |
60614
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
1491 (or (isearch-error-state frame) |
56867
16f3ec82330a
Remove ancient Change Log section.
Juri Linkov <juri@jurta.org>
parents:
56681
diff
changeset
|
1492 (let* ((string (isearch-string-state frame)) |
56668
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1493 (lchar (aref string (1- (length string))))) |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1494 ;; The operators aren't always operators; check |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1495 ;; backslashes. This doesn't handle the case of |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1496 ;; operators at the beginning of the regexp not |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1497 ;; being special, but then we should fall back to |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1498 ;; the barrier anyway because it's all optional. |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1499 (if (isearch-backslash |
56867
16f3ec82330a
Remove ancient Change Log section.
Juri Linkov <juri@jurta.org>
parents:
56681
diff
changeset
|
1500 (isearch-string-state (car previous))) |
56668
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1501 (eq lchar ?\}) |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1502 (memq lchar '(?* ?? ?+)))))) |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1503 (setq stack previous previous (cdr previous) frame (car stack))) |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1504 (when stack |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1505 ;; `stack' now refers the most recent valid regexp that is not at |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1506 ;; all optional in its last term. Now dig one level deeper and find |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1507 ;; what matched before that. |
60672
9b6f40e2868c
(isearch-fallback): Check for `(car previous)'
Juri Linkov <juri@jurta.org>
parents:
60627
diff
changeset
|
1508 (let ((last-other-end |
9b6f40e2868c
(isearch-fallback): Check for `(car previous)'
Juri Linkov <juri@jurta.org>
parents:
60627
diff
changeset
|
1509 (or (and (car previous) |
9b6f40e2868c
(isearch-fallback): Check for `(car previous)'
Juri Linkov <juri@jurta.org>
parents:
60627
diff
changeset
|
1510 (isearch-other-end-state (car previous))) |
9b6f40e2868c
(isearch-fallback): Check for `(car previous)'
Juri Linkov <juri@jurta.org>
parents:
60627
diff
changeset
|
1511 isearch-barrier))) |
56668
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1512 (goto-char (if isearch-forward |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1513 (max last-other-end isearch-barrier) |
99e8e40ec202
Remove accidental changes of March 4. Fix backing
Eli Zaretskii <eliz@gnu.org>
parents:
56352
diff
changeset
|
1514 (min last-other-end isearch-barrier))) |
64436
8c591f014cf5
(isearch-mode-map): Remove key bindings for regexp chars * ? } |.
Juri Linkov <juri@jurta.org>
parents:
64399
diff
changeset
|
1515 (setq isearch-adjusted t))))))) |
725 | 1516 |
52965
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1517 (defun isearch-unread-key-sequence (keylist) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1518 "Unread the given key-sequence KEYLIST. |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1519 Scroll-bar or mode-line events are processed appropriately." |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1520 (cancel-kbd-macro-events) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1521 (apply 'isearch-unread keylist) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1522 ;; If the event was a scroll-bar or mode-line click, the event will have |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1523 ;; been prefixed by a symbol such as vertical-scroll-bar. We must remove |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1524 ;; it here, because this symbol will be attached to the event again next |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1525 ;; time it gets read by read-key-sequence. |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1526 ;; |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1527 ;; (Old comment from isearch-other-meta-char: "Note that we don't have to |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1528 ;; modify the event anymore in 21 because read_key_sequence no longer |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1529 ;; modifies events to produce fake prefix keys.") |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1530 (if (and (> (length keylist) 1) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1531 (symbolp (car keylist)) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1532 (listp (cadr keylist)) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1533 (not (numberp (posn-point |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1534 (event-start (cadr keylist) ))))) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1535 (pop unread-command-events))) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1536 |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1537 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1538 ;; scrolling within Isearch mode. Alan Mackenzie (acm@muc.de), 2003/2/24 |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1539 ;; |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1540 ;; The idea here is that certain vertical scrolling commands (like C-l |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1541 ;; `recenter') should be usable WITHIN Isearch mode. For a command to be |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1542 ;; suitable, it must NOT alter the buffer, swap to another buffer or frame, |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1543 ;; tamper with isearch's state, or move point. It is unacceptable for the |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1544 ;; search string to be scrolled out of the current window. If a command |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1545 ;; attempts this, we scroll the text back again. |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1546 ;; |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1547 ;; We implement this feature with a property called `isearch-scroll'. |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1548 ;; If a command's symbol has the value t for this property it is a |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1549 ;; scrolling command. The feature needs to be enabled by setting the |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1550 ;; customizable variable `isearch-allow-scroll' to a non-nil value. |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1551 ;; |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1552 ;; The universal argument commands (e.g. C-u) in simple.el are marked |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1553 ;; as scrolling commands, and isearch.el has been amended to allow |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1554 ;; prefix arguments to be passed through to scrolling commands. Thus |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1555 ;; M-0 C-l will scroll point to the top of the window. |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1556 ;; |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1557 ;; Horizontal scrolling commands are currently not catered for. |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1558 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1559 |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1560 ;; Set the isearch-scroll property on some standard functions: |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1561 ;; Scroll-bar functions: |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1562 (if (fboundp 'scroll-bar-toolkit-scroll) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1563 (put 'scroll-bar-toolkit-scroll 'isearch-scroll t)) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1564 (if (fboundp 'mac-handle-scroll-bar-event) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1565 (put 'mac-handle-scroll-bar-event 'isearch-scroll t)) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1566 (if (fboundp 'w32-handle-scroll-bar-event) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1567 (put 'w32-handle-scroll-bar-event 'isearch-scroll t)) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1568 |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1569 ;; Commands which scroll the window: |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1570 (put 'recenter 'isearch-scroll t) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1571 (put 'reposition-window 'isearch-scroll t) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1572 (put 'scroll-up 'isearch-scroll t) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1573 (put 'scroll-down 'isearch-scroll t) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1574 |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1575 ;; Commands which act on the other window |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1576 (put 'list-buffers 'isearch-scroll t) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1577 (put 'scroll-other-window 'isearch-scroll t) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1578 (put 'scroll-other-window-down 'isearch-scroll t) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1579 (put 'beginning-of-buffer-other-window 'isearch-scroll t) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1580 (put 'end-of-buffer-other-window 'isearch-scroll t) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1581 |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1582 ;; Commands which change the window layout |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1583 (put 'delete-other-windows 'isearch-scroll t) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1584 (put 'balance-windows 'isearch-scroll t) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1585 (put 'split-window-vertically 'isearch-scroll t) |
60627
c7f7dd018168
Put `isearch-scroll' property to `split-window-horizontally'.
Juri Linkov <juri@jurta.org>
parents:
60614
diff
changeset
|
1586 (put 'split-window-horizontally 'isearch-scroll t) |
52965
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1587 (put 'enlarge-window 'isearch-scroll t) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1588 |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1589 ;; Universal argument commands |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1590 (put 'universal-argument 'isearch-scroll t) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1591 (put 'negative-argument 'isearch-scroll t) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1592 (put 'digit-argument 'isearch-scroll t) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1593 |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1594 (defcustom isearch-allow-scroll nil |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1595 "If non-nil, scrolling commands are allowed during incremental search." |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1596 :type 'boolean |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1597 :group 'isearch) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1598 |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1599 (defun isearch-string-out-of-window (isearch-point) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1600 "Test whether the search string is currently outside of the window. |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1601 Return nil if it's completely visible, or if point is visible, |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1602 together with as much of the search string as will fit; the symbol |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1603 `above' if we need to scroll the text downwards; the symbol `below', |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1604 if upwards." |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1605 (let ((w-start (window-start)) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1606 (w-end (window-end nil t)) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1607 (w-L1 (save-excursion (move-to-window-line 1) (point))) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1608 (w-L-1 (save-excursion (move-to-window-line -1) (point))) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1609 start end) ; start and end of search string in buffer |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1610 (if isearch-forward |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1611 (setq end isearch-point start (or isearch-other-end isearch-point)) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1612 (setq start isearch-point end (or isearch-other-end isearch-point))) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1613 (cond ((or (and (>= start w-start) (<= end w-end)) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1614 (if isearch-forward |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1615 (and (>= isearch-point w-L-1) (< isearch-point w-end)) ; point on Line -1 |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1616 (and (>= isearch-point w-start) (< isearch-point w-L1)))) ; point on Line 0 |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1617 nil) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1618 ((and (< start w-start) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1619 (< isearch-point w-L-1)) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1620 'above) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1621 (t 'below)))) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1622 |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1623 (defun isearch-back-into-window (above isearch-point) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1624 "Scroll the window to bring the search string back into view. |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1625 Restore point to ISEARCH-POINT in the process. ABOVE is t when the |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1626 search string is above the top of the window, nil when it is beneath |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1627 the bottom." |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1628 (let (start end) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1629 (if isearch-forward |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1630 (setq end isearch-point start (or isearch-other-end isearch-point)) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1631 (setq start isearch-point end (or isearch-other-end isearch-point))) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1632 (if above |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1633 (progn |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1634 (goto-char start) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1635 (recenter 0) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1636 (when (>= isearch-point (window-end nil t)) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1637 (goto-char isearch-point) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1638 (recenter -1))) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1639 (goto-char end) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1640 (recenter -1) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1641 (when (< isearch-point (window-start)) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1642 (goto-char isearch-point) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1643 (recenter 0)))) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1644 (goto-char isearch-point)) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1645 |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1646 (defun isearch-reread-key-sequence-naturally (keylist) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1647 "Reread key sequence KEYLIST with Isearch mode's keymap deactivated. |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1648 Return the key sequence as a string/vector." |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1649 (isearch-unread-key-sequence keylist) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1650 (let (overriding-terminal-local-map) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1651 (read-key-sequence nil))) ; This will go through function-key-map, if nec. |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1652 |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1653 (defun isearch-lookup-scroll-key (key-seq) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1654 "If KEY-SEQ is bound to a scrolling command, return it as a symbol. |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1655 Otherwise return nil." |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1656 (let* ((overriding-terminal-local-map nil) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1657 (binding (key-binding key-seq))) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1658 (and binding (symbolp binding) (commandp binding) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1659 (eq (get binding 'isearch-scroll) t) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1660 binding))) |
725 | 1661 |
2572
8784bb8514b0
Replaced all fsets with defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2533
diff
changeset
|
1662 (defalias 'isearch-other-control-char 'isearch-other-meta-char) |
725 | 1663 |
52965
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1664 (defun isearch-other-meta-char (&optional arg) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1665 "Process a miscellaneous key sequence in Isearch mode. |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1666 |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1667 Try to convert the current key-sequence to something usable in Isearch |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1668 mode, either by converting it with `function-key-map', downcasing a |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1669 key with C-<upper case>, or finding a \"scrolling command\" bound to |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1670 it. \(In the last case, we may have to read more events.) If so, |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1671 either unread the converted sequence or execute the command. |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1672 |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1673 Otherwise, if `search-exit-option' is non-nil (the default) unread the |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1674 key-sequence and exit the search normally. If it is the symbol |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1675 `edit', the search string is edited in the minibuffer and the meta |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1676 character is unread so that it applies to editing the string. |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1677 |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1678 ARG is the prefix argument. It will be transmitted through to the |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1679 scrolling command or to the command whose key-sequence exits |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1680 Isearch mode." |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1681 (interactive "P") |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1682 (let* ((key (if current-prefix-arg ; not nec the same as ARG |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1683 (substring (this-command-keys) universal-argument-num-events) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1684 (this-command-keys))) |
12106
3ae851bcd773
(isearch-other-meta-char): Try downshifting
Karl Heuer <kwzh@gnu.org>
parents:
11969
diff
changeset
|
1685 (main-event (aref key 0)) |
52965
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1686 (keylist (listify-key-sequence key)) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1687 scroll-command isearch-point) |
12716
cadb9c7a1501
(isearch-mode-map): Don't bind tab, return, kp-N, etc.
Richard M. Stallman <rms@gnu.org>
parents:
12284
diff
changeset
|
1688 (cond ((and (= (length key) 1) |
83394
7d093d9d4479
Fix semantics of terminal-local variables. Remove `terminal-local-value' hack.
Karoly Lorentey <lorentey@elte.hu>
parents:
83383
diff
changeset
|
1689 (let ((lookup (lookup-key local-function-key-map key))) |
14288
dbb66b58d8f4
* isearch.el (isearch-other-meta-char): Avoid error if lookup in
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1690 (not (or (null lookup) (integerp lookup) |
dbb66b58d8f4
* isearch.el (isearch-other-meta-char): Avoid error if lookup in
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1691 (keymapp lookup))))) |
12716
cadb9c7a1501
(isearch-mode-map): Don't bind tab, return, kp-N, etc.
Richard M. Stallman <rms@gnu.org>
parents:
12284
diff
changeset
|
1692 ;; 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
|
1693 ;; 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
|
1694 ;; 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
|
1695 ;; 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
|
1696 ;; 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
|
1697 (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
|
1698 (if (lookup-key global-map key) |
33704
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
1699 (progn |
12716
cadb9c7a1501
(isearch-mode-map): Don't bind tab, return, kp-N, etc.
Richard M. Stallman <rms@gnu.org>
parents:
12284
diff
changeset
|
1700 (isearch-done) |
cadb9c7a1501
(isearch-mode-map): Don't bind tab, return, kp-N, etc.
Richard M. Stallman <rms@gnu.org>
parents:
12284
diff
changeset
|
1701 (apply 'isearch-unread keylist)) |
29358
9a6d0cf1e313
(isearch-update): Set disable-point-adjustment to t
Kenichi Handa <handa@m17n.org>
parents:
29325
diff
changeset
|
1702 (setq keylist |
83394
7d093d9d4479
Fix semantics of terminal-local variables. Remove `terminal-local-value' hack.
Karoly Lorentey <lorentey@elte.hu>
parents:
83383
diff
changeset
|
1703 (listify-key-sequence (lookup-key local-function-key-map key))) |
29358
9a6d0cf1e313
(isearch-update): Set disable-point-adjustment to t
Kenichi Handa <handa@m17n.org>
parents:
29325
diff
changeset
|
1704 (while keylist |
9a6d0cf1e313
(isearch-update): Set disable-point-adjustment to t
Kenichi Handa <handa@m17n.org>
parents:
29325
diff
changeset
|
1705 (setq key (car keylist)) |
9a6d0cf1e313
(isearch-update): Set disable-point-adjustment to t
Kenichi Handa <handa@m17n.org>
parents:
29325
diff
changeset
|
1706 ;; If KEY is a printing char, we handle it here |
9a6d0cf1e313
(isearch-update): Set disable-point-adjustment to t
Kenichi Handa <handa@m17n.org>
parents:
29325
diff
changeset
|
1707 ;; directly to avoid the input method and keyboard |
9a6d0cf1e313
(isearch-update): Set disable-point-adjustment to t
Kenichi Handa <handa@m17n.org>
parents:
29325
diff
changeset
|
1708 ;; coding system translating it. |
9a6d0cf1e313
(isearch-update): Set disable-point-adjustment to t
Kenichi Handa <handa@m17n.org>
parents:
29325
diff
changeset
|
1709 (if (and (integerp key) |
64665
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
1710 (>= key ?\s) (/= key 127) (< key 256)) |
29358
9a6d0cf1e313
(isearch-update): Set disable-point-adjustment to t
Kenichi Handa <handa@m17n.org>
parents:
29325
diff
changeset
|
1711 (progn |
9a6d0cf1e313
(isearch-update): Set disable-point-adjustment to t
Kenichi Handa <handa@m17n.org>
parents:
29325
diff
changeset
|
1712 (isearch-process-search-char key) |
9a6d0cf1e313
(isearch-update): Set disable-point-adjustment to t
Kenichi Handa <handa@m17n.org>
parents:
29325
diff
changeset
|
1713 (setq keylist (cdr keylist))) |
9a6d0cf1e313
(isearch-update): Set disable-point-adjustment to t
Kenichi Handa <handa@m17n.org>
parents:
29325
diff
changeset
|
1714 ;; As the remaining keys in KEYLIST can't be handled |
9a6d0cf1e313
(isearch-update): Set disable-point-adjustment to t
Kenichi Handa <handa@m17n.org>
parents:
29325
diff
changeset
|
1715 ;; here, we must reread them. |
9a6d0cf1e313
(isearch-update): Set disable-point-adjustment to t
Kenichi Handa <handa@m17n.org>
parents:
29325
diff
changeset
|
1716 (apply 'isearch-unread keylist) |
9a6d0cf1e313
(isearch-update): Set disable-point-adjustment to t
Kenichi Handa <handa@m17n.org>
parents:
29325
diff
changeset
|
1717 (setq keylist nil))))) |
12716
cadb9c7a1501
(isearch-mode-map): Don't bind tab, return, kp-N, etc.
Richard M. Stallman <rms@gnu.org>
parents:
12284
diff
changeset
|
1718 ( |
12106
3ae851bcd773
(isearch-other-meta-char): Try downshifting
Karl Heuer <kwzh@gnu.org>
parents:
11969
diff
changeset
|
1719 ;; Handle an undefined shifted control character |
3ae851bcd773
(isearch-other-meta-char): Try downshifting
Karl Heuer <kwzh@gnu.org>
parents:
11969
diff
changeset
|
1720 ;; by downshifting it if that makes it defined. |
3ae851bcd773
(isearch-other-meta-char): Try downshifting
Karl Heuer <kwzh@gnu.org>
parents:
11969
diff
changeset
|
1721 ;; (As read-key-sequence would normally do, |
3ae851bcd773
(isearch-other-meta-char): Try downshifting
Karl Heuer <kwzh@gnu.org>
parents:
11969
diff
changeset
|
1722 ;; if we didn't have a default definition.) |
3ae851bcd773
(isearch-other-meta-char): Try downshifting
Karl Heuer <kwzh@gnu.org>
parents:
11969
diff
changeset
|
1723 (let ((mods (event-modifiers main-event))) |
3ae851bcd773
(isearch-other-meta-char): Try downshifting
Karl Heuer <kwzh@gnu.org>
parents:
11969
diff
changeset
|
1724 (and (integerp main-event) |
3ae851bcd773
(isearch-other-meta-char): Try downshifting
Karl Heuer <kwzh@gnu.org>
parents:
11969
diff
changeset
|
1725 (memq 'shift mods) |
3ae851bcd773
(isearch-other-meta-char): Try downshifting
Karl Heuer <kwzh@gnu.org>
parents:
11969
diff
changeset
|
1726 (memq 'control mods) |
69564
30b0fe844c71
(isearch-other-meta-char): Handle user bindings for shifted control characters.
Eli Zaretskii <eliz@gnu.org>
parents:
69078
diff
changeset
|
1727 (not (memq (lookup-key isearch-mode-map |
30b0fe844c71
(isearch-other-meta-char): Handle user bindings for shifted control characters.
Eli Zaretskii <eliz@gnu.org>
parents:
69078
diff
changeset
|
1728 (let ((copy (copy-sequence key))) |
30b0fe844c71
(isearch-other-meta-char): Handle user bindings for shifted control characters.
Eli Zaretskii <eliz@gnu.org>
parents:
69078
diff
changeset
|
1729 (aset copy 0 |
30b0fe844c71
(isearch-other-meta-char): Handle user bindings for shifted control characters.
Eli Zaretskii <eliz@gnu.org>
parents:
69078
diff
changeset
|
1730 (- main-event |
30b0fe844c71
(isearch-other-meta-char): Handle user bindings for shifted control characters.
Eli Zaretskii <eliz@gnu.org>
parents:
69078
diff
changeset
|
1731 (- ?\C-\S-a ?\C-a))) |
30b0fe844c71
(isearch-other-meta-char): Handle user bindings for shifted control characters.
Eli Zaretskii <eliz@gnu.org>
parents:
69078
diff
changeset
|
1732 copy) |
30b0fe844c71
(isearch-other-meta-char): Handle user bindings for shifted control characters.
Eli Zaretskii <eliz@gnu.org>
parents:
69078
diff
changeset
|
1733 nil) |
30b0fe844c71
(isearch-other-meta-char): Handle user bindings for shifted control characters.
Eli Zaretskii <eliz@gnu.org>
parents:
69078
diff
changeset
|
1734 '(nil |
30b0fe844c71
(isearch-other-meta-char): Handle user bindings for shifted control characters.
Eli Zaretskii <eliz@gnu.org>
parents:
69078
diff
changeset
|
1735 isearch-other-control-char))))) |
12106
3ae851bcd773
(isearch-other-meta-char): Try downshifting
Karl Heuer <kwzh@gnu.org>
parents:
11969
diff
changeset
|
1736 (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
|
1737 (cancel-kbd-macro-events) |
12106
3ae851bcd773
(isearch-other-meta-char): Try downshifting
Karl Heuer <kwzh@gnu.org>
parents:
11969
diff
changeset
|
1738 (apply 'isearch-unread keylist)) |
3ae851bcd773
(isearch-other-meta-char): Try downshifting
Karl Heuer <kwzh@gnu.org>
parents:
11969
diff
changeset
|
1739 ((eq search-exit-option 'edit) |
3ae851bcd773
(isearch-other-meta-char): Try downshifting
Karl Heuer <kwzh@gnu.org>
parents:
11969
diff
changeset
|
1740 (apply 'isearch-unread keylist) |
3ae851bcd773
(isearch-other-meta-char): Try downshifting
Karl Heuer <kwzh@gnu.org>
parents:
11969
diff
changeset
|
1741 (isearch-edit-string)) |
52965
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1742 ;; Handle a scrolling function. |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1743 ((and isearch-allow-scroll |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1744 (progn (setq key (isearch-reread-key-sequence-naturally keylist)) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1745 (setq keylist (listify-key-sequence key)) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1746 (setq main-event (aref key 0)) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1747 (setq scroll-command (isearch-lookup-scroll-key key)))) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1748 ;; From this point onwards, KEY, KEYLIST and MAIN-EVENT hold a |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1749 ;; complete key sequence, possibly as modified by function-key-map, |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1750 ;; not merely the one or two event fragment which invoked |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1751 ;; isearch-other-meta-char in the first place. |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1752 (setq isearch-point (point)) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1753 (setq prefix-arg arg) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1754 (command-execute scroll-command) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1755 (let ((ab-bel (isearch-string-out-of-window isearch-point))) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1756 (if ab-bel |
55226
e3dae0e8c99e
(isearch-mode-map): Bind \C-w to isearch-yank-word instead of isearch-yank-word-or-char.
Juri Linkov <juri@jurta.org>
parents:
54256
diff
changeset
|
1757 (isearch-back-into-window (eq ab-bel 'above) isearch-point) |
56905
661d52db56de
(isearch-toggle-regexp): Set `isearch-success' and `isearch-adjusted' to `t'.
Juri Linkov <juri@jurta.org>
parents:
56868
diff
changeset
|
1758 (goto-char isearch-point))) |
52965
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1759 (isearch-update)) |
85720
79ffe1cb3583
(isearch-other-meta-char): Call `isearch-edit-string' when mouse is
Juri Linkov <juri@jurta.org>
parents:
85569
diff
changeset
|
1760 ;; A mouse click on the isearch message starts editing the search string |
79ffe1cb3583
(isearch-other-meta-char): Call `isearch-edit-string' when mouse is
Juri Linkov <juri@jurta.org>
parents:
85569
diff
changeset
|
1761 ((and (eq (car-safe main-event) 'down-mouse-1) |
79ffe1cb3583
(isearch-other-meta-char): Call `isearch-edit-string' when mouse is
Juri Linkov <juri@jurta.org>
parents:
85569
diff
changeset
|
1762 (window-minibuffer-p (posn-window (event-start main-event)))) |
79ffe1cb3583
(isearch-other-meta-char): Call `isearch-edit-string' when mouse is
Juri Linkov <juri@jurta.org>
parents:
85569
diff
changeset
|
1763 ;; Swallow the up-event. |
79ffe1cb3583
(isearch-other-meta-char): Call `isearch-edit-string' when mouse is
Juri Linkov <juri@jurta.org>
parents:
85569
diff
changeset
|
1764 (read-event) |
79ffe1cb3583
(isearch-other-meta-char): Call `isearch-edit-string' when mouse is
Juri Linkov <juri@jurta.org>
parents:
85569
diff
changeset
|
1765 (isearch-edit-string)) |
12106
3ae851bcd773
(isearch-other-meta-char): Try downshifting
Karl Heuer <kwzh@gnu.org>
parents:
11969
diff
changeset
|
1766 (search-exit-option |
3ae851bcd773
(isearch-other-meta-char): Try downshifting
Karl Heuer <kwzh@gnu.org>
parents:
11969
diff
changeset
|
1767 (let (window) |
52965
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1768 (isearch-unread-key-sequence keylist) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1769 (setq main-event (car unread-command-events)) |
38553
4e1d2c941d86
(isearch-other-meta-char): Don't modify mode-line and
Gerd Moellmann <gerd@gnu.org>
parents:
38412
diff
changeset
|
1770 |
38778
cdd382cc0e92
(isearch-other-meta-char): Don't switch to the
Gerd Moellmann <gerd@gnu.org>
parents:
38555
diff
changeset
|
1771 ;; If we got a mouse click event, that event contains the |
cdd382cc0e92
(isearch-other-meta-char): Don't switch to the
Gerd Moellmann <gerd@gnu.org>
parents:
38555
diff
changeset
|
1772 ;; window clicked on. maybe it was read with the buffer |
12106
3ae851bcd773
(isearch-other-meta-char): Try downshifting
Karl Heuer <kwzh@gnu.org>
parents:
11969
diff
changeset
|
1773 ;; 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
|
1774 ;; is in isearch mode. So end the search in that buffer. |
38778
cdd382cc0e92
(isearch-other-meta-char): Don't switch to the
Gerd Moellmann <gerd@gnu.org>
parents:
38555
diff
changeset
|
1775 |
cdd382cc0e92
(isearch-other-meta-char): Don't switch to the
Gerd Moellmann <gerd@gnu.org>
parents:
38555
diff
changeset
|
1776 ;; ??? I have no idea what this if checks for, but it's |
cdd382cc0e92
(isearch-other-meta-char): Don't switch to the
Gerd Moellmann <gerd@gnu.org>
parents:
38555
diff
changeset
|
1777 ;; obviously wrong for the case that a down-mouse event |
cdd382cc0e92
(isearch-other-meta-char): Don't switch to the
Gerd Moellmann <gerd@gnu.org>
parents:
38555
diff
changeset
|
1778 ;; on another window invokes this function. The event |
cdd382cc0e92
(isearch-other-meta-char): Don't switch to the
Gerd Moellmann <gerd@gnu.org>
parents:
38555
diff
changeset
|
1779 ;; will contain the window clicked on and that window's |
49420
07a876ca33f0
(isearch-forward): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
49069
diff
changeset
|
1780 ;; buffer is certainly not always in Isearch mode. |
38778
cdd382cc0e92
(isearch-other-meta-char): Don't switch to the
Gerd Moellmann <gerd@gnu.org>
parents:
38555
diff
changeset
|
1781 ;; |
cdd382cc0e92
(isearch-other-meta-char): Don't switch to the
Gerd Moellmann <gerd@gnu.org>
parents:
38555
diff
changeset
|
1782 ;; Leave the code in, but check for current buffer not |
cdd382cc0e92
(isearch-other-meta-char): Don't switch to the
Gerd Moellmann <gerd@gnu.org>
parents:
38555
diff
changeset
|
1783 ;; being in Isearch mode for now, until someone tells |
cdd382cc0e92
(isearch-other-meta-char): Don't switch to the
Gerd Moellmann <gerd@gnu.org>
parents:
38555
diff
changeset
|
1784 ;; what it's really supposed to do. |
cdd382cc0e92
(isearch-other-meta-char): Don't switch to the
Gerd Moellmann <gerd@gnu.org>
parents:
38555
diff
changeset
|
1785 ;; |
cdd382cc0e92
(isearch-other-meta-char): Don't switch to the
Gerd Moellmann <gerd@gnu.org>
parents:
38555
diff
changeset
|
1786 ;; --gerd 2001-08-10. |
cdd382cc0e92
(isearch-other-meta-char): Don't switch to the
Gerd Moellmann <gerd@gnu.org>
parents:
38555
diff
changeset
|
1787 |
cdd382cc0e92
(isearch-other-meta-char): Don't switch to the
Gerd Moellmann <gerd@gnu.org>
parents:
38555
diff
changeset
|
1788 (if (and (not isearch-mode) |
cdd382cc0e92
(isearch-other-meta-char): Don't switch to the
Gerd Moellmann <gerd@gnu.org>
parents:
38555
diff
changeset
|
1789 (listp main-event) |
12106
3ae851bcd773
(isearch-other-meta-char): Try downshifting
Karl Heuer <kwzh@gnu.org>
parents:
11969
diff
changeset
|
1790 (setq window (posn-window (event-start main-event))) |
19127
ce44f2008a22
(isearch-other-meta-char): Don't switch windows to exit
Richard M. Stallman <rms@gnu.org>
parents:
19069
diff
changeset
|
1791 (windowp window) |
ce44f2008a22
(isearch-other-meta-char): Don't switch windows to exit
Richard M. Stallman <rms@gnu.org>
parents:
19069
diff
changeset
|
1792 (or (> (minibuffer-depth) 0) |
ce44f2008a22
(isearch-other-meta-char): Don't switch windows to exit
Richard M. Stallman <rms@gnu.org>
parents:
19069
diff
changeset
|
1793 (not (window-minibuffer-p window)))) |
12106
3ae851bcd773
(isearch-other-meta-char): Try downshifting
Karl Heuer <kwzh@gnu.org>
parents:
11969
diff
changeset
|
1794 (save-excursion |
3ae851bcd773
(isearch-other-meta-char): Try downshifting
Karl Heuer <kwzh@gnu.org>
parents:
11969
diff
changeset
|
1795 (set-buffer (window-buffer window)) |
18236
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
1796 (isearch-done) |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
1797 (isearch-clean-overlays)) |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
1798 (isearch-done) |
52965
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1799 (isearch-clean-overlays) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1800 (setq prefix-arg arg)))) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1801 (t;; otherwise nil |
12106
3ae851bcd773
(isearch-other-meta-char): Try downshifting
Karl Heuer <kwzh@gnu.org>
parents:
11969
diff
changeset
|
1802 (isearch-process-search-string key key))))) |
725 | 1803 |
1804 (defun isearch-quote-char () | |
1805 "Quote special characters for incremental search." | |
1806 (interactive) | |
19146
0f89b8543e19
(isearch-quote-char): Fix handling of control
Richard M. Stallman <rms@gnu.org>
parents:
19127
diff
changeset
|
1807 (let ((char (read-quoted-char (isearch-message t)))) |
24921
036b2fb4944f
(isearch-quote-char): Call unibyte-char-to-multibyte for \200...\240 also.
Richard M. Stallman <rms@gnu.org>
parents:
24919
diff
changeset
|
1808 ;; Assume character codes 0200 - 0377 stand for characters in some |
24788
1d21edd48d82
(isearch-quote-char): Don't assume character codes
Kenichi Handa <handa@m17n.org>
parents:
23318
diff
changeset
|
1809 ;; single-byte character set, and convert them to Emacs |
1d21edd48d82
(isearch-quote-char): Don't assume character codes
Kenichi Handa <handa@m17n.org>
parents:
23318
diff
changeset
|
1810 ;; characters. |
64665
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
1811 (if (and isearch-regexp (= char ?\s)) |
58840
1cdfec9f283d
(isearch-quote-char): Fix up typo in last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58801
diff
changeset
|
1812 (if (subregexp-context-p isearch-string (length isearch-string)) |
58801
33ad50d0b8f5
(isearch-quote-char): Use it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58744
diff
changeset
|
1813 (isearch-process-search-string "[ ]" " ") |
33ad50d0b8f5
(isearch-quote-char): Use it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58744
diff
changeset
|
1814 (isearch-process-search-char char)) |
58744
5eaafc3a7357
(search-whitespace-regexp): Remove the group. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57380
diff
changeset
|
1815 (and enable-multibyte-characters |
5eaafc3a7357
(search-whitespace-regexp): Remove the group. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57380
diff
changeset
|
1816 (>= char ?\200) |
5eaafc3a7357
(search-whitespace-regexp): Remove the group. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57380
diff
changeset
|
1817 (<= char ?\377) |
5eaafc3a7357
(search-whitespace-regexp): Remove the group. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57380
diff
changeset
|
1818 (setq char (unibyte-char-to-multibyte char))) |
5eaafc3a7357
(search-whitespace-regexp): Remove the group. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57380
diff
changeset
|
1819 (isearch-process-search-char char)))) |
725 | 1820 |
1821 (defun isearch-return-char () | |
64436
8c591f014cf5
(isearch-mode-map): Remove key bindings for regexp chars * ? } |.
Juri Linkov <juri@jurta.org>
parents:
64399
diff
changeset
|
1822 "Convert return into newline for incremental search." |
725 | 1823 (interactive) |
1824 (isearch-process-search-char ?\n)) | |
64436
8c591f014cf5
(isearch-mode-map): Remove key bindings for regexp chars * ? } |.
Juri Linkov <juri@jurta.org>
parents:
64399
diff
changeset
|
1825 (make-obsolete 'isearch-return-char 'isearch-printing-char) |
725 | 1826 |
1827 (defun isearch-printing-char () | |
2533 | 1828 "Add this ordinary printing character to the search string and search." |
725 | 1829 (interactive) |
25823
4cecefebde6f
(isearch): Add :links in defgroup.
Dave Love <fx@gnu.org>
parents:
25644
diff
changeset
|
1830 (let ((char last-command-char)) |
20056
dd567e1fddd5
(isearch-printing-char): Change S-SPC to SPC.
Karl Heuer <kwzh@gnu.org>
parents:
19769
diff
changeset
|
1831 (if (= char ?\S-\ ) |
64665
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
1832 (setq char ?\s)) |
19587
7d59cb04d2d9
(isearch-printing-char): Handle nonascii-insert-offset.
Richard M. Stallman <rms@gnu.org>
parents:
19408
diff
changeset
|
1833 (if (and enable-multibyte-characters |
7d59cb04d2d9
(isearch-printing-char): Handle nonascii-insert-offset.
Richard M. Stallman <rms@gnu.org>
parents:
19408
diff
changeset
|
1834 (>= char ?\200) |
7d59cb04d2d9
(isearch-printing-char): Handle nonascii-insert-offset.
Richard M. Stallman <rms@gnu.org>
parents:
19408
diff
changeset
|
1835 (<= char ?\377)) |
29325
e67ef9cdfe51
(isearch-printing-char): If keyboard coding system is
Kenichi Handa <handa@m17n.org>
parents:
28504
diff
changeset
|
1836 (if (keyboard-coding-system) |
e67ef9cdfe51
(isearch-printing-char): If keyboard coding system is
Kenichi Handa <handa@m17n.org>
parents:
28504
diff
changeset
|
1837 (isearch-process-search-multibyte-characters char) |
e67ef9cdfe51
(isearch-printing-char): If keyboard coding system is
Kenichi Handa <handa@m17n.org>
parents:
28504
diff
changeset
|
1838 (isearch-process-search-char (unibyte-char-to-multibyte char))) |
19587
7d59cb04d2d9
(isearch-printing-char): Handle nonascii-insert-offset.
Richard M. Stallman <rms@gnu.org>
parents:
19408
diff
changeset
|
1839 (if current-input-method |
7d59cb04d2d9
(isearch-printing-char): Handle nonascii-insert-offset.
Richard M. Stallman <rms@gnu.org>
parents:
19408
diff
changeset
|
1840 (isearch-process-search-multibyte-characters char) |
7d59cb04d2d9
(isearch-printing-char): Handle nonascii-insert-offset.
Richard M. Stallman <rms@gnu.org>
parents:
19408
diff
changeset
|
1841 (isearch-process-search-char char))))) |
725 | 1842 |
1843 (defun isearch-process-search-char (char) | |
64436
8c591f014cf5
(isearch-mode-map): Remove key bindings for regexp chars * ? } |.
Juri Linkov <juri@jurta.org>
parents:
64399
diff
changeset
|
1844 ;; * and ? are special in regexps when not preceded by \. |
8c591f014cf5
(isearch-mode-map): Remove key bindings for regexp chars * ? } |.
Juri Linkov <juri@jurta.org>
parents:
64399
diff
changeset
|
1845 ;; } and | are special in regexps when preceded by \. |
8c591f014cf5
(isearch-mode-map): Remove key bindings for regexp chars * ? } |.
Juri Linkov <juri@jurta.org>
parents:
64399
diff
changeset
|
1846 ;; Nothing special for + because it matches at least once. |
8c591f014cf5
(isearch-mode-map): Remove key bindings for regexp chars * ? } |.
Juri Linkov <juri@jurta.org>
parents:
64399
diff
changeset
|
1847 (cond |
8c591f014cf5
(isearch-mode-map): Remove key bindings for regexp chars * ? } |.
Juri Linkov <juri@jurta.org>
parents:
64399
diff
changeset
|
1848 ((memq char '(?* ??)) (isearch-fallback nil)) |
8c591f014cf5
(isearch-mode-map): Remove key bindings for regexp chars * ? } |.
Juri Linkov <juri@jurta.org>
parents:
64399
diff
changeset
|
1849 ((eq char ?\}) (isearch-fallback t t)) |
8c591f014cf5
(isearch-mode-map): Remove key bindings for regexp chars * ? } |.
Juri Linkov <juri@jurta.org>
parents:
64399
diff
changeset
|
1850 ((eq char ?|) (isearch-fallback t nil t))) |
8c591f014cf5
(isearch-mode-map): Remove key bindings for regexp chars * ? } |.
Juri Linkov <juri@jurta.org>
parents:
64399
diff
changeset
|
1851 |
725 | 1852 ;; Append the char to the search string, update the message and re-search. |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
1853 (isearch-process-search-string |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
1854 (char-to-string char) |
24924
ef8649234d91
(isearch-process-search-char): Write octal 200 correctly.
Richard M. Stallman <rms@gnu.org>
parents:
24921
diff
changeset
|
1855 (if (>= char ?\200) |
17794
2fc1e3833259
(isearch-process-search-char): Use multibyte
Richard M. Stallman <rms@gnu.org>
parents:
17781
diff
changeset
|
1856 (char-to-string char) |
2fc1e3833259
(isearch-process-search-char): Use multibyte
Richard M. Stallman <rms@gnu.org>
parents:
17781
diff
changeset
|
1857 (isearch-text-char-description char)))) |
725 | 1858 |
1859 (defun isearch-process-search-string (string message) | |
1860 (setq isearch-string (concat isearch-string string) | |
1861 isearch-message (concat isearch-message message)) | |
1862 (isearch-search-and-update)) | |
1863 | |
1864 | |
1865 ;; Search Ring | |
1866 | |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1867 (defun isearch-ring-adjust1 (advance) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1868 ;; Helper for isearch-ring-adjust |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1869 (let* ((ring (if isearch-regexp regexp-search-ring search-ring)) |
725 | 1870 (length (length ring)) |
1871 (yank-pointer-name (if isearch-regexp | |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1872 'regexp-search-ring-yank-pointer |
725 | 1873 'search-ring-yank-pointer)) |
1874 (yank-pointer (eval yank-pointer-name))) | |
1875 (if (zerop length) | |
1876 () | |
1877 (set yank-pointer-name | |
1878 (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
|
1879 (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
|
1880 (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
|
1881 length))) |
1146
02b2f761f9df
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1143
diff
changeset
|
1882 (setq isearch-string (nth yank-pointer ring) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1883 isearch-message (mapconcat 'isearch-text-char-description |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1884 isearch-string ""))))) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1885 |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1886 (defun isearch-ring-adjust (advance) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1887 ;; Helper for isearch-ring-advance and isearch-ring-retreat |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1888 (isearch-ring-adjust1 advance) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1889 (if search-ring-update |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1890 (progn |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1891 (isearch-search) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1892 (isearch-update)) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1893 (isearch-edit-string) |
16711
890b229ea0c7
(isearch-ring-adjust): Don't pop the state at the start.
Richard M. Stallman <rms@gnu.org>
parents:
16687
diff
changeset
|
1894 ) |
890b229ea0c7
(isearch-ring-adjust): Don't pop the state at the start.
Richard M. Stallman <rms@gnu.org>
parents:
16687
diff
changeset
|
1895 (isearch-push-state)) |
725 | 1896 |
1897 (defun isearch-ring-advance () | |
1898 "Advance to the next search string in the ring." | |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1899 ;; This could be more general to handle a prefix arg, but who would use it. |
725 | 1900 (interactive) |
1901 (isearch-ring-adjust 'advance)) | |
1902 | |
1903 (defun isearch-ring-retreat () | |
1904 "Retreat to the previous search string in the ring." | |
1905 (interactive) | |
1906 (isearch-ring-adjust nil)) | |
1907 | |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1908 (defun isearch-complete1 () |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1909 ;; Helper for isearch-complete and isearch-complete-edit |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1910 ;; Return t if completion OK, nil if no completion exists. |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1911 (let* ((ring (if isearch-regexp regexp-search-ring search-ring)) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1912 (completion-ignore-case case-fold-search) |
50733
f038a895a805
(isearch-complete1): Don't allocate unnecessarily.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49420
diff
changeset
|
1913 (completion (try-completion isearch-string ring))) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1914 (cond |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1915 ((eq completion t) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1916 ;; isearch-string stays the same |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1917 t) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1918 ((or completion ; not nil, must be a string |
13991
0297cd54b530
(isearch-abort, isearch-no-upper-case-p): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
13799
diff
changeset
|
1919 (= 0 (length isearch-string))) ; shouldn't have to say this |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1920 (if (equal completion isearch-string) ;; no extension? |
16566
45e694f5babe
(isearch-complete1): If no completion,
Richard M. Stallman <rms@gnu.org>
parents:
16495
diff
changeset
|
1921 (progn |
45e694f5babe
(isearch-complete1): If no completion,
Richard M. Stallman <rms@gnu.org>
parents:
16495
diff
changeset
|
1922 (if completion-auto-help |
45e694f5babe
(isearch-complete1): If no completion,
Richard M. Stallman <rms@gnu.org>
parents:
16495
diff
changeset
|
1923 (with-output-to-temp-buffer "*Isearch completions*" |
49420
07a876ca33f0
(isearch-forward): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
49069
diff
changeset
|
1924 (display-completion-list |
50733
f038a895a805
(isearch-complete1): Don't allocate unnecessarily.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49420
diff
changeset
|
1925 (all-completions isearch-string ring)))) |
16566
45e694f5babe
(isearch-complete1): If no completion,
Richard M. Stallman <rms@gnu.org>
parents:
16495
diff
changeset
|
1926 t) |
45e694f5babe
(isearch-complete1): If no completion,
Richard M. Stallman <rms@gnu.org>
parents:
16495
diff
changeset
|
1927 (and completion |
45e694f5babe
(isearch-complete1): If no completion,
Richard M. Stallman <rms@gnu.org>
parents:
16495
diff
changeset
|
1928 (setq isearch-string completion)))) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1929 (t |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1930 (message "No completion") ; waits a second if in minibuffer |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1931 nil)))) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1932 |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1933 (defun isearch-complete () |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1934 "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
|
1935 The completed string is then editable in the minibuffer. |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1936 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
|
1937 (interactive) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1938 (if (isearch-complete1) |
50783
f26c6004759f
(isearch-complete): Update isearch-message.
Richard M. Stallman <rms@gnu.org>
parents:
50733
diff
changeset
|
1939 (progn (setq isearch-message |
f26c6004759f
(isearch-complete): Update isearch-message.
Richard M. Stallman <rms@gnu.org>
parents:
50733
diff
changeset
|
1940 (mapconcat 'isearch-text-char-description |
f26c6004759f
(isearch-complete): Update isearch-message.
Richard M. Stallman <rms@gnu.org>
parents:
50733
diff
changeset
|
1941 isearch-string "")) |
f26c6004759f
(isearch-complete): Update isearch-message.
Richard M. Stallman <rms@gnu.org>
parents:
50733
diff
changeset
|
1942 (isearch-edit-string)) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1943 ;; else |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1944 (sit-for 1) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1945 (isearch-update))) |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1946 |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1947 (defun isearch-complete-edit () |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1948 "Same as `isearch-complete' except in the minibuffer." |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1949 (interactive) |
50733
f038a895a805
(isearch-complete1): Don't allocate unnecessarily.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49420
diff
changeset
|
1950 (setq isearch-string (field-string)) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1951 (if (isearch-complete1) |
725 | 1952 (progn |
26350
3b7a732fbde2
(isearch-ring-advance-edit, isearch-complete-edit):
Gerd Moellmann <gerd@gnu.org>
parents:
26335
diff
changeset
|
1953 (delete-field) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1954 (insert isearch-string)))) |
725 | 1955 |
1956 | |
1957 ;; Message string | |
1958 | |
1959 (defun isearch-message (&optional c-q-hack ellipsis) | |
1960 ;; Generate and print the message string. | |
1961 (let ((cursor-in-echo-area ellipsis) | |
91785 | 1962 (cmds isearch-cmds) |
1963 succ-msg m) | |
1964 (while (not (isearch-success-state (car cmds))) (pop cmds)) | |
1965 (setq succ-msg (and cmds (isearch-message-state (car cmds)))) | |
1966 (setq m (concat | |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1967 (isearch-message-prefix c-q-hack ellipsis isearch-nonincremental) |
91785 | 1968 succ-msg |
1969 (and (not isearch-success) | |
1970 (string-match (regexp-quote succ-msg) isearch-message) | |
1971 (not (string= succ-msg isearch-message)) | |
1972 (propertize (substring isearch-message (match-end 0)) | |
1973 'face 'isearch-fail)))) | |
1974 (when (and (not isearch-success) (string-match " +$" m)) | |
1975 (put-text-property (match-beginning 0) (length m) 'face 'trailing-whitespace m)) | |
1976 (setq m (concat m (isearch-message-suffix c-q-hack ellipsis))) | |
1977 (if c-q-hack m (let ((message-log-max nil)) (message "%s" m))))) | |
725 | 1978 |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1979 (defun isearch-message-prefix (&optional c-q-hack ellipsis nonincremental) |
725 | 1980 ;; If about to search, and previous search regexp was invalid, |
1981 ;; check that it still is. If it is valid now, | |
1982 ;; let the message we display while searching say that it is valid. | |
60614
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
1983 (and isearch-error ellipsis |
725 | 1984 (condition-case () |
1985 (progn (re-search-forward isearch-string (point) t) | |
60614
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
1986 (setq isearch-error nil)) |
725 | 1987 (error nil))) |
1988 ;; If currently failing, display no ellipsis. | |
1989 (or isearch-success (setq ellipsis nil)) | |
1990 (let ((m (concat (if isearch-success "" "failing ") | |
56905
661d52db56de
(isearch-toggle-regexp): Set `isearch-success' and `isearch-adjusted' to `t'.
Juri Linkov <juri@jurta.org>
parents:
56868
diff
changeset
|
1991 (if isearch-adjusted "pending " "") |
13254
7ed0775e99af
(isearch-message-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
13112
diff
changeset
|
1992 (if (and isearch-wrapped |
56868
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
1993 (not isearch-wrap-function) |
13254
7ed0775e99af
(isearch-message-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
13112
diff
changeset
|
1994 (if isearch-forward |
7ed0775e99af
(isearch-message-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
13112
diff
changeset
|
1995 (> (point) isearch-opoint) |
7ed0775e99af
(isearch-message-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
13112
diff
changeset
|
1996 (< (point) isearch-opoint))) |
7ed0775e99af
(isearch-message-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
13112
diff
changeset
|
1997 "over") |
725 | 1998 (if isearch-wrapped "wrapped ") |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
1999 (if isearch-word "word " "") |
725 | 2000 (if isearch-regexp "regexp " "") |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
2001 (if nonincremental "search" "I-search") |
17006 | 2002 (if isearch-forward "" " backward") |
19408
7457b6e05a60
(isearch-multibyte-characters-flag): Deleted.
Kenichi Handa <handa@m17n.org>
parents:
19146
diff
changeset
|
2003 (if current-input-method |
7457b6e05a60
(isearch-multibyte-characters-flag): Deleted.
Kenichi Handa <handa@m17n.org>
parents:
19146
diff
changeset
|
2004 (concat " [" current-input-method-title "]: ") |
17006 | 2005 ": ") |
725 | 2006 ))) |
76362
80b69f15b249
(isearch-message-prefix): Undo 2007-03-01 change.
Kim F. Storm <storm@cua.dk>
parents:
76263
diff
changeset
|
2007 (propertize (concat (upcase (substring m 0 1)) (substring m 1)) |
80b69f15b249
(isearch-message-prefix): Undo 2007-03-01 change.
Kim F. Storm <storm@cua.dk>
parents:
76263
diff
changeset
|
2008 'face 'minibuffer-prompt))) |
725 | 2009 |
2010 (defun isearch-message-suffix (&optional c-q-hack ellipsis) | |
2011 (concat (if c-q-hack "^Q" "") | |
60614
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
2012 (if isearch-error |
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
2013 (concat " [" isearch-error "]") |
725 | 2014 ""))) |
2015 | |
2016 | |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2017 ;; Searching |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2018 |
56170
b3821f47a6d4
(isearch-repeat): Avoid testing old match data.
Richard M. Stallman <rms@gnu.org>
parents:
55950
diff
changeset
|
2019 (defvar isearch-search-fun-function nil |
b3821f47a6d4
(isearch-repeat): Avoid testing old match data.
Richard M. Stallman <rms@gnu.org>
parents:
55950
diff
changeset
|
2020 "Override `isearch-search-fun'. |
b3821f47a6d4
(isearch-repeat): Avoid testing old match data.
Richard M. Stallman <rms@gnu.org>
parents:
55950
diff
changeset
|
2021 This function should return the search function for isearch to use. |
b3821f47a6d4
(isearch-repeat): Avoid testing old match data.
Richard M. Stallman <rms@gnu.org>
parents:
55950
diff
changeset
|
2022 It will call this function with three arguments |
b3821f47a6d4
(isearch-repeat): Avoid testing old match data.
Richard M. Stallman <rms@gnu.org>
parents:
55950
diff
changeset
|
2023 as if it were `search-forward'.") |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2024 |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2025 (defun isearch-search-fun () |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2026 "Return the function to use for the search. |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2027 Can be changed via `isearch-search-fun-function' for special needs." |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2028 (if isearch-search-fun-function |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2029 (funcall isearch-search-fun-function) |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2030 (cond |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2031 (isearch-word |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2032 (if isearch-forward 'word-search-forward 'word-search-backward)) |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2033 (isearch-regexp |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2034 (if isearch-forward 're-search-forward 're-search-backward)) |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2035 (t |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2036 (if isearch-forward 'search-forward 'search-backward))))) |
725 | 2037 |
73008
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2038 (defun isearch-search-string (string bound noerror) |
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2039 ;; Search for the first occurance of STRING or its translation. If |
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2040 ;; found, move point to the end of the occurance, update |
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2041 ;; isearch-match-beg and isearch-match-end, and return point. |
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2042 (let ((func (isearch-search-fun)) |
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2043 (len (length string)) |
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2044 pos1 pos2) |
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2045 (setq pos1 (save-excursion (funcall func string bound noerror))) |
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2046 (if (and (char-table-p translation-table-for-input) |
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2047 (> (string-bytes string) len)) |
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2048 (let (translated match-data) |
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2049 (dotimes (i len) |
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2050 (let ((x (aref translation-table-for-input (aref string i)))) |
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2051 (when x |
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2052 (or translated (setq translated (copy-sequence string))) |
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2053 (aset translated i x)))) |
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2054 (when translated |
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2055 (save-match-data |
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2056 (save-excursion |
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2057 (if (setq pos2 (funcall func translated bound noerror)) |
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2058 (setq match-data (match-data t))))) |
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2059 (when (and pos2 |
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2060 (or (not pos1) |
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2061 (if isearch-forward (< pos2 pos1) (> pos2 pos1)))) |
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2062 (setq pos1 pos2) |
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2063 (set-match-data match-data))))) |
85569
6c0aa34f6c37
(isearch-search-string): After finding the next
Juri Linkov <juri@jurta.org>
parents:
83652
diff
changeset
|
2064 (when pos1 |
6c0aa34f6c37
(isearch-search-string): After finding the next
Juri Linkov <juri@jurta.org>
parents:
83652
diff
changeset
|
2065 ;; When using multiple buffers isearch, switch to the new buffer here, |
6c0aa34f6c37
(isearch-search-string): After finding the next
Juri Linkov <juri@jurta.org>
parents:
83652
diff
changeset
|
2066 ;; because `save-excursion' above doesn't allow doing it inside funcall. |
6c0aa34f6c37
(isearch-search-string): After finding the next
Juri Linkov <juri@jurta.org>
parents:
83652
diff
changeset
|
2067 (if (and isearch-buffers-next-buffer-function |
6c0aa34f6c37
(isearch-search-string): After finding the next
Juri Linkov <juri@jurta.org>
parents:
83652
diff
changeset
|
2068 (buffer-live-p isearch-buffers-current-buffer)) |
6c0aa34f6c37
(isearch-search-string): After finding the next
Juri Linkov <juri@jurta.org>
parents:
83652
diff
changeset
|
2069 (switch-to-buffer isearch-buffers-current-buffer)) |
6c0aa34f6c37
(isearch-search-string): After finding the next
Juri Linkov <juri@jurta.org>
parents:
83652
diff
changeset
|
2070 (goto-char pos1)) |
73008
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2071 pos1)) |
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2072 |
725 | 2073 (defun isearch-search () |
2074 ;; Do the search with the current search string. | |
82060
d22a586b6032
(isearch-message-function): New variable.
Juri Linkov <juri@jurta.org>
parents:
82039
diff
changeset
|
2075 (if isearch-message-function |
d22a586b6032
(isearch-message-function): New variable.
Juri Linkov <juri@jurta.org>
parents:
82039
diff
changeset
|
2076 (funcall isearch-message-function nil t) |
d22a586b6032
(isearch-message-function): New variable.
Juri Linkov <juri@jurta.org>
parents:
82039
diff
changeset
|
2077 (isearch-message nil t)) |
7294
4ff0c1e7c8e2
(isearch-case-fold-search): new possible value `yes'
Richard M. Stallman <rms@gnu.org>
parents:
6736
diff
changeset
|
2078 (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
|
2079 (setq isearch-case-fold-search |
ac5c322cea84
(search-upper-case): Make `no-yanks' the default.
Richard M. Stallman <rms@gnu.org>
parents:
3476
diff
changeset
|
2080 (isearch-no-upper-case-p isearch-string isearch-regexp))) |
725 | 2081 (condition-case lossage |
18866
04d56f77da0d
(search-invisible): Fix typo.
Richard M. Stallman <rms@gnu.org>
parents:
18783
diff
changeset
|
2082 (let ((inhibit-point-motion-hooks search-invisible) |
04d56f77da0d
(search-invisible): Fix typo.
Richard M. Stallman <rms@gnu.org>
parents:
18783
diff
changeset
|
2083 (inhibit-quit nil) |
16990
a2fc2ef460e3
(isearch-search): Refuse to match invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
16737
diff
changeset
|
2084 (case-fold-search isearch-case-fold-search) |
58744
5eaafc3a7357
(search-whitespace-regexp): Remove the group. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57380
diff
changeset
|
2085 (search-spaces-regexp search-whitespace-regexp) |
16990
a2fc2ef460e3
(isearch-search): Refuse to match invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
16737
diff
changeset
|
2086 (retry t)) |
60614
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
2087 (setq isearch-error nil) |
16990
a2fc2ef460e3
(isearch-search): Refuse to match invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
16737
diff
changeset
|
2088 (while retry |
a2fc2ef460e3
(isearch-search): Refuse to match invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
16737
diff
changeset
|
2089 (setq isearch-success |
73008
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2090 (isearch-search-string isearch-string nil t)) |
16990
a2fc2ef460e3
(isearch-search): Refuse to match invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
16737
diff
changeset
|
2091 ;; Clear RETRY unless we matched some invisible text |
a2fc2ef460e3
(isearch-search): Refuse to match invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
16737
diff
changeset
|
2092 ;; and we aren't supposed to do that. |
18236
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2093 (if (or (eq search-invisible t) |
16990
a2fc2ef460e3
(isearch-search): Refuse to match invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
16737
diff
changeset
|
2094 (not isearch-success) |
a2fc2ef460e3
(isearch-search): Refuse to match invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
16737
diff
changeset
|
2095 (bobp) (eobp) |
a2fc2ef460e3
(isearch-search): Refuse to match invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
16737
diff
changeset
|
2096 (= (match-beginning 0) (match-end 0)) |
a2fc2ef460e3
(isearch-search): Refuse to match invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
16737
diff
changeset
|
2097 (not (isearch-range-invisible |
a2fc2ef460e3
(isearch-search): Refuse to match invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
16737
diff
changeset
|
2098 (match-beginning 0) (match-end 0)))) |
a2fc2ef460e3
(isearch-search): Refuse to match invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
16737
diff
changeset
|
2099 (setq retry nil))) |
13799
49b7cd70c43c
(isearch-done): Use executing-kbd-macro.
Karl Heuer <kwzh@gnu.org>
parents:
13682
diff
changeset
|
2100 (setq isearch-just-started nil) |
725 | 2101 (if isearch-success |
2102 (setq isearch-other-end | |
2103 (if isearch-forward (match-beginning 0) (match-end 0))))) | |
2104 | |
5196 | 2105 (quit (isearch-unread ?\C-g) |
725 | 2106 (setq isearch-success nil)) |
2107 | |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2108 (invalid-regexp |
60614
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
2109 (setq isearch-error (car (cdr lossage))) |
725 | 2110 (if (string-match |
2111 "\\`Premature \\|\\`Unmatched \\|\\`Invalid " | |
60614
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
2112 isearch-error) |
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
2113 (setq isearch-error "incomplete input"))) |
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
2114 |
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
2115 (search-failed |
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
2116 (setq isearch-success nil) |
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
2117 (setq isearch-error (nth 2 lossage))) |
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
2118 |
1534
dd292c7ef749
(isearch-search): Handle all sorts of errors from regexp search.
Richard M. Stallman <rms@gnu.org>
parents:
1480
diff
changeset
|
2119 (error |
35362
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2120 ;; stack overflow in regexp search. |
60614
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
2121 (setq isearch-error (format "%s" lossage)))) |
725 | 2122 |
2123 (if isearch-success | |
2124 nil | |
2125 ;; Ding if failed this time after succeeding last time. | |
56867
16f3ec82330a
Remove ancient Change Log section.
Juri Linkov <juri@jurta.org>
parents:
56681
diff
changeset
|
2126 (and (isearch-success-state (car isearch-cmds)) |
725 | 2127 (ding)) |
56868
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
2128 (if (functionp (isearch-pop-fun-state (car isearch-cmds))) |
bec9907cc422
* isearch.el (isearch-wrap-function)
Juri Linkov <juri@jurta.org>
parents:
56867
diff
changeset
|
2129 (funcall (isearch-pop-fun-state (car isearch-cmds)) (car isearch-cmds))) |
56867
16f3ec82330a
Remove ancient Change Log section.
Juri Linkov <juri@jurta.org>
parents:
56681
diff
changeset
|
2130 (goto-char (isearch-point-state (car isearch-cmds))))) |
725 | 2131 |
18236
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2132 |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2133 ;; Called when opening an overlay, and we are still in isearch. |
18236
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2134 (defun isearch-open-overlay-temporary (ov) |
49420
07a876ca33f0
(isearch-forward): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
49069
diff
changeset
|
2135 (if (not (null (overlay-get ov 'isearch-open-invisible-temporary))) |
18236
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2136 ;; Some modes would want to open the overlays temporary during |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2137 ;; isearch in their own way, they should set the |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2138 ;; `isearch-open-invisible-temporary' to a function doing this. |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2139 (funcall (overlay-get ov 'isearch-open-invisible-temporary) ov nil) |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2140 ;; Store the values for the `invisible' and `intangible' |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2141 ;; properties, and then set them to nil. This way the text hidden |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2142 ;; by this overlay becomes visible. |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2143 |
35098
63af2c5d55f9
(isearch-lazy-highlight-remove-overlays): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
35083
diff
changeset
|
2144 ;; Do we really need to set the `intangible' property to t? Can we |
18236
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2145 ;; have the point inside an overlay with an `intangible' property? |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2146 ;; In 19.34 this does not exist so I cannot test it. |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2147 (overlay-put ov 'isearch-invisible (overlay-get ov 'invisible)) |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2148 (overlay-put ov 'isearch-intangible (overlay-get ov 'intangible)) |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2149 (overlay-put ov 'invisible nil) |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2150 (overlay-put ov 'intangible nil))) |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2151 |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2152 |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2153 ;; This is called at the end of isearch. It will open the overlays |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2154 ;; that contain the latest match. Obviously in case of a C-g the |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2155 ;; point returns to the original location which surely is not contain |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2156 ;; in any of these overlays, se we are safe in this case too. |
18236
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2157 (defun isearch-open-necessary-overlays (ov) |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2158 (let ((inside-overlay (and (> (point) (overlay-start ov)) |
18236
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2159 (< (point) (overlay-end ov)))) |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2160 ;; If this exists it means that the overlay was opened using |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2161 ;; this function, not by us tweaking the overlay properties. |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2162 (fct-temp (overlay-get ov 'isearch-open-invisible-temporary))) |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2163 (when (or inside-overlay (not fct-temp)) |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2164 ;; restore the values for the `invisible' and `intangible' |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2165 ;; properties |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2166 (overlay-put ov 'invisible (overlay-get ov 'isearch-invisible)) |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2167 (overlay-put ov 'intangible (overlay-get ov 'isearch-intangible)) |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2168 (overlay-put ov 'isearch-invisible nil) |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2169 (overlay-put ov 'isearch-intangible nil)) |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2170 (if inside-overlay |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2171 (funcall (overlay-get ov 'isearch-open-invisible) ov) |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2172 (if fct-temp |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2173 (funcall fct-temp ov t))))) |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2174 |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2175 ;; This is called when exiting isearch. It closes the temporary |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2176 ;; opened overlays, except the ones that contain the latest match. |
18236
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2177 (defun isearch-clean-overlays () |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2178 (when isearch-opened-overlays |
33704
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
2179 (mapc 'isearch-open-necessary-overlays isearch-opened-overlays) |
18236
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2180 (setq isearch-opened-overlays nil))) |
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2181 |
39189
45d6d104c4f2
(isearch-intersects-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
39047
diff
changeset
|
2182 |
45d6d104c4f2
(isearch-intersects-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
39047
diff
changeset
|
2183 (defun isearch-intersects-p (start0 end0 start1 end1) |
45d6d104c4f2
(isearch-intersects-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
39047
diff
changeset
|
2184 "Return t if regions START0..END0 and START1..END1 intersect." |
39256
cc4b3cf1bfcd
(isearch-intersects-p): Fix end checks.
Gerd Moellmann <gerd@gnu.org>
parents:
39189
diff
changeset
|
2185 (or (and (>= start0 start1) (< start0 end1)) |
cc4b3cf1bfcd
(isearch-intersects-p): Fix end checks.
Gerd Moellmann <gerd@gnu.org>
parents:
39189
diff
changeset
|
2186 (and (> end0 start1) (<= end0 end1)) |
cc4b3cf1bfcd
(isearch-intersects-p): Fix end checks.
Gerd Moellmann <gerd@gnu.org>
parents:
39189
diff
changeset
|
2187 (and (>= start1 start0) (< start1 end0)) |
cc4b3cf1bfcd
(isearch-intersects-p): Fix end checks.
Gerd Moellmann <gerd@gnu.org>
parents:
39189
diff
changeset
|
2188 (and (> end1 start0) (<= end1 end0)))) |
39189
45d6d104c4f2
(isearch-intersects-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
39047
diff
changeset
|
2189 |
45d6d104c4f2
(isearch-intersects-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
39047
diff
changeset
|
2190 |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2191 ;; Verify if the current match is outside of each element of |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2192 ;; `isearch-opened-overlays', if so close that overlay. |
39189
45d6d104c4f2
(isearch-intersects-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
39047
diff
changeset
|
2193 |
45d6d104c4f2
(isearch-intersects-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
39047
diff
changeset
|
2194 (defun isearch-close-unnecessary-overlays (begin end) |
45d6d104c4f2
(isearch-intersects-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
39047
diff
changeset
|
2195 (let ((overlays isearch-opened-overlays)) |
18236
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2196 (setq isearch-opened-overlays nil) |
39189
45d6d104c4f2
(isearch-intersects-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
39047
diff
changeset
|
2197 (dolist (ov overlays) |
45d6d104c4f2
(isearch-intersects-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
39047
diff
changeset
|
2198 (if (isearch-intersects-p begin end (overlay-start ov) (overlay-end ov)) |
45d6d104c4f2
(isearch-intersects-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
39047
diff
changeset
|
2199 (push ov isearch-opened-overlays) |
45d6d104c4f2
(isearch-intersects-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
39047
diff
changeset
|
2200 (let ((fct-temp (overlay-get ov 'isearch-open-invisible-temporary))) |
45d6d104c4f2
(isearch-intersects-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
39047
diff
changeset
|
2201 (if fct-temp |
45d6d104c4f2
(isearch-intersects-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
39047
diff
changeset
|
2202 ;; If this exists it means that the overlay was opened |
45d6d104c4f2
(isearch-intersects-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
39047
diff
changeset
|
2203 ;; using this function, not by us tweaking the overlay |
45d6d104c4f2
(isearch-intersects-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
39047
diff
changeset
|
2204 ;; properties. |
45d6d104c4f2
(isearch-intersects-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
39047
diff
changeset
|
2205 (funcall fct-temp ov t) |
45d6d104c4f2
(isearch-intersects-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
39047
diff
changeset
|
2206 (overlay-put ov 'invisible (overlay-get ov 'isearch-invisible)) |
45d6d104c4f2
(isearch-intersects-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
39047
diff
changeset
|
2207 (overlay-put ov 'intangible (overlay-get ov 'isearch-intangible)) |
45d6d104c4f2
(isearch-intersects-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
39047
diff
changeset
|
2208 (overlay-put ov 'isearch-invisible nil) |
45d6d104c4f2
(isearch-intersects-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
39047
diff
changeset
|
2209 (overlay-put ov 'isearch-intangible nil))))))) |
45d6d104c4f2
(isearch-intersects-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
39047
diff
changeset
|
2210 |
18236
f249cd470d71
(isearch-hide-immediately): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18037
diff
changeset
|
2211 |
16990
a2fc2ef460e3
(isearch-search): Refuse to match invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
16737
diff
changeset
|
2212 (defun isearch-range-invisible (beg end) |
18866
04d56f77da0d
(search-invisible): Fix typo.
Richard M. Stallman <rms@gnu.org>
parents:
18783
diff
changeset
|
2213 "Return t if all the text from BEG to END is invisible." |
48201
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2214 (when (/= beg end) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2215 ;; Check that invisibility runs up to END. |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2216 (save-excursion |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2217 (goto-char beg) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2218 (let (;; can-be-opened keeps track if we can open some overlays. |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2219 (can-be-opened (eq search-invisible 'open)) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2220 ;; the list of overlays that could be opened |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2221 (crt-overlays nil)) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2222 (when (and can-be-opened isearch-hide-immediately) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2223 (isearch-close-unnecessary-overlays beg end)) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2224 ;; If the following character is currently invisible, |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2225 ;; skip all characters with that same `invisible' property value. |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2226 ;; Do that over and over. |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2227 (while (and (< (point) end) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2228 (let ((prop |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2229 (get-char-property (point) 'invisible))) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2230 (if (eq buffer-invisibility-spec t) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2231 prop |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2232 (or (memq prop buffer-invisibility-spec) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2233 (assq prop buffer-invisibility-spec))))) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2234 (if (get-text-property (point) 'invisible) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2235 (progn |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2236 (goto-char (next-single-property-change (point) 'invisible |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2237 nil end)) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2238 ;; if text is hidden by an `invisible' text property |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2239 ;; we cannot open it at all. |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2240 (setq can-be-opened nil)) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2241 (when can-be-opened |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2242 (let ((overlays (overlays-at (point))) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2243 ov-list |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2244 o |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2245 invis-prop) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2246 (while overlays |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2247 (setq o (car overlays) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2248 invis-prop (overlay-get o 'invisible)) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2249 (if (if (eq buffer-invisibility-spec t) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2250 invis-prop |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2251 (or (memq invis-prop buffer-invisibility-spec) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2252 (assq invis-prop buffer-invisibility-spec))) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2253 (if (overlay-get o 'isearch-open-invisible) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2254 (setq ov-list (cons o ov-list)) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2255 ;; We found one overlay that cannot be |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2256 ;; opened, that means the whole chunk |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2257 ;; cannot be opened. |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2258 (setq can-be-opened nil))) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2259 (setq overlays (cdr overlays))) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2260 (if can-be-opened |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2261 ;; It makes sense to append to the open |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2262 ;; overlays list only if we know that this is |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2263 ;; t. |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2264 (setq crt-overlays (append ov-list crt-overlays))))) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2265 (goto-char (next-overlay-change (point))))) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2266 ;; See if invisibility reaches up thru END. |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2267 (if (>= (point) end) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2268 (if (and can-be-opened (consp crt-overlays)) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2269 (progn |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2270 (setq isearch-opened-overlays |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2271 (append isearch-opened-overlays crt-overlays)) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2272 (mapc 'isearch-open-overlay-temporary crt-overlays) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2273 nil) |
f233dc0ca0aa
(isearch-hidden): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47341
diff
changeset
|
2274 (setq isearch-hidden t))))))) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
2275 |
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
2276 |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2277 ;; General utilities |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
2278 |
3526
ac5c322cea84
(search-upper-case): Make `no-yanks' the default.
Richard M. Stallman <rms@gnu.org>
parents:
3476
diff
changeset
|
2279 (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
|
2280 "Return t if there are no upper case chars in STRING. |
13991
0297cd54b530
(isearch-abort, isearch-no-upper-case-p): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
13799
diff
changeset
|
2281 If REGEXP-FLAG is non-nil, disregard letters preceded by `\\' (but not `\\\\') |
3526
ac5c322cea84
(search-upper-case): Make `no-yanks' the default.
Richard M. Stallman <rms@gnu.org>
parents:
3476
diff
changeset
|
2282 since they have special meaning in a regexp." |
49420
07a876ca33f0
(isearch-forward): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
49069
diff
changeset
|
2283 (let (quote-flag (i 0) (len (length string)) found) |
16635
1b774e82752f
(isearch-no-upper-case-p): Use downcase
Richard M. Stallman <rms@gnu.org>
parents:
16620
diff
changeset
|
2284 (while (and (not found) (< i len)) |
1b774e82752f
(isearch-no-upper-case-p): Use downcase
Richard M. Stallman <rms@gnu.org>
parents:
16620
diff
changeset
|
2285 (let ((char (aref string i))) |
1b774e82752f
(isearch-no-upper-case-p): Use downcase
Richard M. Stallman <rms@gnu.org>
parents:
16620
diff
changeset
|
2286 (if (and regexp-flag (eq char ?\\)) |
1b774e82752f
(isearch-no-upper-case-p): Use downcase
Richard M. Stallman <rms@gnu.org>
parents:
16620
diff
changeset
|
2287 (setq quote-flag (not quote-flag)) |
1b774e82752f
(isearch-no-upper-case-p): Use downcase
Richard M. Stallman <rms@gnu.org>
parents:
16620
diff
changeset
|
2288 (if (and (not quote-flag) (not (eq char (downcase char)))) |
48775
25ef28e528f4
(isearch-no-upper-case-p): \\ only quotes one character.
Richard M. Stallman <rms@gnu.org>
parents:
48206
diff
changeset
|
2289 (setq found t)) |
25ef28e528f4
(isearch-no-upper-case-p): \\ only quotes one character.
Richard M. Stallman <rms@gnu.org>
parents:
48206
diff
changeset
|
2290 (setq quote-flag nil))) |
16635
1b774e82752f
(isearch-no-upper-case-p): Use downcase
Richard M. Stallman <rms@gnu.org>
parents:
16620
diff
changeset
|
2291 (setq i (1+ i))) |
75258
38cd68f9ba51
(isearch-no-upper-case-p): Look for [:upper:] as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75025
diff
changeset
|
2292 (not (or found |
38cd68f9ba51
(isearch-no-upper-case-p): Look for [:upper:] as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75025
diff
changeset
|
2293 ;; Even if there's no uppercase char, we want to detect the use |
38cd68f9ba51
(isearch-no-upper-case-p): Look for [:upper:] as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75025
diff
changeset
|
2294 ;; of [:upper:] or [:lower:] char-class, which indicates |
38cd68f9ba51
(isearch-no-upper-case-p): Look for [:upper:] as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75025
diff
changeset
|
2295 ;; clearly that the user cares about case distinction. |
38cd68f9ba51
(isearch-no-upper-case-p): Look for [:upper:] as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75025
diff
changeset
|
2296 (and regexp-flag (string-match "\\[:\\(upp\\|low\\)er:]" string) |
38cd68f9ba51
(isearch-no-upper-case-p): Look for [:upper:] as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75025
diff
changeset
|
2297 (condition-case err |
38cd68f9ba51
(isearch-no-upper-case-p): Look for [:upper:] as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75025
diff
changeset
|
2298 (progn |
38cd68f9ba51
(isearch-no-upper-case-p): Look for [:upper:] as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75025
diff
changeset
|
2299 (string-match (substring string 0 (match-beginning 0)) |
38cd68f9ba51
(isearch-no-upper-case-p): Look for [:upper:] as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75025
diff
changeset
|
2300 "") |
38cd68f9ba51
(isearch-no-upper-case-p): Look for [:upper:] as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75025
diff
changeset
|
2301 nil) |
38cd68f9ba51
(isearch-no-upper-case-p): Look for [:upper:] as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75025
diff
changeset
|
2302 (invalid-regexp |
38cd68f9ba51
(isearch-no-upper-case-p): Look for [:upper:] as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75025
diff
changeset
|
2303 (equal "Unmatched [ or [^" (cadr err))))))))) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
2304 |
3526
ac5c322cea84
(search-upper-case): Make `no-yanks' the default.
Richard M. Stallman <rms@gnu.org>
parents:
3476
diff
changeset
|
2305 ;; Portability functions to support various Emacs versions. |
725 | 2306 |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
2307 (defun isearch-text-char-description (c) |
31974
9b1d5a50bddd
(isearch-text-char-description): Pointless rewrite.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30476
diff
changeset
|
2308 (cond |
64665
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
2309 ((< c ?\s) (format "^%c" (+ c 64))) |
31974
9b1d5a50bddd
(isearch-text-char-description): Pointless rewrite.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30476
diff
changeset
|
2310 ((= c ?\^?) "^?") |
9b1d5a50bddd
(isearch-text-char-description): Pointless rewrite.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30476
diff
changeset
|
2311 (t (char-to-string c)))) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
2312 |
9934
4c3ab9b8d1a9
(isearch-unread): Always use unread-command-events.
Richard M. Stallman <rms@gnu.org>
parents:
9768
diff
changeset
|
2313 ;; General function to unread characters or events. |
13799
49b7cd70c43c
(isearch-done): Use executing-kbd-macro.
Karl Heuer <kwzh@gnu.org>
parents:
13682
diff
changeset
|
2314 ;; Also insert them in a keyboard macro being defined. |
2031
f2dbfd43a1c5
(isearch-unread): Handle multiple args.
Richard M. Stallman <rms@gnu.org>
parents:
1885
diff
changeset
|
2315 (defun isearch-unread (&rest char-or-events) |
33704
f14d787f4b33
(isearch-mode-map): Fix docstring. Init in defvar.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32402
diff
changeset
|
2316 (mapc 'store-kbd-macro-event char-or-events) |
9934
4c3ab9b8d1a9
(isearch-unread): Always use unread-command-events.
Richard M. Stallman <rms@gnu.org>
parents:
9768
diff
changeset
|
2317 (setq unread-command-events |
4c3ab9b8d1a9
(isearch-unread): Always use unread-command-events.
Richard M. Stallman <rms@gnu.org>
parents:
9768
diff
changeset
|
2318 (append char-or-events unread-command-events))) |
1142
7fc9de9d8cef
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
853
diff
changeset
|
2319 |
26408 | 2320 |
59478
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
2321 ;; Highlighting |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
2322 |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
2323 (defvar isearch-overlay nil) |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
2324 |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
2325 (defun isearch-highlight (beg end) |
67425
98dba3ad8a8a
(isearch-highlight): Change main overlay priority from 1 to 1001. Simplify.
Juri Linkov <juri@jurta.org>
parents:
67229
diff
changeset
|
2326 (if search-highlight |
98dba3ad8a8a
(isearch-highlight): Change main overlay priority from 1 to 1001. Simplify.
Juri Linkov <juri@jurta.org>
parents:
67229
diff
changeset
|
2327 (if isearch-overlay |
98dba3ad8a8a
(isearch-highlight): Change main overlay priority from 1 to 1001. Simplify.
Juri Linkov <juri@jurta.org>
parents:
67229
diff
changeset
|
2328 ;; Overlay already exists, just move it. |
98dba3ad8a8a
(isearch-highlight): Change main overlay priority from 1 to 1001. Simplify.
Juri Linkov <juri@jurta.org>
parents:
67229
diff
changeset
|
2329 (move-overlay isearch-overlay beg end (current-buffer)) |
98dba3ad8a8a
(isearch-highlight): Change main overlay priority from 1 to 1001. Simplify.
Juri Linkov <juri@jurta.org>
parents:
67229
diff
changeset
|
2330 ;; Overlay doesn't exist, create it. |
98dba3ad8a8a
(isearch-highlight): Change main overlay priority from 1 to 1001. Simplify.
Juri Linkov <juri@jurta.org>
parents:
67229
diff
changeset
|
2331 (setq isearch-overlay (make-overlay beg end)) |
98dba3ad8a8a
(isearch-highlight): Change main overlay priority from 1 to 1001. Simplify.
Juri Linkov <juri@jurta.org>
parents:
67229
diff
changeset
|
2332 ;; 1001 is higher than lazy's 1000 and ediff's 100+ |
98dba3ad8a8a
(isearch-highlight): Change main overlay priority from 1 to 1001. Simplify.
Juri Linkov <juri@jurta.org>
parents:
67229
diff
changeset
|
2333 (overlay-put isearch-overlay 'priority 1001) |
98dba3ad8a8a
(isearch-highlight): Change main overlay priority from 1 to 1001. Simplify.
Juri Linkov <juri@jurta.org>
parents:
67229
diff
changeset
|
2334 (overlay-put isearch-overlay 'face isearch)))) |
59478
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
2335 |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
2336 (defun isearch-dehighlight () |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
2337 (when isearch-overlay |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
2338 (delete-overlay isearch-overlay))) |
f71796591aa0
(search-highlight, isearch, isearch-lazy-highlight):
Juri Linkov <juri@jurta.org>
parents:
59387
diff
changeset
|
2339 |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2340 ;; isearch-lazy-highlight feature |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2341 ;; by Bob Glickstein <http://www.zanshin.com/~bobg/> |
26408 | 2342 |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2343 ;; When active, *every* match for the current search string is |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2344 ;; highlighted: the current one using the normal isearch match color |
59386
89c73b450bcc
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-12
Miles Bader <miles@gnu.org>
parents:
59379
diff
changeset
|
2345 ;; and all the others using `isearch-lazy-highlight'. The extra |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2346 ;; highlighting makes it easier to anticipate where the cursor will |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2347 ;; land each time you press C-s or C-r to repeat a pending search. |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2348 ;; Highlighting of these additional matches happens in a deferred |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2349 ;; fashion using "idle timers," so the cycles needed do not rob |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2350 ;; isearch of its usual snappy response. |
26408 | 2351 |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2352 ;; IMPLEMENTATION NOTE: This depends on some isearch internals. |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2353 ;; Specifically: |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2354 ;; - `isearch-update' is expected to be called (at least) every time |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2355 ;; the search string or window-start changes; |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2356 ;; - `isearch-string' is expected to contain the current search |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2357 ;; string as entered by the user; |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2358 ;; - the type of the current search is expected to be given by |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2359 ;; `isearch-word' and `isearch-regexp'; |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2360 ;; - the direction of the current search is expected to be given by |
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2361 ;; `isearch-forward'; |
60614
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
2362 ;; - the variable `isearch-error' is expected to be true |
78492
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
2363 ;; only if `isearch-string' is an invalid regexp. |
26408 | 2364 |
2365 (defvar isearch-lazy-highlight-overlays nil) | |
35362
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2366 (defvar isearch-lazy-highlight-wrapped nil) |
60098
adba0765157c
(isearch-lazy-highlight-start-limit)
Richard M. Stallman <rms@gnu.org>
parents:
59478
diff
changeset
|
2367 (defvar isearch-lazy-highlight-start-limit nil) |
adba0765157c
(isearch-lazy-highlight-start-limit)
Richard M. Stallman <rms@gnu.org>
parents:
59478
diff
changeset
|
2368 (defvar isearch-lazy-highlight-end-limit nil) |
26408 | 2369 (defvar isearch-lazy-highlight-start nil) |
2370 (defvar isearch-lazy-highlight-end nil) | |
2371 (defvar isearch-lazy-highlight-timer nil) | |
2372 (defvar isearch-lazy-highlight-last-string nil) | |
35362
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2373 (defvar isearch-lazy-highlight-window nil) |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2374 (defvar isearch-lazy-highlight-window-start nil) |
52965
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
2375 (defvar isearch-lazy-highlight-window-end nil) |
35458
52a68daf83b8
(isearch-lazy-highlight-case-fold-search)
Gerd Moellmann <gerd@gnu.org>
parents:
35454
diff
changeset
|
2376 (defvar isearch-lazy-highlight-case-fold-search nil) |
52a68daf83b8
(isearch-lazy-highlight-case-fold-search)
Gerd Moellmann <gerd@gnu.org>
parents:
35454
diff
changeset
|
2377 (defvar isearch-lazy-highlight-regexp nil) |
75920
e78fc0d23669
(isearch-lazy-highlight-space-regexp): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
75258
diff
changeset
|
2378 (defvar isearch-lazy-highlight-space-regexp nil) |
26408 | 2379 |
60706
c102b0eb3db5
(lazy-highlight-cleanup) <command>: Rename from
Juri Linkov <juri@jurta.org>
parents:
60672
diff
changeset
|
2380 (defun lazy-highlight-cleanup (&optional force) |
35362
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2381 "Stop lazy highlighting and remove extra highlighting from current buffer. |
59340
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
2382 FORCE non-nil means do it whether or not `lazy-highlight-cleanup' |
35362
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2383 is nil. This function is called when exiting an incremental search if |
59340
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
2384 `lazy-highlight-cleanup' is non-nil." |
35362
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2385 (interactive '(t)) |
59340
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
2386 (if (or force lazy-highlight-cleanup) |
35362
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2387 (while isearch-lazy-highlight-overlays |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2388 (delete-overlay (car isearch-lazy-highlight-overlays)) |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2389 (setq isearch-lazy-highlight-overlays |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2390 (cdr isearch-lazy-highlight-overlays)))) |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2391 (when isearch-lazy-highlight-timer |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2392 (cancel-timer isearch-lazy-highlight-timer) |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2393 (setq isearch-lazy-highlight-timer nil))) |
26408 | 2394 |
64665
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
2395 (define-obsolete-function-alias 'isearch-lazy-highlight-cleanup |
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
2396 'lazy-highlight-cleanup |
abb5bceb3f58
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
Juanma Barranquero <lekktu@gmail.com>
parents:
64502
diff
changeset
|
2397 "22.1") |
60706
c102b0eb3db5
(lazy-highlight-cleanup) <command>: Rename from
Juri Linkov <juri@jurta.org>
parents:
60672
diff
changeset
|
2398 |
60712
d37e83a20683
(isearch-lazy-highlight-new-loop):
Juri Linkov <juri@jurta.org>
parents:
60706
diff
changeset
|
2399 (defun isearch-lazy-highlight-new-loop (&optional beg end) |
59340
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
2400 "Cleanup any previous `lazy-highlight' loop and begin a new one. |
60098
adba0765157c
(isearch-lazy-highlight-start-limit)
Richard M. Stallman <rms@gnu.org>
parents:
59478
diff
changeset
|
2401 BEG and END specify the bounds within which highlighting should occur. |
adba0765157c
(isearch-lazy-highlight-start-limit)
Richard M. Stallman <rms@gnu.org>
parents:
59478
diff
changeset
|
2402 This is called when `isearch-update' is invoked (which can cause the |
adba0765157c
(isearch-lazy-highlight-start-limit)
Richard M. Stallman <rms@gnu.org>
parents:
59478
diff
changeset
|
2403 search string to change or the window to scroll). It is also used |
adba0765157c
(isearch-lazy-highlight-start-limit)
Richard M. Stallman <rms@gnu.org>
parents:
59478
diff
changeset
|
2404 by other Emacs features." |
58972
71d0bc7835fb
(isearch-update): Test isearch-lazy-highlight
Juri Linkov <juri@jurta.org>
parents:
58911
diff
changeset
|
2405 (when (and (null executing-kbd-macro) |
35362
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2406 (sit-for 0) ;make sure (window-start) is credible |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2407 (or (not (equal isearch-string |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2408 isearch-lazy-highlight-last-string)) |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2409 (not (eq (selected-window) |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2410 isearch-lazy-highlight-window)) |
35458
52a68daf83b8
(isearch-lazy-highlight-case-fold-search)
Gerd Moellmann <gerd@gnu.org>
parents:
35454
diff
changeset
|
2411 (not (eq isearch-lazy-highlight-case-fold-search |
52a68daf83b8
(isearch-lazy-highlight-case-fold-search)
Gerd Moellmann <gerd@gnu.org>
parents:
35454
diff
changeset
|
2412 isearch-case-fold-search)) |
52a68daf83b8
(isearch-lazy-highlight-case-fold-search)
Gerd Moellmann <gerd@gnu.org>
parents:
35454
diff
changeset
|
2413 (not (eq isearch-lazy-highlight-regexp |
52a68daf83b8
(isearch-lazy-highlight-case-fold-search)
Gerd Moellmann <gerd@gnu.org>
parents:
35454
diff
changeset
|
2414 isearch-regexp)) |
35362
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2415 (not (= (window-start) |
52965
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
2416 isearch-lazy-highlight-window-start)) |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
2417 (not (= (window-end) ; Window may have been split/joined. |
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
2418 isearch-lazy-highlight-window-end)))) |
35362
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2419 ;; something important did indeed change |
60706
c102b0eb3db5
(lazy-highlight-cleanup) <command>: Rename from
Juri Linkov <juri@jurta.org>
parents:
60672
diff
changeset
|
2420 (lazy-highlight-cleanup t) ;kill old loop & remove overlays |
60614
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
2421 (when (not isearch-error) |
60098
adba0765157c
(isearch-lazy-highlight-start-limit)
Richard M. Stallman <rms@gnu.org>
parents:
59478
diff
changeset
|
2422 (setq isearch-lazy-highlight-start-limit beg |
adba0765157c
(isearch-lazy-highlight-start-limit)
Richard M. Stallman <rms@gnu.org>
parents:
59478
diff
changeset
|
2423 isearch-lazy-highlight-end-limit end) |
35362
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2424 (setq isearch-lazy-highlight-window (selected-window) |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2425 isearch-lazy-highlight-window-start (window-start) |
52965
0f3d00e06554
(isearch-unread-key-sequence): New function, extracted from
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
2426 isearch-lazy-highlight-window-end (window-end) |
35362
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2427 isearch-lazy-highlight-start (point) |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2428 isearch-lazy-highlight-end (point) |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2429 isearch-lazy-highlight-last-string isearch-string |
35458
52a68daf83b8
(isearch-lazy-highlight-case-fold-search)
Gerd Moellmann <gerd@gnu.org>
parents:
35454
diff
changeset
|
2430 isearch-lazy-highlight-case-fold-search isearch-case-fold-search |
52a68daf83b8
(isearch-lazy-highlight-case-fold-search)
Gerd Moellmann <gerd@gnu.org>
parents:
35454
diff
changeset
|
2431 isearch-lazy-highlight-regexp isearch-regexp |
75920
e78fc0d23669
(isearch-lazy-highlight-space-regexp): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
75258
diff
changeset
|
2432 isearch-lazy-highlight-wrapped nil |
e78fc0d23669
(isearch-lazy-highlight-space-regexp): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
75258
diff
changeset
|
2433 isearch-lazy-highlight-space-regexp search-whitespace-regexp) |
56938
4fb2d507742d
(isearch-lazy-highlight-new-loop): Don't invoke
Richard M. Stallman <rms@gnu.org>
parents:
56905
diff
changeset
|
2434 (unless (equal isearch-string "") |
4fb2d507742d
(isearch-lazy-highlight-new-loop): Don't invoke
Richard M. Stallman <rms@gnu.org>
parents:
56905
diff
changeset
|
2435 (setq isearch-lazy-highlight-timer |
59340
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
2436 (run-with-idle-timer lazy-highlight-initial-delay nil |
56938
4fb2d507742d
(isearch-lazy-highlight-new-loop): Don't invoke
Richard M. Stallman <rms@gnu.org>
parents:
56905
diff
changeset
|
2437 'isearch-lazy-highlight-update)))))) |
35012
444b43c38978
Do highlighting of alternative matches all at once,
Richard M. Stallman <rms@gnu.org>
parents:
34603
diff
changeset
|
2438 |
35362
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2439 (defun isearch-lazy-highlight-search () |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2440 "Search ahead for the next or previous match, for lazy highlighting. |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2441 Attempt to do the search exactly the way the pending isearch would." |
60712
d37e83a20683
(isearch-lazy-highlight-new-loop):
Juri Linkov <juri@jurta.org>
parents:
60706
diff
changeset
|
2442 (let ((case-fold-search isearch-lazy-highlight-case-fold-search) |
d37e83a20683
(isearch-lazy-highlight-new-loop):
Juri Linkov <juri@jurta.org>
parents:
60706
diff
changeset
|
2443 (isearch-regexp isearch-lazy-highlight-regexp) |
75920
e78fc0d23669
(isearch-lazy-highlight-space-regexp): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
75258
diff
changeset
|
2444 (search-spaces-regexp isearch-lazy-highlight-space-regexp)) |
60614
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
2445 (condition-case nil |
73008
163ae35e835d
(isearch-process-search-char): Cancel the previous
Kenichi Handa <handa@m17n.org>
parents:
71737
diff
changeset
|
2446 (isearch-search-string |
60712
d37e83a20683
(isearch-lazy-highlight-new-loop):
Juri Linkov <juri@jurta.org>
parents:
60706
diff
changeset
|
2447 isearch-lazy-highlight-last-string |
60614
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
2448 (if isearch-forward |
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
2449 (min (or isearch-lazy-highlight-end-limit (point-max)) |
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
2450 (if isearch-lazy-highlight-wrapped |
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
2451 isearch-lazy-highlight-start |
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
2452 (window-end))) |
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
2453 (max (or isearch-lazy-highlight-start-limit (point-min)) |
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
2454 (if isearch-lazy-highlight-wrapped |
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
2455 isearch-lazy-highlight-end |
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
2456 (window-start)))) |
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
2457 t) |
50f2c823523a
(isearch-error): New variable.
Juri Linkov <juri@jurta.org>
parents:
60173
diff
changeset
|
2458 (error nil)))) |
26408 | 2459 |
2460 (defun isearch-lazy-highlight-update () | |
35362
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2461 "Update highlighting of other matches for current search." |
59340
eb4a4bdb4f0f
(lazy-highlight): Group renamed from isearch-lazy-...
Richard M. Stallman <rms@gnu.org>
parents:
58972
diff
changeset
|
2462 (let ((max lazy-highlight-max-at-a-time) |
35362
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2463 (looping t) |
f6b85f5a5397
(isearch-highlight): Set isearch-overlay priority to
Gerd Moellmann <gerd@gnu.org>
parents:
35344
diff
changeset
|
2464 nomore) |
58911
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2465 (with-local-quit |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2466 (save-selected-window |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2467 (if (and (window-live-p isearch-lazy-highlight-window) |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2468 (not (eq (selected-window) isearch-lazy-highlight-window))) |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2469 (select-window isearch-lazy-highlight-window)) |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2470 (save-excursion |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2471 (save-match-data |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2472 (goto-char (if isearch-forward |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2473 isearch-lazy-highlight-end |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2474 isearch-lazy-highlight-start)) |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2475 (while looping |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2476 (let ((found (isearch-lazy-highlight-search))) |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2477 (when max |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2478 (setq max (1- max)) |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2479 (if (<= max 0) |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2480 (setq looping nil))) |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2481 (if found |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2482 (let ((mb (match-beginning 0)) |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2483 (me (match-end 0))) |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2484 (if (= mb me) ;zero-length match |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2485 (if isearch-forward |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2486 (if (= mb (if isearch-lazy-highlight-wrapped |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2487 isearch-lazy-highlight-start |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2488 (window-end))) |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2489 (setq found nil) |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2490 (forward-char 1)) |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2491 (if (= mb (if isearch-lazy-highlight-wrapped |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2492 isearch-lazy-highlight-end |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2493 (window-start))) |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2494 (setq found nil) |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2495 (forward-char -1))) |
32402
b8defc3b27e2
(isearch-set-lazy-highlight-faces-at): New function.
Miles Bader <miles@gnu.org>
parents:
32083
diff
changeset
|
2496 |
58911
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2497 ;; non-zero-length match |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2498 (let ((ov (make-overlay mb me))) |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2499 (push ov isearch-lazy-highlight-overlays) |
67425
98dba3ad8a8a
(isearch-highlight): Change main overlay priority from 1 to 1001. Simplify.
Juri Linkov <juri@jurta.org>
parents:
67229
diff
changeset
|
2500 ;; 1000 is higher than ediff's 100+, |
98dba3ad8a8a
(isearch-highlight): Change main overlay priority from 1 to 1001. Simplify.
Juri Linkov <juri@jurta.org>
parents:
67229
diff
changeset
|
2501 ;; but lower than isearch main overlay's 1001 |
98dba3ad8a8a
(isearch-highlight): Change main overlay priority from 1 to 1001. Simplify.
Juri Linkov <juri@jurta.org>
parents:
67229
diff
changeset
|
2502 (overlay-put ov 'priority 1000) |
60706
c102b0eb3db5
(lazy-highlight-cleanup) <command>: Rename from
Juri Linkov <juri@jurta.org>
parents:
60672
diff
changeset
|
2503 (overlay-put ov 'face lazy-highlight-face) |
58911
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2504 (overlay-put ov 'window (selected-window)))) |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2505 (if isearch-forward |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2506 (setq isearch-lazy-highlight-end (point)) |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2507 (setq isearch-lazy-highlight-start (point))))) |
32083
b716f8518dd7
(isearch-lazy-highlight-update): Don't put a lazy
Gerd Moellmann <gerd@gnu.org>
parents:
32080
diff
changeset
|
2508 |
58911
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2509 ;; not found or zero-length match at the search bound |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2510 (if (not found) |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2511 (if isearch-lazy-highlight-wrapped |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2512 (setq looping nil |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2513 nomore t) |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2514 (setq isearch-lazy-highlight-wrapped t) |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2515 (if isearch-forward |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2516 (progn |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2517 (setq isearch-lazy-highlight-end (window-start)) |
60098
adba0765157c
(isearch-lazy-highlight-start-limit)
Richard M. Stallman <rms@gnu.org>
parents:
59478
diff
changeset
|
2518 (goto-char (max (or isearch-lazy-highlight-start-limit (point-min)) |
adba0765157c
(isearch-lazy-highlight-start-limit)
Richard M. Stallman <rms@gnu.org>
parents:
59478
diff
changeset
|
2519 (window-start)))) |
58911
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2520 (setq isearch-lazy-highlight-start (window-end)) |
60098
adba0765157c
(isearch-lazy-highlight-start-limit)
Richard M. Stallman <rms@gnu.org>
parents:
59478
diff
changeset
|
2521 (goto-char (min (or isearch-lazy-highlight-end-limit (point-max)) |
adba0765157c
(isearch-lazy-highlight-start-limit)
Richard M. Stallman <rms@gnu.org>
parents:
59478
diff
changeset
|
2522 (window-end)))))))) |
58911
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2523 (unless nomore |
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2524 (setq isearch-lazy-highlight-timer |
59387
9ecc0aa7a55a
(isearch-lazy-highlight-update): Rename
Juri Linkov <juri@jurta.org>
parents:
59386
diff
changeset
|
2525 (run-at-time lazy-highlight-interval nil |
58911
50c8d5bb29a0
(isearch-edit-string): Set 7th arg of
Juri Linkov <juri@jurta.org>
parents:
58882
diff
changeset
|
2526 'isearch-lazy-highlight-update))))))))) |
26408 | 2527 |
85720
79ffe1cb3583
(isearch-other-meta-char): Call `isearch-edit-string' when mouse is
Juri Linkov <juri@jurta.org>
parents:
85569
diff
changeset
|
2528 (defun isearch-resume (string regexp word forward message case-fold) |
30476
26fe451fc5f7
(isearch-resume): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29377
diff
changeset
|
2529 "Resume an incremental search. |
85720
79ffe1cb3583
(isearch-other-meta-char): Call `isearch-edit-string' when mouse is
Juri Linkov <juri@jurta.org>
parents:
85569
diff
changeset
|
2530 STRING is the string or regexp searched for. |
30476
26fe451fc5f7
(isearch-resume): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29377
diff
changeset
|
2531 REGEXP non-nil means the resumed search was a regexp search. |
26fe451fc5f7
(isearch-resume): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29377
diff
changeset
|
2532 WORD non-nil means resume a word search. |
26fe451fc5f7
(isearch-resume): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29377
diff
changeset
|
2533 FORWARD non-nil means resume a forward search. |
26fe451fc5f7
(isearch-resume): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29377
diff
changeset
|
2534 MESSAGE is the echo-area message recorded for the search resumed. |
26fe451fc5f7
(isearch-resume): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29377
diff
changeset
|
2535 CASE-FOLD non-nil means the search was case-insensitive." |
26fe451fc5f7
(isearch-resume): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29377
diff
changeset
|
2536 (isearch-mode forward regexp nil nil word) |
85720
79ffe1cb3583
(isearch-other-meta-char): Call `isearch-edit-string' when mouse is
Juri Linkov <juri@jurta.org>
parents:
85569
diff
changeset
|
2537 (setq isearch-string string |
30476
26fe451fc5f7
(isearch-resume): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29377
diff
changeset
|
2538 isearch-message message |
26fe451fc5f7
(isearch-resume): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29377
diff
changeset
|
2539 isearch-case-fold-search case-fold) |
85720
79ffe1cb3583
(isearch-other-meta-char): Call `isearch-edit-string' when mouse is
Juri Linkov <juri@jurta.org>
parents:
85569
diff
changeset
|
2540 (isearch-search) |
79ffe1cb3583
(isearch-other-meta-char): Call `isearch-edit-string' when mouse is
Juri Linkov <juri@jurta.org>
parents:
85569
diff
changeset
|
2541 (isearch-update)) |
47341
bbfc60a6c247
(isearch-cmds): Add docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44893
diff
changeset
|
2542 |
56352
f0e5e08dd63e
(isearch-query-replace): Pass the regexp-ness and delimited-ness of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56349
diff
changeset
|
2543 ;; arch-tag: 74850515-f7d8-43a6-8a2c-ca90a4c1e675 |
2230
6314334d7c2b
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2055
diff
changeset
|
2544 ;;; isearch.el ends here |