annotate lisp/isearch.el @ 17720:530ee47cb56b

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