Mercurial > emacs
annotate lisp/replace.el @ 45664:535f4a1db8cb
*** empty log message ***
author | Francesco Potortì <pot@gnu.org> |
---|---|
date | Thu, 06 Jun 2002 22:36:54 +0000 |
parents | 45014630aeb2 |
children | 01fbc1331841 |
rev | line source |
---|---|
38414
67b464da13ec
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
38080
diff
changeset
|
1 ;;; replace.el --- replace commands for Emacs |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
324
diff
changeset
|
2 |
43405
9550f54734dc
(query-replace-regexp-eval): Doc fix.
Andreas Schwab <schwab@suse.de>
parents:
42943
diff
changeset
|
3 ;; Copyright (C) 1985, 86, 87, 92, 94, 96, 1997, 2000, 2001, 2002 |
28502
3e4e6d45a774
(perform-replace): Don't move forward one char
Gerd Moellmann <gerd@gnu.org>
parents:
27391
diff
changeset
|
4 ;; Free Software Foundation, Inc. |
61 | 5 |
45078 | 6 ;; Maintainer: FSF |
7 | |
61 | 8 ;; This file is part of GNU Emacs. |
9 | |
10 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
11 ;; it under the terms of the GNU General Public License as published by | |
732 | 12 ;; the Free Software Foundation; either version 2, or (at your option) |
61 | 13 ;; any later version. |
14 | |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
14169 | 21 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
23 ;; Boston, MA 02111-1307, USA. | |
61 | 24 |
2315
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2156
diff
changeset
|
25 ;;; Commentary: |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2156
diff
changeset
|
26 |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2156
diff
changeset
|
27 ;; This package supplies the string and regular-expression replace functions |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2156
diff
changeset
|
28 ;; documented in the Emacs user's manual. |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2156
diff
changeset
|
29 |
788
c8d4eb38ebfc
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
732
diff
changeset
|
30 ;;; Code: |
61 | 31 |
17664
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17655
diff
changeset
|
32 (defcustom case-replace t |
38036
018637678f29
(case-replace, query-replace-from-history-variable)
Eli Zaretskii <eliz@gnu.org>
parents:
37832
diff
changeset
|
33 "*Non-nil means `query-replace' should preserve case in replacements." |
17664
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17655
diff
changeset
|
34 :type 'boolean |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17655
diff
changeset
|
35 :group 'matching) |
264 | 36 |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
862
diff
changeset
|
37 (defvar query-replace-history nil) |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
862
diff
changeset
|
38 |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
39 (defvar query-replace-interactive nil |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
40 "Non-nil means `query-replace' uses the last search string. |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
41 That becomes the \"string to replace\".") |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
42 |
20806
24a1fcdc31d7
(query-replace-from-history-variable): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20658
diff
changeset
|
43 (defcustom query-replace-from-history-variable 'query-replace-history |
38036
018637678f29
(case-replace, query-replace-from-history-variable)
Eli Zaretskii <eliz@gnu.org>
parents:
37832
diff
changeset
|
44 "History list to use for the FROM argument of `query-replace' commands. |
20806
24a1fcdc31d7
(query-replace-from-history-variable): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20658
diff
changeset
|
45 The value of this variable should be a symbol; that symbol |
24a1fcdc31d7
(query-replace-from-history-variable): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20658
diff
changeset
|
46 is used as a variable to hold a history list for the strings |
24a1fcdc31d7
(query-replace-from-history-variable): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20658
diff
changeset
|
47 or patterns to be replaced." |
24a1fcdc31d7
(query-replace-from-history-variable): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20658
diff
changeset
|
48 :group 'matching |
21669
9861518505cb
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21294
diff
changeset
|
49 :type 'symbol |
9861518505cb
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21294
diff
changeset
|
50 :version "20.3") |
20806
24a1fcdc31d7
(query-replace-from-history-variable): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20658
diff
changeset
|
51 |
24a1fcdc31d7
(query-replace-from-history-variable): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20658
diff
changeset
|
52 (defcustom query-replace-to-history-variable 'query-replace-history |
38036
018637678f29
(case-replace, query-replace-from-history-variable)
Eli Zaretskii <eliz@gnu.org>
parents:
37832
diff
changeset
|
53 "History list to use for the TO argument of `query-replace' commands. |
20806
24a1fcdc31d7
(query-replace-from-history-variable): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20658
diff
changeset
|
54 The value of this variable should be a symbol; that symbol |
24a1fcdc31d7
(query-replace-from-history-variable): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20658
diff
changeset
|
55 is used as a variable to hold a history list for replacement |
24a1fcdc31d7
(query-replace-from-history-variable): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20658
diff
changeset
|
56 strings or patterns." |
24a1fcdc31d7
(query-replace-from-history-variable): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20658
diff
changeset
|
57 :group 'matching |
21669
9861518505cb
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21294
diff
changeset
|
58 :type 'symbol |
9861518505cb
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21294
diff
changeset
|
59 :version "20.3") |
20806
24a1fcdc31d7
(query-replace-from-history-variable): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20658
diff
changeset
|
60 |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
61 (defcustom query-replace-skip-read-only nil |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
62 "*Non-nil means `query-replace' and friends ignore read-only matches." |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
63 :type 'boolean |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
64 :group 'matching |
45255
20c79f08a7da
Change all post-21.1 :version attributes to 21.4.
Eli Zaretskii <eliz@gnu.org>
parents:
45176
diff
changeset
|
65 :version "21.4") |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
66 |
44138
f1d7c706f7f7
(query-replace-read-args): New optional arg NOERROR.
Richard M. Stallman <rms@gnu.org>
parents:
43406
diff
changeset
|
67 (defun query-replace-read-args (string regexp-flag &optional noerror) |
f1d7c706f7f7
(query-replace-read-args): New optional arg NOERROR.
Richard M. Stallman <rms@gnu.org>
parents:
43406
diff
changeset
|
68 (unless noerror |
f1d7c706f7f7
(query-replace-read-args): New optional arg NOERROR.
Richard M. Stallman <rms@gnu.org>
parents:
43406
diff
changeset
|
69 (barf-if-buffer-read-only)) |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
862
diff
changeset
|
70 (let (from to) |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
71 (if query-replace-interactive |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
72 (setq from (car (if regexp-flag regexp-search-ring search-ring))) |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
73 (setq from (read-from-minibuffer (format "%s: " string) |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
74 nil nil nil |
20806
24a1fcdc31d7
(query-replace-from-history-variable): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20658
diff
changeset
|
75 query-replace-from-history-variable |
41761
878a3e2e7cfa
(query-replace-read-args): Display message if FROM contains `\n' or `\t'.
Richard M. Stallman <rms@gnu.org>
parents:
41329
diff
changeset
|
76 nil t)) |
878a3e2e7cfa
(query-replace-read-args): Display message if FROM contains `\n' or `\t'.
Richard M. Stallman <rms@gnu.org>
parents:
41329
diff
changeset
|
77 ;; Warn if user types \n or \t, but don't reject the input. |
878a3e2e7cfa
(query-replace-read-args): Display message if FROM contains `\n' or `\t'.
Richard M. Stallman <rms@gnu.org>
parents:
41329
diff
changeset
|
78 (if (string-match "\\\\[nt]" from) |
878a3e2e7cfa
(query-replace-read-args): Display message if FROM contains `\n' or `\t'.
Richard M. Stallman <rms@gnu.org>
parents:
41329
diff
changeset
|
79 (let ((match (match-string 0 from))) |
878a3e2e7cfa
(query-replace-read-args): Display message if FROM contains `\n' or `\t'.
Richard M. Stallman <rms@gnu.org>
parents:
41329
diff
changeset
|
80 (cond |
878a3e2e7cfa
(query-replace-read-args): Display message if FROM contains `\n' or `\t'.
Richard M. Stallman <rms@gnu.org>
parents:
41329
diff
changeset
|
81 ((string= match "\\n") |
878a3e2e7cfa
(query-replace-read-args): Display message if FROM contains `\n' or `\t'.
Richard M. Stallman <rms@gnu.org>
parents:
41329
diff
changeset
|
82 (message "Note: `\\n' here doesn't match a newline; to do that, type C-q C-j instead")) |
878a3e2e7cfa
(query-replace-read-args): Display message if FROM contains `\n' or `\t'.
Richard M. Stallman <rms@gnu.org>
parents:
41329
diff
changeset
|
83 ((string= match "\\t") |
878a3e2e7cfa
(query-replace-read-args): Display message if FROM contains `\n' or `\t'.
Richard M. Stallman <rms@gnu.org>
parents:
41329
diff
changeset
|
84 (message "Note: `\\t' here doesn't match a tab; to do that, just type TAB"))) |
878a3e2e7cfa
(query-replace-read-args): Display message if FROM contains `\n' or `\t'.
Richard M. Stallman <rms@gnu.org>
parents:
41329
diff
changeset
|
85 (sit-for 2)))) |
878a3e2e7cfa
(query-replace-read-args): Display message if FROM contains `\n' or `\t'.
Richard M. Stallman <rms@gnu.org>
parents:
41329
diff
changeset
|
86 |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
862
diff
changeset
|
87 (setq to (read-from-minibuffer (format "%s %s with: " string from) |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
862
diff
changeset
|
88 nil nil nil |
20860
1432a2b3c44e
(occur): Apply default by hand after read-from-minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
20806
diff
changeset
|
89 query-replace-to-history-variable from t)) |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
90 (if (and transient-mark-mode mark-active) |
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
91 (list from to current-prefix-arg (region-beginning) (region-end)) |
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
92 (list from to current-prefix-arg nil nil)))) |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
862
diff
changeset
|
93 |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
94 (defun query-replace (from-string to-string &optional delimited start end) |
260 | 95 "Replace some occurrences of FROM-STRING with TO-STRING. |
96 As each match is found, the user must type a character saying | |
97 what to do with it. For directions, type \\[help-command] at that time. | |
98 | |
20248
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
99 In Transient Mark mode, if the mark is active, operate on the contents |
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
100 of the region. Otherwise, operate from point to the end of the buffer. |
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
101 |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
102 If `query-replace-interactive' is non-nil, the last incremental search |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
103 string is used as FROM-STRING--you don't have to specify it with the |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
104 minibuffer. |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
105 |
23457
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
106 Replacement transfers the case of the old text to the new text, |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
107 if `case-replace' and `case-fold-search' |
260 | 108 are non-nil and FROM-STRING has no uppercase letters. |
10104
8a04af3511c1
(replace-string, query-replace): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
10069
diff
changeset
|
109 \(Preserving case means that if the string matched is all caps, or capitalized, |
8a04af3511c1
(replace-string, query-replace): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
10069
diff
changeset
|
110 then its replacement is upcased or capitalized.) |
8a04af3511c1
(replace-string, query-replace): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
10069
diff
changeset
|
111 |
6707 | 112 Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace |
2080
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
113 only matches surrounded by word boundaries. |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
114 Fourth and fifth arg START and END specify the region to operate on. |
2080
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
115 |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
116 To customize possible responses, change the \"bindings\" in `query-replace-map'." |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
117 (interactive (query-replace-read-args "Query replace" nil)) |
40254
51c9985454e3
(perform-replace): Move START and END parameters
Gerd Moellmann <gerd@gnu.org>
parents:
38986
diff
changeset
|
118 (perform-replace from-string to-string t nil delimited nil nil start end)) |
20248
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
119 |
268 | 120 (define-key esc-map "%" 'query-replace) |
260 | 121 |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
122 (defun query-replace-regexp (regexp to-string &optional delimited start end) |
260 | 123 "Replace some things after point matching REGEXP with TO-STRING. |
124 As each match is found, the user must type a character saying | |
125 what to do with it. For directions, type \\[help-command] at that time. | |
126 | |
20248
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
127 In Transient Mark mode, if the mark is active, operate on the contents |
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
128 of the region. Otherwise, operate from point to the end of the buffer. |
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
129 |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
130 If `query-replace-interactive' is non-nil, the last incremental search |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
131 regexp is used as REGEXP--you don't have to specify it with the |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
132 minibuffer. |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
133 |
6707 | 134 Preserves case in each replacement if `case-replace' and `case-fold-search' |
260 | 135 are non-nil and REGEXP has no uppercase letters. |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
136 |
6707 | 137 Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace |
260 | 138 only matches surrounded by word boundaries. |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
139 Fourth and fifth arg START and END specify the region to operate on. |
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
140 |
6707 | 141 In TO-STRING, `\\&' stands for whatever matched the whole of REGEXP, |
142 and `\\=\\N' (where N is a digit) stands for | |
143 whatever what matched the Nth `\\(...\\)' in REGEXP." | |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
144 (interactive (query-replace-read-args "Query replace regexp" t)) |
40254
51c9985454e3
(perform-replace): Move START and END parameters
Gerd Moellmann <gerd@gnu.org>
parents:
38986
diff
changeset
|
145 (perform-replace regexp to-string t t delimited nil nil start end)) |
22353
402ebb81ae84
(esc-map): Bind C-M-% to query-replace-regexp.
Karl Heuer <kwzh@gnu.org>
parents:
21669
diff
changeset
|
146 (define-key esc-map [?\C-%] 'query-replace-regexp) |
260 | 147 |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
148 (defun query-replace-regexp-eval (regexp to-expr &optional delimited start end) |
25167
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
149 "Replace some things after point matching REGEXP with the result of TO-EXPR. |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
150 As each match is found, the user must type a character saying |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
151 what to do with it. For directions, type \\[help-command] at that time. |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
152 |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
153 TO-EXPR is a Lisp expression evaluated to compute each replacement. It may |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
154 reference `replace-count' to get the number of replacements already made. |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
155 If the result of TO-EXPR is not a string, it is converted to one using |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
156 `prin1-to-string' with the NOESCAPE argument (which see). |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
157 |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
158 For convenience, when entering TO-EXPR interactively, you can use `\\&' or |
43406
f39dfc11dc58
(query-replace-regexp-eval): Doc fix.
Andreas Schwab <schwab@suse.de>
parents:
43405
diff
changeset
|
159 `\\0' to stand for whatever matched the whole of REGEXP, and `\\N' (where |
f39dfc11dc58
(query-replace-regexp-eval): Doc fix.
Andreas Schwab <schwab@suse.de>
parents:
43405
diff
changeset
|
160 N is a digit) to stand for whatever matched the Nth `\\(...\\)' in REGEXP. |
25167
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
161 Use `\\#&' or `\\#N' if you want a number instead of a string. |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
162 |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
163 In Transient Mark mode, if the mark is active, operate on the contents |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
164 of the region. Otherwise, operate from point to the end of the buffer. |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
165 |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
166 If `query-replace-interactive' is non-nil, the last incremental search |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
167 regexp is used as REGEXP--you don't have to specify it with the |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
168 minibuffer. |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
169 |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
170 Preserves case in each replacement if `case-replace' and `case-fold-search' |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
171 are non-nil and REGEXP has no uppercase letters. |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
172 |
25167
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
173 Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace |
37536
0e883854b9fc
(query-replace-regexp-eval): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
36076
diff
changeset
|
174 only matches that are surrounded by word boundaries. |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
175 Fourth and fifth arg START and END specify the region to operate on." |
25167
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
176 (interactive |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
177 (let (from to start end) |
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
178 (when (and transient-mark-mode mark-active) |
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
179 (setq start (region-beginning) |
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
180 end (region-end))) |
25167
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
181 (if query-replace-interactive |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
182 (setq from (car regexp-search-ring)) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
183 (setq from (read-from-minibuffer "Query replace regexp: " |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
184 nil nil nil |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
185 query-replace-from-history-variable |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
186 nil t))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
187 (setq to (list (read-from-minibuffer |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
188 (format "Query replace regexp %s with eval: " from) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
189 nil nil t query-replace-to-history-variable from t))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
190 ;; We make TO a list because replace-match-string-symbols requires one, |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
191 ;; and the user might enter a single token. |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
192 (replace-match-string-symbols to) |
38986
56099fbee0b3
(query-replace-regexp-eval): Return args from `interactive' form in
Miles Bader <miles@gnu.org>
parents:
38837
diff
changeset
|
193 (list from (car to) current-prefix-arg start end))) |
27391
abaa4ac29f51
(query-replace): Rename last arg to DELIMITED.
Richard M. Stallman <rms@gnu.org>
parents:
25167
diff
changeset
|
194 (perform-replace regexp (cons 'replace-eval-replacement to-expr) |
40254
51c9985454e3
(perform-replace): Move START and END parameters
Gerd Moellmann <gerd@gnu.org>
parents:
38986
diff
changeset
|
195 t t delimited nil nil start end)) |
25167
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
196 |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
197 (defun map-query-replace-regexp (regexp to-strings &optional n start end) |
260 | 198 "Replace some matches for REGEXP with various strings, in rotation. |
29051 | 199 The second argument TO-STRINGS contains the replacement strings, |
200 separated by spaces. Third arg DELIMITED (prefix arg if interactive), | |
201 if non-nil, means replace only matches surrounded by word boundaries. | |
202 This command works like `query-replace-regexp' except that each | |
203 successive replacement uses the next successive replacement string, | |
260 | 204 wrapping around from the last such string to the first. |
205 | |
20248
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
206 In Transient Mark mode, if the mark is active, operate on the contents |
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
207 of the region. Otherwise, operate from point to the end of the buffer. |
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
208 |
260 | 209 Non-interactively, TO-STRINGS may be a list of replacement strings. |
210 | |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
211 If `query-replace-interactive' is non-nil, the last incremental search |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
212 regexp is used as REGEXP--you don't have to specify it with the minibuffer. |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
213 |
260 | 214 A prefix argument N says to use each replacement string N times |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
215 before rotating to the next. |
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
216 Fourth and fifth arg START and END specify the region to operate on." |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
862
diff
changeset
|
217 (interactive |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
218 (let (from to start end) |
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
219 (when (and transient-mark-mode mark-active) |
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
220 (setq start (region-beginning) |
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
221 end (region-end))) |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
222 (setq from (if query-replace-interactive |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
223 (car regexp-search-ring) |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
224 (read-from-minibuffer "Map query replace (regexp): " |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
225 nil nil nil |
19551
256843b0f804
(query-replace-read-args): Locally bind
Kenichi Handa <handa@m17n.org>
parents:
18991
diff
changeset
|
226 'query-replace-history nil t))) |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
862
diff
changeset
|
227 (setq to (read-from-minibuffer |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
862
diff
changeset
|
228 (format "Query replace %s with (space-separated strings): " |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
862
diff
changeset
|
229 from) |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
862
diff
changeset
|
230 nil nil nil |
20860
1432a2b3c44e
(occur): Apply default by hand after read-from-minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
20806
diff
changeset
|
231 'query-replace-history from t)) |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
232 (list from to start end current-prefix-arg))) |
260 | 233 (let (replacements) |
234 (if (listp to-strings) | |
235 (setq replacements to-strings) | |
236 (while (/= (length to-strings) 0) | |
237 (if (string-match " " to-strings) | |
238 (setq replacements | |
239 (append replacements | |
240 (list (substring to-strings 0 | |
241 (string-match " " to-strings)))) | |
242 to-strings (substring to-strings | |
243 (1+ (string-match " " to-strings)))) | |
244 (setq replacements (append replacements (list to-strings)) | |
245 to-strings "")))) | |
40254
51c9985454e3
(perform-replace): Move START and END parameters
Gerd Moellmann <gerd@gnu.org>
parents:
38986
diff
changeset
|
246 (perform-replace regexp replacements t t nil n nil start end))) |
260 | 247 |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
248 (defun replace-string (from-string to-string &optional delimited start end) |
260 | 249 "Replace occurrences of FROM-STRING with TO-STRING. |
250 Preserve case in each match if `case-replace' and `case-fold-search' | |
251 are non-nil and FROM-STRING has no uppercase letters. | |
10104
8a04af3511c1
(replace-string, query-replace): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
10069
diff
changeset
|
252 \(Preserving case means that if the string matched is all caps, or capitalized, |
8a04af3511c1
(replace-string, query-replace): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
10069
diff
changeset
|
253 then its replacement is upcased or capitalized.) |
8a04af3511c1
(replace-string, query-replace): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
10069
diff
changeset
|
254 |
20248
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
255 In Transient Mark mode, if the mark is active, operate on the contents |
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
256 of the region. Otherwise, operate from point to the end of the buffer. |
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
257 |
6707 | 258 Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace |
260 | 259 only matches surrounded by word boundaries. |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
260 Fourth and fifth arg START and END specify the region to operate on. |
260 | 261 |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
262 If `query-replace-interactive' is non-nil, the last incremental search |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
263 string is used as FROM-STRING--you don't have to specify it with the |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
264 minibuffer. |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
265 |
260 | 266 This function is usually the wrong thing to use in a Lisp program. |
267 What you probably want is a loop like this: | |
6707 | 268 (while (search-forward FROM-STRING nil t) |
269 (replace-match TO-STRING nil t)) | |
17211
ecf78b4eb138
(replace-string): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17010
diff
changeset
|
270 which will run faster and will not set the mark or print anything. |
ecf78b4eb138
(replace-string): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17010
diff
changeset
|
271 \(You may need a more complex loop if FROM-STRING can match the null string |
ecf78b4eb138
(replace-string): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17010
diff
changeset
|
272 and TO-STRING is also null.)" |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
273 (interactive (query-replace-read-args "Replace string" nil)) |
40254
51c9985454e3
(perform-replace): Move START and END parameters
Gerd Moellmann <gerd@gnu.org>
parents:
38986
diff
changeset
|
274 (perform-replace from-string to-string nil nil delimited nil nil start end)) |
260 | 275 |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
276 (defun replace-regexp (regexp to-string &optional delimited start end) |
260 | 277 "Replace things after point matching REGEXP with TO-STRING. |
6707 | 278 Preserve case in each match if `case-replace' and `case-fold-search' |
260 | 279 are non-nil and REGEXP has no uppercase letters. |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
280 |
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
281 In Transient Mark mode, if the mark is active, operate on the contents |
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
282 of the region. Otherwise, operate from point to the end of the buffer. |
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
283 |
6707 | 284 Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace |
260 | 285 only matches surrounded by word boundaries. |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
286 Fourth and fifth arg START and END specify the region to operate on. |
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
287 |
6707 | 288 In TO-STRING, `\\&' stands for whatever matched the whole of REGEXP, |
289 and `\\=\\N' (where N is a digit) stands for | |
6722
dd74576b79f6
(replace-regexp): Fix misbalanced quotes.
Karl Heuer <kwzh@gnu.org>
parents:
6707
diff
changeset
|
290 whatever what matched the Nth `\\(...\\)' in REGEXP. |
260 | 291 |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
292 If `query-replace-interactive' is non-nil, the last incremental search |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
293 regexp is used as REGEXP--you don't have to specify it with the minibuffer. |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
294 |
260 | 295 This function is usually the wrong thing to use in a Lisp program. |
296 What you probably want is a loop like this: | |
297 (while (re-search-forward REGEXP nil t) | |
6707 | 298 (replace-match TO-STRING nil nil)) |
260 | 299 which will run faster and will not set the mark or print anything." |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
300 (interactive (query-replace-read-args "Replace regexp" t)) |
40254
51c9985454e3
(perform-replace): Move START and END parameters
Gerd Moellmann <gerd@gnu.org>
parents:
38986
diff
changeset
|
301 (perform-replace regexp to-string nil t delimited nil nil start end)) |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
302 |
2408
a9c05a12b615
(regexp-history): New history list.
Richard M. Stallman <rms@gnu.org>
parents:
2327
diff
changeset
|
303 |
a9c05a12b615
(regexp-history): New history list.
Richard M. Stallman <rms@gnu.org>
parents:
2327
diff
changeset
|
304 (defvar regexp-history nil |
a9c05a12b615
(regexp-history): New history list.
Richard M. Stallman <rms@gnu.org>
parents:
2327
diff
changeset
|
305 "History list for some commands that read regular expressions.") |
260 | 306 |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
307 |
2571
b65cf676a09b
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2408
diff
changeset
|
308 (defalias 'delete-non-matching-lines 'keep-lines) |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
309 (defalias 'delete-matching-lines 'flush-lines) |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
310 (defalias 'count-matches 'how-many) |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
311 |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
312 |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
313 (defun keep-lines-read-args (prompt) |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
314 "Read arguments for `keep-lines' and friends. |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
315 Prompt for a regexp with PROMPT. |
38040
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
316 Value is a list, (REGEXP)." |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
317 (list (read-from-minibuffer prompt nil nil nil |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
318 'regexp-history nil t))) |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
319 |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
320 (defun keep-lines (regexp &optional rstart rend) |
61 | 321 "Delete all lines except those containing matches for REGEXP. |
322 A match split across lines preserves all the lines it lies in. | |
23457
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
323 Applies to all lines after point. |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
324 |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
325 If REGEXP contains upper case characters (excluding those preceded by `\\'), |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
326 the matching is case-sensitive. |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
327 |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
328 Second and third arg RSTART and REND specify the region to operate on. |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
329 |
38040
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
330 Interactively, in Transient Mark mode when the mark is active, operate |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
331 on the contents of the region. Otherwise, operate from point to the |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
332 end of the buffer." |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
333 |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
334 (interactive |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
335 (keep-lines-read-args "Keep lines (containing match for regexp): ")) |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
336 (if rstart |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
337 (goto-char (min rstart rend)) |
38040
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
338 (if (and transient-mark-mode mark-active) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
339 (setq rstart (region-beginning) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
340 rend (copy-marker (region-end))) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
341 (setq rstart (point) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
342 rend (point-max-marker))) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
343 (goto-char rstart)) |
61 | 344 (save-excursion |
345 (or (bolp) (forward-line 1)) | |
23457
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
346 (let ((start (point)) |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
347 (case-fold-search (and case-fold-search |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
348 (isearch-no-upper-case-p regexp t)))) |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
349 (while (< (point) rend) |
61 | 350 ;; Start is first char not preserved by previous match. |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
351 (if (not (re-search-forward regexp rend 'move)) |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
352 (delete-region start rend) |
61 | 353 (let ((end (save-excursion (goto-char (match-beginning 0)) |
354 (beginning-of-line) | |
355 (point)))) | |
356 ;; Now end is first char preserved by the new match. | |
357 (if (< start end) | |
358 (delete-region start end)))) | |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
359 |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
360 (setq start (save-excursion (forward-line 1) (point))) |
61 | 361 ;; If the match was empty, avoid matching again at same place. |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
362 (and (< (point) rend) |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
363 (= (match-beginning 0) (match-end 0)) |
61 | 364 (forward-char 1)))))) |
365 | |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
366 |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
367 (defun flush-lines (regexp &optional rstart rend) |
61 | 368 "Delete lines containing matches for REGEXP. |
369 If a match is split across lines, all the lines it lies in are deleted. | |
23457
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
370 Applies to lines after point. |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
371 |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
372 If REGEXP contains upper case characters (excluding those preceded by `\\'), |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
373 the matching is case-sensitive. |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
374 |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
375 Second and third arg RSTART and REND specify the region to operate on. |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
376 |
38040
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
377 Interactively, in Transient Mark mode when the mark is active, operate |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
378 on the contents of the region. Otherwise, operate from point to the |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
379 end of the buffer." |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
380 |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
381 (interactive |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
382 (keep-lines-read-args "Flush lines (containing match for regexp): ")) |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
383 (if rstart |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
384 (goto-char (min rstart rend)) |
38040
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
385 (if (and transient-mark-mode mark-active) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
386 (setq rstart (region-beginning) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
387 rend (copy-marker (region-end))) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
388 (setq rstart (point) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
389 rend (point-max-marker))) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
390 (goto-char rstart)) |
23457
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
391 (let ((case-fold-search (and case-fold-search |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
392 (isearch-no-upper-case-p regexp t)))) |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
393 (save-excursion |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
394 (while (and (< (point) rend) |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
395 (re-search-forward regexp rend t)) |
23457
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
396 (delete-region (save-excursion (goto-char (match-beginning 0)) |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
397 (beginning-of-line) |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
398 (point)) |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
399 (progn (forward-line 1) (point))))))) |
61 | 400 |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
401 |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
402 (defun how-many (regexp &optional rstart rend) |
23457
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
403 "Print number of matches for REGEXP following point. |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
404 |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
405 If REGEXP contains upper case characters (excluding those preceded by `\\'), |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
406 the matching is case-sensitive. |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
407 |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
408 Second and third arg RSTART and REND specify the region to operate on. |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
409 |
38040
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
410 Interactively, in Transient Mark mode when the mark is active, operate |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
411 on the contents of the region. Otherwise, operate from point to the |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
412 end of the buffer." |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
413 |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
414 (interactive |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
415 (keep-lines-read-args "How many matches for (regexp): ")) |
37832
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
416 (save-excursion |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
417 (if rstart |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
418 (goto-char (min rstart rend)) |
38040
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
419 (if (and transient-mark-mode mark-active) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
420 (setq rstart (region-beginning) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
421 rend (copy-marker (region-end))) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
422 (setq rstart (point) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
423 rend (point-max-marker))) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
424 (goto-char rstart)) |
37832
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
425 (let ((count 0) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
426 opoint |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
427 (case-fold-search (and case-fold-search |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
428 (isearch-no-upper-case-p regexp t)))) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
429 (while (and (< (point) rend) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
430 (progn (setq opoint (point)) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
431 (re-search-forward regexp rend t))) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
432 (if (= opoint (point)) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
433 (forward-char 1) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
434 (setq count (1+ count)))) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
435 (message "%d occurrences" count)))) |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
436 |
2408
a9c05a12b615
(regexp-history): New history list.
Richard M. Stallman <rms@gnu.org>
parents:
2327
diff
changeset
|
437 |
37832
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
438 (defvar occur-mode-map |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
439 (let ((map (make-sparse-keymap))) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
440 (define-key map [mouse-2] 'occur-mode-mouse-goto) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
441 (define-key map "\C-c\C-c" 'occur-mode-goto-occurrence) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
442 (define-key map "\C-m" 'occur-mode-goto-occurrence) |
45444
84e0e49bfb75
(occur-engine): Increment globalcount all at once after searching a buffer.
Colin Walters <walters@gnu.org>
parents:
45308
diff
changeset
|
443 (define-key map "o" 'occur-mode-goto-occurrence-other-window) |
42294
d1c81a1250f2
(occur-mode-display-occurrence): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41761
diff
changeset
|
444 (define-key map "\C-o" 'occur-mode-display-occurrence) |
37832
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
445 (define-key map "\M-n" 'occur-next) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
446 (define-key map "\M-p" 'occur-prev) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
447 (define-key map "g" 'revert-buffer) |
45079
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
448 (define-key map "q" 'delete-window) |
37832
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
449 map) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
450 "Keymap for `occur-mode'.") |
61 | 451 |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
452 (defvar occur-revert-arguments nil |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
453 "Arguments to pass to `occur-1' to revert an Occur mode buffer. |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
454 See `occur-revert-function'.") |
61 | 455 |
45444
84e0e49bfb75
(occur-engine): Increment globalcount all at once after searching a buffer.
Colin Walters <walters@gnu.org>
parents:
45308
diff
changeset
|
456 (defcustom occur-mode-hook '(turn-on-font-lock) |
84e0e49bfb75
(occur-engine): Increment globalcount all at once after searching a buffer.
Colin Walters <walters@gnu.org>
parents:
45308
diff
changeset
|
457 "Hooks run when `occur' is called." |
84e0e49bfb75
(occur-engine): Increment globalcount all at once after searching a buffer.
Colin Walters <walters@gnu.org>
parents:
45308
diff
changeset
|
458 :type 'hook |
84e0e49bfb75
(occur-engine): Increment globalcount all at once after searching a buffer.
Colin Walters <walters@gnu.org>
parents:
45308
diff
changeset
|
459 :group 'matching) |
84e0e49bfb75
(occur-engine): Increment globalcount all at once after searching a buffer.
Colin Walters <walters@gnu.org>
parents:
45308
diff
changeset
|
460 |
17655
8e35bb3ec2e2
(occur-mode): Add a mode-class property.
Richard M. Stallman <rms@gnu.org>
parents:
17638
diff
changeset
|
461 (put 'occur-mode 'mode-class 'special) |
41329
040cb763bd64
(occur-mode): Undo 2001-5-20 change.
Richard M. Stallman <rms@gnu.org>
parents:
40925
diff
changeset
|
462 (defun occur-mode () |
61 | 463 "Major mode for output from \\[occur]. |
10266
a44beb55d3e1
(occur-mode-map): Bind C-m and `return' to occur-mode-goto-occurrence.
Richard M. Stallman <rms@gnu.org>
parents:
10157
diff
changeset
|
464 \\<occur-mode-map>Move point to one of the items in this buffer, then use |
a44beb55d3e1
(occur-mode-map): Bind C-m and `return' to occur-mode-goto-occurrence.
Richard M. Stallman <rms@gnu.org>
parents:
10157
diff
changeset
|
465 \\[occur-mode-goto-occurrence] to go to the occurrence that the item refers to. |
a44beb55d3e1
(occur-mode-map): Bind C-m and `return' to occur-mode-goto-occurrence.
Richard M. Stallman <rms@gnu.org>
parents:
10157
diff
changeset
|
466 Alternatively, click \\[occur-mode-mouse-goto] on an item to go to it. |
a44beb55d3e1
(occur-mode-map): Bind C-m and `return' to occur-mode-goto-occurrence.
Richard M. Stallman <rms@gnu.org>
parents:
10157
diff
changeset
|
467 |
61 | 468 \\{occur-mode-map}" |
41329
040cb763bd64
(occur-mode): Undo 2001-5-20 change.
Richard M. Stallman <rms@gnu.org>
parents:
40925
diff
changeset
|
469 (kill-all-local-variables) |
040cb763bd64
(occur-mode): Undo 2001-5-20 change.
Richard M. Stallman <rms@gnu.org>
parents:
40925
diff
changeset
|
470 (use-local-map occur-mode-map) |
040cb763bd64
(occur-mode): Undo 2001-5-20 change.
Richard M. Stallman <rms@gnu.org>
parents:
40925
diff
changeset
|
471 (setq major-mode 'occur-mode) |
040cb763bd64
(occur-mode): Undo 2001-5-20 change.
Richard M. Stallman <rms@gnu.org>
parents:
40925
diff
changeset
|
472 (setq mode-name "Occur") |
040cb763bd64
(occur-mode): Undo 2001-5-20 change.
Richard M. Stallman <rms@gnu.org>
parents:
40925
diff
changeset
|
473 (make-local-variable 'revert-buffer-function) |
45444
84e0e49bfb75
(occur-engine): Increment globalcount all at once after searching a buffer.
Colin Walters <walters@gnu.org>
parents:
45308
diff
changeset
|
474 (set (make-local-variable 'font-lock-category-alist) |
84e0e49bfb75
(occur-engine): Increment globalcount all at once after searching a buffer.
Colin Walters <walters@gnu.org>
parents:
45308
diff
changeset
|
475 `((,(make-symbol "occur-match") . bold) |
84e0e49bfb75
(occur-engine): Increment globalcount all at once after searching a buffer.
Colin Walters <walters@gnu.org>
parents:
45308
diff
changeset
|
476 (,(make-symbol "occur-title") . underline))) |
37832
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
477 (set (make-local-variable 'revert-buffer-function) 'occur-revert-function) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
478 (make-local-variable 'occur-revert-arguments) |
41329
040cb763bd64
(occur-mode): Undo 2001-5-20 change.
Richard M. Stallman <rms@gnu.org>
parents:
40925
diff
changeset
|
479 (run-hooks 'occur-mode-hook)) |
61 | 480 |
16864
59ed508195a4
(occur-mode-map): Bind g to revert-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
16819
diff
changeset
|
481 (defun occur-revert-function (ignore1 ignore2) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
482 "Handle `revert-buffer' for Occur mode buffers." |
45265
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
483 (apply 'occur-1 (append occur-revert-arguments (list (buffer-name))))) |
16864
59ed508195a4
(occur-mode-map): Bind g to revert-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
16819
diff
changeset
|
484 |
6596
80df3b456672
(occur-mode-find-occurrence): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
6410
diff
changeset
|
485 (defun occur-mode-mouse-goto (event) |
80df3b456672
(occur-mode-find-occurrence): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
6410
diff
changeset
|
486 "In Occur mode, go to the occurrence whose line you click on." |
80df3b456672
(occur-mode-find-occurrence): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
6410
diff
changeset
|
487 (interactive "e") |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
488 (let (pos) |
6596
80df3b456672
(occur-mode-find-occurrence): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
6410
diff
changeset
|
489 (save-excursion |
80df3b456672
(occur-mode-find-occurrence): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
6410
diff
changeset
|
490 (set-buffer (window-buffer (posn-window (event-end event)))) |
80df3b456672
(occur-mode-find-occurrence): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
6410
diff
changeset
|
491 (save-excursion |
80df3b456672
(occur-mode-find-occurrence): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
6410
diff
changeset
|
492 (goto-char (posn-point (event-end event))) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
493 (setq pos (occur-mode-find-occurrence)))) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
494 (pop-to-buffer (marker-buffer pos)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
495 (goto-char pos))) |
6596
80df3b456672
(occur-mode-find-occurrence): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
6410
diff
changeset
|
496 |
80df3b456672
(occur-mode-find-occurrence): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
6410
diff
changeset
|
497 (defun occur-mode-find-occurrence () |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
498 (let ((pos (get-text-property (point) 'occur-target))) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
499 (unless pos |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
500 (error "No occurrence on this line")) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
501 (unless (buffer-live-p (marker-buffer pos)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
502 (error "Buffer for this occurrence was killed")) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
503 pos)) |
6596
80df3b456672
(occur-mode-find-occurrence): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
6410
diff
changeset
|
504 |
80df3b456672
(occur-mode-find-occurrence): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
6410
diff
changeset
|
505 (defun occur-mode-goto-occurrence () |
80df3b456672
(occur-mode-find-occurrence): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
6410
diff
changeset
|
506 "Go to the occurrence the current line describes." |
80df3b456672
(occur-mode-find-occurrence): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
6410
diff
changeset
|
507 (interactive) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
508 (let ((pos (occur-mode-find-occurrence))) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
509 (pop-to-buffer (marker-buffer pos)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
510 (goto-char pos))) |
18918
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
511 |
42604
a49b37e22b38
(occur-mode-goto-occurrence-other-window): New command.
Richard M. Stallman <rms@gnu.org>
parents:
42430
diff
changeset
|
512 (defun occur-mode-goto-occurrence-other-window () |
a49b37e22b38
(occur-mode-goto-occurrence-other-window): New command.
Richard M. Stallman <rms@gnu.org>
parents:
42430
diff
changeset
|
513 "Go to the occurrence the current line describes, in another window." |
a49b37e22b38
(occur-mode-goto-occurrence-other-window): New command.
Richard M. Stallman <rms@gnu.org>
parents:
42430
diff
changeset
|
514 (interactive) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
515 (let ((pos (occur-mode-find-occurrence))) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
516 (switch-to-buffer-other-window (marker-buffer pos)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
517 (goto-char pos))) |
42604
a49b37e22b38
(occur-mode-goto-occurrence-other-window): New command.
Richard M. Stallman <rms@gnu.org>
parents:
42430
diff
changeset
|
518 |
42294
d1c81a1250f2
(occur-mode-display-occurrence): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41761
diff
changeset
|
519 (defun occur-mode-display-occurrence () |
d1c81a1250f2
(occur-mode-display-occurrence): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41761
diff
changeset
|
520 "Display in another window the occurrence the current line describes." |
d1c81a1250f2
(occur-mode-display-occurrence): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41761
diff
changeset
|
521 (interactive) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
522 (let ((pos (occur-mode-find-occurrence)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
523 window |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
524 ;; Bind these to ensure `display-buffer' puts it in another window. |
42294
d1c81a1250f2
(occur-mode-display-occurrence): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41761
diff
changeset
|
525 same-window-buffer-names |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
526 same-window-regexps) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
527 (setq window (display-buffer (marker-buffer pos))) |
42294
d1c81a1250f2
(occur-mode-display-occurrence): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41761
diff
changeset
|
528 ;; This is the way to set point in the proper window. |
d1c81a1250f2
(occur-mode-display-occurrence): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41761
diff
changeset
|
529 (save-selected-window |
d1c81a1250f2
(occur-mode-display-occurrence): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41761
diff
changeset
|
530 (select-window window) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
531 (goto-char pos)))) |
42294
d1c81a1250f2
(occur-mode-display-occurrence): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41761
diff
changeset
|
532 |
18918
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
533 (defun occur-next (&optional n) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
534 "Move to the Nth (default 1) next match in an Occur mode buffer." |
18918
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
535 (interactive "p") |
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
536 (if (not n) (setq n 1)) |
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
537 (let ((r)) |
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
538 (while (> n 0) |
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
539 (if (get-text-property (point) 'occur-point) |
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
540 (forward-char 1)) |
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
541 (setq r (next-single-property-change (point) 'occur-point)) |
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
542 (if r |
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
543 (goto-char r) |
29051 | 544 (error "No more matches")) |
18918
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
545 (setq n (1- n))))) |
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
546 |
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
547 (defun occur-prev (&optional n) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
548 "Move to the Nth (default 1) previous match in an Occur mode buffer." |
18918
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
549 (interactive "p") |
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
550 (if (not n) (setq n 1)) |
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
551 (let ((r)) |
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
552 (while (> n 0) |
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
553 |
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
554 (setq r (get-text-property (point) 'occur-point)) |
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
555 (if r (forward-char -1)) |
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
556 |
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
557 (setq r (previous-single-property-change (point) 'occur-point)) |
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
558 (if r |
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
559 (goto-char (- r 1)) |
29051 | 560 (error "No earlier matches")) |
18918
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
561 |
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
562 (setq n (1- n))))) |
2408
a9c05a12b615
(regexp-history): New history list.
Richard M. Stallman <rms@gnu.org>
parents:
2327
diff
changeset
|
563 |
17664
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17655
diff
changeset
|
564 (defcustom list-matching-lines-default-context-lines 0 |
29051 | 565 "*Default number of context lines included around `list-matching-lines' matches. |
566 A negative number means to include that many lines before the match. | |
17664
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17655
diff
changeset
|
567 A positive number means to include that many lines both before and after." |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17655
diff
changeset
|
568 :type 'integer |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17655
diff
changeset
|
569 :group 'matching) |
61 | 570 |
2571
b65cf676a09b
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2408
diff
changeset
|
571 (defalias 'list-matching-lines 'occur) |
61 | 572 |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
573 (defcustom list-matching-lines-face 'bold |
29051 | 574 "*Face used by \\[list-matching-lines] to show the text that matches. |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
575 If the value is nil, don't highlight the matching portions specially." |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
576 :type 'face |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
577 :group 'matching) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
578 |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
579 (defcustom list-matching-lines-buffer-name-face 'underline |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
580 "*Face used by \\[list-matching-lines] to show the names of buffers. |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
581 If the value is nil, don't highlight the buffer names specially." |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
582 :type 'face |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
583 :group 'matching) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
584 |
44832
d60f225edddc
(occur-accumulate-lines): Add optional argument `no-props'. Handle it.
Colin Walters <walters@gnu.org>
parents:
44794
diff
changeset
|
585 (defun occur-accumulate-lines (count &optional no-props) |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
586 (save-excursion |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
587 (let ((forwardp (> count 0)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
588 (result nil)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
589 (while (not (or (zerop count) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
590 (if forwardp |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
591 (eobp) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
592 (bobp)))) |
45176
2a245e4bdf59
(occur-unfontify-region-function): Delete.
Colin Walters <walters@gnu.org>
parents:
45079
diff
changeset
|
593 (setq count (+ count (if forwardp -1 1))) |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
594 (push |
44832
d60f225edddc
(occur-accumulate-lines): Add optional argument `no-props'. Handle it.
Colin Walters <walters@gnu.org>
parents:
44794
diff
changeset
|
595 (funcall (if no-props |
d60f225edddc
(occur-accumulate-lines): Add optional argument `no-props'. Handle it.
Colin Walters <walters@gnu.org>
parents:
44794
diff
changeset
|
596 #'buffer-substring-no-properties |
d60f225edddc
(occur-accumulate-lines): Add optional argument `no-props'. Handle it.
Colin Walters <walters@gnu.org>
parents:
44794
diff
changeset
|
597 #'buffer-substring) |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
598 (line-beginning-position) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
599 (line-end-position)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
600 result) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
601 (forward-line (if forwardp 1 -1))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
602 (nreverse result)))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
603 |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
604 (defun occur-read-primary-args () |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
605 (list (let* ((default (car regexp-history)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
606 (input |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
607 (read-from-minibuffer |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
608 (if default |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
609 (format "List lines matching regexp (default `%s'): " |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
610 default) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
611 "List lines matching regexp: ") |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
612 nil |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
613 nil |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
614 nil |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
615 'regexp-history))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
616 (if (equal input "") |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
617 default |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
618 input)) |
45308
abd8a68f87a7
(occur-read-primary-args): Handle a bare 'C-u' correctly.
Colin Walters <walters@gnu.org>
parents:
45265
diff
changeset
|
619 (when current-prefix-arg |
abd8a68f87a7
(occur-read-primary-args): Handle a bare 'C-u' correctly.
Colin Walters <walters@gnu.org>
parents:
45265
diff
changeset
|
620 (prefix-numeric-value current-prefix-arg)))) |
16818
6de559d0b20f
(list-matching-lines-face): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16758
diff
changeset
|
621 |
61 | 622 (defun occur (regexp &optional nlines) |
1427
c49077849583
(occur): Always search entire buffer.
Richard M. Stallman <rms@gnu.org>
parents:
866
diff
changeset
|
623 "Show all lines in the current buffer containing a match for REGEXP. |
61 | 624 |
260 | 625 If a match spreads across multiple lines, all those lines are shown. |
626 | |
627 Each line is displayed with NLINES lines before and after, or -NLINES | |
628 before if NLINES is negative. | |
629 NLINES defaults to `list-matching-lines-default-context-lines'. | |
61 | 630 Interactively it is the prefix arg. |
631 | |
2408
a9c05a12b615
(regexp-history): New history list.
Richard M. Stallman <rms@gnu.org>
parents:
2327
diff
changeset
|
632 The lines are shown in a buffer named `*Occur*'. |
61 | 633 It serves as a menu to find any of the occurrences in this buffer. |
17655
8e35bb3ec2e2
(occur-mode): Add a mode-class property.
Richard M. Stallman <rms@gnu.org>
parents:
17638
diff
changeset
|
634 \\<occur-mode-map>\\[describe-mode] in that buffer will explain how. |
17638
9ece72836276
(occur): If regexp has uppercase in it, match it case-sensitively.
Richard M. Stallman <rms@gnu.org>
parents:
17211
diff
changeset
|
635 |
17655
8e35bb3ec2e2
(occur-mode): Add a mode-class property.
Richard M. Stallman <rms@gnu.org>
parents:
17638
diff
changeset
|
636 If REGEXP contains upper case characters (excluding those preceded by `\\'), |
8e35bb3ec2e2
(occur-mode): Add a mode-class property.
Richard M. Stallman <rms@gnu.org>
parents:
17638
diff
changeset
|
637 the matching is case-sensitive." |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
638 (interactive (occur-read-primary-args)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
639 (occur-1 regexp nlines (list (current-buffer)))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
640 |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
641 (defun multi-occur (bufs regexp &optional nlines) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
642 "Show all lines in buffers BUFS containing a match for REGEXP. |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
643 This function acts on multiple buffers; otherwise, it is exactly like |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
644 `occur'." |
15040
04f81516b6e0
(occur): Fix up interactive code.
Richard M. Stallman <rms@gnu.org>
parents:
14819
diff
changeset
|
645 (interactive |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
646 (cons |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
647 (let ((bufs (list (read-buffer "First buffer to search: " |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
648 (current-buffer) t))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
649 (buf nil)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
650 (while (not (string-equal |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
651 (setq buf (read-buffer "Next buffer to search (RET to end): " |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
652 nil t)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
653 "")) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
654 (push buf bufs)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
655 (nreverse (mapcar #'get-buffer bufs))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
656 (occur-read-primary-args))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
657 (occur-1 regexp nlines bufs)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
658 |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
659 (defun multi-occur-by-filename-regexp (bufregexp regexp &optional nlines) |
44853
ca887baefc80
(multi-occur-by-filename-regexp): Doc fix.
Colin Walters <walters@gnu.org>
parents:
44832
diff
changeset
|
660 "Show all lines matching REGEXP in buffers named by BUFREGEXP. |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
661 See also `multi-occur'." |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
662 (interactive |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
663 (cons |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
664 (let* ((default (car regexp-history)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
665 (input |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
666 (read-from-minibuffer |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
667 "List lines in buffers whose filename matches regexp: " |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
668 nil |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
669 nil |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
670 nil |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
671 'regexp-history))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
672 (if (equal input "") |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
673 default |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
674 input)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
675 (occur-read-primary-args))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
676 (when bufregexp |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
677 (occur-1 regexp nlines |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
678 (delq nil |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
679 (mapcar (lambda (buf) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
680 (when (and (buffer-file-name buf) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
681 (string-match bufregexp |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
682 (buffer-file-name buf))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
683 buf)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
684 (buffer-list)))))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
685 |
45265
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
686 (defun occur-1 (regexp nlines bufs &optional buf-name) |
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
687 (unless buf-name |
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
688 (setq buf-name "*Occur*")) |
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
689 (let ((occur-buf (get-buffer-create buf-name)) |
45079
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
690 (made-temp-buf nil) |
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
691 (active-bufs (delq nil (mapcar #'(lambda (buf) |
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
692 (when (buffer-live-p buf) buf)) |
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
693 bufs)))) |
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
694 ;; Handle the case where one of the buffers we're searching is the |
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
695 ;; *Occur* buffer itself. |
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
696 (when (memq occur-buf bufs) |
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
697 (setq occur-buf (with-current-buffer occur-buf |
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
698 (clone-buffer "*Occur-temp*")) |
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
699 made-temp-buf t)) |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
700 (with-current-buffer occur-buf |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
701 (setq buffer-read-only nil) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
702 (occur-mode) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
703 (erase-buffer) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
704 (let ((count (occur-engine |
45079
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
705 regexp active-bufs occur-buf |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
706 (or nlines list-matching-lines-default-context-lines) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
707 (and case-fold-search |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
708 (isearch-no-upper-case-p regexp t)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
709 nil nil nil nil))) |
45079
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
710 (let* ((diff (- (length bufs) (length active-bufs))) |
45265
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
711 (bufcount (- (length bufs) diff)) |
45079
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
712 (msg (concat |
45265
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
713 (format "Searched %d buffer%s" bufcount (if (= bufcount 1) "" "s")) |
45079
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
714 "%s; " |
45265
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
715 (format "%s match%s for `%s'" |
45079
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
716 (if (zerop count) |
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
717 "no" |
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
718 (format "%d" count)) |
45265
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
719 (if (= count 1) |
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
720 "" |
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
721 "es") |
45079
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
722 regexp)))) |
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
723 (message msg (if (zerop diff) |
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
724 "" |
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
725 (format " (%d killed)" diff)))) |
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
726 ;; If we had to make a temporary buffer, make it the *Occur* |
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
727 ;; buffer now. |
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
728 (when made-temp-buf |
45265
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
729 (with-current-buffer (get-buffer buf-name) |
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
730 (kill-buffer (current-buffer))) |
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
731 (rename-buffer buf-name)) |
45079
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
732 (setq occur-revert-arguments (list regexp nlines bufs) |
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
733 buffer-read-only t) |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
734 (if (> count 0) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
735 (display-buffer occur-buf) |
45079
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
736 (kill-buffer occur-buf)))))) |
18991
2cf48aa123b8
(occur): Local variable line-start redundant.
Richard M. Stallman <rms@gnu.org>
parents:
18918
diff
changeset
|
737 |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
738 (defun occur-engine-add-prefix (lines) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
739 (mapcar |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
740 #'(lambda (line) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
741 (concat " :" line "\n")) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
742 lines)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
743 |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
744 (defun occur-engine (regexp buffers out-buf nlines case-fold-search |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
745 title-face prefix-face match-face keep-props) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
746 (with-current-buffer out-buf |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
747 (setq buffer-read-only nil) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
748 (let ((globalcount 0)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
749 ;; Map over all the buffers |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
750 (dolist (buf buffers) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
751 (when (buffer-live-p buf) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
752 (let ((matches 0) ;; count of matched lines |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
753 (lines 1) ;; line count |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
754 (matchbeg 0) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
755 (matchend 0) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
756 (origpt nil) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
757 (begpt nil) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
758 (endpt nil) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
759 (marker nil) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
760 (curstring "") |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
761 (headerpt (with-current-buffer out-buf (point)))) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
762 (save-excursion |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
763 (set-buffer buf) |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
764 (save-excursion |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
765 (goto-char (point-min)) ;; begin searching in the buffer |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
766 (while (not (eobp)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
767 (setq origpt (point)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
768 (when (setq endpt (re-search-forward regexp nil t)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
769 (setq matches (1+ matches)) ;; increment match count |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
770 (setq matchbeg (match-beginning 0) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
771 matchend (match-end 0)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
772 (setq begpt (save-excursion |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
773 (goto-char matchbeg) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
774 (line-beginning-position))) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
775 (setq lines (+ lines (1- (count-lines origpt endpt)))) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
776 (setq marker (make-marker)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
777 (set-marker marker matchbeg) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
778 (setq curstring (buffer-substring begpt |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
779 (line-end-position))) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
780 ;; Depropertize the string, and maybe |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
781 ;; highlight the matches |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
782 (let ((len (length curstring)) |
45444
84e0e49bfb75
(occur-engine): Increment globalcount all at once after searching a buffer.
Colin Walters <walters@gnu.org>
parents:
45308
diff
changeset
|
783 (match-category (with-current-buffer out-buf |
84e0e49bfb75
(occur-engine): Increment globalcount all at once after searching a buffer.
Colin Walters <walters@gnu.org>
parents:
45308
diff
changeset
|
784 (car (nth 0 font-lock-category-alist)))) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
785 (start 0)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
786 (unless keep-props |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
787 (set-text-properties 0 len nil curstring)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
788 (while (and (< start len) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
789 (string-match regexp curstring start)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
790 (add-text-properties (match-beginning 0) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
791 (match-end 0) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
792 (append |
45444
84e0e49bfb75
(occur-engine): Increment globalcount all at once after searching a buffer.
Colin Walters <walters@gnu.org>
parents:
45308
diff
changeset
|
793 `(occur-match t category ,match-category) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
794 (when match-face |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
795 `(face ,match-face))) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
796 curstring) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
797 (setq start (match-end 0)))) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
798 ;; Generate the string to insert for this match |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
799 (let* ((out-line |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
800 (concat |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
801 (apply #'propertize (format "%6d:" lines) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
802 (append |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
803 (when prefix-face |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
804 `(face prefix-face)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
805 '(occur-prefix t))) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
806 curstring |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
807 "\n")) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
808 (data |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
809 (if (= nlines 0) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
810 ;; The simple display style |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
811 out-line |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
812 ;; The complex multi-line display |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
813 ;; style. Generate a list of lines, |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
814 ;; concatenate them all together. |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
815 (apply #'concat |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
816 (nconc |
45176
2a245e4bdf59
(occur-unfontify-region-function): Delete.
Colin Walters <walters@gnu.org>
parents:
45079
diff
changeset
|
817 (occur-engine-add-prefix (nreverse (cdr (occur-accumulate-lines (- (1+ nlines)) keep-props)))) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
818 (list out-line) |
45176
2a245e4bdf59
(occur-unfontify-region-function): Delete.
Colin Walters <walters@gnu.org>
parents:
45079
diff
changeset
|
819 (occur-engine-add-prefix (cdr (occur-accumulate-lines (1+ nlines) keep-props)))))))) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
820 ;; Actually insert the match display data |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
821 (with-current-buffer out-buf |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
822 (let ((beg (point)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
823 (end (progn (insert data) (point)))) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
824 (unless (= nlines 0) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
825 (insert "-------\n")) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
826 (add-text-properties |
45490
177f92e9f497
(occur-engine): Include all text properties except mouse-face on the
Colin Walters <walters@gnu.org>
parents:
45444
diff
changeset
|
827 beg end |
177f92e9f497
(occur-engine): Include all text properties except mouse-face on the
Colin Walters <walters@gnu.org>
parents:
45444
diff
changeset
|
828 `(occur-target ,marker help-echo "mouse-2: go to this occurrence")) |
177f92e9f497
(occur-engine): Include all text properties except mouse-face on the
Colin Walters <walters@gnu.org>
parents:
45444
diff
changeset
|
829 ;; We don't put `mouse-face' on the newline, |
177f92e9f497
(occur-engine): Include all text properties except mouse-face on the
Colin Walters <walters@gnu.org>
parents:
45444
diff
changeset
|
830 ;; because that loses. |
177f92e9f497
(occur-engine): Include all text properties except mouse-face on the
Colin Walters <walters@gnu.org>
parents:
45444
diff
changeset
|
831 (add-text-properties beg (1- end) '(mouse-face highlight))))) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
832 (goto-char endpt)) |
45265
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
833 (if endpt |
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
834 (progn |
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
835 (setq lines (1+ lines)) |
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
836 ;; On to the next match... |
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
837 (forward-line 1)) |
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
838 (goto-char (point-max)))))) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
839 (when (not (zerop matches)) ;; is the count zero? |
45444
84e0e49bfb75
(occur-engine): Increment globalcount all at once after searching a buffer.
Colin Walters <walters@gnu.org>
parents:
45308
diff
changeset
|
840 (setq globalcount (+ globalcount matches)) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
841 (with-current-buffer out-buf |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
842 (goto-char headerpt) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
843 (let ((beg (point)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
844 end) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
845 (insert (format "%d lines matching \"%s\" in buffer: %s\n" |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
846 matches regexp (buffer-name buf))) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
847 (setq end (point)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
848 (add-text-properties beg end |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
849 (append |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
850 (when title-face |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
851 `(face ,title-face)) |
45444
84e0e49bfb75
(occur-engine): Increment globalcount all at once after searching a buffer.
Colin Walters <walters@gnu.org>
parents:
45308
diff
changeset
|
852 `(occur-title |
84e0e49bfb75
(occur-engine): Increment globalcount all at once after searching a buffer.
Colin Walters <walters@gnu.org>
parents:
45308
diff
changeset
|
853 ,buf category |
84e0e49bfb75
(occur-engine): Increment globalcount all at once after searching a buffer.
Colin Walters <walters@gnu.org>
parents:
45308
diff
changeset
|
854 ,(car (nth 1 font-lock-category-alist)))))) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
855 (goto-char (point-min))))))) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
856 ;; Return the number of matches |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
857 globalcount))) |
18991
2cf48aa123b8
(occur): Local variable line-start redundant.
Richard M. Stallman <rms@gnu.org>
parents:
18918
diff
changeset
|
858 |
61 | 859 |
2080
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
860 ;; It would be nice to use \\[...], but there is no reasonable way |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
861 ;; to make that display both SPC and Y. |
61 | 862 (defconst query-replace-help |
863 "Type Space or `y' to replace one match, Delete or `n' to skip to next, | |
5337
0740b2a454d9
(query-replace-map): Don't bind ESC.
Richard M. Stallman <rms@gnu.org>
parents:
5298
diff
changeset
|
864 RET or `q' to exit, Period to replace one match and exit, |
61 | 865 Comma to replace but not move point immediately, |
866 C-r to enter recursive edit (\\[exit-recursive-edit] to get out again), | |
867 C-w to delete match and recursive edit, | |
868 C-l to clear the screen, redisplay, and offer same replacement again, | |
869 ! to replace all remaining matches with no more questions, | |
28801
be3f5fa41e90
(query-replace-map): Add binding for `E'.
Gerd Moellmann <gerd@gnu.org>
parents:
28706
diff
changeset
|
870 ^ to move point back to previous match, |
be3f5fa41e90
(query-replace-map): Add binding for `E'.
Gerd Moellmann <gerd@gnu.org>
parents:
28706
diff
changeset
|
871 E to edit the replacement string" |
38036
018637678f29
(case-replace, query-replace-from-history-variable)
Eli Zaretskii <eliz@gnu.org>
parents:
37832
diff
changeset
|
872 "Help message while in `query-replace'.") |
61 | 873 |
2080
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
874 (defvar query-replace-map (make-sparse-keymap) |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
875 "Keymap that defines the responses to questions in `query-replace'. |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
876 The \"bindings\" in this map are not commands; they are answers. |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
877 The valid answers include `act', `skip', `act-and-show', |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
878 `exit', `act-and-exit', `edit', `delete-and-edit', `recenter', |
10057
460fecc93446
(query-replace-map): Define \e and escape as exit-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
9908
diff
changeset
|
879 `automatic', `backup', `exit-prefix', and `help'.") |
2080
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
880 |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
881 (define-key query-replace-map " " 'act) |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
882 (define-key query-replace-map "\d" 'skip) |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
883 (define-key query-replace-map [delete] 'skip) |
2327
61b35714d880
(query-replace-map): Define backspace like delete.
Richard M. Stallman <rms@gnu.org>
parents:
2315
diff
changeset
|
884 (define-key query-replace-map [backspace] 'skip) |
2080
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
885 (define-key query-replace-map "y" 'act) |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
886 (define-key query-replace-map "n" 'skip) |
9908
32d20ec5ed51
(query-replace-map): Bind Y and N like y and n.
Richard M. Stallman <rms@gnu.org>
parents:
9847
diff
changeset
|
887 (define-key query-replace-map "Y" 'act) |
32d20ec5ed51
(query-replace-map): Bind Y and N like y and n.
Richard M. Stallman <rms@gnu.org>
parents:
9847
diff
changeset
|
888 (define-key query-replace-map "N" 'skip) |
29971
939e6ca411e9
(query-replace-map): Bind `e' like `E'.
Gerd Moellmann <gerd@gnu.org>
parents:
29952
diff
changeset
|
889 (define-key query-replace-map "e" 'edit-replacement) |
28801
be3f5fa41e90
(query-replace-map): Add binding for `E'.
Gerd Moellmann <gerd@gnu.org>
parents:
28706
diff
changeset
|
890 (define-key query-replace-map "E" 'edit-replacement) |
2080
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
891 (define-key query-replace-map "," 'act-and-show) |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
892 (define-key query-replace-map "q" 'exit) |
3852
e365900ca7e7
* replace.el (query-replace-map): Make return exit query-replace,
Jim Blandy <jimb@redhat.com>
parents:
2709
diff
changeset
|
893 (define-key query-replace-map "\r" 'exit) |
3885
d89645572b0f
* replace.el (query-replace-map): Fix typo in binding for [return].
Jim Blandy <jimb@redhat.com>
parents:
3852
diff
changeset
|
894 (define-key query-replace-map [return] 'exit) |
2080
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
895 (define-key query-replace-map "." 'act-and-exit) |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
896 (define-key query-replace-map "\C-r" 'edit) |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
897 (define-key query-replace-map "\C-w" 'delete-and-edit) |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
898 (define-key query-replace-map "\C-l" 'recenter) |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
899 (define-key query-replace-map "!" 'automatic) |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
900 (define-key query-replace-map "^" 'backup) |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
901 (define-key query-replace-map "\C-h" 'help) |
12109
6be53feb3323
(query-replace-map): Bind f1 and help.
Karl Heuer <kwzh@gnu.org>
parents:
11314
diff
changeset
|
902 (define-key query-replace-map [f1] 'help) |
6be53feb3323
(query-replace-map): Bind f1 and help.
Karl Heuer <kwzh@gnu.org>
parents:
11314
diff
changeset
|
903 (define-key query-replace-map [help] 'help) |
2080
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
904 (define-key query-replace-map "?" 'help) |
2083
ff782069e797
(query-replace-map): Add `quit' bindings. Delete default binding.
Richard M. Stallman <rms@gnu.org>
parents:
2080
diff
changeset
|
905 (define-key query-replace-map "\C-g" 'quit) |
ff782069e797
(query-replace-map): Add `quit' bindings. Delete default binding.
Richard M. Stallman <rms@gnu.org>
parents:
2080
diff
changeset
|
906 (define-key query-replace-map "\C-]" 'quit) |
10057
460fecc93446
(query-replace-map): Define \e and escape as exit-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
9908
diff
changeset
|
907 (define-key query-replace-map "\e" 'exit-prefix) |
460fecc93446
(query-replace-map): Define \e and escape as exit-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
9908
diff
changeset
|
908 (define-key query-replace-map [escape] 'exit-prefix) |
2080
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
909 |
25167
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
910 (defun replace-match-string-symbols (n) |
29051 | 911 "Process a list (and any sub-lists), expanding certain symbols. |
912 Symbol Expands To | |
913 N (match-string N) (where N is a string of digits) | |
914 #N (string-to-number (match-string N)) | |
915 & (match-string 0) | |
916 #& (string-to-number (match-string 0)) | |
917 | |
918 Note that these symbols must be preceeded by a backslash in order to | |
919 type them." | |
25167
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
920 (while n |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
921 (cond |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
922 ((consp (car n)) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
923 (replace-match-string-symbols (car n))) ;Process sub-list |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
924 ((symbolp (car n)) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
925 (let ((name (symbol-name (car n)))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
926 (cond |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
927 ((string-match "^[0-9]+$" name) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
928 (setcar n (list 'match-string (string-to-number name)))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
929 ((string-match "^#[0-9]+$" name) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
930 (setcar n (list 'string-to-number |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
931 (list 'match-string |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
932 (string-to-number (substring name 1)))))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
933 ((string= "&" name) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
934 (setcar n '(match-string 0))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
935 ((string= "#&" name) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
936 (setcar n '(string-to-number (match-string 0)))))))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
937 (setq n (cdr n)))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
938 |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
939 (defun replace-eval-replacement (expression replace-count) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
940 (let ((replacement (eval expression))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
941 (if (stringp replacement) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
942 replacement |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
943 (prin1-to-string replacement t)))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
944 |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
945 (defun replace-loop-through-replacements (data replace-count) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
946 ;; DATA is a vector contaning the following values: |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
947 ;; 0 next-rotate-count |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
948 ;; 1 repeat-count |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
949 ;; 2 next-replacement |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
950 ;; 3 replacements |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
951 (if (= (aref data 0) replace-count) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
952 (progn |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
953 (aset data 0 (+ replace-count (aref data 1))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
954 (let ((next (cdr (aref data 2)))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
955 (aset data 2 (if (consp next) next (aref data 3)))))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
956 (car (aref data 2))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
957 |
40254
51c9985454e3
(perform-replace): Move START and END parameters
Gerd Moellmann <gerd@gnu.org>
parents:
38986
diff
changeset
|
958 (defun perform-replace (from-string replacements |
61 | 959 query-flag regexp-flag delimited-flag |
40254
51c9985454e3
(perform-replace): Move START and END parameters
Gerd Moellmann <gerd@gnu.org>
parents:
38986
diff
changeset
|
960 &optional repeat-count map start end) |
61 | 961 "Subroutine of `query-replace'. Its complexity handles interactive queries. |
962 Don't use this in your own program unless you want to query and set the mark | |
963 just as `query-replace' does. Instead, write a simple loop like this: | |
38675
a7b1d283fe97
(perform-replace): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
38414
diff
changeset
|
964 |
a7b1d283fe97
(perform-replace): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
38414
diff
changeset
|
965 (while (re-search-forward \"foo[ \\t]+bar\" nil t) |
61 | 966 (replace-match \"foobar\" nil nil)) |
38675
a7b1d283fe97
(perform-replace): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
38414
diff
changeset
|
967 |
a7b1d283fe97
(perform-replace): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
38414
diff
changeset
|
968 which will run faster and probably do exactly what you want. Please |
a7b1d283fe97
(perform-replace): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
38414
diff
changeset
|
969 see the documentation of `replace-match' to find out how to simulate |
45529
45014630aeb2
(perform-replace): Document return value. Use `pop'.
Colin Walters <walters@gnu.org>
parents:
45490
diff
changeset
|
970 `case-replace'. |
45014630aeb2
(perform-replace): Document return value. Use `pop'.
Colin Walters <walters@gnu.org>
parents:
45490
diff
changeset
|
971 |
45014630aeb2
(perform-replace): Document return value. Use `pop'.
Colin Walters <walters@gnu.org>
parents:
45490
diff
changeset
|
972 This function returns nil if and only if there were no matches to |
45014630aeb2
(perform-replace): Document return value. Use `pop'.
Colin Walters <walters@gnu.org>
parents:
45490
diff
changeset
|
973 make, or the user didn't cancel the call." |
2080
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
974 (or map (setq map query-replace-map)) |
16631
024d3847af99
(perform-replace): Obey minibuffer-auto-raise.
Richard M. Stallman <rms@gnu.org>
parents:
16129
diff
changeset
|
975 (and query-flag minibuffer-auto-raise |
024d3847af99
(perform-replace): Obey minibuffer-auto-raise.
Richard M. Stallman <rms@gnu.org>
parents:
16129
diff
changeset
|
976 (raise-frame (window-frame (minibuffer-window)))) |
61 | 977 (let ((nocasify (not (and case-fold-search case-replace |
978 (string-equal from-string | |
979 (downcase from-string))))) | |
25039
7a53fe8294bf
(perform-replace): Turn off case-fold-search
Karl Heuer <kwzh@gnu.org>
parents:
23457
diff
changeset
|
980 (case-fold-search (and case-fold-search |
7a53fe8294bf
(perform-replace): Turn off case-fold-search
Karl Heuer <kwzh@gnu.org>
parents:
23457
diff
changeset
|
981 (string-equal from-string |
7a53fe8294bf
(perform-replace): Turn off case-fold-search
Karl Heuer <kwzh@gnu.org>
parents:
23457
diff
changeset
|
982 (downcase from-string)))) |
61 | 983 (literal (not regexp-flag)) |
984 (search-function (if regexp-flag 're-search-forward 'search-forward)) | |
985 (search-string from-string) | |
732 | 986 (real-match-data nil) ; the match data for the current match |
61 | 987 (next-replacement nil) |
988 (keep-going t) | |
989 (stack nil) | |
990 (replace-count 0) | |
18433
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
991 (nonempty-match nil) |
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
992 |
20248
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
993 ;; If non-nil, it is marker saying where in the buffer to stop. |
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
994 (limit nil) |
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
995 |
18433
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
996 ;; Data for the next match. If a cons, it has the same format as |
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
997 ;; (match-data); otherwise it is t if a match is possible at point. |
16725
cdc897a9054f
(perform-replace): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
16713
diff
changeset
|
998 (match-again t) |
18433
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
999 |
7258
68c7b93914fe
(perform-replace): Call substitute-command-keys just once
Richard M. Stallman <rms@gnu.org>
parents:
6722
diff
changeset
|
1000 (message |
68c7b93914fe
(perform-replace): Call substitute-command-keys just once
Richard M. Stallman <rms@gnu.org>
parents:
6722
diff
changeset
|
1001 (if query-flag |
68c7b93914fe
(perform-replace): Call substitute-command-keys just once
Richard M. Stallman <rms@gnu.org>
parents:
6722
diff
changeset
|
1002 (substitute-command-keys |
68c7b93914fe
(perform-replace): Call substitute-command-keys just once
Richard M. Stallman <rms@gnu.org>
parents:
6722
diff
changeset
|
1003 "Query replacing %s with %s: (\\<query-replace-map>\\[help] for help) ")))) |
20248
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
1004 |
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
1005 ;; If region is active, in Transient Mark mode, operate on region. |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
1006 (when start |
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
1007 (setq limit (copy-marker (max start end))) |
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
1008 (goto-char (min start end)) |
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
1009 (deactivate-mark)) |
25167
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1010 |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1011 ;; REPLACEMENTS is either a string, a list of strings, or a cons cell |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1012 ;; containing a function and its first argument. The function is |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1013 ;; called to generate each replacement like this: |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1014 ;; (funcall (car replacements) (cdr replacements) replace-count) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1015 ;; It must return a string. |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1016 (cond |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1017 ((stringp replacements) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1018 (setq next-replacement replacements |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1019 replacements nil)) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1020 ((stringp (car replacements)) ; If it isn't a string, it must be a cons |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1021 (or repeat-count (setq repeat-count 1)) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1022 (setq replacements (cons 'replace-loop-through-replacements |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1023 (vector repeat-count repeat-count |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1024 replacements replacements))))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1025 |
61 | 1026 (if delimited-flag |
1027 (setq search-function 're-search-forward | |
1028 search-string (concat "\\b" | |
1029 (if regexp-flag from-string | |
1030 (regexp-quote from-string)) | |
1031 "\\b"))) | |
1032 (push-mark) | |
1033 (undo-boundary) | |
5393
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1034 (unwind-protect |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1035 ;; Loop finding occurrences that perhaps should be replaced. |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1036 (while (and keep-going |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1037 (not (eobp)) |
18433
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
1038 ;; Use the next match if it is already known; |
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
1039 ;; otherwise, search for a match after moving forward |
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
1040 ;; one char if progress is required. |
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
1041 (setq real-match-data |
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
1042 (if (consp match-again) |
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
1043 (progn (goto-char (nth 1 match-again)) |
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
1044 match-again) |
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
1045 (and (or match-again |
29952
3e2589e69a8a
(perform-replace): Undo change of 2000-04-04.
Gerd Moellmann <gerd@gnu.org>
parents:
29051
diff
changeset
|
1046 ;; MATCH-AGAIN non-nil means we |
3e2589e69a8a
(perform-replace): Undo change of 2000-04-04.
Gerd Moellmann <gerd@gnu.org>
parents:
29051
diff
changeset
|
1047 ;; accept an adjacent match. If |
3e2589e69a8a
(perform-replace): Undo change of 2000-04-04.
Gerd Moellmann <gerd@gnu.org>
parents:
29051
diff
changeset
|
1048 ;; we don't, move one char to the |
3e2589e69a8a
(perform-replace): Undo change of 2000-04-04.
Gerd Moellmann <gerd@gnu.org>
parents:
29051
diff
changeset
|
1049 ;; right. This takes us a |
3e2589e69a8a
(perform-replace): Undo change of 2000-04-04.
Gerd Moellmann <gerd@gnu.org>
parents:
29051
diff
changeset
|
1050 ;; character too far at the end, |
3e2589e69a8a
(perform-replace): Undo change of 2000-04-04.
Gerd Moellmann <gerd@gnu.org>
parents:
29051
diff
changeset
|
1051 ;; but this is undone after the |
3e2589e69a8a
(perform-replace): Undo change of 2000-04-04.
Gerd Moellmann <gerd@gnu.org>
parents:
29051
diff
changeset
|
1052 ;; while-loop. |
28502
3e4e6d45a774
(perform-replace): Don't move forward one char
Gerd Moellmann <gerd@gnu.org>
parents:
27391
diff
changeset
|
1053 (progn (forward-char 1) (not (eobp)))) |
20248
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
1054 (funcall search-function search-string limit t) |
18433
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
1055 ;; For speed, use only integers and |
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
1056 ;; reuse the list used last time. |
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
1057 (match-data t real-match-data))))) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1058 ;; Optionally ignore matches that have a read-only property. |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1059 (unless (and query-replace-skip-read-only |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1060 (text-property-not-all |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1061 (match-beginning 0) (match-end 0) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1062 'read-only nil)) |
732 | 1063 |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1064 ;; Record whether the match is nonempty, to avoid an infinite loop |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1065 ;; repeatedly matching the same empty string. |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1066 (setq nonempty-match |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1067 (/= (nth 0 real-match-data) (nth 1 real-match-data))) |
34480
816fa0390935
(perform-replace): Don't use an empty match adjacent
Gerd Moellmann <gerd@gnu.org>
parents:
34290
diff
changeset
|
1068 |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1069 ;; If the match is empty, record that the next one can't be |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1070 ;; adjacent. |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1071 |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1072 ;; Otherwise, if matching a regular expression, do the next |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1073 ;; match now, since the replacement for this match may |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1074 ;; affect whether the next match is adjacent to this one. |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1075 ;; If that match is empty, don't use it. |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1076 (setq match-again |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1077 (and nonempty-match |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1078 (or (not regexp-flag) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1079 (and (looking-at search-string) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1080 (let ((match (match-data))) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1081 (and (/= (nth 0 match) (nth 1 match)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1082 match)))))) |
18433
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
1083 |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1084 ;; Calculate the replacement string, if necessary. |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1085 (when replacements |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1086 (set-match-data real-match-data) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1087 (setq next-replacement |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1088 (funcall (car replacements) (cdr replacements) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1089 replace-count))) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1090 (if (not query-flag) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1091 (let ((inhibit-read-only query-replace-skip-read-only)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1092 (set-match-data real-match-data) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1093 (replace-match next-replacement nocasify literal) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1094 (setq replace-count (1+ replace-count))) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1095 (undo-boundary) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1096 (let (done replaced key def) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1097 ;; Loop reading commands until one of them sets done, |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1098 ;; which means it has finished handling this occurrence. |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1099 (while (not done) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1100 (set-match-data real-match-data) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1101 (replace-highlight (match-beginning 0) (match-end 0)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1102 ;; Bind message-log-max so we don't fill up the message log |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1103 ;; with a bunch of identical messages. |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1104 (let ((message-log-max nil)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1105 (message message from-string next-replacement)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1106 (setq key (read-event)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1107 ;; Necessary in case something happens during read-event |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1108 ;; that clobbers the match data. |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1109 (set-match-data real-match-data) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1110 (setq key (vector key)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1111 (setq def (lookup-key map key)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1112 ;; Restore the match data while we process the command. |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1113 (cond ((eq def 'help) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1114 (with-output-to-temp-buffer "*Help*" |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1115 (princ |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1116 (concat "Query replacing " |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1117 (if regexp-flag "regexp " "") |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1118 from-string " with " |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1119 next-replacement ".\n\n" |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1120 (substitute-command-keys |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1121 query-replace-help))) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1122 (with-current-buffer standard-output |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1123 (help-mode)))) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1124 ((eq def 'exit) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1125 (setq keep-going nil) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1126 (setq done t)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1127 ((eq def 'backup) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1128 (if stack |
45529
45014630aeb2
(perform-replace): Document return value. Use `pop'.
Colin Walters <walters@gnu.org>
parents:
45490
diff
changeset
|
1129 (let ((elt (pop stack))) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1130 (goto-char (car elt)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1131 (setq replaced (eq t (cdr elt))) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1132 (or replaced |
45529
45014630aeb2
(perform-replace): Document return value. Use `pop'.
Colin Walters <walters@gnu.org>
parents:
45490
diff
changeset
|
1133 (set-match-data (cdr elt)))) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1134 (message "No previous match") |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1135 (ding 'no-terminate) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1136 (sit-for 1))) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1137 ((eq def 'act) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1138 (or replaced |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1139 (progn |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1140 (replace-match next-replacement nocasify literal) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1141 (setq replace-count (1+ replace-count)))) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1142 (setq done t replaced t)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1143 ((eq def 'act-and-exit) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1144 (or replaced |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1145 (progn |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1146 (replace-match next-replacement nocasify literal) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1147 (setq replace-count (1+ replace-count)))) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1148 (setq keep-going nil) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1149 (setq done t replaced t)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1150 ((eq def 'act-and-show) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1151 (if (not replaced) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1152 (progn |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1153 (replace-match next-replacement nocasify literal) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1154 (setq replace-count (1+ replace-count)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1155 (setq replaced t)))) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1156 ((eq def 'automatic) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1157 (or replaced |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1158 (progn |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1159 (replace-match next-replacement nocasify literal) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1160 (setq replace-count (1+ replace-count)))) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1161 (setq done t query-flag nil replaced t)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1162 ((eq def 'skip) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1163 (setq done t)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1164 ((eq def 'recenter) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1165 (recenter nil)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1166 ((eq def 'edit) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1167 (let ((opos (point-marker))) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1168 (goto-char (match-beginning 0)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1169 (save-excursion |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1170 (funcall search-function search-string limit t) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1171 (setq real-match-data (match-data))) |
44138
f1d7c706f7f7
(query-replace-read-args): New optional arg NOERROR.
Richard M. Stallman <rms@gnu.org>
parents:
43406
diff
changeset
|
1172 (save-excursion |
f1d7c706f7f7
(query-replace-read-args): New optional arg NOERROR.
Richard M. Stallman <rms@gnu.org>
parents:
43406
diff
changeset
|
1173 (save-window-excursion |
f1d7c706f7f7
(query-replace-read-args): New optional arg NOERROR.
Richard M. Stallman <rms@gnu.org>
parents:
43406
diff
changeset
|
1174 (recursive-edit))) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1175 (goto-char opos)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1176 (set-match-data real-match-data) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1177 ;; Before we make the replacement, |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1178 ;; decide whether the search string |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1179 ;; can match again just after this match. |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1180 (if (and regexp-flag nonempty-match) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1181 (setq match-again (and (looking-at search-string) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1182 (match-data))))) |
28801
be3f5fa41e90
(query-replace-map): Add binding for `E'.
Gerd Moellmann <gerd@gnu.org>
parents:
28706
diff
changeset
|
1183 |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1184 ;; Edit replacement. |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1185 ((eq def 'edit-replacement) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1186 (setq next-replacement |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1187 (read-input "Edit replacement string: " |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1188 next-replacement)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1189 (or replaced |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1190 (replace-match next-replacement nocasify literal)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1191 (setq done t)) |
28801
be3f5fa41e90
(query-replace-map): Add binding for `E'.
Gerd Moellmann <gerd@gnu.org>
parents:
28706
diff
changeset
|
1192 |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1193 ((eq def 'delete-and-edit) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1194 (delete-region (match-beginning 0) (match-end 0)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1195 (set-match-data |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1196 (prog1 (match-data) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1197 (save-excursion (recursive-edit)))) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1198 (setq replaced t)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1199 ;; Note: we do not need to treat `exit-prefix' |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1200 ;; specially here, since we reread |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1201 ;; any unrecognized character. |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1202 (t |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1203 (setq this-command 'mode-exited) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1204 (setq keep-going nil) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1205 (setq unread-command-events |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1206 (append (listify-key-sequence key) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1207 unread-command-events)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1208 (setq done t)))) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1209 ;; Record previous position for ^ when we move on. |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1210 ;; Change markers to numbers in the match data |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1211 ;; since lots of markers slow down editing. |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1212 (setq stack |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1213 (cons (cons (point) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1214 (or replaced (match-data t))) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1215 stack)))))) |
29952
3e2589e69a8a
(perform-replace): Undo change of 2000-04-04.
Gerd Moellmann <gerd@gnu.org>
parents:
29051
diff
changeset
|
1216 |
3e2589e69a8a
(perform-replace): Undo change of 2000-04-04.
Gerd Moellmann <gerd@gnu.org>
parents:
29051
diff
changeset
|
1217 ;; The code preventing adjacent regexp matches in the condition |
3e2589e69a8a
(perform-replace): Undo change of 2000-04-04.
Gerd Moellmann <gerd@gnu.org>
parents:
29051
diff
changeset
|
1218 ;; of the while-loop above will haven taken us one character |
3e2589e69a8a
(perform-replace): Undo change of 2000-04-04.
Gerd Moellmann <gerd@gnu.org>
parents:
29051
diff
changeset
|
1219 ;; beyond the last replacement. Undo that. |
3e2589e69a8a
(perform-replace): Undo change of 2000-04-04.
Gerd Moellmann <gerd@gnu.org>
parents:
29051
diff
changeset
|
1220 (when (and regexp-flag (not match-again) (> replace-count 0)) |
3e2589e69a8a
(perform-replace): Undo change of 2000-04-04.
Gerd Moellmann <gerd@gnu.org>
parents:
29051
diff
changeset
|
1221 (backward-char 1)) |
3e2589e69a8a
(perform-replace): Undo change of 2000-04-04.
Gerd Moellmann <gerd@gnu.org>
parents:
29051
diff
changeset
|
1222 |
5393
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1223 (replace-dehighlight)) |
10157
7953cde9d951
(perform-replace): Report number of replacements when done.
Richard M. Stallman <rms@gnu.org>
parents:
10155
diff
changeset
|
1224 (or unread-command-events |
7953cde9d951
(perform-replace): Report number of replacements when done.
Richard M. Stallman <rms@gnu.org>
parents:
10155
diff
changeset
|
1225 (message "Replaced %d occurrence%s" |
7953cde9d951
(perform-replace): Report number of replacements when done.
Richard M. Stallman <rms@gnu.org>
parents:
10155
diff
changeset
|
1226 replace-count |
7953cde9d951
(perform-replace): Report number of replacements when done.
Richard M. Stallman <rms@gnu.org>
parents:
10155
diff
changeset
|
1227 (if (= replace-count 1) "" "s"))) |
7953cde9d951
(perform-replace): Report number of replacements when done.
Richard M. Stallman <rms@gnu.org>
parents:
10155
diff
changeset
|
1228 (and keep-going stack))) |
61 | 1229 |
20244
6fbf1436a7f4
(query-replace-highlight): Change default to t.
Karl Heuer <kwzh@gnu.org>
parents:
19551
diff
changeset
|
1230 (defcustom query-replace-highlight t |
17664
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17655
diff
changeset
|
1231 "*Non-nil means to highlight words during query replacement." |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17655
diff
changeset
|
1232 :type 'boolean |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17655
diff
changeset
|
1233 :group 'matching) |
5393
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1234 |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1235 (defvar replace-overlay nil) |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1236 |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1237 (defun replace-dehighlight () |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1238 (and replace-overlay |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1239 (progn |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1240 (delete-overlay replace-overlay) |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1241 (setq replace-overlay nil)))) |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1242 |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1243 (defun replace-highlight (start end) |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1244 (and query-replace-highlight |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1245 (progn |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1246 (or replace-overlay |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1247 (progn |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1248 (setq replace-overlay (make-overlay start end)) |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1249 (overlay-put replace-overlay 'face |
29051 | 1250 (if (facep 'query-replace) |
5393
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1251 'query-replace 'region)))) |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1252 (move-overlay replace-overlay start end (current-buffer))))) |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1253 |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
324
diff
changeset
|
1254 ;;; replace.el ends here |