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