annotate lisp/isearch.el @ 112280:a0a140d8d84d

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