annotate lisp/isearch-mode.el @ 410:de805c49cfc1 r21-2-35

Import from CVS: tag r21-2-35
author cvs
date Mon, 13 Aug 2007 11:19:21 +0200
parents 74fd4e045ea6
children 697ef44129c6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1 ;;; isearch-mode.el --- Incremental search minor mode.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3 ;; Copyright (C) 1992,93,94,95,96,97,98,1999 Free Software Foundation, Inc.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
4
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
5 ;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu>
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
6 ;; Maintainer: XEmacs Development Team
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
7 ;; Keywords: extensions, dumped
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
8
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
9 ;; This file is part of XEmacs.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
10
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
11 ;; XEmacs is free software; you can redistribute it and/or modify it
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
12 ;; under the terms of the GNU General Public License as published by
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
13 ;; the Free Software Foundation; either version 2, or (at your option)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
14 ;; any later version.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
15
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
16 ;; XEmacs is distributed in the hope that it will be useful, but
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
17 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
19 ;; General Public License for more details.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
20
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
21 ;; You should have received a copy of the GNU General Public License
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
22 ;; along with XEmacs; see the file COPYING. If not, write to the
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
23 ;; Free Software Foundation, 59 Temple Place - Suite 330,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
24 ;; Boston, MA 02111-1307, USA.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
25
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
26 ;;; Synched up with: FSF 20.4.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
27
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
28 ;;; Commentary:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
29
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
30 ;; Instructions
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
31
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
32 ;; Searching with isearch-mode.el should work just like isearch.el
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
33 ;; [the one from Emacs 18], except it is done in a temporary minor
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
34 ;; mode that terminates when you finish searching.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
35
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
36 ;; For programmed use of isearch-mode, e.g. calling (isearch-forward),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
37 ;; isearch-mode behaves modally and does not return until the search
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
38 ;; is completed. It uses a recursive-edit to behave this way. In
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
39 ;; that case, you should still be able switch buffers, so be careful
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
40 ;; not to get things confused.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
41
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
42 ;; The key bindings active within isearch-mode are defined below in
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
43 ;; `isearch-mode-map' which is given bindings close to the default
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
44 ;; characters of the original isearch.el. With `isearch-mode',
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
45 ;; however, you can bind multi-character keys and it should be easier
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
46 ;; to add new commands. One bug though: keys with meta-prefix cannot
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
47 ;; be longer than two chars. Also see minibuffer-local-isearch-map
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
48 ;; for bindings active during `isearch-edit-string'.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
49
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
50 ;; The search ring and completion commands automatically put you in
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
51 ;; the minibuffer to edit the string. This gives you a chance to
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
52 ;; modify the search string before executing the search. There are
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
53 ;; three commands to terminate the editing: C-s and C-r exit the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
54 ;; minibuffer and search forward and reverse respectively, while C-m
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
55 ;; exits and does a nonincremental search.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
56
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
57 ;; Exiting immediately from isearch uses isearch-edit-string instead
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
58 ;; of nonincremental-search, if search-nonincremental-instead is non-nil.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
59 ;; The name of this option should probably be changed if we decide to
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
60 ;; keep the behavior. No point in forcing nonincremental search until
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
61 ;; the last possible moment.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
62
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
63 ;; TODO
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
64 ;; - Integrate generalized command history to isearch-edit-string.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
65 ;; - Think about incorporating query-replace.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
66 ;; - Hooks and options for failed search.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
67
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
68 ;;; Change Log:
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
69
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
70 ;; Changes before those recorded in ChangeLog:
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
71
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
72 ;; 20-aug-92 Hacked by jwz for Lucid Emacs 19.3.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
73 ;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
74 ;; Revision 1.3 92/06/29 13:10:08 liberte
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
75 ;; Moved modal isearch-mode handling into isearch-mode.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
76 ;; Got rid of buffer-local isearch variables.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
77 ;; isearch-edit-string used by ring adjustments, completion, and
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
78 ;; nonincremental searching. C-s and C-r are additional exit commands.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
79 ;; Renamed all regex to regexp.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
80 ;; Got rid of found-start and found-point globals.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
81 ;; Generalized handling of upper-case chars.
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
82
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
83 ;; Revision 1.2 92/05/27 11:33:57 liberte
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
84 ;; Emacs version 19 has a search ring, which is supported here.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
85 ;; Other fixes found in the version 19 isearch are included here.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
86 ;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
87 ;; Also see variables search-caps-disable-folding,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
88 ;; search-nonincremental-instead, search-whitespace-regexp, and
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
89 ;; commands isearch-toggle-regexp, isearch-edit-string.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
90 ;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
91 ;; semi-modal isearching is supported.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
92
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
93 ;; Changes for 1.1
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
94 ;; 3/18/92 Fixed invalid-regexp.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
95 ;; 3/18/92 Fixed yanking in regexps.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
96
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
97 ;;; Code:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
98
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
99
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
100 ;;;=========================================================================
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
101 ;;; User-accessible variables
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
102
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
103 (defgroup isearch nil
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
104 "Incremental search minor mode."
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
105 :prefix "search-"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
106 :group 'matching)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
107
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
108
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
109 (defcustom search-exit-option t
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
110 "*Non-nil means random control characters terminate incremental search."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
111 :type 'boolean
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
112 :group 'isearch)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
113
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
114 (defcustom search-slow-window-lines 1
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
115 "*Number of lines in slow search display windows.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
116 These are the short windows used during incremental search on slow terminals.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
117 Negative means put the slow search window at the top (normally it's at bottom)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
118 and the value is minus the number of lines."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
119 :type 'integer
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
120 :group 'isearch)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
121
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
122 (defcustom search-slow-speed 1200
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
123 "*Highest terminal speed at which to use \"slow\" style incremental search.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
124 This is the style where a one-line window is created to show the line
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
125 that the search has reached."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
126 :type 'integer
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
127 :group 'isearch)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
128
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
129 ;; We have `search-caps-disable-folding'.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
130 ;(defcustom search-upper-case 'not-yanks
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
131 ; "*If non-nil, upper case chars disable case fold searching.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
132 ;That is, upper and lower case chars must match exactly.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
133 ;This applies no matter where the chars come from, but does not
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
134 ;apply to chars in regexps that are prefixed with `\\'.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
135 ;If this value is `not-yanks', yanked text is always downcased."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
136 ; :type '(choice (const :tag "off" nil)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
137 ; (const not-yanks)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
138 ; (other :tag "on" t))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
139 ; :group 'isearch)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
140
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
141 (defcustom search-nonincremental-instead t
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
142 "*If non-nil, do a nonincremental search instead if exiting immediately.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
143 Actually, `isearch-edit-string' is called to let you enter the search
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
144 string, and RET terminates editing and does a nonincremental search."
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
145 :type 'boolean
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
146 :group 'isearch)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
147
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
148 ;; FSF default is "\\s-+", but I think our default is better so I'm
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
149 ;; leaving it.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
150 (defcustom search-whitespace-regexp "\\(\\s-\\|[\n\r]\\)+"
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
151 "*If non-nil, regular expression to match a sequence of whitespace chars."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
152 :type 'regexp
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
153 :group 'isearch)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
154
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
155 (defcustom search-highlight t
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
156 "*Whether incremental search and query-replace should highlight
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
157 the text that currently matches the search string."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
158 :type 'boolean
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
159 :group 'isearch)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
160
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
161 ;; I think the name `search-highlight' makes more sense, both because
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
162 ;; of consistency with other search-* variables above, and because it
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
163 ;; also applies to query-replace.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
164 (define-obsolete-variable-alias 'isearch-highlight 'search-highlight)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
165
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
166 (defcustom search-invisible 'open
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
167 "If t incremental search can match hidden text.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
168 nil means don't match invisible text.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
169 If the value is `open', if the text matched is made invisible by
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
170 an overlay having an `invisible' property and that overlay has a property
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
171 `isearch-open-invisible', then incremental search will show the contents.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
172 \(This applies when using `outline.el' and `hideshow.el'.)"
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
173 :type '(choice (const :tag "Match hidden text" t)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
174 (const :tag "Open overlays" open)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
175 (const :tag "Don't match hidden text" nil))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
176 :group 'isearch)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
177
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
178 (defcustom isearch-hide-immediately t
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
179 "If non-nil, re-hide an invisible match right away.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
180 This variable makes a difference when `search-invisible' is set to `open'.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
181 It means that after search makes some invisible text visible
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
182 to show the match, it makes the text invisible again when the match moves.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
183 Ordinarily the text becomes invisible again at the end of the search."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
184 :type 'boolean
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
185 :group 'isearch)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
186
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
187 (defvar isearch-mode-hook nil
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
188 "Function(s) to call after starting up an incremental search.")
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
189
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
190 (defvar isearch-mode-end-hook nil
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
191 "Function(s) to call after terminating an incremental search.")
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
192
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
193 ;;;==================================================================
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
194 ;;; Search ring.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
195
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
196 (defvar search-ring nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
197 "List of search string sequences.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
198 (defvar regexp-search-ring nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
199 "List of regular expression search string sequences.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
200
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
201 (defcustom search-ring-max 16
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
202 "*Maximum length of search ring before oldest elements are thrown away."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
203 :type 'integer
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
204 :group 'isearch)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
205 (defcustom regexp-search-ring-max 16
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
206 "*Maximum length of regexp search ring before oldest elements are thrown away."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
207 :type 'integer
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
208 :group 'isearch)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
209
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
210 ;; The important difference between pre-20.4-merge yank-pointers and
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
211 ;; current code is that the yank pointers positions used to be
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
212 ;; preserved across the isearch sessions. I changed this because I
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
213 ;; think the FSF code is closer to how the feature is supposed to
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
214 ;; behave (read: to minibuffer histories.)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
215 (defvar search-ring-yank-pointer nil
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
216 "Index in `search-ring' of last string reused.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
217 nil if none yet.")
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
218 (defvar regexp-search-ring-yank-pointer nil
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
219 "Index in `regexp-search-ring' of last string reused.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
220 nil if none yet.")
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
221
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
222 (defcustom search-ring-update nil
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
223 "*Non-nil if advancing or retreating in the search ring should cause search.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
224 Default nil means edit the string from the search ring first."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
225 :type 'boolean
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
226 :group 'isearch)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
227
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
228 ;;;====================================================
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
229 ;;; Define isearch-mode keymap.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
230
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
231 (defvar isearch-mode-map
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
232 (let ((map (make-keymap)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
233 (set-keymap-name map 'isearch-mode-map)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
234
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
235 ;; Bind all printing characters to `isearch-printing-char'.
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
236 ;; This isn't normally necessary, but if a printing character were
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
237 ;; bound to something other than self-insert-command in global-map,
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
238 ;; then it would terminate the search and be executed without this.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
239 (let ((i 32)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
240 (str (make-string 1 0)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
241 (while (< i 127)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
242 (aset str 0 i)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
243 (define-key map str 'isearch-printing-char)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
244 (setq i (1+ i))))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
245
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
246 ;; Here FSF sets up various kludges to handle local bindings with
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
247 ;; meta char prefix keys. We don't need isearch-other-meta-char
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
248 ;; because we handle things differently (via pre-command-hook).
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
249
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
250 ;; Several non-printing chars change the searching behavior.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
251 ;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
252 (define-key map "\C-s" 'isearch-repeat-forward)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
253 (define-key map "\M-\C-s" 'isearch-repeat-forward)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
254 (define-key map "\C-r" 'isearch-repeat-backward)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
255 (define-key map "\C-g" 'isearch-abort)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
256
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
257 ;; I wish this worked...
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
258 ;(define-key map [escape escape escape] 'isearch-cancel)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
259 (define-key map [(meta escape) escape] 'isearch-cancel)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
260
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
261 (define-key map "\C-q" 'isearch-quote-char)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
262
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
263 (define-key map "\C-m" 'isearch-exit)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
264 (define-key map "\C-j" 'isearch-printing-char)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
265 (define-key map "\t" 'isearch-printing-char)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
266 ;; I prefer our default.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
267 ;(define-key map " " 'isearch-whitespace-chars)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
268 (define-key map "\M- " 'isearch-whitespace-chars)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
269
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
270 (define-key map "\C-w" 'isearch-yank-word)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
271 (define-key map "\C-y" 'isearch-yank-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
272 (define-key map "\M-y" 'isearch-yank-kill)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
273
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
274 ;; Define keys for regexp chars * ? |.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
275 ;; Nothing special for + because it matches at least once.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
276 (define-key map "*" 'isearch-*-char)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
277 (define-key map "?" 'isearch-*-char)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
278 (define-key map "|" 'isearch-|-char)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
279
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
280 ;; delete and backspace delete backward, f1 is help, and C-h can be either
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
281 (define-key map 'delete 'isearch-delete-char)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
282 (define-key map 'backspace 'isearch-delete-char)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
283 (define-key map '(control h) 'isearch-help-or-delete-char)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
284 (define-key map 'f1 'isearch-mode-help)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
285 (define-key map 'help 'isearch-mode-help)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
286
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
287 (define-key map "\M-n" 'isearch-ring-advance)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
288 (define-key map "\M-p" 'isearch-ring-retreat)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
289 (define-key map "\M-\t" 'isearch-complete)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
290
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
291 ;; I find this binding somewhat unintuitive, because it doesn't
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
292 ;; work if the mouse pointer is over the echo area -- it has to be
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
293 ;; over the search window.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
294 (define-key map 'button2 'isearch-yank-selection)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
295
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
296 map)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
297 "Keymap for isearch-mode.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
298
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
299 ;; Some bindings you may want to put in your isearch-mode-hook.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
300 ;; Suggest some alternates...
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
301 ;; (define-key isearch-mode-map "\C-t" 'isearch-toggle-case-fold)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
302 ;; (define-key isearch-mode-map "\C-t" 'isearch-toggle-regexp)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
303 ;; (define-key isearch-mode-map "\C-^" 'isearch-edit-string)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
304
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
305 (defvar minibuffer-local-isearch-map
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
306 (let ((map (make-sparse-keymap)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
307 ;; #### - this should also be minor-mode-ified
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
308 (set-keymap-parents map (list minibuffer-local-map))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
309 (set-keymap-name map 'minibuffer-local-isearch-map)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
310
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
311 ;;#### This should just arrange to use the usual Emacs minibuffer histories
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
312 (define-key map "\r" 'isearch-nonincremental-exit-minibuffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
313 (define-key map "\M-n" 'isearch-ring-advance-edit)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
314 (define-key map "\M-p" 'isearch-ring-retreat-edit)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
315 (define-key map 'down 'isearch-ring-advance-edit)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
316 (define-key map 'up 'isearch-ring-retreat-edit)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
317 (define-key map "\M-\t" 'isearch-complete-edit)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
318 (define-key map "\C-s" 'isearch-forward-exit-minibuffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
319 (define-key map "\C-r" 'isearch-reverse-exit-minibuffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
320 map)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
321 "Keymap for editing isearch strings in the minibuffer.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
322
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
323 ;;;========================================================
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
324 ;; Internal variables declared globally for byte-compiler.
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
325 ;; These are all set with setq while isearching
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
326 ;; and bound locally while editing the search string.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
327
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
328 (defvar isearch-forward nil) ; Searching in the forward direction.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
329 (defvar isearch-regexp nil) ; Searching for a regexp.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
330 (defvar isearch-word nil) ; Searching for words.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
331
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
332 (defvar isearch-cmds nil) ; Stack of search status sets.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
333 (defvar isearch-string "") ; The current search string.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
334 (defvar isearch-message "") ; text-char-description version of isearch-string
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
335
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
336 (defvar isearch-success t) ; Searching is currently successful.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
337 (defvar isearch-invalid-regexp nil) ; Regexp not well formed.
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
338 (defvar isearch-within-brackets nil) ; Regexp has unclosed [.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
339 (defvar isearch-other-end nil) ; Start (end) of match if forward (backward).
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
340 (defvar isearch-wrapped nil) ; Searching restarted from the top (bottom).
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
341 (defvar isearch-barrier 0)
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 253
diff changeset
342 (defvar isearch-just-started nil)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
343 (defvar isearch-buffer nil) ; the buffer we've frobbed the keymap of
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
344
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
345 (defvar isearch-case-fold-search nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
346
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
347 ;; Need this for toggling case in isearch-toggle-case-fold. When this
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
348 ;; is non-nil, the case-sensitiveness of the search is set by the
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
349 ;; user, and is may no longer be dynamically changed as per
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
350 ;; search-caps-disable-folding.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
351 (defvar isearch-fixed-case nil)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
352
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
353 (defvar isearch-adjusted nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
354 (defvar isearch-slow-terminal-mode nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
355 ;;; If t, using a small window.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
356 (defvar isearch-small-window nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
357 (defvar isearch-opoint 0)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
358 ;;; The window configuration active at the beginning of the search.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
359 (defvar isearch-window-configuration nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
360 (defvar isearch-selected-frame nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
361
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
362 ;; Flag to indicate a yank occurred, so don't move the cursor.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
363 (defvar isearch-yank-flag nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
364
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
365 ;;; A function to be called after each input character is processed.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
366 ;;; (It is not called after characters that exit the search.)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
367 ;;; It is only set from an optional argument to `isearch-mode'.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
368 (defvar isearch-op-fun nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
369
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
370 ;;; Is isearch-mode in a recursive edit for modal searching.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
371 (defvar isearch-recursive-edit nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
372
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
373 ;;; Should isearch be terminated after doing one search?
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
374 (defvar isearch-nonincremental nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
375
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
376 ;; New value of isearch-forward after isearch-edit-string.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
377 (defvar isearch-new-forward nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
378
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
379 ;; Accumulate here the extents unhidden during searching.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
380 (defvar isearch-unhidden-extents nil) ; in FSF: isearch-opened-overlays
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
381
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
382
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
383 ;;;==============================================================
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
384 ;; Minor-mode-alist changes - kind of redundant with the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
385 ;; echo area, but if isearching in multiple windows, it can be useful.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
386
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
387 (add-minor-mode 'isearch-mode 'isearch-mode)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
388
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
389 (defvar isearch-mode nil) ;; Name of the minor mode, if non-nil.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
390 (make-variable-buffer-local 'isearch-mode)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
391
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
392 ;; We bind these in keydefs.el.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
393 ;(define-key global-map "\C-s" 'isearch-forward)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
394 ;(define-key global-map "\C-r" 'isearch-backward)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
395 ;(define-key global-map "\M-\C-s" 'isearch-forward-regexp)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
396 ;(define-key global-map "\M-\C-r" 'isearch-backward-regexp)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
397
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
398 ;;;===============================================================
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
399 ;;; Entry points to isearch-mode.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
400 ;;; These four functions should replace those in loaddefs.el
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
401 ;;; An alternative is to defalias isearch-forward etc to isearch-mode,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
402 ;;; and look at this-command to set the options accordingly.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
403
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
404 (defun isearch-forward (&optional regexp-p no-recursive-edit)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
405 "\
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
406 Do incremental search forward.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
407 With a prefix argument, do an incremental regular expression search instead.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
408 \\<isearch-mode-map>
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
409 As you type characters, they add to the search string and are found.
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
410 The following non-printing keys are bound in `isearch-mode-map'.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
411
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
412 Type \\[isearch-delete-char] to cancel characters from end of search string.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
413 Type \\[isearch-exit] to exit, leaving point at location found.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
414 Type LFD (C-j) to match end of line.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
415 Type \\[isearch-repeat-forward] to search again forward,\
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
416 \\[isearch-repeat-backward] to search again backward.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
417 Type \\[isearch-yank-word] to yank word from buffer onto end of search\
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
418 string and search for it.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
419 Type \\[isearch-yank-line] to yank rest of line onto end of search string\
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
420 and search for it.
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
421 Type \\[isearch-yank-kill] to yank last killed text onto end of search string\
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
422 and search for it.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
423 Type \\[isearch-quote-char] to quote control character to search for it.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
424 Type \\[isearch-whitespace-chars] to match all whitespace chars in regexp.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
425 \\[isearch-abort] while searching or when search has failed cancels input\
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
426 back to what has
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
427 been found successfully.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
428 \\[isearch-abort] when search is successful aborts and moves point to\
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
429 starting point.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
430
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
431 Also supported is a search ring of the previous 16 search strings.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
432 Type \\[isearch-ring-advance] to search for the next item in the search ring.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
433 Type \\[isearch-ring-retreat] to search for the previous item in the search\
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
434 ring.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
435 Type \\[isearch-complete] to complete the search string using the search ring.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
436
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
437 The above keys are bound in the isearch-mode-map. To change the keys which
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
438 are special to isearch-mode, simply change the bindings in that map.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
439
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
440 Other control and meta characters terminate the search
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
441 and are then executed normally (depending on `search-exit-option').
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
442
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
443 If this function is called non-interactively, it does not return to
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
444 the calling function until the search is done.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
445
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
446 The bindings, more precisely:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
447 \\{isearch-mode-map}"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
448
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
449 ;; Non-standard bindings
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
450 ;; Type \\[isearch-toggle-regexp] to toggle regular expression with normal searching.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
451 ;; Type \\[isearch-edit-string] to edit the search string in the minibuffer.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
452 ;; Terminate editing and return to incremental searching with CR.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
453
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
454 (interactive "_P\np")
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
455 (isearch-mode t (not (null regexp-p)) nil (not no-recursive-edit)))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
456
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
457 (defun isearch-forward-regexp (&optional not-regexp no-recursive-edit)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
458 "\
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
459 Do incremental search forward for regular expression.
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
460 With a prefix argument, do a regular string search instead.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
461 Like ordinary incremental search except that your input
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
462 is treated as a regexp. See \\[isearch-forward] for more info."
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
463 (interactive "_P\np")
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
464 (isearch-mode t (null not-regexp) nil (not no-recursive-edit)))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
465
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
466 (defun isearch-backward (&optional regexp-p no-recursive-edit)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
467 "\
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
468 Do incremental search backward.
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
469 With a prefix argument, do a regular expression search instead.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
470 See \\[isearch-forward] for more information."
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
471 (interactive "_P\np")
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
472 (isearch-mode nil (not (null regexp-p)) nil (not no-recursive-edit)))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
473
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
474 (defun isearch-backward-regexp (&optional not-regexp no-recursive-edit)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
475 "\
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
476 Do incremental search backward for regular expression.
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
477 With a prefix argument, do a regular string search instead.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
478 Like ordinary incremental search except that your input
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
479 is treated as a regexp. See \\[isearch-forward] for more info."
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
480 (interactive "_P\np")
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
481 (isearch-mode nil (null not-regexp) nil (not no-recursive-edit)))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
482
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
483 ;; The problem here is that you can't scroll the help screen; as soon
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
484 ;; as you press a key, it's gone. I don't know of a good way to fix
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
485 ;; it, though. -hniksic
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
486 (defun isearch-mode-help ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
487 (interactive "_")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
488 (let ((w (selected-window)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
489 (describe-function 'isearch-forward)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
490 (select-window w))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
491 (isearch-update))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
492
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
493
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
494 ;;;==================================================================
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
495 ;; isearch-mode only sets up incremental search for the minor mode.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
496 ;; All the work is done by the isearch-mode commands.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
497
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
498 (defun isearch-mode (forward &optional regexp op-fun recursive-edit word-p)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
499 "Start isearch minor mode. Called by `isearch-forward', etc.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
500
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
501 \\{isearch-mode-map}"
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
502
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
503 (if executing-kbd-macro (setq recursive-edit nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
504
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
505 (let ((inhibit-quit t)) ; don't leave things in an inconsistent state...
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
506
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
507 ;; Initialize global vars.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
508 (setq isearch-buffer (current-buffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
509 isearch-forward forward
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
510 isearch-regexp regexp
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
511 isearch-word word-p
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
512 isearch-op-fun op-fun
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
513 isearch-case-fold-search case-fold-search
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
514 isearch-fixed-case nil
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
515 isearch-string ""
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
516 isearch-message ""
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
517 isearch-cmds nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
518 isearch-success t
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
519 isearch-wrapped nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
520 isearch-barrier (point)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
521 isearch-adjusted nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
522 isearch-yank-flag nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
523 isearch-invalid-regexp nil
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
524 isearch-within-brackets nil
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
525 isearch-slow-terminal-mode (and (<= (device-baud-rate)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
526 search-slow-speed)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
527 (> (window-height)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
528 (* 4 search-slow-window-lines)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
529 isearch-other-end nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
530 isearch-small-window nil
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 253
diff changeset
531 isearch-just-started t
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
532
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
533 isearch-opoint (point)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
534 search-ring-yank-pointer nil
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
535 regexp-search-ring-yank-pointer nil
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
536 isearch-unhidden-extents nil
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
537 isearch-window-configuration (current-window-configuration)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
538
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
539 ;; #### What we really need is a buffer-local
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
540 ;; overriding-local-map. See isearch-pre-command-hook for
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
541 ;; more details.
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 377
diff changeset
542 overriding-local-map (progn
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 377
diff changeset
543 (set-keymap-parents isearch-mode-map
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 377
diff changeset
544 (nconc (current-minor-mode-maps)
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 377
diff changeset
545 (and (current-local-map)
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 377
diff changeset
546 (list (current-local-map)))))
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 377
diff changeset
547 isearch-mode-map)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
548 isearch-selected-frame (selected-frame)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
549
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
550 )
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
551
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
552 ;; XEmacs change: without clearing the match data, sometimes old values
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
553 ;; of isearch-other-end get used. Don't ask me why...
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
554 (store-match-data nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
555
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
556 (add-hook 'pre-command-hook 'isearch-pre-command-hook)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
557
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
558 (setq isearch-mode (gettext " Isearch"))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
559 (redraw-modeline)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
560
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
561 (isearch-push-state)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
562
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
563 ) ; inhibit-quit is t before here
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
564
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
565 (isearch-update)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
566 (run-hooks 'isearch-mode-hook)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
567
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
568 ;; isearch-mode can be made modal (in the sense of not returning to
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
569 ;; the calling function until searching is completed) by entering
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
570 ;; a recursive-edit and exiting it when done isearching.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
571 (if recursive-edit
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
572 (let ((isearch-recursive-edit t))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
573 (recursive-edit)))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
574 isearch-success)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
575
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
576
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
577 ;;;====================================================
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
578 ;; Some high level utilities. Others below.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
579
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
580 (defun isearch-update ()
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
581 ;; Called after each command to update the display.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
582 (if (null unread-command-events)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
583 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
584 (if (not (input-pending-p))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
585 (isearch-message))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
586 (if (and isearch-slow-terminal-mode
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
587 (not (or isearch-small-window
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
588 (pos-visible-in-window-p))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
589 (let ((found-point (point)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
590 (setq isearch-small-window t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
591 (move-to-window-line 0)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
592 (let ((window-min-height 1))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
593 (split-window nil (if (< search-slow-window-lines 0)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
594 (1+ (- search-slow-window-lines))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
595 (- (window-height)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
596 (1+ search-slow-window-lines)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
597 (if (< search-slow-window-lines 0)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
598 (progn (vertical-motion (- 1 search-slow-window-lines))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
599 (set-window-start (next-window) (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
600 (set-window-hscroll (next-window)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
601 (window-hscroll))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
602 (set-window-hscroll (selected-window) 0))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
603 (other-window 1))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
604 (goto-char found-point)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
605 (if isearch-other-end
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
606 (if (< isearch-other-end (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
607 (isearch-highlight isearch-other-end (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
608 (isearch-highlight (point) isearch-other-end))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
609 (isearch-dehighlight))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
610 ))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
611 (setq ;; quit-flag nil not for isearch-mode
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
612 isearch-adjusted nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
613 isearch-yank-flag nil)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
614 (isearch-highlight-all-update)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
615 )
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
616
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
617
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
618 (defun isearch-done (&optional nopush edit)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
619 ;; Called by all commands that terminate isearch-mode.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
620 (let ((inhibit-quit t)) ; danger danger!
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
621 (if (and isearch-buffer (buffer-live-p isearch-buffer))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
622 ;; Some loser process filter might have switched the window's
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
623 ;; buffer, so be sure to set these variables back in the
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
624 ;; buffer we frobbed them in. But only if the buffer is still
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
625 ;; alive.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
626 (with-current-buffer isearch-buffer
373
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
627 (setq overriding-local-map nil)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
628 ;; Use remove-hook instead of just setting it to our saved value
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
629 ;; in case some process filter has created a buffer and modified
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
630 ;; the pre-command-hook in that buffer... yeah, this is obscure,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
631 ;; and yeah, I was getting screwed by it. -jwz
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
632 (remove-hook 'pre-command-hook 'isearch-pre-command-hook)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
633 (set-keymap-parents isearch-mode-map nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
634 (setq isearch-mode nil)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
635 (redraw-modeline)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
636 (isearch-dehighlight)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
637 (isearch-highlight-all-cleanup)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
638 (isearch-restore-invisible-extents nil nil)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
639 ))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
640
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
641 ;; it's not critical that this be inside inhibit-quit, but leaving
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
642 ;; things in small-window-mode would be bad.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
643 (let ((found-start (window-start (selected-window)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
644 (found-point (point)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
645 (cond ((eq (selected-frame) isearch-selected-frame)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
646 (set-window-configuration isearch-window-configuration)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
647
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
648 (if isearch-small-window
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
649 (goto-char found-point)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
650 ;; Exiting the save-window-excursion clobbers
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
651 ;; window-start; restore it.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
652 (set-window-start (selected-window) found-start t))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
653 ;; If there was movement, mark the starting position.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
654 ;; Maybe should test difference between and set mark iff > threshold.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
655 (if (and (buffer-live-p isearch-buffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
656 (/= (point isearch-buffer) isearch-opoint))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
657 ;; #### FSF doesn't do this if the region is active. Should
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
658 ;; we do the same?
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
659 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
660 (push-mark isearch-opoint t nil isearch-buffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
661 (or executing-kbd-macro (> (minibuffer-depth) 0)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
662 (display-message 'command "Mark saved where search started")))))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
663 (setq isearch-buffer nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
664 ) ; inhibit-quit is t before here
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
665
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
666 (if (and (> (length isearch-string) 0) (not nopush))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
667 ;; Update the ring data.
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
668 (isearch-update-ring isearch-string isearch-regexp))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
669
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
670 (run-hooks 'isearch-mode-end-hook)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
671
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
672 (and (not edit) isearch-recursive-edit (exit-recursive-edit)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
673
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
674 (defun isearch-update-ring (string &optional regexp)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
675 "Add STRING to the beginning of the search ring.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
676 REGEXP says which ring to use."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
677 (if regexp
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
678 (if (or (null regexp-search-ring)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
679 (not (string= string (car regexp-search-ring))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
680 (progn
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
681 (setq regexp-search-ring
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
682 (cons string regexp-search-ring))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
683 (if (> (length regexp-search-ring) regexp-search-ring-max)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
684 (setcdr (nthcdr (1- search-ring-max) regexp-search-ring)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
685 nil))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
686 (if (or (null search-ring)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
687 (not (string= string (car search-ring))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
688 (progn
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
689 (setq search-ring (cons string search-ring))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
690 (if (> (length search-ring) search-ring-max)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
691 (setcdr (nthcdr (1- search-ring-max) search-ring) nil))))))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
692
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
693
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
694 ;;;====================================================
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
695 ;; Commands active while inside of the isearch minor mode.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
696
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
697 (defun isearch-exit ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
698 "Exit search normally.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
699 However, if this is the first command after starting incremental
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
700 search and `search-nonincremental-instead' is non-nil, do a
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
701 nonincremental search instead via `isearch-edit-string'."
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
702 (interactive)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
703 (if (and search-nonincremental-instead
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
704 (= 0 (length isearch-string)))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
705 (let ((isearch-nonincremental t)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
706 ;; Highlighting only gets in the way of nonincremental
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
707 ;; search.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
708 (search-highlight nil)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
709 (isearch-highlight-all-matches nil))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
710 (isearch-edit-string))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
711 (isearch-done)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
712
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
713
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
714 (defun isearch-edit-string ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
715 "Edit the search string in the minibuffer.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
716 The following additional command keys are active while editing.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
717 \\<minibuffer-local-isearch-map>
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
718 \\[exit-minibuffer] to resume incremental searching with the edited string.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
719 \\[isearch-nonincremental-exit-minibuffer] to do one nonincremental search.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
720 \\[isearch-forward-exit-minibuffer] to resume isearching forward.
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
721 \\[isearch-reverse-exit-minibuffer] to resume isearching backward.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
722 \\[isearch-ring-advance-edit] to replace the search string with the next item in the search ring.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
723 \\[isearch-ring-retreat-edit] to replace the search string with the previous item in the search ring.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
724 \\[isearch-complete-edit] to complete the search string using the search ring.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
725 \\<isearch-mode-map>
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
726 If first char entered is \\[isearch-yank-word], then do word search instead."
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
727
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
728 ;; This code is very hairy for several reasons, explained in the code.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
729 ;; Mainly, isearch-mode must be terminated while editing and then restarted.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
730 ;; If there were a way to catch any change of buffer from the minibuffer,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
731 ;; this could be simplified greatly.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
732 ;; Editing doesn't back up the search point. Should it?
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
733 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
734
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
735 (condition-case nil
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
736 (progn
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
737 (let ((isearch-nonincremental isearch-nonincremental)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
738
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
739 ;; Locally bind all isearch global variables to protect them
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
740 ;; from recursive isearching.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
741 ;; isearch-string -message and -forward are not bound
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
742 ;; so they may be changed. Instead, save the values.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
743 (isearch-new-string isearch-string)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
744 (isearch-new-message isearch-message)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
745 (isearch-new-forward isearch-forward)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
746 (isearch-new-word isearch-word)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
747
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
748 (isearch-regexp isearch-regexp)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
749 (isearch-op-fun isearch-op-fun)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
750 (isearch-cmds isearch-cmds)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
751 (isearch-success isearch-success)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
752 (isearch-wrapped isearch-wrapped)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
753 (isearch-barrier isearch-barrier)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
754 (isearch-adjusted isearch-adjusted)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
755 (isearch-fixed-case isearch-fixed-case)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
756 (isearch-yank-flag isearch-yank-flag)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
757 (isearch-invalid-regexp isearch-invalid-regexp)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
758 (isearch-within-brackets isearch-within-brackets)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
759 ;;; Don't bind this. We want isearch-search, below, to set it.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
760 ;;; And the old value won't matter after that.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
761 ;;; (isearch-other-end isearch-other-end)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
762 (isearch-opoint isearch-opoint)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
763 (isearch-slow-terminal-mode isearch-slow-terminal-mode)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
764 (isearch-small-window isearch-small-window)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
765 (isearch-recursive-edit isearch-recursive-edit)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
766 (isearch-window-configuration (current-window-configuration))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
767 (isearch-selected-frame (selected-frame))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
768 )
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
769 ;; Actually terminate isearching until editing is done.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
770 ;; This is so that the user can do anything without failure,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
771 ;; like switch buffers and start another isearch, and return.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
772 ;; (condition-case nil
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
773 (isearch-done t t)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
774 ;;#### What does this mean? There is no such condition!
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
775 ;; (exit nil)) ; was recursive editing
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
776
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
777 (unwind-protect
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
778 (progn
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
779 ;; Fake the prompt message for the sake of
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
780 ;; next-command-event below.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
781 (isearch-message)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
782 ;; If the first character the user types when we
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
783 ;; prompt them for a string is the yank-word
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
784 ;; character, then go into word-search mode.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
785 ;; Otherwise unread that character and read a string
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
786 ;; the normal way.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
787 (let* ((cursor-in-echo-area t)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
788 (event (next-command-event)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
789 (if (eq 'isearch-yank-word
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
790 (lookup-key isearch-mode-map (vector event)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
791 (setq isearch-word t;; so message-prefix is right
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
792 isearch-new-word t)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
793 (setq unread-command-event event)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
794 (setq isearch-new-string
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
795 (read-from-minibuffer
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
796 (isearch-message-prefix nil isearch-nonincremental)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
797 isearch-string
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
798 minibuffer-local-isearch-map
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
799 nil
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
800 't ;does its own history (but shouldn't)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
801 )
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
802 isearch-new-message (mapconcat
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
803 'isearch-text-char-description
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
804 isearch-new-string "")))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
805 ;; Always resume isearching by restarting it.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
806 (isearch-mode isearch-forward
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
807 isearch-regexp
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
808 isearch-op-fun
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
809 isearch-recursive-edit
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
810 isearch-word)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
811
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
812 ;; Copy new values in outer locals to isearch globals
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
813 (setq isearch-string isearch-new-string
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
814 isearch-message isearch-new-message
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
815 isearch-forward isearch-new-forward
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
816 isearch-word isearch-new-word))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
817
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
818 ;; Empty isearch-string means use default.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
819 (if (= 0 (length isearch-string))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
820 (setq isearch-string (or (car (if isearch-regexp
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
821 regexp-search-ring
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
822 search-ring))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
823 ""))))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
824
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
825 ;; Reinvoke the pending search.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
826 (isearch-push-state)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
827 (isearch-search)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
828 (isearch-update)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
829 (if isearch-nonincremental (isearch-done)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
830
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
831 (quit ; handle abort-recursive-edit
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
832 (isearch-abort) ;; outside of let to restore outside global values
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
833 )))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
834
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
835 (defun isearch-nonincremental-exit-minibuffer ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
836 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
837 (setq isearch-nonincremental t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
838 (exit-minibuffer))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
839
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
840 (defun isearch-forward-exit-minibuffer ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
841 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
842 (setq isearch-new-forward t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
843 (exit-minibuffer))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
844
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
845 (defun isearch-reverse-exit-minibuffer ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
846 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
847 (setq isearch-new-forward nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
848 (exit-minibuffer))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
849
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
850 (defun isearch-cancel ()
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
851 "Terminate the search and go back to the starting point."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
852 (interactive)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
853 (goto-char isearch-opoint)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
854 (isearch-done t)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
855 (signal 'quit '(isearch))) ; and pass on quit signal
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
856
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
857 (defun isearch-abort ()
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
858 "Abort incremental search mode if searching is successful, signaling quit.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
859 Otherwise, revert to previous successful search and continue searching.
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
860 Use `isearch-exit' to quit without signaling."
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
861 (interactive)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
862 ;; (ding) signal instead below, if quitting
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
863 (discard-input)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
864 (if isearch-success
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
865 ;; If search is successful, move back to starting point
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
866 ;; and really do quit.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
867 (progn (goto-char isearch-opoint)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
868 (setq isearch-success nil)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
869 (isearch-done t) ; exit isearch
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
870 (signal 'quit '(isearch))) ; and pass on quit signal
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
871 ;; If search is failing, or has an incomplete regexp,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
872 ;; rub out until it is once more successful.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
873 (while (or (not isearch-success) isearch-invalid-regexp)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
874 (isearch-pop-state))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
875 (isearch-update)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
876
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
877 (defun isearch-repeat (direction)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
878 ;; Utility for isearch-repeat-forward and -backward.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
879 (if (eq isearch-forward (eq direction 'forward))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
880 ;; C-s in forward or C-r in reverse.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
881 (if (equal isearch-string "")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
882 ;; If search string is empty, use last one.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
883 (setq isearch-string
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
884 (or (if isearch-regexp
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
885 (car regexp-search-ring)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
886 (car search-ring))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
887 "")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
888 isearch-message
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
889 (mapconcat 'isearch-text-char-description
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
890 isearch-string ""))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
891 ;; If already have what to search for, repeat it.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
892 (or isearch-success
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
893 (progn
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
894 (goto-char (if isearch-forward (point-min) (point-max)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
895 (setq isearch-wrapped t))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
896 ;; C-s in reverse or C-r in forward, change direction.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
897 (setq isearch-forward (not isearch-forward)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
898
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
899 (setq isearch-barrier (point)) ; For subsequent \| if regexp.
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
900
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 253
diff changeset
901 (if (equal isearch-string "")
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 253
diff changeset
902 (setq isearch-success t)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
903 (if (and isearch-success (equal (match-end 0) (match-beginning 0))
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 253
diff changeset
904 (not isearch-just-started))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
905 ;; If repeating a search that found
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
906 ;; an empty string, ensure we advance.
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 253
diff changeset
907 (if (if isearch-forward (eobp) (bobp))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
908 ;; If there's nowhere to advance to, fail (and wrap next time).
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 253
diff changeset
909 (progn
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 253
diff changeset
910 (setq isearch-success nil)
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 253
diff changeset
911 (and executing-kbd-macro
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 253
diff changeset
912 (not defining-kbd-macro)
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 253
diff changeset
913 (isearch-done))
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 253
diff changeset
914 (ding nil 'isearch-failed))
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 253
diff changeset
915 (forward-char (if isearch-forward 1 -1))
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 253
diff changeset
916 (isearch-search))
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 253
diff changeset
917 (isearch-search)))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
918
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
919 (isearch-push-state)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
920 (isearch-update))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
921
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
922 (defun isearch-repeat-forward ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
923 "Repeat incremental search forwards."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
924 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
925 (isearch-repeat 'forward))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
926
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
927 (defun isearch-repeat-backward ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
928 "Repeat incremental search backwards."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
929 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
930 (isearch-repeat 'backward))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
931
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
932 (defun isearch-toggle-regexp ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
933 "Toggle regexp searching on or off."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
934 ;; The status stack is left unchanged.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
935 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
936 (setq isearch-regexp (not isearch-regexp))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
937 (if isearch-regexp (setq isearch-word nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
938 (isearch-update))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
939
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
940 (defun isearch-toggle-case-fold ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
941 "Toggle case folding in searching on or off."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
942 (interactive)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
943 (setq isearch-case-fold-search (if isearch-case-fold-search nil 'yes)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
944 isearch-fixed-case t)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
945 (lmessage 'progress "%s%s [case %ssensitive]"
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
946 (isearch-message-prefix)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
947 isearch-message
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
948 (if isearch-case-fold-search "in" ""))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
949 (setq isearch-adjusted t)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
950 ;; Update the highlighting here so that it gets done before the
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
951 ;; one-second pause.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
952 (isearch-highlight-all-update)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
953 (sit-for 1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
954 (isearch-update))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
955
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
956 (defun isearch-delete-char ()
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
957 "Discard last input item and move point back.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
958 If no previous match was done, just beep."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
959 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
960 (if (null (cdr isearch-cmds))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
961 (ding nil 'isearch-quit)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
962 (isearch-pop-state))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
963 (isearch-update))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
964
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
965 (defun isearch-help-or-delete-char ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
966 "Show Isearch help or delete backward in the search string.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
967 Deletes when `delete-key-deletes-forward' is t and C-h is used for deleting
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
968 backwards."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
969 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
970 (if (and delete-key-deletes-forward
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
971 (case (device-type)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
972 ('tty (eq tty-erase-char ?\C-h))
253
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 209
diff changeset
973 ('x (not (x-keysym-on-keyboard-sans-modifiers-p 'backspace)))))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
974 (isearch-delete-char)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
975 (isearch-mode-help)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
976
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
977 ;; This is similar to FSF isearch-yank-string, but more general.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
978 (defun isearch-yank (chunk)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
979 ;; Helper for isearch-yank-* functions. CHUNK can be a string or a
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
980 ;; function.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
981 (let ((word (if (stringp chunk)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
982 chunk
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
983 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
984 (and (not isearch-forward) isearch-other-end
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
985 (goto-char isearch-other-end))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
986 (buffer-substring
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
987 (point)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
988 (progn
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
989 (funcall chunk)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
990 (point)))))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
991 ;; if configured so that typing upper-case characters turns off case
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
992 ;; folding, then downcase the string so that yanking an upper-case
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
993 ;; word doesn't mess with case-foldedness.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
994 (if (and search-caps-disable-folding isearch-case-fold-search)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
995 (setq word (downcase word)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
996 (if isearch-regexp (setq word (regexp-quote word)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
997 (setq isearch-string (concat isearch-string word)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
998 isearch-message
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
999 (concat isearch-message
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1000 (mapconcat 'isearch-text-char-description
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1001 word ""))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1002 ;; Don't move cursor in reverse search.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1003 isearch-yank-flag t))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1004 (isearch-search-and-update))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1005
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1006 (defun isearch-yank-word ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1007 "Pull next word from buffer into search string."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1008 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1009 (isearch-yank (function (lambda () (forward-word 1)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1010
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1011 (defun isearch-yank-line ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1012 "Pull rest of line from buffer into search string."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1013 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1014 (isearch-yank 'end-of-line))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1015
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1016 (defun isearch-yank-kill ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1017 "Pull rest of line from kill ring into search string."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1018 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1019 (isearch-yank (current-kill 0)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1020
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1021 (defun isearch-yank-sexp ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1022 "Pull next expression from buffer into search string."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1023 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1024 (isearch-yank 'forward-sexp))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1025
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1026 (defun isearch-yank-selection ()
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1027 "Pull the current selection into the search string."
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1028 (interactive)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1029 (isearch-yank (get-selection)))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1030
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1031 (defun isearch-yank-clipboard ()
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1032 "Pull the current clipboard selection into the search string."
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1033 (interactive)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1034 (isearch-yank (get-clipboard)))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1035
373
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
1036 (defun isearch-fix-case ()
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1037 ;; The commented-out (and ...) form implies that, once
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1038 ;; isearch-case-fold-search becomes nil due to a capital letter
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1039 ;; typed in, it can never be restored to the original value. In
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1040 ;; that case, it's impossible to revert a case-sensitive search back
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1041 ;; to case-insensitive.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1042 (if ;(and isearch-case-fold-search search-caps-disable-folding)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1043 (and case-fold-search
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1044 ;; Make sure isearch-toggle-case-fold works.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1045 (not isearch-fixed-case)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1046 search-caps-disable-folding)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1047 (setq isearch-case-fold-search
375
a300bb07d72d Import from CVS: tag r21-2b3
cvs
parents: 373
diff changeset
1048 (no-upper-case-p isearch-string isearch-regexp)))
373
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
1049 (setq isearch-mode (if case-fold-search
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
1050 (if isearch-case-fold-search
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
1051 " Isearch" ;As God Intended Mode
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
1052 " ISeARch") ;Warn about evil case via StuDLYcAps.
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1053 " Isearch")))
373
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
1054
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1055 (defun isearch-search-and-update ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1056 ;; Do the search and update the display.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1057 (if (and (not isearch-success)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1058 ;; unsuccessful regexp search may become
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1059 ;; successful by addition of characters which
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1060 ;; make isearch-string valid
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1061 (not isearch-regexp))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1062 nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1063 ;; In reverse search, adding stuff at
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1064 ;; the end may cause zero or many more chars to be
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1065 ;; matched, in the string following point.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1066 ;; Allow all those possibilities without moving point as
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1067 ;; long as the match does not extend past search origin.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1068 (if (and (not isearch-forward) (not isearch-adjusted)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1069 (condition-case ()
373
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
1070 (progn
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
1071 (isearch-fix-case)
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
1072 (let ((case-fold-search isearch-case-fold-search))
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
1073 (looking-at (if isearch-regexp isearch-string
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
1074 (regexp-quote isearch-string)))))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1075 (error nil))
373
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
1076 (or isearch-yank-flag
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1077 (<= (match-end 0)
373
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
1078 (min isearch-opoint isearch-barrier))))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1079 (setq isearch-success t
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1080 isearch-invalid-regexp nil
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1081 isearch-within-brackets nil
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1082 isearch-other-end (match-end 0))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1083 ;; Not regexp, not reverse, or no match at point.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1084 (if (and isearch-other-end (not isearch-adjusted))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1085 (goto-char (if isearch-forward isearch-other-end
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1086 (min isearch-opoint
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1087 isearch-barrier
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1088 (1+ isearch-other-end)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1089 (isearch-search)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1090 ))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1091 (isearch-push-state)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1092 (if isearch-op-fun (funcall isearch-op-fun))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1093 (isearch-update))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1094
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1095
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1096 ;; *, ?, and | chars can make a regexp more liberal.
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1097 ;; They can make a regexp match sooner or make it succeed instead of failing.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1098 ;; So go back to place last successful search started
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1099 ;; or to the last ^S/^R (barrier), whichever is nearer.
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1100 ;; + needs no special handling because the string must match at least once.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1101
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1102 (defun isearch-*-char ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1103 "Handle * and ? specially in regexps."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1104 (interactive)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1105 (if isearch-regexp
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1106 (let ((idx (length isearch-string)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1107 (while (and (> idx 0)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1108 (eq (aref isearch-string (1- idx)) ?\\))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1109 (setq idx (1- idx)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1110 (when (= (mod (- (length isearch-string) idx) 2) 0)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1111 (setq isearch-adjusted t)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1112 ;; Get the isearch-other-end from before the last search.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1113 ;; We want to start from there,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1114 ;; so that we don't retreat farther than that.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1115 ;; (car isearch-cmds) is after last search;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1116 ;; (car (cdr isearch-cmds)) is from before it.
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1117 (let ((cs (nth 5 (car (cdr isearch-cmds)))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1118 (setq cs (or cs isearch-barrier))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1119 (goto-char
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1120 (if isearch-forward
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1121 (max cs isearch-barrier)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1122 (min cs isearch-barrier)))))))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1123 (isearch-process-search-char last-command-event))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1124
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1125
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1126
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1127 (defun isearch-|-char ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1128 "If in regexp search, jump to the barrier."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1129 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1130 (if isearch-regexp
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1131 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1132 (setq isearch-adjusted t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1133 (goto-char isearch-barrier)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1134 (isearch-process-search-char last-command-event))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1135
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1136 ;; FSF:
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1137 ;(defalias 'isearch-other-control-char 'isearch-other-meta-char)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1138 ;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1139 ;(defun isearch-other-meta-char ()
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1140 ;...
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1141 ;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1142
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1143 (defun isearch-quote-char ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1144 "Quote special characters for incremental search."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1145 (interactive)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1146 ;; #### Here FSF does some special conversion of chars in 0200-0377
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1147 ;; range. Maybe we should do the same.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1148 (isearch-process-search-char (read-quoted-char (isearch-message t))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1149
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1150 (defun isearch-return-char ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1151 "Convert return into newline for incremental search.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1152 Obsolete."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1153 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1154 (isearch-process-search-char ?\n))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1155
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1156 (defun isearch-printing-char ()
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1157 "Add this ordinary printing character to the search string and search."
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1158 (interactive)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1159 (let ((event last-command-event))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1160 ;; If we are called by isearch-whitespace-chars because the
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1161 ;; context disallows whitespace search (e.g. within brackets),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1162 ;; replace M-SPC with a space. FSF has similar code.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1163 (and (eq this-command 'isearch-whitespace-chars)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1164 (null (event-to-character event))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1165 (setq event (character-to-event ?\ )))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1166 (isearch-process-search-char event)))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1167
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1168 (defun isearch-whitespace-chars ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1169 "Match all whitespace chars, if in regexp mode."
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1170 ;; FSF docstring adds: "If you want to search for just a space, type
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1171 ;; C-q SPC." But we don't need the addition because we have a
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1172 ;; different (better) default for the variable.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1173 (interactive)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1174 (if isearch-regexp
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1175 (if (and search-whitespace-regexp (not isearch-within-brackets)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1176 (not isearch-invalid-regexp))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1177 (isearch-process-search-string search-whitespace-regexp " ")
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1178 (isearch-printing-char))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1179 (progn
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1180 ;; This way of doing word search doesn't correctly extend current search.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1181 ;; (setq isearch-word t)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1182 ;; (setq isearch-adjusted t)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1183 ;; (goto-char isearch-barrier)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1184 (isearch-printing-char))))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1185
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1186 (defun isearch-process-search-char (char)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1187 ;; Append the char to the search string, update the message and re-search.
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1188 (isearch-process-search-string (isearch-char-to-string char)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1189 (isearch-text-char-description char)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1190
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1191 (defun isearch-process-search-string (string message)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1192 (setq isearch-string (concat isearch-string string)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1193 isearch-message (concat isearch-message message))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1194 (isearch-search-and-update))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1195
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1196
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1197 ;;===========================================================
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1198 ;; Search Ring
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1199
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1200 (defun isearch-ring-adjust1 (advance)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1201 ;; Helper for isearch-ring-adjust
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1202 (let* ((ring (if isearch-regexp regexp-search-ring search-ring))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1203 (length (length ring))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1204 (yank-pointer-name (if isearch-regexp
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1205 'regexp-search-ring-yank-pointer
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1206 'search-ring-yank-pointer))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1207 (yank-pointer (eval yank-pointer-name)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1208 (if (zerop length)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1209 ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1210 (set yank-pointer-name
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1211 (setq yank-pointer
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1212 (mod (+ (or yank-pointer 0)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1213 (if advance -1 1))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1214 length)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1215 (setq isearch-string (nth yank-pointer ring)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1216 isearch-message (mapconcat 'isearch-text-char-description
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1217 isearch-string "")))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1218
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1219 (defun isearch-ring-adjust (advance)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1220 ;; Helper for isearch-ring-advance and isearch-ring-retreat
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1221 ; (if (cdr isearch-cmds) ;; is there more than one thing on stack?
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1222 ; (isearch-pop-state))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1223 (isearch-ring-adjust1 advance)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1224 (if search-ring-update
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1225 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1226 (isearch-search)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1227 (isearch-update))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1228 (isearch-edit-string)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1229 )
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1230 (isearch-push-state))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1231
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1232 (defun isearch-ring-advance ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1233 "Advance to the next search string in the ring."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1234 ;; This could be more general to handle a prefix arg, but who would use it.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1235 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1236 (isearch-ring-adjust 'advance))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1237
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1238 (defun isearch-ring-retreat ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1239 "Retreat to the previous search string in the ring."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1240 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1241 (isearch-ring-adjust nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1242
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1243 (defun isearch-ring-advance-edit (n)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1244 "Insert the next element of the search history into the minibuffer."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1245 (interactive "p")
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1246 (let* ((yank-pointer-name (if isearch-regexp
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1247 'regexp-search-ring-yank-pointer
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1248 'search-ring-yank-pointer))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1249 (yank-pointer (eval yank-pointer-name))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1250 (ring (if isearch-regexp regexp-search-ring search-ring))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1251 (length (length ring)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1252 (if (zerop length)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1253 ()
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1254 (set yank-pointer-name
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1255 (setq yank-pointer
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1256 (mod (- (or yank-pointer 0) n)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1257 length)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1258
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1259 (erase-buffer)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1260 (insert (nth yank-pointer ring))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1261 (goto-char (point-max)))))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1262
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1263 (defun isearch-ring-retreat-edit (n)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1264 "Inserts the previous element of the search history into the minibuffer."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1265 (interactive "p")
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1266 (isearch-ring-advance-edit (- n)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1267
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1268 ;; Merging note: FSF comments out these functions and implements them
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1269 ;; differently (see above), presumably because the versions below mess
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1270 ;; with isearch-string, while what we really want them to do is simply
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1271 ;; to insert the correct string to the minibuffer.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1272
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1273 ;;(defun isearch-ring-adjust-edit (advance)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1274 ;; "Use the next or previous search string in the ring while in minibuffer."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1275 ;; (isearch-ring-adjust1 advance)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1276 ;; (erase-buffer)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1277 ;; (insert isearch-string))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1278
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1279 ;;(defun isearch-ring-advance-edit ()
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1280 ;; (interactive)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1281 ;; (isearch-ring-adjust-edit 'advance))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1282
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1283 ;;(defun isearch-ring-retreat-edit ()
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1284 ;; "Retreat to the previous search string in the ring while in the minibuffer."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1285 ;; (interactive)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1286 ;; (isearch-ring-adjust-edit nil))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1287
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1288
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1289 (defun isearch-complete1 ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1290 ;; Helper for isearch-complete and isearch-complete-edit
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1291 ;; Return t if completion OK, nil if no completion exists.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1292 (let* ((ring (if isearch-regexp regexp-search-ring search-ring))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1293 (alist (mapcar (function (lambda (string) (list string))) ring))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1294 (completion-ignore-case case-fold-search)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1295 (completion (try-completion isearch-string alist)))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1296 (cond
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1297 ((eq completion t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1298 ;; isearch-string stays the same
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1299 t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1300 ((or completion ; not nil, must be a string
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1301 (= 0 (length isearch-string))) ; shouldn't have to say this
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1302 (if (equal completion isearch-string) ;; no extension?
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1303 (progn
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1304 (if completion-auto-help
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1305 (with-output-to-temp-buffer "*Isearch completions*"
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1306 (display-completion-list
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1307 (all-completions isearch-string alist))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1308 t)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1309 (and completion
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1310 (setq isearch-string completion))))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1311 (t
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1312 (temp-minibuffer-message "No completion")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1313 nil))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1314
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1315 (defun isearch-complete ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1316 "Complete the search string from the strings on the search ring.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1317 The completed string is then editable in the minibuffer.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1318 If there is no completion possible, say so and continue searching."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1319 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1320 (if (isearch-complete1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1321 (isearch-edit-string)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1322 ;; else
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1323 (sit-for 1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1324 (isearch-update)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1325
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1326 (defun isearch-complete-edit ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1327 "Same as `isearch-complete' except in the minibuffer."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1328 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1329 (setq isearch-string (buffer-string))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1330 (if (isearch-complete1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1331 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1332 (erase-buffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1333 (insert isearch-string))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1334
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1335
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1336 ;;;==============================================================
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1337 ;; The search status stack.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1338
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1339 (defun isearch-top-state ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1340 (let ((cmd (car isearch-cmds)))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1341 ;; #### Grr, this is so error-prone. If you add something to
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1342 ;; isearch-push-state, don't forget to update this. I thought I'd
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1343 ;; make a list of variables, and just do (mapcar* #'set vars
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1344 ;; values), but the (point) thing would spoil it, leaving to more
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1345 ;; complication.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1346 (setq isearch-string (car cmd)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1347 isearch-message (car (cdr cmd))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1348 isearch-success (nth 3 cmd)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1349 isearch-forward (nth 4 cmd)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1350 isearch-other-end (nth 5 cmd)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1351 isearch-word (nth 6 cmd)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1352 isearch-invalid-regexp (nth 7 cmd)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1353 isearch-wrapped (nth 8 cmd)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1354 isearch-barrier (nth 9 cmd)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1355 isearch-within-brackets (nth 10 cmd))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1356 (goto-char (car (cdr (cdr cmd))))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1357
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1358 (defun isearch-pop-state ()
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1359 (pop isearch-cmds)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1360 (isearch-top-state)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1361
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1362 ;; Make sure isearch-case-fold-search gets the correct value. FSF
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1363 ;; simply stores isearch-case-fold-search to isearch-cmds. We
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1364 ;; should probably do the same.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1365 (isearch-fix-case)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1366
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1367 ;; Here, as well as in isearch-search we must deal with the point
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1368 ;; landing at an invisible area which may need unhiding.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1369 (if (or (not (eq search-invisible 'open))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1370 (not isearch-hide-immediately))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1371 ;; If search-invisible is t, invisible text is just like any
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1372 ;; other text. If it is nil, it is always skipped and we can't
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1373 ;; land inside. In both cases, we don't need to do anything.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1374 ;;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1375 ;; Similarly, if isearch-hide-immediately is nil, needn't
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1376 ;; re-hide the area here, and neither can we land back into a
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1377 ;; hidden one.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1378 nil
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1379 (when isearch-other-end
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1380 ;; This will unhide the extents.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1381 (isearch-range-invisible (point) isearch-other-end))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1382 (isearch-restore-invisible-extents (point)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1383 (or isearch-other-end (point)))))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1384
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1385 (defun isearch-push-state ()
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1386 (setq isearch-cmds
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1387 (cons (list isearch-string isearch-message (point)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1388 isearch-success isearch-forward isearch-other-end
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1389 isearch-word
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1390 isearch-invalid-regexp isearch-wrapped isearch-barrier
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1391 isearch-within-brackets)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1392 isearch-cmds)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1393
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1394
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1395 ;;;==================================================================
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1396 ;; Message string
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1397
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1398 (defun isearch-message (&optional c-q-hack ellipsis)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1399 ;; Generate and print the message string.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1400 (let ((cursor-in-echo-area ellipsis)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1401 (m (concat
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1402 (isearch-message-prefix c-q-hack ellipsis isearch-nonincremental)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1403 isearch-message
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1404 (isearch-message-suffix c-q-hack ellipsis)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1405 )))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1406 (if c-q-hack
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1407 m
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1408 (display-message 'progress (format "%s" m)))))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1409
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1410 (defun isearch-message-prefix (&optional c-q-hack ellipsis nonincremental)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1411 ;; If about to search, and previous search regexp was invalid,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1412 ;; check that it still is. If it is valid now,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1413 ;; let the message we display while searching say that it is valid.
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1414 (and isearch-invalid-regexp ellipsis
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1415 (condition-case ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1416 (progn (re-search-forward isearch-string (point) t)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1417 (setq isearch-invalid-regexp nil
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1418 isearch-within-brackets nil))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1419 (error nil)))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1420 ;; If currently failing, display no ellipsis.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1421 (or isearch-success (setq ellipsis nil))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1422 ;; #### - ! Emacs assembles strings all over the place, they can't
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1423 ;; all be internationalized in the manner proposed below... Add an
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1424 ;; explicit call to `gettext' and have the string snarfer pluck the
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1425 ;; english strings out of the comment below. XEmacs is on a
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1426 ;; purespace diet! -Stig
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1427
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1428 ;; The comment below is dead and buried, but it can be rebuilt if
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1429 ;; necessary. -hniksic
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1430 (let ((m (concat (if isearch-success nil "failing ")
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1431 (if (and isearch-wrapped
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1432 (if isearch-forward
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1433 (> (point) isearch-opoint)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1434 (< (point) isearch-opoint)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1435 "overwrapped "
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1436 (if isearch-wrapped "wrapped "))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1437 (if isearch-word "word ")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1438 (if isearch-regexp "regexp ")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1439 (if nonincremental "search" "I-search")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1440 (if isearch-forward nil " backward")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1441 ": "
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1442 )))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1443 (aset m 0 (upcase (aref m 0)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1444 (gettext m)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1445
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1446 (defun isearch-message-suffix (&optional c-q-hack ellipsis)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1447 (concat (if c-q-hack "^Q" "")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1448 (if isearch-invalid-regexp
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1449 (concat " [" isearch-invalid-regexp "]")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1450 "")))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1451
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1452 ;;;(let ((i (logior (if isearch-success 32 0)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1453 ;;; (if isearch-wrapped 16 0)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1454 ;;; (if isearch-word 8 0)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1455 ;;; (if isearch-regexp 4 0)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1456 ;;; (if nonincremental 2 0)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1457 ;;; (if isearch-forward 1 0))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1458 ;;; (cond
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1459 ;;; ((= i 63) (gettext "Wrapped word regexp search: ")) ; 111111
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1460 ;;; ...and so on, ad nauseam...
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1461 ;;; ((= i 0) (gettext "Failing I-search backward: ")) ; 000000
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1462 ;;; (t (error "Something's rotten")))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1463
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1464
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1465 ;;;========================================================
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1466 ;;; Exiting
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1467
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1468 (put 'isearch-printing-char 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1469 (put 'isearch-return-char 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1470 (put 'isearch-repeat-forward 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1471 (put 'isearch-repeat-backward 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1472 (put 'isearch-delete-char 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1473 (put 'isearch-help-or-delete-char 'isearch-command t)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1474 (put 'isearch-cancel 'isearch-command t)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1475 (put 'isearch-abort 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1476 (put 'isearch-quote-char 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1477 (put 'isearch-exit 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1478 (put 'isearch-printing-char 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1479 (put 'isearch-printing-char 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1480 (put 'isearch-yank-word 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1481 (put 'isearch-yank-line 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1482 (put 'isearch-yank-kill 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1483 (put 'isearch-yank-sexp 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1484 (put 'isearch-*-char 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1485 (put 'isearch-*-char 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1486 (put 'isearch-|-char 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1487 (put 'isearch-toggle-regexp 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1488 (put 'isearch-toggle-case-fold 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1489 (put 'isearch-edit-string 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1490 (put 'isearch-mode-help 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1491 (put 'isearch-ring-advance 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1492 (put 'isearch-ring-retreat 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1493 (put 'isearch-ring-advance-edit 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1494 (put 'isearch-ring-retreat-edit 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1495 (put 'isearch-whitespace-chars 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1496 (put 'isearch-complete 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1497 (put 'isearch-complete-edit 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1498 (put 'isearch-edit-string 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1499 (put 'isearch-toggle-regexp 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1500 (put 'isearch-forward-exit-minibuffer 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1501 (put 'isearch-reverse-exit-minibuffer 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1502 (put 'isearch-nonincremental-exit-minibuffer 'isearch-command t)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1503 (put 'isearch-yank-selection 'isearch-command t)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1504 (put 'isearch-yank-clipboard 'isearch-command t)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1505 (put 'isearch-yank-x-selection 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1506 (put 'isearch-yank-x-clipboard 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1507
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1508 ;; scrolling the scrollbar should not terminate isearch.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1509
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1510 ;; vertical scrollbar:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1511 (put 'scrollbar-line-up 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1512 (put 'scrollbar-line-down 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1513 (put 'scrollbar-page-up 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1514 (put 'scrollbar-page-down 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1515 (put 'scrollbar-to-top 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1516 (put 'scrollbar-to-bottom 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1517 (put 'scrollbar-vertical-drag 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1518
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1519 ;; horizontal scrollbar:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1520 (put 'scrollbar-char-left 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1521 (put 'scrollbar-char-right 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1522 (put 'scrollbar-page-left 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1523 (put 'scrollbar-page-right 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1524 (put 'scrollbar-to-left 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1525 (put 'scrollbar-to-right 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1526 (put 'scrollbar-horizontal-drag 'isearch-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1527
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1528 (defun isearch-pre-command-hook ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1529 ;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1530 ;; For use as the value of `pre-command-hook' when isearch-mode is active.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1531 ;; If the command about to be executed is not one of the isearch commands,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1532 ;; then isearch-mode is turned off before that command is executed.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1533 ;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1534 ;; If the command about to be executed is self-insert-command, or is a
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1535 ;; keyboard macro of a single key sequence which is bound to self-insert-
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1536 ;; command, then we add those chars to the search ring instead of inserting
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1537 ;; them in the buffer. In this way, the set of self-searching characters
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1538 ;; need not be exhaustively enumerated, but is derived from other maps.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1539 ;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1540 (cond ((not (eq (current-buffer) isearch-buffer))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1541 ;; If the buffer (likely meaning "frame") has changed, bail.
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1542 ;; This can happen if the user types something into another
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1543 ;; frame. It can also happen if a proc filter has popped up
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1544 ;; another buffer, which is arguably a bad thing for it to
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1545 ;; have done, but the way in which isearch would have hosed
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1546 ;; you in that case is unarguably even worse. -jwz
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1547 (isearch-done)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1548
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1549 ;; `this-command' is set according to the value of
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1550 ;; `overriding-local-map', set by isearch-mode. This is
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1551 ;; wrong because that keymap makes sense only in isearch
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1552 ;; buffer. To make sure the right command is called, adjust
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1553 ;; `this-command' to the appropriate value, now that
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1554 ;; `isearch-done' has set `overriding-local-map' to nil.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1555
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1556 ;; FSF does similar magic in `isearch-other-meta-char', which
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1557 ;; is horribly complex. I *hope* what we do works in all
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1558 ;; cases.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1559 (setq this-command (key-binding (this-command-keys))))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1560 (t
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1561 (isearch-maybe-frob-keyboard-macros)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1562 (if (and this-command
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1563 (symbolp this-command)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1564 (get this-command 'isearch-command))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1565 nil ; then continue.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1566 (isearch-done)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1567
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1568 (defun isearch-maybe-frob-keyboard-macros ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1569 ;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1570 ;; If the command about to be executed is `self-insert-command' then change
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1571 ;; the command to `isearch-printing-char' instead, meaning add the last-
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1572 ;; typed character to the search string.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1573 ;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1574 ;; If `this-command' is a string or a vector (that is, a keyboard macro)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1575 ;; and it contains only one command, which is bound to self-insert-command,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1576 ;; then do the same thing as for self-inserting commands: arrange for that
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1577 ;; character to be added to the search string. If we didn't do this, then
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1578 ;; typing a compose sequence (a la x-compose.el) would terminate the search
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1579 ;; and insert the character, instead of searching for that character.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1580 ;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1581 ;; We should continue doing this, since it's pretty much the behavior one
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1582 ;; would expect, but it will stop being so necessary once key-translation-
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1583 ;; map exists and is used by x-compose.el and things like it, since the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1584 ;; translation will have been done before we see the keys.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1585 ;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1586 (cond ((eq this-command 'self-insert-command)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1587 (setq this-command 'isearch-printing-char))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1588 ((and (or (stringp this-command) (vectorp this-command))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1589 (eq (key-binding this-command) 'self-insert-command))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1590 (setq last-command-event (character-to-event (aref this-command 0))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1591 last-command-char (and (stringp this-command)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1592 (aref this-command 0))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1593 this-command 'isearch-printing-char))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1594 ))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1595
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1596
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1597 ;;;========================================================
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1598 ;;; Highlighting
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1599
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1600 (defvar isearch-extent nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1601
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1602 ;; this face is initialized by faces.el since isearch is preloaded.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1603 ;(make-face 'isearch)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1604
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1605 (defun isearch-make-extent (begin end)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1606 (let ((x (make-extent begin end (current-buffer))))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1607 ;; make the isearch extent always take precedence over any mouse-
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1608 ;; highlighted extents we may be passing through, since isearch, being
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1609 ;; modal, is more interesting (there's nothing they could do with a
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1610 ;; mouse-highlighted extent while in the midst of a search anyway).
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1611 (set-extent-priority x (+ mouse-highlight-priority 2))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1612 (set-extent-face x 'isearch)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1613 (setq isearch-extent x)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1614
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1615 (defun isearch-highlight (begin end)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1616 (if (null search-highlight)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1617 nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1618 ;; make sure isearch-extent is in the current buffer
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1619 (or (and (extentp isearch-extent)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1620 (extent-live-p isearch-extent))
373
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
1621 (isearch-make-extent begin end))
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
1622 (set-extent-endpoints isearch-extent begin end (current-buffer))))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1623
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1624 ;; This used to have a TOTALLY flag that also deleted the extent. I
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1625 ;; don't think this is necessary any longer, as isearch-highlight can
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1626 ;; simply move the extent to another buffer. The IGNORED argument is
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1627 ;; for the code that calls this function with an argument. --hniksic
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1628 (defun isearch-dehighlight (&optional ignored)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1629 (and search-highlight
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1630 (extentp isearch-extent)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1631 (extent-live-p isearch-extent)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1632 (detach-extent isearch-extent)))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1633
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1634
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1635 ;;;========================================================
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1636 ;;; Searching
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1637
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1638 (defun isearch-search ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1639 ;; Do the search with the current search string.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1640 (isearch-message nil t)
373
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
1641 (isearch-fix-case)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1642 (condition-case lossage
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1643 (let ((inhibit-quit nil)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1644 (case-fold-search isearch-case-fold-search)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1645 (retry t))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1646 (if isearch-regexp (setq isearch-invalid-regexp nil))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1647 (setq isearch-within-brackets nil)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1648 (while retry
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1649 (setq isearch-success
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1650 (funcall
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1651 (cond (isearch-word
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1652 (if isearch-forward
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1653 'word-search-forward 'word-search-backward))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1654 (isearch-regexp
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1655 (if isearch-forward
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1656 're-search-forward 're-search-backward))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1657 (t
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1658 (if isearch-forward 'search-forward 'search-backward)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1659 isearch-string nil t))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1660 ;; Clear RETRY unless we matched some invisible text
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1661 ;; and we aren't supposed to do that.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1662 (if (or (eq search-invisible t)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1663 (not isearch-success)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1664 (bobp) (eobp)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1665 (= (match-beginning 0) (match-end 0))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1666 (not (isearch-range-invisible
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1667 (match-beginning 0) (match-end 0))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1668 (setq retry nil)))
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 253
diff changeset
1669 (setq isearch-just-started nil)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1670 (when isearch-success
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1671 (setq isearch-other-end
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1672 (if isearch-forward (match-beginning 0) (match-end 0)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1673 (and isearch-hide-immediately
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1674 (isearch-restore-invisible-extents (match-beginning 0)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1675 (match-end 0)))))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1676
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1677 (quit (setq unread-command-events (nconc unread-command-events
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1678 (character-to-event (quit-char))))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1679 (setq isearch-success nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1680
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1681 (invalid-regexp
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1682 (setq isearch-invalid-regexp (car (cdr lossage)))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1683 (setq isearch-within-brackets (string-match "\\`Unmatched \\["
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1684 isearch-invalid-regexp))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1685 (if (string-match
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1686 "\\`Premature \\|\\`Unmatched \\|\\`Invalid "
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1687 isearch-invalid-regexp)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1688 (setq isearch-invalid-regexp (gettext "incomplete input"))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1689 (error
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1690 ;; stack overflow in regexp search.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1691 (setq isearch-invalid-regexp (car (cdr lossage)))))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1692
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1693 (if isearch-success
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1694 nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1695
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1696 ;; If we're being run inside a keyboard macro, then the call to
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1697 ;; ding will signal an error (to terminate the macro). We must
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1698 ;; turn off isearch-mode first, so that we aren't still in isearch
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1699 ;; mode after the macro exits. Note that isearch-recursive-edit
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1700 ;; must not be true if a keyboard macro is executing.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1701 (if (and executing-kbd-macro (not defining-kbd-macro))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1702 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1703 (isearch-done)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1704 (ding nil 'isearch-failed)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1705
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1706 ;; Ding if failed this time after succeeding last time.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1707 (and (nth 3 (car isearch-cmds))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1708 (ding nil 'isearch-failed))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1709 (goto-char (nth 2 (car isearch-cmds)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1710
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1711 ;; Replaced with isearch-edit-string.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1712 ;(defun nonincremental-search (forward regexp)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1713 ;...
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1714
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1715 (defun isearch-unhide-extent (extent)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1716 ;; Store the values for the `invisible' and `intangible'
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1717 ;; properties, and then set them to nil. This way the text hidden
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1718 ;; by this extent becomes visible.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1719 (put extent 'isearch-invisible (get extent 'invisible))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1720 (put extent 'isearch-intangible (get extent 'intangible))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1721 (put extent 'invisible nil)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1722 (put extent 'intangible nil))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1723
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1724 (defun isearch-range-invisible (beg end)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1725 "Return t if all the text from BEG to END is invisible.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1726 Before that, if search-invisible is `open', unhide the extents with an
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1727 `isearch-open-invisible' property."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1728 ;; isearch-search uses this to skip the extents that are invisible,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1729 ;; but don't have `isearch-open-invisible' set. It is unclear
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1730 ;; what's supposed to happen if only a part of [BEG, END) overlaps
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1731 ;; the extent.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1732 (let (to-be-unhidden)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1733 (if (map-extents
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1734 (lambda (extent ignored)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1735 (if (and (<= (extent-start-position extent) beg)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1736 (>= (extent-end-position extent) end))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1737 ;; All of the region is covered by the extent.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1738 (if (and (eq search-invisible 'open)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1739 (get extent 'isearch-open-invisible))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1740 (progn
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1741 (push extent to-be-unhidden)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1742 nil) ; keep mapping
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1743 ;; We can't or won't unhide this extent, so we must
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1744 ;; skip the whole match. We return from map-extents
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1745 ;; immediately.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1746 t)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1747 ;; Else, keep looking.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1748 nil))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1749 nil beg end nil 'all-extents-closed 'invisible)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1750 ;; The whole match must be skipped. Signal it by returning t
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1751 ;; to the caller.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1752 t
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1753 ;; If any extents need to be unhidden, unhide them.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1754 (mapc #'isearch-unhide-extent to-be-unhidden)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1755 ;; Will leave this assert for some time, to catch bugs.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1756 (assert (null (intersection to-be-unhidden isearch-unhidden-extents)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1757 (setq isearch-unhidden-extents (nconc to-be-unhidden
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1758 isearch-unhidden-extents))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1759 nil)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1760
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1761 (defun isearch-restore-extent (extent)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1762 (put extent 'invisible (get extent 'isearch-invisible))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1763 (put extent 'intangible (get extent 'isearch-intangible))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1764 (remprop extent 'isearch-invisible)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1765 (remprop extent 'isearch-intangible))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1766
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1767 ;; FSF calls this function `isearch-clean-overlays'.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1768 (defun isearch-restore-invisible-extents (beg end)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1769 (cond
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1770 ((null beg)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1771 ;; Delete all -- this is called at the end of isearch.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1772 (mapc #'isearch-restore-extent isearch-unhidden-extents)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1773 (setq isearch-unhidden-extents nil))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1774 (t
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1775 ;; Extents that do not overlap the match area can be safely
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1776 ;; restored to their hidden state.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1777 (setq isearch-unhidden-extents
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1778 (delete-if (lambda (extent)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1779 (unless (extent-in-region-p extent beg end
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1780 'all-extents-closed)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1781 (isearch-restore-extent extent)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1782 t))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1783 isearch-unhidden-extents)))))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1784
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1785 (defun isearch-no-upper-case-p (string)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1786 "Return t if there are no upper case chars in string.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1787 But upper case chars preceded by \\ do not count since they
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1788 have special meaning in a regexp."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1789 ;; this incorrectly returns t for "\\\\A"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1790 (let ((case-fold-search nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1791 (not (string-match "\\(^\\|[^\\]\\)[A-Z]" string))))
375
a300bb07d72d Import from CVS: tag r21-2b3
cvs
parents: 373
diff changeset
1792 (make-obsolete 'isearch-no-upper-case-p 'no-upper-case-p)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1793
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1794 ;; Portability functions to support various Emacs versions.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1795
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1796 (defun isearch-char-to-string (c)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1797 (if (eventp c)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1798 (make-string 1 (event-to-character c nil nil t))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1799 (make-string 1 c)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1800
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1801 ;(defun isearch-text-char-description (c)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1802 ; (isearch-char-to-string c))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1803
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1804 (define-function 'isearch-text-char-description 'text-char-description)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1805
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1806 ;; Used by etags.el and info.el
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1807 (defmacro with-caps-disable-folding (string &rest body) "\
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1808 Eval BODY with `case-fold-search' let to nil if STRING contains
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1809 uppercase letters and `search-caps-disable-folding' is t."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1810 `(let ((case-fold-search
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1811 (if (and case-fold-search search-caps-disable-folding)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1812 (isearch-no-upper-case-p ,string)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1813 case-fold-search)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1814 ,@body))
375
a300bb07d72d Import from CVS: tag r21-2b3
cvs
parents: 373
diff changeset
1815 (make-obsolete 'with-caps-disable-folding 'with-search-caps-disable-folding)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1816 (put 'with-caps-disable-folding 'lisp-indent-function 1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1817 (put 'with-caps-disable-folding 'edebug-form-spec '(form body))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1818
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1819
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1820 ;;;========================================================
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1821 ;;; Advanced highlighting
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1822
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1823 ;; When active, *every* visible match for the current search string is
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1824 ;; highlighted: the current one using the normal isearch match color
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1825 ;; and all the others using the `isearch-secondary' face. The extra
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1826 ;; highlighting makes it easier to anticipate where the cursor will
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1827 ;; land each time you press C-s or C-r to repeat a pending search.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1828 ;; Only the matches visible at any point are highlighted -- when you
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1829 ;; move through the buffer, the highlighting is readjusted.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1830
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1831 ;; This is based on ideas from Bob Glickstein's `ishl' package. It
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1832 ;; has been merged with XEmacs by Darryl Okahata, and then completely
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1833 ;; rewritten by Hrvoje Niksic.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1834
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1835 ;; The code makes the following assumptions about the rest of this
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1836 ;; file, so be careful when modifying it.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1837
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1838 ;; * `isearch-highlight-all-update' should get called when the search
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1839 ;; string changes, or when the search advances. This is done from
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1840 ;; `isearch-update'.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1841 ;; * `isearch-highlight-all-cleanup' should get called when the search
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1842 ;; is done. This is performed in `isearch-done'.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1843 ;; * `isearch-string' is expected to contain the current search string
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1844 ;; as entered by the user.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1845 ;; * `isearch-opoint' is expected to contain the location where the
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1846 ;; current search began.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1847 ;; * the type of the current search is expected to be given by
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1848 ;; `isearch-word' and `isearch-regexp'.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1849 ;; * the variable `isearch-invalid-regexp' is expected to be true iff
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1850 ;; `isearch-string' is an invalid regexp.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1851
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1852 (defcustom isearch-highlight-all-matches search-highlight
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1853 "*Non-nil means highlight all visible matches."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1854 :type 'boolean
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1855 :group 'isearch)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1856
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1857 ;; We can't create this face here, as isearch.el is preloaded.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1858 ;; #### Think up a better name for this!
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1859 ;(defface isearch-secondary '((t (:foreground "red3")))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1860 ; "Face to use for highlighting all matches."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1861 ; :group 'isearch)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1862
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1863 (defvar isearch-highlight-extents nil)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1864 (defvar isearch-window-start nil)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1865 (defvar isearch-window-end nil)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1866 ;; We compare isearch-string and isearch-case-fold-search to saved
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1867 ;; values for better efficiency.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1868 (defvar isearch-highlight-last-string nil)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1869 (defvar isearch-highlight-last-case-fold-search nil)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1870 (defvar isearch-highlight-last-regexp nil)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1871
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1872 (defun isearch-delete-extents-in-range (start end)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1873 ;; Delete all highlighting extents that overlap [START, END).
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1874 (setq isearch-highlight-extents
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1875 (delete-if (lambda (extent)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1876 (when (extent-in-region-p extent start end)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1877 (delete-extent extent)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1878 t))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1879 isearch-highlight-extents)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1880
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1881 (defun isearch-highlight-all-cleanup ()
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1882 ;; Stop lazily highlighting and remove extra highlighting from
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1883 ;; buffer.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1884 (mapc #'delete-extent isearch-highlight-extents)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1885 (setq isearch-highlight-extents nil)
410
de805c49cfc1 Import from CVS: tag r21-2-35
cvs
parents: 398
diff changeset
1886 (setq isearch-window-end nil
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1887 isearch-highlight-last-string nil))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1888
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1889 (defun isearch-highlight-all-update ()
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1890 ;; Update the highlighting if necessary. This needs to check if the
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1891 ;; search string has changed, or if the window has changed position
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1892 ;; in the buffer.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1893 (let ((need-start-over nil))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1894 ;; NB: we don't check for isearch-success because if the point is
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1895 ;; after the last match, the search can be unsuccessful, and yet
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1896 ;; there are things to highlight.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1897 (cond ((not isearch-highlight-all-matches))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1898 ((or (equal isearch-string "")
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1899 isearch-invalid-regexp)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1900 (isearch-highlight-all-cleanup))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1901 ((not (eq isearch-case-fold-search
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1902 isearch-highlight-last-case-fold-search))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1903 ;; This case is usually caused by search string being
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1904 ;; changed, which would be caught below, but it can also be
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1905 ;; tripped using isearch-toggle-case-fold.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1906 (setq need-start-over t))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1907 ((not (eq isearch-regexp isearch-highlight-last-regexp))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1908 ;; Ditto for isearch-toggle-regexp.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1909 (setq need-start-over t))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1910 ((equal isearch-string isearch-highlight-last-string)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1911 ;; The search string is the same. We need to do something
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1912 ;; if our position has changed.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1913
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1914 ;; It would be nice if we didn't have to do this; however,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1915 ;; window-start doesn't support a GUARANTEE flag, so we must
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1916 ;; force redisplay to get the correct value for start and end
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1917 ;; of window.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1918 (sit-for 0)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1919
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1920 ;; Check whether our location has changed.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1921 (let ((start (window-start))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1922 (end (min (window-end) (point-max))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1923 (cond ((and (= start isearch-window-start)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1924 (= end isearch-window-end))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1925 ;; Our position is unchanged -- do nothing.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1926 )
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1927 ((and (> start isearch-window-start)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1928 (> end isearch-window-end)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1929 (<= start isearch-window-end))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1930 ;; We've migrated downward, but we overlap the old
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1931 ;; region. Delete the old non-overlapping extents
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1932 ;; and fill in the rest.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1933 (isearch-delete-extents-in-range isearch-window-start start)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1934 (isearch-highlightify-region isearch-window-end end)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1935 (setq isearch-window-start start
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1936 isearch-window-end end))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1937 ((and (<= start isearch-window-start)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1938 (<= end isearch-window-end)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1939 (> end isearch-window-start))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1940 ;; We've migrated upward, but we overlap the old
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1941 ;; region. Delete the old non-overlapping extents
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1942 ;; and fill in the rest.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1943 (isearch-delete-extents-in-range
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1944 end isearch-window-end)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1945 (isearch-highlightify-region start isearch-window-start)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1946 (setq isearch-window-start start
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1947 isearch-window-end end))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1948 (t
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1949 ;; The regions don't overlap, or they overlap in a
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1950 ;; weird way.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1951 (setq need-start-over t)))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1952 (t
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1953 ;; The search string has changed.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1954
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1955 ;; If more input is pending, don't start over because
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1956 ;; starting over forces redisplay, and that slows down
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1957 ;; typing.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1958 (unless (input-pending-p)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1959 (setq need-start-over t))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1960 (when need-start-over
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1961 ;; Force redisplay before removing the old extents, in order to
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1962 ;; avoid flicker.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1963 (sit-for 0)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1964 (isearch-highlight-all-cleanup)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1965 (setq isearch-window-start (window-start)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1966 isearch-window-end (min (window-end) (point-max)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1967 (isearch-highlightify-region isearch-window-start isearch-window-end))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1968
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1969 (setq isearch-highlight-last-string isearch-string
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1970 isearch-highlight-last-case-fold-search isearch-case-fold-search
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1971 isearch-highlight-last-regexp isearch-regexp)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1972
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1973 (defun isearch-highlight-advance (string forwardp)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1974 ;; Search ahead for the next or previous match. This is the same as
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1975 ;; isearch-search, but without the extra baggage. Maybe it should
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1976 ;; be in a separate function.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1977 (let ((case-fold-search isearch-case-fold-search))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1978 (funcall (cond (isearch-word (if forwardp
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1979 'word-search-forward
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1980 'word-search-backward))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1981 (isearch-regexp (if forwardp
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1982 're-search-forward
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1983 're-search-backward))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1984 (t (if forwardp
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1985 'search-forward
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1986 'search-backward)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1987 string nil t)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1988
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1989 (defun isearch-highlightify-region (start end)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1990 ;; Highlight all occurrences of isearch-string between START and
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1991 ;; END. To do this right, we have to search forward as long as
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1992 ;; there are matches that overlap [START, END), and then search
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1993 ;; backward the same way.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1994 (save-excursion
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1995 (goto-char isearch-opoint)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1996 (let ((lastpoint (point)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1997 (while (and (isearch-highlight-advance isearch-string t)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1998 (/= lastpoint (point))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
1999 (< (match-beginning 0) end))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
2000 (let ((extent (make-extent (match-beginning 0)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
2001 (match-end 0))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
2002 (set-extent-priority extent (1+ mouse-highlight-priority))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
2003 (put extent 'face 'isearch-secondary)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
2004 (push extent isearch-highlight-extents))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
2005 (setq lastpoint (point))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
2006 (goto-char isearch-opoint)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
2007 (let ((lastpoint (point)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
2008 (while (and (isearch-highlight-advance isearch-string nil)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
2009 (/= lastpoint (point))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
2010 (>= (match-end 0) start))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
2011 (let ((extent (make-extent (match-beginning 0)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
2012 (match-end 0))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
2013 (set-extent-priority extent (1+ mouse-highlight-priority))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
2014 (put extent 'face 'isearch-secondary)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
2015 (push extent isearch-highlight-extents))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
2016 (setq lastpoint (point))))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
2017
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2018 ;;; isearch-mode.el ends here