annotate lisp/prim/isearch-mode.el @ 193:f53b5ca2e663 r20-3b23

Import from CVS: tag r20-3b23
author cvs
date Mon, 13 Aug 2007 09:58:30 +0200
parents 1856695b1fa9
children acd284d43ca1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1 ;; Incremental search minor mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2 ;; Copyright (C) 1992, 1993 Free Software Foundation, Inc.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4 ;; LCD Archive Entry:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5 ;; isearch-mode|Daniel LaLiberte|liberte@cs.uiuc.edu
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6 ;; |A minor mode replacement for isearch.el.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8 ;; This file is part of XEmacs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
9
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10 ;; XEmacs is free software; you can redistribute it and/or modify it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
11 ;; under the terms of the GNU General Public License as published by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12 ;; the Free Software Foundation; either version 2, or (at your option)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13 ;; any later version.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15 ;; XEmacs is distributed in the hope that it will be useful, but
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
18 ;; General Public License for more details.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
19
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
20 ;; You should have received a copy of the GNU General Public License
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 0
diff changeset
21 ;; along with XEmacs; see the file COPYING. If not, write to the
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 44
diff changeset
22 ;; Free Software Foundation, 59 Temple Place - Suite 330,
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 0
diff changeset
23 ;; Boston, MA 02111-1307, USA.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
24
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
25 ;;; Synched up with: Not synched with FSF.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
26
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
27 ;;;====================================================================
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
28 ;; Instructions
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
29
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
30 ;; Searching with isearch-mode.el should work just like isearch.el,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
31 ;; except it is done in a temporary minor mode that terminates when
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
32 ;; you finish searching.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
33
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34 ;; Semi-modal searching is supported, using a recursive edit. If
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
35 ;; isearching is started non-interactively by calling one of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
36 ;; isearch commands (e.g. (isearch-forward), but not like gnus does
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
37 ;; it: (call-interactively 'isearch-forward)), isearch-mode does not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
38 ;; return until the search is completed. You should still be able
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39 ;; switch buffers, so be careful not to get things confused.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
40
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41 ;; The key bindings active within isearch-mode are defined below in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42 ;; `isearch-mode-map' which is given bindings close to the default
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
43 ;; characters of isearch.el for version 19. With `isearch-mode',
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44 ;; however, you can bind multi-character keys and it should be easier
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45 ;; to add new commands. One bug though: keys with meta-prefix cannot
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46 ;; be longer than two chars. Also see minibuffer-local-isearch-map
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
47 ;; for bindings active during `isearch-edit-string'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
49 ;; The search ring and completion commands automatically put you in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50 ;; the minibuffer to edit the string. This gives you a chance to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
51 ;; modify the search string before executing the search. There are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52 ;; three commands to terminate the editing: C-s and C-r exit the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
53 ;; minibuffer and search forward and reverse respectively, while C-m
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54 ;; exits and does a nonincremental search.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
55
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
56 ;; Exiting immediately from isearch uses isearch-edit-string instead
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
57 ;; of nonincremental-search, if search-nonincremental-instead is non-nil.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
58 ;; The name of this option should probably be changed if we decide to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
59 ;; keep the behavior. One difference is that isearch-edit-string does
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
60 ;; not support word search yet; perhaps isearch-mode should support it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
61 ;; even for incremental searches, but how?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
62
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
63 ;;;====================================================================
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
64 ;;; Change History
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
65
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
66 ;;; Header: /import/kaplan/kaplan/liberte/Isearch/RCS/isearch-mode.el,v 1.3 92/06/29 13:10:08 liberte Exp Locker: liberte
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
67 ;;; Log: isearch-mode.el,v
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
68 ;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
69 ;;; 20-aug-92 Hacked by jwz for Lucid Emacs 19.3.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
70 ;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
71 ;;; Revision 1.3 92/06/29 13:10:08 liberte
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72 ;;; Moved modal isearch-mode handling into isearch-mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73 ;;; Got rid of buffer-local isearch variables.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74 ;;; isearch-edit-string used by ring adjustments, completion, and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
75 ;;; nonincremental searching. C-s and C-r are additional exit commands.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76 ;;; Renamed all regex to regexp.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
77 ;;; Got rid of found-start and found-point globals.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
78 ;;; Generalized handling of upper-case chars.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
79
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
80 ;;; Revision 1.2 92/05/27 11:33:57 liberte
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
81 ;;; Emacs version 19 has a search ring, which is supported here.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
82 ;;; Other fixes found in the version 19 isearch are included here.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
83 ;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
84 ;;; Also see variables search-caps-disable-folding,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
85 ;;; search-nonincremental-instead, search-whitespace-regexp, and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
86 ;;; commands isearch-toggle-regexp, isearch-edit-string.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
87 ;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88 ;;; semi-modal isearching is supported.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
89
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
90 ;;; Changes for 1.1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
91 ;;; 3/18/92 Fixed invalid-regexp.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
92 ;;; 3/18/92 Fixed yanking in regexps.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
93
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
94
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
95 (defgroup isearch nil
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
96 "Incremental search"
126
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
97 :prefix "search-"
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
98 :group 'matching)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
99
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
100
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
101 (defun isearch-char-to-string (c)
142
1856695b1fa9 Import from CVS: tag r20-2b5
cvs
parents: 126
diff changeset
102 (if (eventp c)
1856695b1fa9 Import from CVS: tag r20-2b5
cvs
parents: 126
diff changeset
103 (make-string 1 (event-to-character c nil nil t))
1856695b1fa9 Import from CVS: tag r20-2b5
cvs
parents: 126
diff changeset
104 (make-string 1 c)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
105
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
106 ;(defun isearch-text-char-description (c)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
107 ; (isearch-char-to-string c))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
108
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
109 (define-function 'isearch-text-char-description 'text-char-description)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
110
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
111
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
112 ;;;=========================================================================
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
113 ;;; User-accessible variables
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
114
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
115 (defvar search-last-string ""
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
116 "Last string search for by a search command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
117 This does not include direct calls to the primitive search functions,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
118 and does not include searches that are aborted.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
119
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
120 (defvar search-last-regexp ""
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
121 "Last string searched for by a regexp search command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
122 This does not include direct calls to the primitive search functions,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
123 and does not include searches that are aborted.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
124
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
125 (defconst search-exit-option t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
126 "Non-nil means random control characters terminate incremental search.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
127
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
128 (defcustom search-slow-window-lines 1
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
129 "*Number of lines in slow search display windows.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
130 These are the short windows used during incremental search on slow terminals.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
131 Negative means put the slow search window at the top (normally it's at bottom)
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
132 and the value is minus the number of lines."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
133 :type 'integer
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
134 :group 'isearch)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
135
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
136 (defcustom search-slow-speed 1200
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
137 "*Highest terminal speed at which to use \"slow\" style incremental search.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
138 This is the style where a one-line window is created to show the line
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
139 that the search has reached."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
140 :type 'integer
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
141 :group 'isearch)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
142
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
143 (defcustom search-caps-disable-folding t
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
144 "*If non-nil, upper case chars disable case fold searching.
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
145 This does not apply to \"yanked\" strings."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
146 :type 'boolean
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
147 :group 'isearch)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
148
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
149 (defcustom search-nonincremental-instead t
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
150 "*If non-nil, do a nonincremental search instead if exiting immediately."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
151 :type 'boolean
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
152 :group 'isearch)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
153
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
154 (defcustom search-whitespace-regexp "\\(\\s \\|[\n\r]\\)+"
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
155 "*If non-nil, regular expression to match a sequence of whitespace chars."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
156 :type 'regexp
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
157 :group 'isearch)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
158
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
159 ;;;==================================================================
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
160 ;;; Search ring.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
161
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
162 (defvar search-ring nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
163 "List of search string sequences.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
164 (defvar regexp-search-ring nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
165 "List of regular expression search string sequences.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
166
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
167 (defcustom search-ring-max 16
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
168 "*Maximum length of search ring before oldest elements are thrown away."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
169 :type 'integer
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
170 :group 'isearch)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
171 (defcustom regexp-search-ring-max 16
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
172 "*Maximum length of regexp search ring before oldest elements are thrown away."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
173 :type 'integer
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
174 :group 'isearch)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
175
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
176 (defvar search-ring-yank-pointer nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
177 "The tail of the search ring whose car is the last thing searched for.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
178 (defvar regexp-search-ring-yank-pointer nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
179 "The tail of the regular expression search ring whose car is the last
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
180 thing searched for.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
181
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
182 ;;;====================================================
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
183 ;;; Define isearch-mode keymap.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
184
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
185 (defvar isearch-mode-map
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
186 (let ((map (make-keymap)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
187 (set-keymap-name map 'isearch-mode-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
188
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
189 ;; Bind all printing characters to `isearch-printing-char'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
190 ;; This isn't normally necessary, but if a printing character were
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
191 ;; bound to something other than self-insert-command in global-map,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
192 ;; then it would terminate the search and be executed without this.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
193 (let ((i 32)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
194 (str (make-string 1 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
195 (while (< i 127)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
196 (aset str 0 i)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
197 (define-key map str 'isearch-printing-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
198 (setq i (1+ i))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
199 (define-key map "\t" 'isearch-printing-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
200
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
201 ;; Several non-printing chars change the searching behavior.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
202 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
203 (define-key map "\C-s" 'isearch-repeat-forward)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
204 (define-key map "\M-\C-s" 'isearch-repeat-forward)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
205 (define-key map "\C-r" 'isearch-repeat-backward)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
206 (define-key map "\177" 'isearch-delete-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
207 (define-key map "\C-g" 'isearch-abort)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
208
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
209 (define-key map "\C-q" 'isearch-quote-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
210
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
211 (define-key map "\C-m" 'isearch-exit)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
212 (define-key map "\C-j" 'isearch-printing-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
213 (define-key map "\t" 'isearch-printing-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
214
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
215 (define-key map "\C-w" 'isearch-yank-word)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
216 (define-key map "\C-y" 'isearch-yank-line)
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
217 (define-key map "\M-y" 'isearch-yank-kill)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
218
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
219 ;; Define keys for regexp chars * ? |
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
220 (define-key map "*" 'isearch-*-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
221 (define-key map "?" 'isearch-*-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
222 (define-key map "|" 'isearch-|-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
223
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
224 ;; Some bindings you may want to put in your isearch-mode-hook.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
225 ;; Suggest some alternates...
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
226 ;; (define-key map "\C-t" 'isearch-toggle-regexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
227 ;; (define-key map "\C-^" 'isearch-edit-string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
228
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
229 ;; backspace deletes, but C-h is help.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
230 (define-key map 'backspace 'isearch-delete-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
231 (define-key map '(control h) 'isearch-mode-help)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
232
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
233 (define-key map "\M-n" 'isearch-ring-advance)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
234 (define-key map "\M-p" 'isearch-ring-retreat)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
235 (define-key map "\M- " 'isearch-whitespace-chars)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
236 (define-key map "\M-\t" 'isearch-complete)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
237
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
238 (define-key map 'button2 'isearch-yank-x-selection)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
239
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
240 map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
241 "Keymap for isearch-mode.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
242
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
243 (defvar minibuffer-local-isearch-map
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
244 (let ((map (make-sparse-keymap)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
245 ;; #### - this should also be minor-mode-ified
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
246 (set-keymap-parents map (list minibuffer-local-map))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
247 (set-keymap-name map 'minibuffer-local-isearch-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
248
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
249 ;;#### This should just arrange to use the usual Emacs minibuffer histories
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
250 (define-key map "\r" 'isearch-nonincremental-exit-minibuffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
251 (define-key map "\M-n" 'isearch-ring-advance-edit)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
252 (define-key map "\M-p" 'isearch-ring-retreat-edit)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
253 (define-key map "\M-\t" 'isearch-complete-edit)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
254 (define-key map "\C-s" 'isearch-forward-exit-minibuffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
255 (define-key map "\C-r" 'isearch-reverse-exit-minibuffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
256 map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
257 "Keymap for editing isearch strings in the minibuffer.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
258
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
259 ;;;========================================================
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
260 ;; Internal variables declared globally for byte-compiler.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
261 ;; These are all bound locally while editing the search string.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
262
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
263 (defvar isearch-forward nil) ; Searching in the forward direction.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
264 (defvar isearch-regexp nil) ; Searching for a regexp.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
265 (defvar isearch-word nil) ; Searching for words.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
266
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
267 (defvar isearch-cmds nil) ; Stack of search status sets.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
268 (defvar isearch-string "") ; The current search string.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
269 (defvar isearch-message "") ; text-char-description version of isearch-string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
270
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
271 (defvar isearch-success t) ; Searching is currently successful.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
272 (defvar isearch-invalid-regexp nil) ; Regexp not well formed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
273 (defvar isearch-other-end nil) ; Start (end) of match if forward (backward).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
274 (defvar isearch-wrapped nil) ; Searching restarted from the top (bottom).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
275 (defvar isearch-barrier 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
276 (defvar isearch-buffer nil) ; the buffer we've frobbed the keymap of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
277
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
278 (defvar isearch-case-fold-search nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
279
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
280 (defvar isearch-adjusted nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
281 (defvar isearch-slow-terminal-mode nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
282 ;;; If t, using a small window.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
283 (defvar isearch-small-window nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
284 (defvar isearch-opoint 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
285 ;;; The window configuration active at the beginning of the search.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
286 (defvar isearch-window-configuration nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
287 (defvar isearch-selected-frame nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
288
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
289 ;; Flag to indicate a yank occurred, so don't move the cursor.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
290 (defvar isearch-yank-flag nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
291
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
292 ;;; A function to be called after each input character is processed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
293 ;;; (It is not called after characters that exit the search.)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
294 ;;; It is only set from an optional argument to `isearch-mode'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
295 (defvar isearch-op-fun nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
296
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
297 ;;; Is isearch-mode in a recursive edit for modal searching.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
298 (defvar isearch-recursive-edit nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
299
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
300 ;;; Should isearch be terminated after doing one search?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
301 (defvar isearch-nonincremental nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
302
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
303 ;; New value of isearch-forward after isearch-edit-string.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
304 (defvar isearch-new-forward nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
305
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
306
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
307 (defvar isearch-mode-hook nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
308 "Function(s) to call after starting up an incremental search.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
309
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
310 (defvar isearch-mode-end-hook nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
311 "Function(s) to call after terminating an incremental search.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
312
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
313 ;;;==============================================================
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
314 ;; Minor-mode-alist changes - kind of redundant with the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
315 ;; echo area, but if isearching in multiple windows, it can be useful.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
316
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
317 (add-minor-mode 'isearch-mode 'isearch-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
318
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
319 (defvar isearch-mode nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
320 (make-variable-buffer-local 'isearch-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
321
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
322 ;;;===============================================================
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
323 ;;; Entry points to isearch-mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
324 ;;; These four functions should replace those in loaddefs.el
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
325 ;;; An alternative is to fset isearch-forward etc to isearch-mode,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
326 ;;; and look at the last command to set the options accordingly.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
327
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
328 (defun isearch-forward (&optional regexp-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
329 "Do incremental search forward.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
330 With a prefix argument, do an incremental regular expression search instead.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
331 \\<isearch-mode-map>
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
332 As you type characters, they add to the search string and are found.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
333 The following non-printing keys are bound in `isearch-mode-map'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
334
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
335 Type \\[isearch-delete-char] to cancel characters from end of search string.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
336 Type \\[isearch-exit] to exit, leaving point at location found.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
337 Type LFD (C-j) to match end of line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
338 Type \\[isearch-repeat-forward] to search again forward,\
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
339 \\[isearch-repeat-backward] to search again backward.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
340 Type \\[isearch-yank-word] to yank word from buffer onto end of search\
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
341 string and search for it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
342 Type \\[isearch-yank-line] to yank rest of line onto end of search string\
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
343 and search for it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
344 Type \\[isearch-quote-char] to quote control character to search for it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
345 Type \\[isearch-whitespace-chars] to match all whitespace chars in regexp.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
346 \\[isearch-abort] while searching or when search has failed cancels input\
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
347 back to what has
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
348 been found successfully.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
349 \\[isearch-abort] when search is successful aborts and moves point to\
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
350 starting point.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
351
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
352 Also supported is a search ring of the previous 16 search strings.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
353 Type \\[isearch-ring-advance] to search for the next item in the search ring.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
354 Type \\[isearch-ring-retreat] to search for the previous item in the search\
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
355 ring.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
356 Type \\[isearch-complete] to complete the search string using the search ring.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
357
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
358 The above keys are bound in the isearch-mode-map. To change the keys which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
359 are special to isearch-mode, simply change the bindings in that map.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
360
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
361 Other control and meta characters terminate the search
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
362 and are then executed normally (depending on `search-exit-option').
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
363
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
364 If this function is called non-interactively, it does not return to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
365 the calling function until the search is done.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
366
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
367 The bindings, more precisely:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
368 \\{isearch-mode-map}"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
369
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
370 ;; Non-standard bindings
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
371 ;; Type \\[isearch-toggle-regexp] to toggle regular expression with normal searching.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
372 ;; Type \\[isearch-edit-string] to edit the search string in the minibuffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
373 ;; Terminate editing and return to incremental searching with CR.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
374
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
375 (interactive "_P")
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
376 (isearch-mode t (not (null regexp-p)) nil (not (interactive-p))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
377
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
378 (defun isearch-forward-regexp ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
379 "\
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
380 Do incremental search forward for regular expression.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
381 Like ordinary incremental search except that your input
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
382 is treated as a regexp. See \\[isearch-forward] for more info."
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
383 (interactive "_")
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
384 (isearch-mode t t nil (not (interactive-p))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
385
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
386 (defun isearch-backward (&optional regexp-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
387 "\
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
388 Do incremental search backward.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
389 With a prefix argument, do an incremental regular expression search instead.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
390 See \\[isearch-forward] for more information."
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
391 (interactive "_P")
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
392 (isearch-mode nil (not (null regexp-p)) nil (not (interactive-p))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
393
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
394 (defun isearch-backward-regexp ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
395 "\
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
396 Do incremental search backward for regular expression.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
397 Like ordinary incremental search except that your input
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
398 is treated as a regexp. See \\[isearch-forward] for more info."
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
399 (interactive "_")
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
400 (isearch-mode nil t nil (not (interactive-p))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
401
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
402 ;; This function is way wrong, because you can't scroll the help
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
403 ;; screen; as soon as you press a key, it's gone. I don't know of a
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
404 ;; good way to fix it, though. -hniksic
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
405 (defun isearch-mode-help ()
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
406 (interactive "_")
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 108
diff changeset
407 (let ((w (selected-window)))
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 108
diff changeset
408 (describe-function 'isearch-forward)
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 108
diff changeset
409 (select-window w))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
410 (isearch-update))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
411
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
412
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
413 ;;;==================================================================
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
414 ;; isearch-mode only sets up incremental search for the minor mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
415 ;; All the work is done by the isearch-mode commands.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
416
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
417 (defun isearch-mode (forward &optional regexp op-fun recursive-edit word-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
418 "Start isearch minor mode. Called by isearch-forward, etc."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
419
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
420 (if executing-kbd-macro (setq recursive-edit nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
421
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
422 (let ((inhibit-quit t)) ; don't leave things in an inconsistent state...
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
423
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
424 ;; Initialize global vars.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
425 (setq isearch-buffer (current-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
426 isearch-forward forward
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
427 isearch-regexp regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
428 isearch-word word-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
429 isearch-op-fun op-fun
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
430 isearch-case-fold-search case-fold-search
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
431 isearch-string ""
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
432 isearch-message ""
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
433 isearch-cmds nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
434 isearch-success t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
435 isearch-wrapped nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
436 isearch-barrier (point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
437 isearch-adjusted nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
438 isearch-yank-flag nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
439 isearch-invalid-regexp nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
440 isearch-slow-terminal-mode (and (<= (device-baud-rate)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
441 search-slow-speed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
442 (> (window-height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
443 (* 4 search-slow-window-lines)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
444 isearch-other-end nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
445 isearch-small-window nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
446
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
447 isearch-opoint (point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
448 isearch-window-configuration (current-window-configuration)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
449
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
450 ;; #### - don't do this statically: isearch-mode must be FIRST in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
451 ;; the minor-mode-map-alist -- Stig
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
452 minor-mode-map-alist (cons (cons 'isearch-mode isearch-mode-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
453 minor-mode-map-alist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
454 isearch-selected-frame (selected-frame)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
455
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
456 isearch-mode (gettext " Isearch")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
457 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
458
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
459 ;; XEmacs change: without clearing the match data, sometimes old values
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
460 ;; of isearch-other-end get used. Don't ask me why...
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
461 (store-match-data nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
462
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
463 (add-hook 'pre-command-hook 'isearch-pre-command-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
464 (set-buffer-modified-p (buffer-modified-p)) ; update modeline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
465 (isearch-push-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
466
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
467 ) ; inhibit-quit is t before here
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
468
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
469 (isearch-update)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
470 (run-hooks 'isearch-mode-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
471
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
472 ;; isearch-mode can be made modal (in the sense of not returning to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
473 ;; the calling function until searching is completed) by entering
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
474 ;; a recursive-edit and exiting it when done isearching.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
475 (if recursive-edit
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
476 (let ((isearch-recursive-edit t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
477 (recursive-edit)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
478 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
479
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
480
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
481 ;;;====================================================
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
482 ;; Some high level utilities. Others below.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
483
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
484 (defun isearch-update ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
485 ;; Called after each command to update the display.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
486 (if (null unread-command-event)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
487 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
488 (if (not (input-pending-p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
489 (isearch-message))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
490 (if (and isearch-slow-terminal-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
491 (not (or isearch-small-window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
492 (pos-visible-in-window-p))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
493 (let ((found-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
494 (setq isearch-small-window t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
495 (move-to-window-line 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
496 (let ((window-min-height 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
497 (split-window nil (if (< search-slow-window-lines 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
498 (1+ (- search-slow-window-lines))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
499 (- (window-height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
500 (1+ search-slow-window-lines)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
501 (if (< search-slow-window-lines 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
502 (progn (vertical-motion (- 1 search-slow-window-lines))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
503 (set-window-start (next-window) (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
504 (set-window-hscroll (next-window)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
505 (window-hscroll))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
506 (set-window-hscroll (selected-window) 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
507 (other-window 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
508 (goto-char found-point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
509 (if isearch-other-end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
510 (if (< isearch-other-end (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
511 (isearch-highlight isearch-other-end (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
512 (isearch-highlight (point) isearch-other-end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
513 (if (extentp isearch-extent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
514 (isearch-dehighlight nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
515 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
516 (setq ;; quit-flag nil not for isearch-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
517 isearch-adjusted nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
518 isearch-yank-flag nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
519 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
520
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
521
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
522 (defun isearch-done ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
523 ;; Called by all commands that terminate isearch-mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
524 (let ((inhibit-quit t)) ; danger danger!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
525 (if (and isearch-buffer (buffer-live-p isearch-buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
526 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
527 ;; Some loser process filter might have switched the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
528 ;; window's buffer, so be sure to set these variables back
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
529 ;; in the buffer we frobbed them in. But only if the buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
530 ;; is still alive.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
531 (set-buffer isearch-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
532 (setq minor-mode-map-alist (delq (assoc 'isearch-mode minor-mode-map-alist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
533 minor-mode-map-alist))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
534 ;; Use remove-hook instead of just setting it to our saved value
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
535 ;; in case some process filter has created a buffer and modified
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
536 ;; the pre-command-hook in that buffer... yeah, this is obscure,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
537 ;; and yeah, I was getting screwed by it. -jwz
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
538 (remove-hook 'pre-command-hook 'isearch-pre-command-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
539 (set-keymap-parents isearch-mode-map nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
540 (setq isearch-mode nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
541 (set-buffer-modified-p (buffer-modified-p));; update modeline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
542 (isearch-dehighlight t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
543
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
544 ;; it's not critical that this be inside inhibit-quit, but leaving
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
545 ;; things in small-window-mode would be bad.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
546 (let ((found-start (window-start (selected-window)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
547 (found-point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
548 (cond ((eq (selected-frame) isearch-selected-frame)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
549 (set-window-configuration isearch-window-configuration)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
550
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
551 (if isearch-small-window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
552 (goto-char found-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
553 ;; Exiting the save-window-excursion clobbers
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
554 ;; window-start; restore it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
555 (set-window-start (selected-window) found-start t))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
556 ;; If there was movement, mark the starting position.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
557 ;; Maybe should test difference between and set mark iff > threshold.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
558 (if (and (buffer-live-p isearch-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
559 (/= (point isearch-buffer) isearch-opoint))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
560 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
561 (push-mark isearch-opoint t nil isearch-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
562 (or executing-kbd-macro (> (minibuffer-depth) 0)
193
f53b5ca2e663 Import from CVS: tag r20-3b23
cvs
parents: 142
diff changeset
563 (display-message 'command "Mark saved where search started"))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
564 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
565 (setq isearch-buffer nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
566 ) ; inhibit-quit is t before here
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
567
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
568 (if (> (length isearch-string) 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
569 ;; Update the ring data.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
570 (if isearch-regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
571 (if (not (setq regexp-search-ring-yank-pointer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
572 (member isearch-string regexp-search-ring)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
573 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
574 (setq regexp-search-ring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
575 (cons isearch-string regexp-search-ring)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
576 regexp-search-ring-yank-pointer regexp-search-ring)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
577 (if (> (length regexp-search-ring) regexp-search-ring-max)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
578 (setcdr (nthcdr (1- search-ring-max) regexp-search-ring)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
579 nil))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
580 (if (not (setq search-ring-yank-pointer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
581 ;; really need equal test instead of eq.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
582 (member isearch-string search-ring)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
583 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
584 (setq search-ring (cons isearch-string search-ring)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
585 search-ring-yank-pointer search-ring)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
586 (if (> (length search-ring) search-ring-max)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
587 (setcdr (nthcdr (1- search-ring-max) search-ring) nil))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
588
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
589 (run-hooks 'isearch-mode-end-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
590 (if isearch-recursive-edit (exit-recursive-edit)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
591
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
592
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
593 ;;;====================================================
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
594 ;; Commands active while inside of the isearch minor mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
595
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
596 (defun isearch-exit ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
597 "Exit search normally.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
598 However, if this is the first command after starting incremental
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
599 search and `search-nonincremental-instead' is non-nil, do an
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
600 incremental search via `isearch-edit-string'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
601 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
602 (if (and search-nonincremental-instead
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
603 (= 0 (length isearch-string)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
604 (let ((isearch-nonincremental t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
605 (isearch-edit-string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
606 (isearch-done)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
607
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
608
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
609 (defun isearch-edit-string ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
610 "Edit the search string in the minibuffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
611 The following additional command keys are active while editing.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
612 \\<minibuffer-local-isearch-map>
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
613 \\[exit-minibuffer] to exit editing and resume incremental searching.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
614 \\[isearch-forward-exit-minibuffer] to resume isearching forward.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
615 \\[isearch-backward-exit-minibuffer] to resume isearching backward.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
616 \\[isearch-ring-advance-edit] to replace the search string with the next\
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
617 item in the search ring.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
618 \\[isearch-ring-retreat-edit] to replace the search string with the next\
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
619 item in the search ring.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
620 \\[isearch-complete-edit] to complete the search string from the search ring."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
621
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
622 ;; Editing doesnt back up the search point. Should it?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
623 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
624
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
625 (condition-case nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
626 (let ((minibuffer-local-map minibuffer-local-isearch-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
627 isearch-nonincremental ; should search nonincrementally?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
628 isearch-new-string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
629 isearch-new-message
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
630 (isearch-new-forward isearch-forward)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
631
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
632 ;; Locally bind all isearch global variables to protect them
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
633 ;; from recursive isearching.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
634 (isearch-string isearch-string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
635 (isearch-message isearch-message)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
636 (isearch-forward isearch-forward) ; set by commands below.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
637
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
638 (isearch-forward isearch-forward)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
639 (isearch-regexp isearch-regexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
640 (isearch-word isearch-word)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
641 (isearch-op-fun isearch-op-fun)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
642 (isearch-cmds isearch-cmds)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
643 (isearch-success isearch-success)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
644 (isearch-wrapped isearch-wrapped)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
645 (isearch-barrier isearch-barrier)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
646 (isearch-adjusted isearch-adjusted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
647 (isearch-yank-flag isearch-yank-flag)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
648 (isearch-invalid-regexp isearch-invalid-regexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
649 (isearch-other-end isearch-other-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
650 (isearch-opoint isearch-opoint)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
651 (isearch-slow-terminal-mode isearch-slow-terminal-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
652 (isearch-small-window isearch-small-window)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
653 (isearch-recursive-edit isearch-recursive-edit)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
654 (isearch-window-configuration (current-window-configuration))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
655 (isearch-selected-frame (selected-frame))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
656 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
657 ;; Actually terminate isearching until editing is done.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
658 ;; This is so that the user can do anything without failure,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
659 ;; like switch buffers and start another isearch, and return.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
660 ;; (condition-case nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
661 (isearch-done)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
662 ;;#### What does this mean? There is no such condition!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
663 ;; (exit nil)) ; was recursive editing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
664
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
665 (unwind-protect
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
666 (let ((prompt (isearch-message-prefix nil t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
667 event)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
668 ;; If the first character the user types when we prompt them
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
669 ;; for a string is the yank-word character, then go into
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
670 ;; word-search mode. Otherwise unread that character and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
671 ;; read a string the normal way.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
672 (let ((cursor-in-echo-area t))
193
f53b5ca2e663 Import from CVS: tag r20-3b23
cvs
parents: 142
diff changeset
673 (display-message 'prompt prompt)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
674 (setq event (next-command-event))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
675 (if (eq 'isearch-yank-word
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
676 (lookup-key isearch-mode-map (vector event)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
677 (setq isearch-word t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
678 (setq unread-command-event event)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
679 (setq isearch-new-string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
680 ;; (if (fboundp 'gmhist-old-read-from-minibuffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
681 ;; ;; Eschew gmhist crockery
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
682 ;; (gmhist-old-read-from-minibuffer prompt isearch-string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
683 (read-string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
684 prompt isearch-string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
685 't ;does its own history (but shouldn't)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
686 ;; (if isearch-regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
687 ;; ;; The search-rings aren't exactly minibuffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
688 ;; ;; histories, but they are close enough
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
689 ;; (cons 'regexp-search-ring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
690 ;; (- (length regexp-search-ring-yank-pointer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
691 ;; (length regexp-search-ring)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
692 ;; (cons 'search-ring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
693 ;; (- (length search-ring-yank-pointer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
694 ;; (length search-ring))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
695 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
696 ;; )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
697 isearch-new-message (mapconcat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
698 'isearch-text-char-description
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
699 isearch-new-string ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
700 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
701 ;; Always resume isearching by restarting it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
702 (isearch-mode isearch-forward
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
703 isearch-regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
704 isearch-op-fun
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
705 isearch-recursive-edit
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
706 isearch-word)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
707 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
708
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
709 ;; Copy new values in outer locals to isearch globals
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
710 (setq isearch-string isearch-new-string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
711 isearch-message isearch-new-message
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
712 isearch-forward isearch-new-forward)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
713
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
714 ;; Empty isearch-string means use default.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
715 (if (= 0 (length isearch-string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
716 (setq isearch-string (if isearch-regexp search-last-regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
717 search-last-string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
718 ;; Set last search string now so it is set even if we fail.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
719 (if search-last-regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
720 (setq search-last-regexp isearch-string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
721 (setq search-last-string isearch-string)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
722
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
723 ;; Reinvoke the pending search.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
724 (isearch-push-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
725 (isearch-search)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
726 (isearch-update)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
727 (if isearch-nonincremental (isearch-done)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
728
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
729 (quit ; handle abort-recursive-edit
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
730 (isearch-abort) ;; outside of let to restore outside global values
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
731 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
732
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
733 (defun isearch-nonincremental-exit-minibuffer ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
734 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
735 (setq isearch-nonincremental t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
736 (exit-minibuffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
737
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
738 (defun isearch-forward-exit-minibuffer ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
739 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
740 (setq isearch-new-forward t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
741 (exit-minibuffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
742
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
743 (defun isearch-reverse-exit-minibuffer ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
744 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
745 (setq isearch-new-forward nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
746 (exit-minibuffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
747
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
748
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
749 (defun isearch-abort ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
750 "Quit incremental search mode if searching is successful, signalling quit.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
751 Otherwise, revert to previous successful search and continue searching.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
752 Use `isearch-exit' to quit without signalling."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
753 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
754 ;; (ding) signal instead below, if quiting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
755 (discard-input)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
756 (if isearch-success
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
757 ;; If search is successful, move back to starting point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
758 ;; and really do quit.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
759 (progn (goto-char isearch-opoint)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
760 (isearch-done) ; exit isearch
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
761 (signal 'quit '(isearch))) ; and pass on quit signal
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
762 ;; If search is failing, rub out until it is once more successful.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
763 (while (not isearch-success) (isearch-pop-state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
764 (isearch-update)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
765
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
766
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
767 (defun isearch-repeat (direction)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
768 ;; Utility for isearch-repeat-forward and -backward.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
769 (if (eq isearch-forward (eq direction 'forward))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
770 ;; C-s in forward or C-r in reverse.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
771 (if (equal isearch-string "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
772 ;; If search string is empty, use last one.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
773 (setq isearch-string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
774 (or (if isearch-regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
775 (if regexp-search-ring-yank-pointer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
776 (car regexp-search-ring-yank-pointer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
777 (car regexp-search-ring))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
778 (if search-ring-yank-pointer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
779 (car search-ring-yank-pointer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
780 (car search-ring)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
781 "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
782 isearch-message
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
783 (mapconcat 'isearch-text-char-description
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
784 isearch-string ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
785 ;; If already have what to search for, repeat it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
786 (or isearch-success
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
787 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
788
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
789 (goto-char (if isearch-forward (point-min) (point-max)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
790 (setq isearch-wrapped t))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
791 ;; C-s in reverse or C-r in forward, change direction.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
792 (setq isearch-forward (not isearch-forward)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
793
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
794 (setq isearch-barrier (point)) ; For subsequent \| if regexp.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
795 (setq isearch-success t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
796 (or (equal isearch-string "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
797 ;; If repeating a search that found
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
798 ;; an empty string, ensure we advance.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
799 (if (equal (match-end 0) (match-beginning 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
800 (if (if isearch-forward (eobp) (bobp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
801 ;; nowhere to advance to, so fail (and wrap next time)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
802 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
803 (setq isearch-success nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
804 (and executing-kbd-macro
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
805 (not defining-kbd-macro)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
806 (isearch-done))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
807 (ding nil 'isearch-failed))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
808 (forward-char (if isearch-forward 1 -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
809 (isearch-search))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
810 (isearch-search)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
811 (isearch-push-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
812 (isearch-update))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
813
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
814 (defun isearch-repeat-forward ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
815 "Repeat incremental search forwards."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
816 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
817 (isearch-repeat 'forward))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
818
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
819 (defun isearch-repeat-backward ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
820 "Repeat incremental search backwards."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
821 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
822 (isearch-repeat 'backward))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
823
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
824 (defun isearch-toggle-regexp ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
825 "Toggle regexp searching on or off."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
826 ;; The status stack is left unchanged.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
827 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
828 (setq isearch-regexp (not isearch-regexp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
829 (if isearch-regexp (setq isearch-word nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
830 (isearch-update))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
831
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
832 (defun isearch-toggle-case-fold ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
833 "Toggle case folding in searching on or off."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
834 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
835 (setq isearch-case-fold-search
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
836 (if isearch-case-fold-search nil 'yes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
837 (message "%s%s [case %ssensitive]"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
838 (isearch-message-prefix)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
839 isearch-message
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
840 (if isearch-case-fold-search "in" ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
841 (setq isearch-adjusted t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
842 (sit-for 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
843 (isearch-update))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
844
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
845 (defun isearch-delete-char ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
846 "Discard last input item and move point back.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
847 If no previous match was done, just beep."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
848 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
849 (if (null (cdr isearch-cmds))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
850 (ding nil 'isearch-quit)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
851 (isearch-pop-state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
852 (isearch-update))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
853
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
854
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
855 (defun isearch-yank (chunk)
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
856 ;; Helper for isearch-yank-* functions. CHUNK can be a string or a
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
857 ;; function.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
858 (let ((word (if (stringp chunk)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
859 chunk
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
860 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
861 (and (not isearch-forward) isearch-other-end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
862 (goto-char isearch-other-end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
863 (buffer-substring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
864 (point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
865 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
866 (funcall chunk)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
867 (point)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
868 ;; if configured so that typing upper-case characters turns off case
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
869 ;; folding, then downcase the string so that yanking an upper-case
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
870 ;; word doesn't mess with case-foldedness.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
871 (if (and search-caps-disable-folding isearch-case-fold-search)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
872 (setq word (downcase word)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
873 (if isearch-regexp (setq word (regexp-quote word)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
874 (setq isearch-string (concat isearch-string word)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
875 isearch-message
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
876 (concat isearch-message
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
877 (mapconcat 'isearch-text-char-description
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
878 word ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
879 ;; Don't move cursor in reverse search.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
880 isearch-yank-flag t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
881 (isearch-search-and-update))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
882
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
883
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
884 (defun isearch-yank-word ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
885 "Pull next word from buffer into search string."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
886 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
887 (isearch-yank (function (lambda () (forward-word 1)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
888
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
889 (defun isearch-yank-line ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
890 "Pull rest of line from buffer into search string."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
891 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
892 (isearch-yank 'end-of-line))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
893
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
894 (defun isearch-yank-kill ()
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
895 "Pull rest of line from kill ring into search string."
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
896 (interactive)
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
897 (isearch-yank (current-kill 0)))
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
898
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
899 (defun isearch-yank-sexp ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
900 "Pull next expression from buffer into search string."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
901 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
902 (isearch-yank 'forward-sexp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
903
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
904 (defun isearch-yank-x-selection ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
905 "Pull the current X selection into the search string."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
906 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
907 (isearch-yank (x-get-selection)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
908
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
909 (defun isearch-yank-x-clipboard ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
910 "Pull the current X clipboard selection into the search string."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
911 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
912 (isearch-yank (x-get-clipboard)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
913
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
914 (defun isearch-search-and-update ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
915 ;; Do the search and update the display.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
916 (if (and (not isearch-success)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
917 ;; unsuccessful regexp search may become
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
918 ;; successful by addition of characters which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
919 ;; make isearch-string valid
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
920 (not isearch-regexp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
921 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
922 ;; In reverse search, adding stuff at
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
923 ;; the end may cause zero or many more chars to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
924 ;; matched, in the string following point.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
925 ;; Allow all those possibilities without moving point as
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
926 ;; long as the match does not extend past search origin.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
927 (if (and (not isearch-forward) (not isearch-adjusted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
928 (condition-case ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
929 (looking-at (if isearch-regexp isearch-string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
930 (regexp-quote isearch-string)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
931 (error nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
932 (or isearch-yank-flag
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
933 (<= (match-end 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
934 (min isearch-opoint isearch-barrier))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
935 (setq isearch-success t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
936 isearch-invalid-regexp nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
937 isearch-other-end (match-end 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
938 ;; Not regexp, not reverse, or no match at point.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
939 (if (and isearch-other-end (not isearch-adjusted))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
940 (goto-char (if isearch-forward isearch-other-end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
941 (min isearch-opoint
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
942 isearch-barrier
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
943 (1+ isearch-other-end)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
944 (isearch-search)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
945 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
946 (isearch-push-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
947 (if isearch-op-fun (funcall isearch-op-fun))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
948 (isearch-update))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
949
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
950
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
951 ;; *, ?, and | chars can make a regexp more liberal.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
952 ;; They can make a regexp match sooner
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
953 ;; or make it succeed instead of failing.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
954 ;; So go back to place last successful search started
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
955 ;; or to the last ^S/^R (barrier), whichever is nearer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
956
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
957 (defun isearch-*-char ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
958 "Handle * and ? specially in regexps."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
959 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
960 (if isearch-regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
961
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
962 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
963 (setq isearch-adjusted t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
964 (let ((cs (nth (if isearch-forward
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
965 5 ; isearch-other-end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
966 2) ; saved (point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
967 (car (cdr isearch-cmds)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
968 ;; (car isearch-cmds) is after last search;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
969 ;; (car (cdr isearch-cmds)) is from before it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
970 (setq cs (or cs isearch-barrier))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
971 (goto-char
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
972 (if isearch-forward
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
973 (max cs isearch-barrier)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
974 (min cs isearch-barrier))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
975 (isearch-process-search-char last-command-event))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
976
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
977
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
978
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
979 (defun isearch-|-char ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
980 "If in regexp search, jump to the barrier."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
981 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
982 (if isearch-regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
983 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
984 (setq isearch-adjusted t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
985 (goto-char isearch-barrier)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
986 (isearch-process-search-char last-command-event))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
987
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
988 (defun isearch-quote-char ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
989 "Quote special characters for incremental search."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
990 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
991 (isearch-process-search-char (read-quoted-char (isearch-message t))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
992
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
993
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
994 (defun isearch-return-char ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
995 "Convert return into newline for incremental search.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
996 Obsolete."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
997 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
998 (isearch-process-search-char ?\n))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
999
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1000
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1001 (defun isearch-printing-char ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1002 "Any other printing character => add it to the search string and search."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1003 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1004 (isearch-process-search-char last-command-event))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1005
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1006
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1007 (defun isearch-whitespace-chars ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1008 "Match all whitespace chars, if in regexp mode."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1009 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1010 (if (and isearch-regexp search-whitespace-regexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1011 (isearch-process-search-string search-whitespace-regexp " ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1012 (beep)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1013 (isearch-process-search-char ?\ )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1014 ; (if isearch-word
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1015 ; nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1016 ; (setq isearch-word t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1017 ; (goto-char isearch-other-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1018 ; (isearch-process-search-char ?\ ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1019 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1020
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1021 (defun isearch-process-search-char (char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1022 ;; Append the char to the search string, update the message and re-search.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1023 (isearch-process-search-string (isearch-char-to-string char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1024 (isearch-text-char-description char)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1025
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1026 (defun isearch-process-search-string (string message)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1027 (setq isearch-string (concat isearch-string string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1028 isearch-message (concat isearch-message message))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1029 (isearch-search-and-update))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1030
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1031
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1032 ;;===========================================================
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1033 ;; Search Ring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1034
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
1035 (defcustom search-ring-update nil
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1036 "*Non-nil if advancing or retreating in the search ring should cause search.
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
1037 Default nil means edit the string from the search ring first."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
1038 :type 'boolean
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
1039 :group 'isearch)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1040
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1041 (defun isearch-ring-adjust1 (advance)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1042 ;; Helper for isearch-ring-adjust
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1043 (let* ((ring (if isearch-regexp regexp-search-ring search-ring))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1044 (length (length ring))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1045 (yank-pointer-name (if isearch-regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1046 'regexp-search-ring-yank-pointer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1047 'search-ring-yank-pointer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1048 (yank-pointer (eval yank-pointer-name)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1049 (if (zerop length)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1050 ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1051 (set yank-pointer-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1052 (setq yank-pointer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1053 (nthcdr (% (+ (- length (length yank-pointer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1054 (if advance (1- length) 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1055 length) ring)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1056 (setq isearch-string (car yank-pointer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1057 isearch-message (mapconcat 'isearch-text-char-description
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1058 isearch-string "")))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1059
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1060 (defun isearch-ring-adjust (advance)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1061 ;; Helper for isearch-ring-advance and isearch-ring-retreat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1062 (if (cdr isearch-cmds) ;; is there more than one thing on stack?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1063 (isearch-pop-state))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1064 (isearch-ring-adjust1 advance)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1065 (isearch-push-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1066 (if search-ring-update
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1067 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1068 (isearch-search)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1069 (isearch-update))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1070 (isearch-edit-string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1071 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1072
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1073 (defun isearch-ring-advance ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1074 "Advance to the next search string in the ring."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1075 ;; This could be more general to handle a prefix arg, but who would use it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1076 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1077 (isearch-ring-adjust 'advance))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1078
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1079 (defun isearch-ring-retreat ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1080 "Retreat to the previous search string in the ring."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1081 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1082 (isearch-ring-adjust nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1083
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1084 (defun isearch-ring-adjust-edit (advance)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1085 "Use the next or previous search string in the ring while in minibuffer."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1086 (isearch-ring-adjust1 advance)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1087 (erase-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1088 (insert isearch-string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1089
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1090 (defun isearch-ring-advance-edit ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1091 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1092 (isearch-ring-adjust-edit 'advance))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1093
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1094 (defun isearch-ring-retreat-edit ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1095 "Retreat to the previous search string in the ring while in the minibuffer."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1096 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1097 (isearch-ring-adjust-edit nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1098
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1099
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1100 (defun isearch-complete1 ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1101 ;; Helper for isearch-complete and isearch-complete-edit
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1102 ;; Return t if completion OK,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1103 (let* ((ring (if isearch-regexp regexp-search-ring search-ring))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1104 (alist (mapcar (function (lambda (string) (list string))) ring))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1105 (completion-ignore-case case-fold-search)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1106 (completion (try-completion isearch-string alist))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1107 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1108 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1109 ((eq completion t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1110 ;; isearch-string stays the same
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1111 t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1112 ((or completion ; not nil, must be a string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1113 (= 0 (length isearch-string))) ; shouldnt have to say this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1114 (if (equal completion isearch-string) ;; no extension?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1115 (if completion-auto-help
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1116 (with-output-to-temp-buffer "*Isearch completions*"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1117 (display-completion-list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1118 (all-completions isearch-string alist))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1119 (setq isearch-string completion))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1120 t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1121 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1122 (temp-minibuffer-message "No completion")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1123 nil))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1124
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1125 (defun isearch-complete ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1126 "Complete the search string from the strings on the search ring.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1127 The completed string is then editable in the minibuffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1128 If there is no completion possible, say so and continue searching."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1129 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1130 (if (isearch-complete1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1131 (isearch-edit-string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1132 ;; else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1133 (sit-for 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1134 (isearch-update)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1135
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1136 (defun isearch-complete-edit ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1137 "Same as `isearch-complete' except in the minibuffer."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1138 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1139 (setq isearch-string (buffer-string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1140 (if (isearch-complete1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1141 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1142 (erase-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1143 (insert isearch-string))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1144
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1145
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1146 ;;;==============================================================
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1147 ;; The search status stack (and isearch window-local variables, not used).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1148
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1149 (defun isearch-top-state ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1150 ;; (fetch-window-local-variables)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1151 (let ((cmd (car isearch-cmds)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1152 (setq isearch-string (car cmd)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1153 isearch-message (car (cdr cmd))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1154 isearch-success (nth 3 cmd)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1155 isearch-forward (nth 4 cmd)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1156 isearch-other-end (nth 5 cmd)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1157 isearch-invalid-regexp (nth 6 cmd)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1158 isearch-wrapped (nth 7 cmd)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1159 isearch-barrier (nth 8 cmd))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1160 (goto-char (car (cdr (cdr cmd))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1161
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1162 (defun isearch-pop-state ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1163 ;; (fetch-window-local-variables)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1164 (setq isearch-cmds (cdr isearch-cmds))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1165 (isearch-top-state)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1166 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1167
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1168 (defun isearch-push-state ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1169 (setq isearch-cmds
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1170 (cons (list isearch-string isearch-message (point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1171 isearch-success isearch-forward isearch-other-end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1172 isearch-invalid-regexp isearch-wrapped isearch-barrier)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1173 isearch-cmds)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1174
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1175
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1176 ;;;==================================================================
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1177 ;; Message string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1178
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1179 (defun isearch-message (&optional c-q-hack ellipsis)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1180 ;; Generate and print the message string.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1181 (let ((cursor-in-echo-area ellipsis)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1182 (m (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1183 (isearch-message-prefix c-q-hack)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1184 isearch-message
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1185 (isearch-message-suffix c-q-hack)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1186 )))
193
f53b5ca2e663 Import from CVS: tag r20-3b23
cvs
parents: 142
diff changeset
1187 (if c-q-hack m (display-message 'progress (format "%s" m)))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1188
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1189 (defun isearch-message-prefix (&optional c-q-hack nonincremental)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1190 ;; If about to search, and previous search regexp was invalid,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1191 ;; check that it still is. If it is valid now,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1192 ;; let the message we display while searching say that it is valid.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1193 (and isearch-invalid-regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1194 (condition-case ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1195 (progn (re-search-forward isearch-string (point) t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1196 (setq isearch-invalid-regexp nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1197 (error nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1198 ;; #### - Yo! Emacs assembles strings all over the place, they can't all
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1199 ;; be internationalized in the manner proposed below... Add an explicit
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1200 ;; call to `gettext' and have the string snarfer pluck the english
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1201 ;; strings out of the comment below. XEmacs is on a purespace diet! -Stig
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1202 (let ((m (concat (if isearch-success nil "failing ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1203 (if isearch-wrapped "wrapped ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1204 (if isearch-word "word ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1205 (if isearch-regexp "regexp ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1206 (if nonincremental "search" "I-search")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1207 (if isearch-forward nil " backward")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1208 ": "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1209 )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1210 (aset m 0 (upcase (aref m 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1211 (gettext m)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1212
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1213 (defun isearch-message-suffix (&optional c-q-hack)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1214 (concat (if c-q-hack "^Q" "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1215 (if isearch-invalid-regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1216 (concat " [" isearch-invalid-regexp "]")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1217 "")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1218
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1219 ;;;;; #### - yuck...this is soooo lame. Is this really worth 4k of purespace???
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1220 ;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1221 ;;;(let ((i (logior (if isearch-success 32 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1222 ;;; (if isearch-wrapped 16 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1223 ;;; (if isearch-word 8 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1224 ;;; (if isearch-regexp 4 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1225 ;;; (if nonincremental 2 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1226 ;;; (if isearch-forward 1 0))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1227 ;;; (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1228 ;;; ((= i 63) (gettext "Wrapped word regexp search: ")) ; 111111
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1229 ;;; ((= i 62) (gettext "Wrapped word regexp search backward: ")) ; 111110
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1230 ;;; ((= i 61) (gettext "Wrapped word regexp I-search: ")) ; 111101
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1231 ;;; ((= i 60) (gettext "Wrapped word regexp I-search backward: ")) ; 111100
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1232 ;;; ((= i 59) (gettext "Wrapped word search: ")) ; 111011
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1233 ;;; ((= i 58) (gettext "Wrapped word search backward: ")) ; 111010
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1234 ;;; ((= i 57) (gettext "Wrapped word I-search: ")) ; 111001
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1235 ;;; ((= i 56) (gettext "Wrapped word I-search backward: ")) ; 111000
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1236 ;;; ((= i 55) (gettext "Wrapped regexp search: ")) ; 110111
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1237 ;;; ((= i 54) (gettext "Wrapped regexp search backward: ")) ; 110110
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1238 ;;; ((= i 53) (gettext "Wrapped regexp I-search: ")) ; 110101
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1239 ;;; ((= i 52) (gettext "Wrapped regexp I-search backward: ")) ; 110100
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1240 ;;; ((= i 51) (gettext "Wrapped search: ")) ; 110011
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1241 ;;; ((= i 50) (gettext "Wrapped search backward: ")) ; 110010
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1242 ;;; ((= i 49) (gettext "Wrapped I-search: ")) ; 110001
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1243 ;;; ((= i 48) (gettext "Wrapped I-search backward: ")) ; 110000
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1244 ;;; ((= i 47) (gettext "Word regexp search: ")) ; 101111
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1245 ;;; ((= i 46) (gettext "Word regexp search backward: ")) ; 101110
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1246 ;;; ((= i 45) (gettext "Word regexp I-search: ")) ; 101101
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1247 ;;; ((= i 44) (gettext "Word regexp I-search backward: ")) ; 101100
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1248 ;;; ((= i 43) (gettext "Word search: ")) ; 101011
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1249 ;;; ((= i 42) (gettext "Word search backward: ")) ; 101010
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1250 ;;; ((= i 41) (gettext "Word I-search: ")) ; 101001
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1251 ;;; ((= i 40) (gettext "Word I-search backward: ")) ; 101000
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1252 ;;; ((= i 39) (gettext "Regexp search: ")) ; 100111
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1253 ;;; ((= i 38) (gettext "Regexp search backward: ")) ; 100110
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1254 ;;; ((= i 37) (gettext "Regexp I-search: ")) ; 100101
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1255 ;;; ((= i 36) (gettext "Regexp I-search backward: ")) ; 100100
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1256 ;;; ((= i 35) (gettext "Search: ")) ; 100011
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1257 ;;; ((= i 34) (gettext "Search backward: ")) ; 100010
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1258 ;;; ((= i 33) (gettext "I-search: ")) ; 100001
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1259 ;;; ((= i 32) (gettext "I-search backward: ")) ; 100000
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1260 ;;; ((= i 31) (gettext "Failing wrapped word regexp search: ")) ; 011111
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1261 ;;; ((= i 30) (gettext "Failing wrapped word regexp search backward: ")) ; 011110
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1262 ;;; ((= i 29) (gettext "Failing wrapped word regexp I-search: ")) ; 011101
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1263 ;;; ((= i 28) (gettext "Failing wrapped word regexp I-search backward: ")) ; 011100
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1264 ;;; ((= i 27) (gettext "Failing wrapped word search: ")) ; 011011
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1265 ;;; ((= i 26) (gettext "Failing wrapped word search backward: ")) ; 011010
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1266 ;;; ((= i 25) (gettext "Failing wrapped word I-search: ")) ; 011001
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1267 ;;; ((= i 24) (gettext "Failing wrapped word I-search backward: ")) ; 011000
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1268 ;;; ((= i 23) (gettext "Failing wrapped regexp search: ")) ; 010111
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1269 ;;; ((= i 22) (gettext "Failing wrapped regexp search backward: ")) ; 010110
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1270 ;;; ((= i 21) (gettext "Failing wrapped regexp I-search: ")) ; 010101
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1271 ;;; ((= i 20) (gettext "Failing wrapped regexp I-search backward: ")) ; 010100
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1272 ;;; ((= i 19) (gettext "Failing wrapped search: ")) ; 010011
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1273 ;;; ((= i 18) (gettext "Failing wrapped search backward: ")) ; 010010
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1274 ;;; ((= i 17) (gettext "Failing wrapped I-search: ")) ; 010001
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1275 ;;; ((= i 16) (gettext "Failing wrapped I-search backward: ")) ; 010000
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1276 ;;; ((= i 15) (gettext "Failing word regexp search: ")) ; 001111
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1277 ;;; ((= i 14) (gettext "Failing word regexp search backward: ")) ; 001110
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1278 ;;; ((= i 13) (gettext "Failing word regexp I-search: ")) ; 001101
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1279 ;;; ((= i 12) (gettext "Failing word regexp I-search backward: ")) ; 001100
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1280 ;;; ((= i 11) (gettext "Failing word search: ")) ; 001011
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1281 ;;; ((= i 10) (gettext "Failing word search backward: ")) ; 001010
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1282 ;;; ((= i 9) (gettext "Failing word I-search: ")) ; 001001
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1283 ;;; ((= i 8) (gettext "Failing word I-search backward: ")) ; 001000
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1284 ;;; ((= i 7) (gettext "Failing regexp search: ")) ; 000111
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1285 ;;; ((= i 6) (gettext "Failing regexp search backward: ")) ; 000110
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1286 ;;; ((= i 5) (gettext "Failing regexp I-search: ")) ; 000101
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1287 ;;; ((= i 4) (gettext "Failing regexp I-search backward: ")) ; 000100
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1288 ;;; ((= i 3) (gettext "Failing search: ")) ; 000011
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1289 ;;; ((= i 2) (gettext "Failing search backward: ")) ; 000010
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1290 ;;; ((= i 1) (gettext "Failing I-search: ")) ; 000001
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1291 ;;; ((= i 0) (gettext "Failing I-search backward: ")) ; 000000
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1292 ;;; (t (error "Something's rotten")))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1293
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1294
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1295 ;;;========================================================
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1296 ;;; Exiting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1297
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1298 (put 'isearch-printing-char 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1299 (put 'isearch-return-char 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1300 (put 'isearch-repeat-forward 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1301 (put 'isearch-repeat-backward 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1302 (put 'isearch-delete-char 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1303 (put 'isearch-abort 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1304 (put 'isearch-quote-char 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1305 (put 'isearch-exit 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1306 (put 'isearch-printing-char 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1307 (put 'isearch-printing-char 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1308 (put 'isearch-yank-word 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1309 (put 'isearch-yank-line 'isearch-command t)
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
1310 (put 'isearch-yank-kill 'isearch-command t)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1311 (put 'isearch-yank-sexp 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1312 (put 'isearch-*-char 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1313 (put 'isearch-*-char 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1314 (put 'isearch-|-char 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1315 (put 'isearch-toggle-regexp 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1316 (put 'isearch-toggle-case-fold 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1317 (put 'isearch-edit-string 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1318 (put 'isearch-mode-help 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1319 (put 'isearch-ring-advance 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1320 (put 'isearch-ring-retreat 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1321 (put 'isearch-ring-advance-edit 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1322 (put 'isearch-ring-retreat-edit 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1323 (put 'isearch-whitespace-chars 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1324 (put 'isearch-complete 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1325 (put 'isearch-complete-edit 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1326 (put 'isearch-edit-string 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1327 (put 'isearch-toggle-regexp 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1328 (put 'isearch-forward-exit-minibuffer 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1329 (put 'isearch-reverse-exit-minibuffer 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1330 (put 'isearch-nonincremental-exit-minibuffer 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1331 (put 'isearch-yank-x-selection 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1332 (put 'isearch-yank-x-clipboard 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1333
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1334 ;; scrolling the scrollbar should not terminate isearch.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1335
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1336 ;; vertical scrollbar:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1337 (put 'scrollbar-line-up 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1338 (put 'scrollbar-line-down 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1339 (put 'scrollbar-page-up 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1340 (put 'scrollbar-page-down 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1341 (put 'scrollbar-to-top 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1342 (put 'scrollbar-to-bottom 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1343 (put 'scrollbar-vertical-drag 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1344
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1345 ;; horizontal scrollbar:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1346 (put 'scrollbar-char-left 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1347 (put 'scrollbar-char-right 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1348 (put 'scrollbar-page-left 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1349 (put 'scrollbar-page-right 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1350 (put 'scrollbar-to-left 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1351 (put 'scrollbar-to-right 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1352 (put 'scrollbar-horizontal-drag 'isearch-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1353
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1354 (defun isearch-pre-command-hook ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1355 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1356 ;; For use as the value of `pre-command-hook' when isearch-mode is active.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1357 ;; If the command about to be executed is not one of the isearch commands,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1358 ;; then isearch-mode is turned off before that command is executed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1359 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1360 ;; If the command about to be executed is self-insert-command, or is a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1361 ;; keyboard macro of a single key sequence which is bound to self-insert-
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1362 ;; command, then we add those chars to the search ring instead of inserting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1363 ;; them in the buffer. In this way, the set of self-searching characters
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1364 ;; need not be exhaustively enumerated, but is derived from other maps.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1365 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1366 (cond ((not (eq (current-buffer) isearch-buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1367 ;; If the buffer (likely meaning "frame") has changed, bail.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1368 ;; This can also happen if a proc filter has popped up another
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1369 ;; buffer, which is arguably a bad thing for it to have done,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1370 ;; but the way in which isearch would have hosed you in that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1371 ;; case is unarguably even worse. -jwz
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1372 (isearch-done))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1373 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1374 (isearch-maybe-frob-keyboard-macros)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1375 (if (and this-command
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1376 (symbolp this-command)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1377 (get this-command 'isearch-command))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1378 nil ; then continue.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1379 (isearch-done)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1380
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1381 (defun isearch-maybe-frob-keyboard-macros ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1382 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1383 ;; If the command about to be executed is `self-insert-command' then change
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1384 ;; the command to `isearch-printing-char' instead, meaning add the last-
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1385 ;; typed character to the search string.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1386 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1387 ;; If `this-command' is a string or a vector (that is, a keyboard macro)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1388 ;; and it contains only one command, which is bound to self-insert-command,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1389 ;; then do the same thing as for self-inserting commands: arrange for that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1390 ;; character to be added to the search string. If we didn't do this, then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1391 ;; typing a compose sequence (a la x-compose.el) would terminate the search
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1392 ;; and insert the character, instead of searching for that character.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1393 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1394 ;; We should continue doing this, since it's pretty much the behavior one
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1395 ;; would expect, but it will stop being so necessary once key-translation-
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1396 ;; map exists and is used by x-compose.el and things like it, since the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1397 ;; translation will have been done before we see the keys.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1398 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1399 (cond ((eq this-command 'self-insert-command)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1400 (setq this-command 'isearch-printing-char))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1401 ((and (or (stringp this-command) (vectorp this-command))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1402 (eq (key-binding this-command) 'self-insert-command))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1403 (setq last-command-event (character-to-event (aref this-command 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1404 last-command-char (and (stringp this-command)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1405 (aref this-command 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1406 this-command 'isearch-printing-char))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1407 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1408
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1409
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1410 ;;;========================================================
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1411 ;;; Highlighting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1412
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
1413 (defcustom isearch-highlight t
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1414 "*Whether isearch and query-replace should highlight the text which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1415 currently matches the search-string.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1416
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1417 (defvar isearch-extent nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1418
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1419 ;; this face is initialized by x-faces.el since isearch is preloaded.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1420 ;; this face is now created in initialize-faces
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1421 ;;(make-face 'isearch)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1422
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1423 (defun isearch-make-extent (begin end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1424 (let ((x (make-extent begin end (current-buffer))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1425 ;; make the isearch extent always take prescedence over any mouse-
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1426 ;; highlighted extents we may be passing through, since isearch, being
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1427 ;; modal, is more interesting (there's nothing they could do with a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1428 ;; mouse-highlighted extent while in the midst of a search anyway).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1429 (set-extent-priority x (1+ mouse-highlight-priority))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1430 (set-extent-face x 'isearch)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1431 (setq isearch-extent x)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1432
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1433 (defun isearch-highlight (begin end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1434 (if (null isearch-highlight)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1435 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1436 ;; make sure isearch-extent is in the current buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1437 (cond ((not (extentp isearch-extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1438 (isearch-make-extent begin end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1439 ((not (eq (extent-object isearch-extent) (current-buffer)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1440 (delete-extent isearch-extent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1441 (isearch-make-extent begin end)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1442 (set-extent-endpoints isearch-extent begin end)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1443
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1444 (defun isearch-dehighlight (totally)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1445 (if (and isearch-highlight isearch-extent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1446 (if totally
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1447 (let ((inhibit-quit t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1448 (if (extentp isearch-extent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1449 (delete-extent isearch-extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1450 (setq isearch-extent nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1451 (if (extentp isearch-extent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1452 (detach-extent isearch-extent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1453 (setq isearch-extent nil)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1454
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1455
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1456 ;;;========================================================
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1457 ;;; Searching
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1458
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1459 (defun isearch-search ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1460 ;; Do the search with the current search string.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1461 (isearch-message nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1462 (if (and isearch-case-fold-search search-caps-disable-folding)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1463 (setq isearch-case-fold-search (isearch-no-upper-case-p isearch-string)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1464
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1465 (setq isearch-mode (if case-fold-search
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1466 (if isearch-case-fold-search
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1467 " Isearch" ;As God Intended Mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1468 " ISeARch") ;Warn about evil case via StuDLYcAps.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1469 "Isearch"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1470 ; (if isearch-case-fold-search
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1471 ; " isearch" ;Presumably case-sensitive losers
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1472 ; ;will notice this 1-char difference.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1473 ; " Isearch") ;Weenie mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1474 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1475 (condition-case lossage
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1476 (let ((inhibit-quit nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1477 (case-fold-search isearch-case-fold-search))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1478 (if isearch-regexp (setq isearch-invalid-regexp nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1479 (setq isearch-success
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1480 (funcall
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1481 (cond (isearch-word
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1482 (if isearch-forward
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1483 'word-search-forward 'word-search-backward))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1484 (isearch-regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1485 (if isearch-forward
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1486 're-search-forward 're-search-backward))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1487 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1488 (if isearch-forward 'search-forward 'search-backward)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1489 isearch-string nil t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1490 (if isearch-success
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1491 (setq isearch-other-end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1492 (if isearch-forward (match-beginning 0) (match-end 0)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1493
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1494 (quit (setq unread-command-event (character-to-event (quit-char)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1495 (setq isearch-success nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1496
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1497 (invalid-regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1498 (setq isearch-invalid-regexp (car (cdr lossage)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1499 (if (string-match
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1500 "\\`Premature \\|\\`Unmatched \\|\\`Invalid "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1501 isearch-invalid-regexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1502 (setq isearch-invalid-regexp (gettext "incomplete input")))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1503
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1504 (if isearch-success
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1505 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1506
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1507 ;; If we're being run inside a keyboard macro, then the call to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1508 ;; ding will signal an error (to terminate the macro). We must
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1509 ;; turn off isearch-mode first, so that we aren't still in isearch
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1510 ;; mode after the macro exits. Note that isearch-recursive-edit
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1511 ;; must not be true if a keyboard macro is executing.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1512 (if (and executing-kbd-macro (not defining-kbd-macro))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1513 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1514 (isearch-done)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1515 (ding nil 'isearch-failed)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1516
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1517 ;; Ding if failed this time after succeeding last time.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1518 (and (nth 3 (car isearch-cmds))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1519 (ding nil 'isearch-failed))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1520 (goto-char (nth 2 (car isearch-cmds)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1521
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1522 ;;;=================================================
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1523 ;; This is called from incremental-search
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1524 ;; if the first input character is the exit character.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1525
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1526 ;; We store the search string in `isearch-string'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1527 ;; which has been bound already by `isearch-search'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1528 ;; so that, when we exit, it is copied into `search-last-string'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1529
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1530 ;(defun nonincremental-search (forward regexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1531 ; ;; This may be broken. Anyway, it is replaced by the isearch-edit-string.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1532 ; ;; Missing features: word search option, command history.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1533 ; (setq isearch-forward forward
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1534 ; isearch-regexp regexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1535 ; (let (char function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1536 ; inhibit-quit
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1537 ; (cursor-in-echo-area t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1538 ; ;; Prompt assuming not word search,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1539 ; (setq isearch-message
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1540 ; (if isearch-regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1541 ; (if isearch-forward "Regexp search: "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1542 ; "Regexp search backward: ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1543 ; (if isearch-forward "Search: " "Search backward: ")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1544 ; (message "%s" isearch-message)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1545 ; ;; Read 1 char and switch to word search if it is ^W.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1546 ; (setq char (read-char))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1547 ; (if (eq char search-yank-word-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1548 ; (setq isearch-message (if isearch-forward "Word search: "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1549 ; "Word search backward: "))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1550 ; ;; Otherwise let that 1 char be part of the search string.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1551 ; (setq unread-command-event (character-to-event char))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1552 ; )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1553 ; (setq function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1554 ; (if (eq char search-yank-word-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1555 ; (if isearch-forward 'word-search-forward 'word-search-backward)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1556 ; (if isearch-regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1557 ; (if isearch-forward 're-search-forward 're-search-backward)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1558 ; (if isearch-forward 'search-forward 'search-backward))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1559 ; ;; Read the search string with corrected prompt.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1560 ; (setq isearch-string (read-string isearch-message isearch-string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1561 ; ;; Empty means use default.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1562 ; (if (= 0 (length isearch-string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1563 ; (setq isearch-string search-last-string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1564 ; ;; Set last search string now so it is set even if we fail.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1565 ; (setq search-last-string isearch-string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1566 ; ;; Since we used the minibuffer, we should be available for redo.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1567 ; (setq command-history
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1568 ; (cons (list function isearch-string) command-history))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1569 ; ;; Go ahead and search.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1570 ; (if search-caps-disable-folding
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1571 ; (setq isearch-case-fold-search
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1572 ; (isearch-no-upper-case-p isearch-string)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1573 ; (let ((case-fold-search isearch-case-fold-search))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1574 ; (funcall function isearch-string))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1575
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1576
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1577 (defun isearch-no-upper-case-p (string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1578 "Return t if there are no upper case chars in string.
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 104
diff changeset
1579 But upper case chars preceded by \\ do not count since they
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1580 have special meaning in a regexp."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1581 ;; this incorrectly returns t for "\\\\A"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1582 (let ((case-fold-search nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1583 (not (string-match "\\(^\\|[^\\]\\)[A-Z]" string))))
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
1584
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
1585 ;; Used by etags.el and info.el
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
1586 (defmacro with-caps-disable-folding (string &rest body) "\
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
1587 Eval BODY with `case-fold-search' let to nil if STRING contains
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
1588 uppercase letters and `search-caps-disable-folding' is t."
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
1589 `(let ((case-fold-search
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
1590 (if (and case-fold-search search-caps-disable-folding)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
1591 (isearch-no-upper-case-p ,string)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
1592 case-fold-search)))
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
1593 ,@body))
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
1594 (put 'with-caps-disable-folding 'lisp-indent-function 1)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
1595 (put 'with-caps-disable-folding 'edebug-form-spec '(form body))
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 116
diff changeset
1596