Mercurial > emacs
annotate lisp/replace.el @ 56245:93e88c0fb51c
(query-replace-read-args): Swallow space after \,SYMBOL.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Thu, 24 Jun 2004 23:33:59 +0000 |
parents | 4e0ea2b75232 |
children | 29d03615f533 |
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 |
56148
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
3 ;; Copyright (C) 1985, 86, 87, 92, 94, 96, 1997, 2000, 2001, 2002, |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
4 ;; 2003, 2004 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 |
55868
0311117a7581
(query-replace-interactive): Convert defvar into defcustom.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55067
diff
changeset
|
39 (defcustom query-replace-interactive nil |
8935
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. |
55868
0311117a7581
(query-replace-interactive): Convert defvar into defcustom.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55067
diff
changeset
|
41 That becomes the \"string to replace\"." |
0311117a7581
(query-replace-interactive): Convert defvar into defcustom.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55067
diff
changeset
|
42 :type 'boolean |
0311117a7581
(query-replace-interactive): Convert defvar into defcustom.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55067
diff
changeset
|
43 :group 'matching) |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
44 |
20806
24a1fcdc31d7
(query-replace-from-history-variable): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20658
diff
changeset
|
45 (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
|
46 "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
|
47 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
|
48 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
|
49 or patterns to be replaced." |
24a1fcdc31d7
(query-replace-from-history-variable): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20658
diff
changeset
|
50 :group 'matching |
21669
9861518505cb
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21294
diff
changeset
|
51 :type 'symbol |
9861518505cb
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21294
diff
changeset
|
52 :version "20.3") |
20806
24a1fcdc31d7
(query-replace-from-history-variable): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20658
diff
changeset
|
53 |
24a1fcdc31d7
(query-replace-from-history-variable): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20658
diff
changeset
|
54 (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
|
55 "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
|
56 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
|
57 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
|
58 strings or patterns." |
24a1fcdc31d7
(query-replace-from-history-variable): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20658
diff
changeset
|
59 :group 'matching |
21669
9861518505cb
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21294
diff
changeset
|
60 :type 'symbol |
9861518505cb
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21294
diff
changeset
|
61 :version "20.3") |
20806
24a1fcdc31d7
(query-replace-from-history-variable): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20658
diff
changeset
|
62 |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
63 (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
|
64 "*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
|
65 :type 'boolean |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
66 :group 'matching |
45255
20c79f08a7da
Change all post-21.1 :version attributes to 21.4.
Eli Zaretskii <eliz@gnu.org>
parents:
45176
diff
changeset
|
67 :version "21.4") |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
68 |
44138
f1d7c706f7f7
(query-replace-read-args): New optional arg NOERROR.
Richard M. Stallman <rms@gnu.org>
parents:
43406
diff
changeset
|
69 (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
|
70 (unless noerror |
f1d7c706f7f7
(query-replace-read-args): New optional arg NOERROR.
Richard M. Stallman <rms@gnu.org>
parents:
43406
diff
changeset
|
71 (barf-if-buffer-read-only)) |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
862
diff
changeset
|
72 (let (from to) |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
73 (if query-replace-interactive |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
74 (setq from (car (if regexp-flag regexp-search-ring search-ring))) |
50030
1ec92786c9eb
(query-replace-read-args): Use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
49958
diff
changeset
|
75 ;; The save-excursion here is in case the user marks and copies |
1ec92786c9eb
(query-replace-read-args): Use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
49958
diff
changeset
|
76 ;; a region in order to specify the minibuffer input. |
1ec92786c9eb
(query-replace-read-args): Use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
49958
diff
changeset
|
77 ;; That should not clobber the region for the query-replace itself. |
1ec92786c9eb
(query-replace-read-args): Use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
49958
diff
changeset
|
78 (save-excursion |
1ec92786c9eb
(query-replace-read-args): Use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
49958
diff
changeset
|
79 (setq from (read-from-minibuffer (format "%s: " string) |
1ec92786c9eb
(query-replace-read-args): Use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
49958
diff
changeset
|
80 nil nil nil |
1ec92786c9eb
(query-replace-read-args): Use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
49958
diff
changeset
|
81 query-replace-from-history-variable |
1ec92786c9eb
(query-replace-read-args): Use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
49958
diff
changeset
|
82 nil t))) |
41761
878a3e2e7cfa
(query-replace-read-args): Display message if FROM contains `\n' or `\t'.
Richard M. Stallman <rms@gnu.org>
parents:
41329
diff
changeset
|
83 ;; Warn if user types \n or \t, but don't reject the input. |
56148
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
84 (and regexp-flag |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
85 (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\(\\\\[nt]\\)" from) |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
86 (let ((match (match-string 3 from))) |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
87 (cond |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
88 ((string= match "\\n") |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
89 (message "Note: `\\n' here doesn't match a newline; to do that, type C-q C-j instead")) |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
90 ((string= match "\\t") |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
91 (message "Note: `\\t' here doesn't match a tab; to do that, just type TAB"))) |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
92 (sit-for 2)))) |
41761
878a3e2e7cfa
(query-replace-read-args): Display message if FROM contains `\n' or `\t'.
Richard M. Stallman <rms@gnu.org>
parents:
41329
diff
changeset
|
93 |
50030
1ec92786c9eb
(query-replace-read-args): Use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
49958
diff
changeset
|
94 (save-excursion |
1ec92786c9eb
(query-replace-read-args): Use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
49958
diff
changeset
|
95 (setq to (read-from-minibuffer (format "%s %s with: " string from) |
1ec92786c9eb
(query-replace-read-args): Use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
49958
diff
changeset
|
96 nil nil nil |
1ec92786c9eb
(query-replace-read-args): Use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
49958
diff
changeset
|
97 query-replace-to-history-variable from t))) |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
98 (when (and regexp-flag |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
99 (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\\\[,#]" to)) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
100 (let (pos list char) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
101 (while |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
102 (progn |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
103 (setq pos (match-end 0)) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
104 (push (substring to 0 (- pos 2)) list) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
105 (setq char (aref to (1- pos)) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
106 to (substring to pos)) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
107 (cond ((eq char ?\#) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
108 (push '(number-to-string replace-count) list)) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
109 ((eq char ?\,) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
110 (setq pos (read-from-string to)) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
111 (push `(replace-quote ,(car pos)) list) |
56245
93e88c0fb51c
(query-replace-read-args): Swallow space after \,SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
56228
diff
changeset
|
112 (let ((end |
93e88c0fb51c
(query-replace-read-args): Swallow space after \,SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
56228
diff
changeset
|
113 ;; Swallow a space after a symbol |
93e88c0fb51c
(query-replace-read-args): Swallow space after \,SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
56228
diff
changeset
|
114 ;; if there is a space. |
93e88c0fb51c
(query-replace-read-args): Swallow space after \,SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
56228
diff
changeset
|
115 (if (and (or (symbolp (car pos)) |
93e88c0fb51c
(query-replace-read-args): Swallow space after \,SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
56228
diff
changeset
|
116 ;; Swallow a space after 'foo |
93e88c0fb51c
(query-replace-read-args): Swallow space after \,SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
56228
diff
changeset
|
117 ;; but not after (quote foo). |
93e88c0fb51c
(query-replace-read-args): Swallow space after \,SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
56228
diff
changeset
|
118 (and (eq (car-safe (car pos)) 'quote) |
93e88c0fb51c
(query-replace-read-args): Swallow space after \,SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
56228
diff
changeset
|
119 (= ?\( (aref to-string 0)))) |
93e88c0fb51c
(query-replace-read-args): Swallow space after \,SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
56228
diff
changeset
|
120 (equal " " (substring to-string (cdr pos) |
93e88c0fb51c
(query-replace-read-args): Swallow space after \,SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
56228
diff
changeset
|
121 (1+ (cdr pos))))) |
93e88c0fb51c
(query-replace-read-args): Swallow space after \,SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
56228
diff
changeset
|
122 (1+ (cdr pos)) |
93e88c0fb51c
(query-replace-read-args): Swallow space after \,SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
56228
diff
changeset
|
123 (cdr pos)))) |
93e88c0fb51c
(query-replace-read-args): Swallow space after \,SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
56228
diff
changeset
|
124 (setq to (substring to end))))) |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
125 (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\\\[,#]" to))) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
126 (setq to (nreverse (delete "" (cons to list))))) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
127 (replace-match-string-symbols to) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
128 (setq to (cons 'replace-eval-replacement |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
129 (if (> (length to) 1) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
130 (cons 'concat to) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
131 (car to))))) |
49958
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
132 (list from to current-prefix-arg))) |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
862
diff
changeset
|
133 |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
134 (defun query-replace (from-string to-string &optional delimited start end) |
260 | 135 "Replace some occurrences of FROM-STRING with TO-STRING. |
136 As each match is found, the user must type a character saying | |
137 what to do with it. For directions, type \\[help-command] at that time. | |
138 | |
20248
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
139 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
|
140 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
|
141 |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
142 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
|
143 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
|
144 minibuffer. |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
145 |
48173
b0db4f794e73
(query-replace, query-replace-regexp): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
47593
diff
changeset
|
146 Matching is independent of case if `case-fold-search' is non-nil and |
b0db4f794e73
(query-replace, query-replace-regexp): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
47593
diff
changeset
|
147 FROM-STRING has no uppercase letters. Replacement transfers the case |
b0db4f794e73
(query-replace, query-replace-regexp): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
47593
diff
changeset
|
148 pattern of the old text to the new text, if `case-replace' and |
b0db4f794e73
(query-replace, query-replace-regexp): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
47593
diff
changeset
|
149 `case-fold-search' are non-nil and FROM-STRING has no uppercase |
b0db4f794e73
(query-replace, query-replace-regexp): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
47593
diff
changeset
|
150 letters. \(Transferring the case pattern means that if the old text |
b0db4f794e73
(query-replace, query-replace-regexp): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
47593
diff
changeset
|
151 matched is all caps, or capitalized, then its replacement is upcased |
b0db4f794e73
(query-replace, query-replace-regexp): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
47593
diff
changeset
|
152 or capitalized.) |
10104
8a04af3511c1
(replace-string, query-replace): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
10069
diff
changeset
|
153 |
6707 | 154 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
|
155 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
|
156 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
|
157 |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
158 To customize possible responses, change the \"bindings\" in `query-replace-map'." |
49958
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
159 (interactive (let ((common |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
160 (query-replace-read-args "Query replace" nil))) |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
161 (list (nth 0 common) (nth 1 common) (nth 2 common) |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
162 ;; These are done separately here |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
163 ;; so that command-history will record these expressions |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
164 ;; rather than the values they had this time. |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
165 (if (and transient-mark-mode mark-active) |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
166 (region-beginning)) |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
167 (if (and transient-mark-mode mark-active) |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
168 (region-end))))) |
40254
51c9985454e3
(perform-replace): Move START and END parameters
Gerd Moellmann <gerd@gnu.org>
parents:
38986
diff
changeset
|
169 (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
|
170 |
268 | 171 (define-key esc-map "%" 'query-replace) |
260 | 172 |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
173 (defun query-replace-regexp (regexp to-string &optional delimited start end) |
260 | 174 "Replace some things after point matching REGEXP with TO-STRING. |
175 As each match is found, the user must type a character saying | |
176 what to do with it. For directions, type \\[help-command] at that time. | |
177 | |
20248
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
178 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
|
179 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
|
180 |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
181 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
|
182 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
|
183 minibuffer. |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
184 |
48173
b0db4f794e73
(query-replace, query-replace-regexp): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
47593
diff
changeset
|
185 Matching is independent of case if `case-fold-search' is non-nil and |
b0db4f794e73
(query-replace, query-replace-regexp): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
47593
diff
changeset
|
186 REGEXP has no uppercase letters. Replacement transfers the case |
b0db4f794e73
(query-replace, query-replace-regexp): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
47593
diff
changeset
|
187 pattern of the old text to the new text, if `case-replace' and |
b0db4f794e73
(query-replace, query-replace-regexp): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
47593
diff
changeset
|
188 `case-fold-search' are non-nil and REGEXP has no uppercase letters. |
b0db4f794e73
(query-replace, query-replace-regexp): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
47593
diff
changeset
|
189 \(Transferring the case pattern means that if the old text matched is |
b0db4f794e73
(query-replace, query-replace-regexp): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
47593
diff
changeset
|
190 all caps, or capitalized, then its replacement is upcased or |
b0db4f794e73
(query-replace, query-replace-regexp): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
47593
diff
changeset
|
191 capitalized.) |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
192 |
6707 | 193 Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace |
260 | 194 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
|
195 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
|
196 |
6707 | 197 In TO-STRING, `\\&' stands for whatever matched the whole of REGEXP, |
198 and `\\=\\N' (where N is a digit) stands for | |
56148
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
199 whatever what matched the Nth `\\(...\\)' in REGEXP. |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
200 `\\?' lets you edit the replacement text in the minibuffer |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
201 at the given position for each replacement. |
56148
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
202 |
56245
93e88c0fb51c
(query-replace-read-args): Swallow space after \,SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
56228
diff
changeset
|
203 In interactive calls, the replacement text can contain `\\,' |
93e88c0fb51c
(query-replace-read-args): Swallow space after \,SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
56228
diff
changeset
|
204 followed by a Lisp expression. Each |
93e88c0fb51c
(query-replace-read-args): Swallow space after \,SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
56228
diff
changeset
|
205 replacement evaluates that expression to compute the replacement |
93e88c0fb51c
(query-replace-read-args): Swallow space after \,SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
56228
diff
changeset
|
206 string. Inside of that expression, `\\&' is a string denoting the |
93e88c0fb51c
(query-replace-read-args): Swallow space after \,SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
56228
diff
changeset
|
207 whole match as a sting, `\\N' for a partial match, `\\#&' and `\\#N' |
93e88c0fb51c
(query-replace-read-args): Swallow space after \,SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
56228
diff
changeset
|
208 for the whole or a partial match converted to a number with |
93e88c0fb51c
(query-replace-read-args): Swallow space after \,SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
56228
diff
changeset
|
209 `string-to-number', and `\\#' itself for the number of replacements |
93e88c0fb51c
(query-replace-read-args): Swallow space after \,SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
56228
diff
changeset
|
210 done so far (starting with zero). |
56148
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
211 |
56245
93e88c0fb51c
(query-replace-read-args): Swallow space after \,SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
56228
diff
changeset
|
212 If the replacement expression is a symbol, write a space after it |
93e88c0fb51c
(query-replace-read-args): Swallow space after \,SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
56228
diff
changeset
|
213 to terminate it. One space there, if any, will be discarded. |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
214 |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
215 When using those Lisp features interactively in the replacement |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
216 text, TO-STRING is actually made a list instead of a string. |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
217 Use \\[repeat-complex-command] after this command for details." |
49958
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
218 (interactive |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
219 (let ((common |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
220 (query-replace-read-args "Query replace regexp" t))) |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
221 (list (nth 0 common) (nth 1 common) (nth 2 common) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
222 ;; These are done separately here |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
223 ;; so that command-history will record these expressions |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
224 ;; rather than the values they had this time. |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
225 (if (and transient-mark-mode mark-active) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
226 (region-beginning)) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
227 (if (and transient-mark-mode mark-active) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
228 (region-end))))) |
56148
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
229 (perform-replace regexp to-string t t delimited nil nil start end)) |
49958
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
230 |
22353
402ebb81ae84
(esc-map): Bind C-M-% to query-replace-regexp.
Karl Heuer <kwzh@gnu.org>
parents:
21669
diff
changeset
|
231 (define-key esc-map [?\C-%] 'query-replace-regexp) |
260 | 232 |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
233 (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
|
234 "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
|
235 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
|
236 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
|
237 |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
238 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
|
239 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
|
240 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
|
241 `prin1-to-string' with the NOESCAPE argument (which see). |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
242 |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
243 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
|
244 `\\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
|
245 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
|
246 Use `\\#&' or `\\#N' if you want a number instead of a string. |
56148
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
247 In interactive use, `\\#' in itself stands for `replace-count'. |
25167
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
248 |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
249 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
|
250 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
|
251 |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
252 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
|
253 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
|
254 minibuffer. |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
255 |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
256 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
|
257 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
|
258 |
25167
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
259 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
|
260 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
|
261 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
|
262 (interactive |
49958
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
263 (let (from to) |
25167
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
264 (if query-replace-interactive |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
265 (setq from (car regexp-search-ring)) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
266 (setq from (read-from-minibuffer "Query replace regexp: " |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
267 nil nil nil |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
268 query-replace-from-history-variable |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
269 nil t))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
270 (setq to (list (read-from-minibuffer |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
271 (format "Query replace regexp %s with eval: " from) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
272 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
|
273 ;; 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
|
274 ;; and the user might enter a single token. |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
275 (replace-match-string-symbols to) |
49958
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
276 (list from (car to) current-prefix-arg |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
277 (if (and transient-mark-mode mark-active) |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
278 (region-beginning)) |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
279 (if (and transient-mark-mode mark-active) |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
280 (region-end))))) |
27391
abaa4ac29f51
(query-replace): Rename last arg to DELIMITED.
Richard M. Stallman <rms@gnu.org>
parents:
25167
diff
changeset
|
281 (perform-replace regexp (cons 'replace-eval-replacement to-expr) |
53778
7898852aa054
(perform-replace): Allow 'literal argument in
David Kastrup <dak@gnu.org>
parents:
52401
diff
changeset
|
282 t 'literal delimited nil nil start end)) |
25167
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
283 |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
284 (defun map-query-replace-regexp (regexp to-strings &optional n start end) |
260 | 285 "Replace some matches for REGEXP with various strings, in rotation. |
29051 | 286 The second argument TO-STRINGS contains the replacement strings, |
287 separated by spaces. Third arg DELIMITED (prefix arg if interactive), | |
288 if non-nil, means replace only matches surrounded by word boundaries. | |
289 This command works like `query-replace-regexp' except that each | |
290 successive replacement uses the next successive replacement string, | |
260 | 291 wrapping around from the last such string to the first. |
292 | |
20248
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
293 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
|
294 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
|
295 |
260 | 296 Non-interactively, TO-STRINGS may be a list of replacement strings. |
297 | |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
298 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
|
299 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
|
300 |
260 | 301 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
|
302 before rotating to the next. |
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
303 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
|
304 (interactive |
49958
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
305 (let (from to) |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
306 (setq from (if query-replace-interactive |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
307 (car regexp-search-ring) |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
308 (read-from-minibuffer "Map query replace (regexp): " |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
309 nil nil nil |
19551
256843b0f804
(query-replace-read-args): Locally bind
Kenichi Handa <handa@m17n.org>
parents:
18991
diff
changeset
|
310 'query-replace-history nil t))) |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
862
diff
changeset
|
311 (setq to (read-from-minibuffer |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
862
diff
changeset
|
312 (format "Query replace %s with (space-separated strings): " |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
862
diff
changeset
|
313 from) |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
862
diff
changeset
|
314 nil nil nil |
20860
1432a2b3c44e
(occur): Apply default by hand after read-from-minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
20806
diff
changeset
|
315 'query-replace-history from t)) |
50030
1ec92786c9eb
(query-replace-read-args): Use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
49958
diff
changeset
|
316 (list from to |
1ec92786c9eb
(query-replace-read-args): Use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
49958
diff
changeset
|
317 (and current-prefix-arg |
1ec92786c9eb
(query-replace-read-args): Use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
49958
diff
changeset
|
318 (prefix-numeric-value current-prefix-arg)) |
49958
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
319 (if (and transient-mark-mode mark-active) |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
320 (region-beginning)) |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
321 (if (and transient-mark-mode mark-active) |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
322 (region-end))))) |
260 | 323 (let (replacements) |
324 (if (listp to-strings) | |
325 (setq replacements to-strings) | |
326 (while (/= (length to-strings) 0) | |
327 (if (string-match " " to-strings) | |
328 (setq replacements | |
329 (append replacements | |
330 (list (substring to-strings 0 | |
331 (string-match " " to-strings)))) | |
332 to-strings (substring to-strings | |
333 (1+ (string-match " " to-strings)))) | |
334 (setq replacements (append replacements (list to-strings)) | |
335 to-strings "")))) | |
40254
51c9985454e3
(perform-replace): Move START and END parameters
Gerd Moellmann <gerd@gnu.org>
parents:
38986
diff
changeset
|
336 (perform-replace regexp replacements t t nil n nil start end))) |
260 | 337 |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
338 (defun replace-string (from-string to-string &optional delimited start end) |
260 | 339 "Replace occurrences of FROM-STRING with TO-STRING. |
340 Preserve case in each match if `case-replace' and `case-fold-search' | |
341 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
|
342 \(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
|
343 then its replacement is upcased or capitalized.) |
8a04af3511c1
(replace-string, query-replace): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
10069
diff
changeset
|
344 |
20248
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
345 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
|
346 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
|
347 |
6707 | 348 Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace |
260 | 349 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
|
350 Fourth and fifth arg START and END specify the region to operate on. |
260 | 351 |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
352 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
|
353 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
|
354 minibuffer. |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
355 |
260 | 356 This function is usually the wrong thing to use in a Lisp program. |
357 What you probably want is a loop like this: | |
6707 | 358 (while (search-forward FROM-STRING nil t) |
359 (replace-match TO-STRING nil t)) | |
17211
ecf78b4eb138
(replace-string): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17010
diff
changeset
|
360 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
|
361 \(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
|
362 and TO-STRING is also null.)" |
49958
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
363 (interactive |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
364 (let ((common |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
365 (query-replace-read-args "Replace string" nil))) |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
366 (list (nth 0 common) (nth 1 common) (nth 2 common) |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
367 (if (and transient-mark-mode mark-active) |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
368 (region-beginning)) |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
369 (if (and transient-mark-mode mark-active) |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
370 (region-end))))) |
40254
51c9985454e3
(perform-replace): Move START and END parameters
Gerd Moellmann <gerd@gnu.org>
parents:
38986
diff
changeset
|
371 (perform-replace from-string to-string nil nil delimited nil nil start end)) |
260 | 372 |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
373 (defun replace-regexp (regexp to-string &optional delimited start end) |
260 | 374 "Replace things after point matching REGEXP with TO-STRING. |
6707 | 375 Preserve case in each match if `case-replace' and `case-fold-search' |
260 | 376 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
|
377 |
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
378 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
|
379 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
|
380 |
6707 | 381 Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace |
260 | 382 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
|
383 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
|
384 |
6707 | 385 In TO-STRING, `\\&' stands for whatever matched the whole of REGEXP, |
386 and `\\=\\N' (where N is a digit) stands for | |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
387 whatever what matched the Nth `\\(...\\)' in REGEXP. |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
388 `\\?' lets you edit the replacement text in the minibuffer |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
389 at the given position for each replacement. |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
390 |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
391 In interactive calls, the replacement text may contain `\\,' |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
392 followed by a Lisp expression used as part of the replacement |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
393 text. Inside of that expression, `\\&' is a string denoting the |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
394 whole match, `\\N' a partial matches, `\\#&' and `\\#N' the |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
395 respective numeric values from `string-to-number', and `\\#' |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
396 itself for `replace-count', the number of replacements occured so |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
397 far. |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
398 |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
399 If your Lisp expression is an identifier and the next letter in |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
400 the replacement string would be interpreted as part of it, you |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
401 can wrap it with an expression like `\\,(or \\#)'. Incidentally, |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
402 for this particular case you may also enter `\\#' in the |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
403 replacement text directly. |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
404 |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
405 When using those Lisp features interactively in the replacement |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
406 text, TO-STRING is actually made a list instead of a string. |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
407 Use \\[repeat-complex-command] after this command for details. |
260 | 408 |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
409 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
|
410 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
|
411 |
260 | 412 This function is usually the wrong thing to use in a Lisp program. |
413 What you probably want is a loop like this: | |
414 (while (re-search-forward REGEXP nil t) | |
6707 | 415 (replace-match TO-STRING nil nil)) |
260 | 416 which will run faster and will not set the mark or print anything." |
49958
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
417 (interactive |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
418 (let ((common |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
419 (query-replace-read-args "Replace regexp" t))) |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
420 (list (nth 0 common) (nth 1 common) (nth 2 common) |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
421 (if (and transient-mark-mode mark-active) |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
422 (region-beginning)) |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
423 (if (and transient-mark-mode mark-active) |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
424 (region-end))))) |
40254
51c9985454e3
(perform-replace): Move START and END parameters
Gerd Moellmann <gerd@gnu.org>
parents:
38986
diff
changeset
|
425 (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
|
426 |
2408
a9c05a12b615
(regexp-history): New history list.
Richard M. Stallman <rms@gnu.org>
parents:
2327
diff
changeset
|
427 |
a9c05a12b615
(regexp-history): New history list.
Richard M. Stallman <rms@gnu.org>
parents:
2327
diff
changeset
|
428 (defvar regexp-history nil |
a9c05a12b615
(regexp-history): New history list.
Richard M. Stallman <rms@gnu.org>
parents:
2327
diff
changeset
|
429 "History list for some commands that read regular expressions.") |
260 | 430 |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
431 |
2571
b65cf676a09b
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2408
diff
changeset
|
432 (defalias 'delete-non-matching-lines 'keep-lines) |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
433 (defalias 'delete-matching-lines 'flush-lines) |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
434 (defalias 'count-matches 'how-many) |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
435 |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
436 |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
437 (defun keep-lines-read-args (prompt) |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
438 "Read arguments for `keep-lines' and friends. |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
439 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
|
440 Value is a list, (REGEXP)." |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
441 (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
|
442 'regexp-history nil t))) |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
443 |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
444 (defun keep-lines (regexp &optional rstart rend) |
61 | 445 "Delete all lines except those containing matches for REGEXP. |
446 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
|
447 Applies to all lines after point. |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
448 |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
449 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
|
450 the matching is case-sensitive. |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
451 |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
452 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
|
453 |
38040
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
454 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
|
455 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
|
456 end of the buffer." |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
457 |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
458 (interactive |
46519
6de9114ee49a
(keep-lines, flush-lines): Interactively report
Richard M. Stallman <rms@gnu.org>
parents:
46335
diff
changeset
|
459 (progn |
6de9114ee49a
(keep-lines, flush-lines): Interactively report
Richard M. Stallman <rms@gnu.org>
parents:
46335
diff
changeset
|
460 (barf-if-buffer-read-only) |
6de9114ee49a
(keep-lines, flush-lines): Interactively report
Richard M. Stallman <rms@gnu.org>
parents:
46335
diff
changeset
|
461 (keep-lines-read-args "Keep lines (containing match for regexp): "))) |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
462 (if rstart |
46335
b4e553fa1fa8
(flush-lines, keep-lines): Convert REND to a marker.
Richard M. Stallman <rms@gnu.org>
parents:
46004
diff
changeset
|
463 (progn |
b4e553fa1fa8
(flush-lines, keep-lines): Convert REND to a marker.
Richard M. Stallman <rms@gnu.org>
parents:
46004
diff
changeset
|
464 (goto-char (min rstart rend)) |
b4e553fa1fa8
(flush-lines, keep-lines): Convert REND to a marker.
Richard M. Stallman <rms@gnu.org>
parents:
46004
diff
changeset
|
465 (setq rend (copy-marker (max rstart rend)))) |
38040
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
466 (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
|
467 (setq rstart (region-beginning) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
468 rend (copy-marker (region-end))) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
469 (setq rstart (point) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
470 rend (point-max-marker))) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
471 (goto-char rstart)) |
61 | 472 (save-excursion |
473 (or (bolp) (forward-line 1)) | |
23457
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
474 (let ((start (point)) |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
475 (case-fold-search (and case-fold-search |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
476 (isearch-no-upper-case-p regexp t)))) |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
477 (while (< (point) rend) |
61 | 478 ;; 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
|
479 (if (not (re-search-forward regexp rend 'move)) |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
480 (delete-region start rend) |
61 | 481 (let ((end (save-excursion (goto-char (match-beginning 0)) |
482 (beginning-of-line) | |
483 (point)))) | |
484 ;; Now end is first char preserved by the new match. | |
485 (if (< start end) | |
486 (delete-region start end)))) | |
46693
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
487 |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
488 (setq start (save-excursion (forward-line 1) (point))) |
61 | 489 ;; 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
|
490 (and (< (point) rend) |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
491 (= (match-beginning 0) (match-end 0)) |
61 | 492 (forward-char 1)))))) |
493 | |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
494 |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
495 (defun flush-lines (regexp &optional rstart rend) |
61 | 496 "Delete lines containing matches for REGEXP. |
497 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
|
498 Applies to lines after point. |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
499 |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
500 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
|
501 the matching is case-sensitive. |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
502 |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
503 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
|
504 |
38040
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
505 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
|
506 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
|
507 end of the buffer." |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
508 |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
509 (interactive |
46519
6de9114ee49a
(keep-lines, flush-lines): Interactively report
Richard M. Stallman <rms@gnu.org>
parents:
46335
diff
changeset
|
510 (progn |
6de9114ee49a
(keep-lines, flush-lines): Interactively report
Richard M. Stallman <rms@gnu.org>
parents:
46335
diff
changeset
|
511 (barf-if-buffer-read-only) |
6de9114ee49a
(keep-lines, flush-lines): Interactively report
Richard M. Stallman <rms@gnu.org>
parents:
46335
diff
changeset
|
512 (keep-lines-read-args "Flush lines (containing match for regexp): "))) |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
513 (if rstart |
46335
b4e553fa1fa8
(flush-lines, keep-lines): Convert REND to a marker.
Richard M. Stallman <rms@gnu.org>
parents:
46004
diff
changeset
|
514 (progn |
b4e553fa1fa8
(flush-lines, keep-lines): Convert REND to a marker.
Richard M. Stallman <rms@gnu.org>
parents:
46004
diff
changeset
|
515 (goto-char (min rstart rend)) |
b4e553fa1fa8
(flush-lines, keep-lines): Convert REND to a marker.
Richard M. Stallman <rms@gnu.org>
parents:
46004
diff
changeset
|
516 (setq rend (copy-marker (max rstart rend)))) |
38040
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
517 (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
|
518 (setq rstart (region-beginning) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
519 rend (copy-marker (region-end))) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
520 (setq rstart (point) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
521 rend (point-max-marker))) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
522 (goto-char rstart)) |
23457
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
523 (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
|
524 (isearch-no-upper-case-p regexp t)))) |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
525 (save-excursion |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
526 (while (and (< (point) rend) |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
527 (re-search-forward regexp rend t)) |
23457
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
528 (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
|
529 (beginning-of-line) |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
530 (point)) |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
531 (progn (forward-line 1) (point))))))) |
61 | 532 |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
533 |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
534 (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
|
535 "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
|
536 |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
537 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
|
538 the matching is case-sensitive. |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
539 |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
540 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
|
541 |
38040
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
542 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
|
543 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
|
544 end of the buffer." |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
545 |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
546 (interactive |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
547 (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
|
548 (save-excursion |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
549 (if rstart |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
550 (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
|
551 (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
|
552 (setq rstart (region-beginning) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
553 rend (copy-marker (region-end))) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
554 (setq rstart (point) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
555 rend (point-max-marker))) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
556 (goto-char rstart)) |
37832
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
557 (let ((count 0) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
558 opoint |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
559 (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
|
560 (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
|
561 (while (and (< (point) rend) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
562 (progn (setq opoint (point)) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
563 (re-search-forward regexp rend t))) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
564 (if (= opoint (point)) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
565 (forward-char 1) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
566 (setq count (1+ count)))) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
567 (message "%d occurrences" count)))) |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
568 |
2408
a9c05a12b615
(regexp-history): New history list.
Richard M. Stallman <rms@gnu.org>
parents:
2327
diff
changeset
|
569 |
37832
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
570 (defvar occur-mode-map |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
571 (let ((map (make-sparse-keymap))) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
572 (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
|
573 (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
|
574 (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
|
575 (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
|
576 (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
|
577 (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
|
578 (define-key map "\M-p" 'occur-prev) |
46693
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
579 (define-key map "r" 'occur-rename-buffer) |
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
580 (define-key map "c" 'clone-buffer) |
37832
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
581 (define-key map "g" 'revert-buffer) |
46693
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
582 (define-key map "q" 'quit-window) |
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
583 (define-key map "z" 'kill-this-buffer) |
37832
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
584 map) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
585 "Keymap for `occur-mode'.") |
61 | 586 |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
587 (defvar occur-revert-arguments nil |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
588 "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
|
589 See `occur-revert-function'.") |
61 | 590 |
47111
356bbdda5f67
(occur-mode-hook): New hook.
Juanma Barranquero <lekktu@gmail.com>
parents:
47087
diff
changeset
|
591 (defcustom occur-mode-hook '(turn-on-font-lock) |
356bbdda5f67
(occur-mode-hook): New hook.
Juanma Barranquero <lekktu@gmail.com>
parents:
47087
diff
changeset
|
592 "Hook run when entering Occur mode." |
356bbdda5f67
(occur-mode-hook): New hook.
Juanma Barranquero <lekktu@gmail.com>
parents:
47087
diff
changeset
|
593 :type 'hook |
356bbdda5f67
(occur-mode-hook): New hook.
Juanma Barranquero <lekktu@gmail.com>
parents:
47087
diff
changeset
|
594 :group 'matching) |
356bbdda5f67
(occur-mode-hook): New hook.
Juanma Barranquero <lekktu@gmail.com>
parents:
47087
diff
changeset
|
595 |
356bbdda5f67
(occur-mode-hook): New hook.
Juanma Barranquero <lekktu@gmail.com>
parents:
47087
diff
changeset
|
596 (defcustom occur-hook nil |
356bbdda5f67
(occur-mode-hook): New hook.
Juanma Barranquero <lekktu@gmail.com>
parents:
47087
diff
changeset
|
597 "Hook run when `occur' is called." |
45444
84e0e49bfb75
(occur-engine): Increment globalcount all at once after searching a buffer.
Colin Walters <walters@gnu.org>
parents:
45308
diff
changeset
|
598 :type 'hook |
84e0e49bfb75
(occur-engine): Increment globalcount all at once after searching a buffer.
Colin Walters <walters@gnu.org>
parents:
45308
diff
changeset
|
599 :group 'matching) |
84e0e49bfb75
(occur-engine): Increment globalcount all at once after searching a buffer.
Colin Walters <walters@gnu.org>
parents:
45308
diff
changeset
|
600 |
17655
8e35bb3ec2e2
(occur-mode): Add a mode-class property.
Richard M. Stallman <rms@gnu.org>
parents:
17638
diff
changeset
|
601 (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
|
602 (defun occur-mode () |
61 | 603 "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
|
604 \\<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
|
605 \\[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
|
606 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
|
607 |
61 | 608 \\{occur-mode-map}" |
47130
454f46344502
(occur-mode): Add interactive declaration.
Juanma Barranquero <lekktu@gmail.com>
parents:
47111
diff
changeset
|
609 (interactive) |
41329
040cb763bd64
(occur-mode): Undo 2001-5-20 change.
Richard M. Stallman <rms@gnu.org>
parents:
40925
diff
changeset
|
610 (kill-all-local-variables) |
040cb763bd64
(occur-mode): Undo 2001-5-20 change.
Richard M. Stallman <rms@gnu.org>
parents:
40925
diff
changeset
|
611 (use-local-map occur-mode-map) |
040cb763bd64
(occur-mode): Undo 2001-5-20 change.
Richard M. Stallman <rms@gnu.org>
parents:
40925
diff
changeset
|
612 (setq major-mode 'occur-mode) |
040cb763bd64
(occur-mode): Undo 2001-5-20 change.
Richard M. Stallman <rms@gnu.org>
parents:
40925
diff
changeset
|
613 (setq mode-name "Occur") |
37832
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
614 (set (make-local-variable 'revert-buffer-function) 'occur-revert-function) |
47111
356bbdda5f67
(occur-mode-hook): New hook.
Juanma Barranquero <lekktu@gmail.com>
parents:
47087
diff
changeset
|
615 (make-local-variable 'occur-revert-arguments) |
47375
fe8ca2be9fde
(occur-mode): Add font-lock-defontify to change-major-mode-hook.
Richard M. Stallman <rms@gnu.org>
parents:
47204
diff
changeset
|
616 (add-hook 'change-major-mode-hook 'font-lock-defontify nil t) |
55067
b335edb455ad
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54778
diff
changeset
|
617 (setq next-error-function 'occur-next-error) |
47111
356bbdda5f67
(occur-mode-hook): New hook.
Juanma Barranquero <lekktu@gmail.com>
parents:
47087
diff
changeset
|
618 (run-hooks 'occur-mode-hook)) |
61 | 619 |
16864
59ed508195a4
(occur-mode-map): Bind g to revert-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
16819
diff
changeset
|
620 (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
|
621 "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
|
622 (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
|
623 |
6596
80df3b456672
(occur-mode-find-occurrence): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
6410
diff
changeset
|
624 (defun occur-mode-mouse-goto (event) |
80df3b456672
(occur-mode-find-occurrence): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
6410
diff
changeset
|
625 "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
|
626 (interactive "e") |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
627 (let (pos) |
6596
80df3b456672
(occur-mode-find-occurrence): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
6410
diff
changeset
|
628 (save-excursion |
80df3b456672
(occur-mode-find-occurrence): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
6410
diff
changeset
|
629 (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
|
630 (save-excursion |
80df3b456672
(occur-mode-find-occurrence): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
6410
diff
changeset
|
631 (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
|
632 (setq pos (occur-mode-find-occurrence)))) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
633 (pop-to-buffer (marker-buffer pos)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
634 (goto-char pos))) |
6596
80df3b456672
(occur-mode-find-occurrence): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
6410
diff
changeset
|
635 |
80df3b456672
(occur-mode-find-occurrence): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
6410
diff
changeset
|
636 (defun occur-mode-find-occurrence () |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
637 (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
|
638 (unless pos |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
639 (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
|
640 (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
|
641 (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
|
642 pos)) |
6596
80df3b456672
(occur-mode-find-occurrence): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
6410
diff
changeset
|
643 |
80df3b456672
(occur-mode-find-occurrence): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
6410
diff
changeset
|
644 (defun occur-mode-goto-occurrence () |
80df3b456672
(occur-mode-find-occurrence): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
6410
diff
changeset
|
645 "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
|
646 (interactive) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
647 (let ((pos (occur-mode-find-occurrence))) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
648 (pop-to-buffer (marker-buffer pos)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
649 (goto-char pos))) |
18918
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
650 |
42604
a49b37e22b38
(occur-mode-goto-occurrence-other-window): New command.
Richard M. Stallman <rms@gnu.org>
parents:
42430
diff
changeset
|
651 (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
|
652 "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
|
653 (interactive) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
654 (let ((pos (occur-mode-find-occurrence))) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
655 (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
|
656 (goto-char pos))) |
42604
a49b37e22b38
(occur-mode-goto-occurrence-other-window): New command.
Richard M. Stallman <rms@gnu.org>
parents:
42430
diff
changeset
|
657 |
42294
d1c81a1250f2
(occur-mode-display-occurrence): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41761
diff
changeset
|
658 (defun occur-mode-display-occurrence () |
d1c81a1250f2
(occur-mode-display-occurrence): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41761
diff
changeset
|
659 "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
|
660 (interactive) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
661 (let ((pos (occur-mode-find-occurrence)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
662 window |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
663 ;; 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
|
664 same-window-buffer-names |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
665 same-window-regexps) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
666 (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
|
667 ;; 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
|
668 (save-selected-window |
d1c81a1250f2
(occur-mode-display-occurrence): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41761
diff
changeset
|
669 (select-window window) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
670 (goto-char pos)))) |
42294
d1c81a1250f2
(occur-mode-display-occurrence): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41761
diff
changeset
|
671 |
47593
b052c0d51fd4
(occur-find-match): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
47532
diff
changeset
|
672 (defun occur-find-match (n search message) |
18918
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
673 (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
|
674 (let ((r)) |
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
675 (while (> n 0) |
47593
b052c0d51fd4
(occur-find-match): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
47532
diff
changeset
|
676 (setq r (funcall search (point) 'occur-match)) |
b052c0d51fd4
(occur-find-match): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
47532
diff
changeset
|
677 (and r |
b052c0d51fd4
(occur-find-match): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
47532
diff
changeset
|
678 (get-text-property r 'occur-match) |
b052c0d51fd4
(occur-find-match): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
47532
diff
changeset
|
679 (setq r (funcall search r 'occur-match))) |
18918
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
680 (if r |
47593
b052c0d51fd4
(occur-find-match): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
47532
diff
changeset
|
681 (goto-char r) |
b052c0d51fd4
(occur-find-match): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
47532
diff
changeset
|
682 (error message)) |
18918
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
683 (setq n (1- n))))) |
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
684 |
47593
b052c0d51fd4
(occur-find-match): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
47532
diff
changeset
|
685 (defun occur-next (&optional n) |
b052c0d51fd4
(occur-find-match): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
47532
diff
changeset
|
686 "Move to the Nth (default 1) next match in an Occur mode buffer." |
b052c0d51fd4
(occur-find-match): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
47532
diff
changeset
|
687 (interactive "p") |
b052c0d51fd4
(occur-find-match): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
47532
diff
changeset
|
688 (occur-find-match n #'next-single-property-change "No more matches")) |
b052c0d51fd4
(occur-find-match): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
47532
diff
changeset
|
689 |
18918
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
690 (defun occur-prev (&optional n) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
691 "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
|
692 (interactive "p") |
47593
b052c0d51fd4
(occur-find-match): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
47532
diff
changeset
|
693 (occur-find-match n #'previous-single-property-change "No earlier matches")) |
55067
b335edb455ad
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54778
diff
changeset
|
694 |
b335edb455ad
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54778
diff
changeset
|
695 (defun occur-next-error (&optional argp reset) |
b335edb455ad
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54778
diff
changeset
|
696 "Move to the Nth (default 1) next match in an Occur mode buffer. |
b335edb455ad
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54778
diff
changeset
|
697 Compatibility function for \\[next-error] invocations." |
b335edb455ad
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54778
diff
changeset
|
698 (interactive "p") |
b335edb455ad
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54778
diff
changeset
|
699 (when reset |
b335edb455ad
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54778
diff
changeset
|
700 (occur-find-match 0 #'next-single-property-change "No first match")) |
b335edb455ad
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54778
diff
changeset
|
701 (occur-find-match |
b335edb455ad
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54778
diff
changeset
|
702 (prefix-numeric-value argp) |
b335edb455ad
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54778
diff
changeset
|
703 (if (> 0 (prefix-numeric-value argp)) |
b335edb455ad
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54778
diff
changeset
|
704 #'previous-single-property-change |
b335edb455ad
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54778
diff
changeset
|
705 #'next-single-property-change) |
b335edb455ad
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54778
diff
changeset
|
706 "No more matches") |
b335edb455ad
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54778
diff
changeset
|
707 (occur-mode-goto-occurrence)) |
b335edb455ad
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54778
diff
changeset
|
708 |
2408
a9c05a12b615
(regexp-history): New history list.
Richard M. Stallman <rms@gnu.org>
parents:
2327
diff
changeset
|
709 |
17664
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17655
diff
changeset
|
710 (defcustom list-matching-lines-default-context-lines 0 |
29051 | 711 "*Default number of context lines included around `list-matching-lines' matches. |
712 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
|
713 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
|
714 :type 'integer |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17655
diff
changeset
|
715 :group 'matching) |
61 | 716 |
2571
b65cf676a09b
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2408
diff
changeset
|
717 (defalias 'list-matching-lines 'occur) |
61 | 718 |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
719 (defcustom list-matching-lines-face 'bold |
29051 | 720 "*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
|
721 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
|
722 :type 'face |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
723 :group 'matching) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
724 |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
725 (defcustom list-matching-lines-buffer-name-face 'underline |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
726 "*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
|
727 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
|
728 :type 'face |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
729 :group 'matching) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
730 |
44832
d60f225edddc
(occur-accumulate-lines): Add optional argument `no-props'. Handle it.
Colin Walters <walters@gnu.org>
parents:
44794
diff
changeset
|
731 (defun occur-accumulate-lines (count &optional no-props) |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
732 (save-excursion |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
733 (let ((forwardp (> count 0)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
734 (result nil)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
735 (while (not (or (zerop count) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
736 (if forwardp |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
737 (eobp) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
738 (bobp)))) |
45176
2a245e4bdf59
(occur-unfontify-region-function): Delete.
Colin Walters <walters@gnu.org>
parents:
45079
diff
changeset
|
739 (setq count (+ count (if forwardp -1 1))) |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
740 (push |
44832
d60f225edddc
(occur-accumulate-lines): Add optional argument `no-props'. Handle it.
Colin Walters <walters@gnu.org>
parents:
44794
diff
changeset
|
741 (funcall (if no-props |
d60f225edddc
(occur-accumulate-lines): Add optional argument `no-props'. Handle it.
Colin Walters <walters@gnu.org>
parents:
44794
diff
changeset
|
742 #'buffer-substring-no-properties |
d60f225edddc
(occur-accumulate-lines): Add optional argument `no-props'. Handle it.
Colin Walters <walters@gnu.org>
parents:
44794
diff
changeset
|
743 #'buffer-substring) |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
744 (line-beginning-position) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
745 (line-end-position)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
746 result) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
747 (forward-line (if forwardp 1 -1))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
748 (nreverse result)))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
749 |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
750 (defun occur-read-primary-args () |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
751 (list (let* ((default (car regexp-history)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
752 (input |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
753 (read-from-minibuffer |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
754 (if default |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
755 (format "List lines matching regexp (default `%s'): " |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
756 default) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
757 "List lines matching regexp: ") |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
758 nil |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
759 nil |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
760 nil |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
761 'regexp-history))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
762 (if (equal input "") |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
763 default |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
764 input)) |
45308
abd8a68f87a7
(occur-read-primary-args): Handle a bare 'C-u' correctly.
Colin Walters <walters@gnu.org>
parents:
45265
diff
changeset
|
765 (when current-prefix-arg |
abd8a68f87a7
(occur-read-primary-args): Handle a bare 'C-u' correctly.
Colin Walters <walters@gnu.org>
parents:
45265
diff
changeset
|
766 (prefix-numeric-value current-prefix-arg)))) |
16818
6de559d0b20f
(list-matching-lines-face): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16758
diff
changeset
|
767 |
46693
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
768 (defun occur-rename-buffer (&optional unique-p) |
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
769 "Rename the current *Occur* buffer to *Occur: original-buffer-name*. |
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
770 Here `original-buffer-name' is the buffer name were occur was originally run. |
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
771 When given the prefix argument, the renaming will not clobber the existing |
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
772 buffer(s) of that name, but use `generate-new-buffer-name' instead. |
47087
756de7be303c
(occur-hook): Renamed from `occur-mode-hook'.
Juanma Barranquero <lekktu@gmail.com>
parents:
46693
diff
changeset
|
773 You can add this to `occur-hook' if you always want a separate *Occur* |
46693
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
774 buffer for each buffer where you invoke `occur'." |
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
775 (interactive "P") |
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
776 (with-current-buffer |
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
777 (if (eq major-mode 'occur-mode) (current-buffer) (get-buffer "*Occur*")) |
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
778 (rename-buffer (concat "*Occur: " |
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
779 (mapconcat #'buffer-name |
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
780 (car (cddr occur-revert-arguments)) "/") |
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
781 "*") |
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
782 unique-p))) |
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
783 |
61 | 784 (defun occur (regexp &optional nlines) |
1427
c49077849583
(occur): Always search entire buffer.
Richard M. Stallman <rms@gnu.org>
parents:
866
diff
changeset
|
785 "Show all lines in the current buffer containing a match for REGEXP. |
61 | 786 |
260 | 787 If a match spreads across multiple lines, all those lines are shown. |
788 | |
789 Each line is displayed with NLINES lines before and after, or -NLINES | |
790 before if NLINES is negative. | |
791 NLINES defaults to `list-matching-lines-default-context-lines'. | |
61 | 792 Interactively it is the prefix arg. |
793 | |
2408
a9c05a12b615
(regexp-history): New history list.
Richard M. Stallman <rms@gnu.org>
parents:
2327
diff
changeset
|
794 The lines are shown in a buffer named `*Occur*'. |
61 | 795 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
|
796 \\<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
|
797 |
17655
8e35bb3ec2e2
(occur-mode): Add a mode-class property.
Richard M. Stallman <rms@gnu.org>
parents:
17638
diff
changeset
|
798 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
|
799 the matching is case-sensitive." |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
800 (interactive (occur-read-primary-args)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
801 (occur-1 regexp nlines (list (current-buffer)))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
802 |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
803 (defun multi-occur (bufs regexp &optional nlines) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
804 "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
|
805 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
|
806 `occur'." |
15040
04f81516b6e0
(occur): Fix up interactive code.
Richard M. Stallman <rms@gnu.org>
parents:
14819
diff
changeset
|
807 (interactive |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
808 (cons |
47204
539aabdebd62
(multi-occur): Made "ido-aware":
Kim F. Storm <storm@cua.dk>
parents:
47130
diff
changeset
|
809 (let* ((bufs (list (read-buffer "First buffer to search: " |
539aabdebd62
(multi-occur): Made "ido-aware":
Kim F. Storm <storm@cua.dk>
parents:
47130
diff
changeset
|
810 (current-buffer) t))) |
539aabdebd62
(multi-occur): Made "ido-aware":
Kim F. Storm <storm@cua.dk>
parents:
47130
diff
changeset
|
811 (buf nil) |
539aabdebd62
(multi-occur): Made "ido-aware":
Kim F. Storm <storm@cua.dk>
parents:
47130
diff
changeset
|
812 (ido-ignore-item-temp-list bufs)) |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
813 (while (not (string-equal |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48276
diff
changeset
|
814 (setq buf (read-buffer |
47204
539aabdebd62
(multi-occur): Made "ido-aware":
Kim F. Storm <storm@cua.dk>
parents:
47130
diff
changeset
|
815 (if (eq read-buffer-function 'ido-read-buffer) |
539aabdebd62
(multi-occur): Made "ido-aware":
Kim F. Storm <storm@cua.dk>
parents:
47130
diff
changeset
|
816 "Next buffer to search (C-j to end): " |
539aabdebd62
(multi-occur): Made "ido-aware":
Kim F. Storm <storm@cua.dk>
parents:
47130
diff
changeset
|
817 "Next buffer to search (RET to end): ") |
539aabdebd62
(multi-occur): Made "ido-aware":
Kim F. Storm <storm@cua.dk>
parents:
47130
diff
changeset
|
818 nil t)) |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
819 "")) |
47204
539aabdebd62
(multi-occur): Made "ido-aware":
Kim F. Storm <storm@cua.dk>
parents:
47130
diff
changeset
|
820 (add-to-list 'bufs buf) |
539aabdebd62
(multi-occur): Made "ido-aware":
Kim F. Storm <storm@cua.dk>
parents:
47130
diff
changeset
|
821 (setq ido-ignore-item-temp-list bufs)) |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
822 (nreverse (mapcar #'get-buffer bufs))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
823 (occur-read-primary-args))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
824 (occur-1 regexp nlines bufs)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
825 |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
826 (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
|
827 "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
|
828 See also `multi-occur'." |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
829 (interactive |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
830 (cons |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
831 (let* ((default (car regexp-history)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
832 (input |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
833 (read-from-minibuffer |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
834 "List lines in buffers whose filename matches regexp: " |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
835 nil |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
836 nil |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
837 nil |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
838 'regexp-history))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
839 (if (equal input "") |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
840 default |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
841 input)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
842 (occur-read-primary-args))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
843 (when bufregexp |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
844 (occur-1 regexp nlines |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
845 (delq nil |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
846 (mapcar (lambda (buf) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
847 (when (and (buffer-file-name buf) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
848 (string-match bufregexp |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
849 (buffer-file-name buf))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
850 buf)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
851 (buffer-list)))))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
852 |
45265
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
853 (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
|
854 (unless buf-name |
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
855 (setq buf-name "*Occur*")) |
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
856 (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
|
857 (made-temp-buf nil) |
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
858 (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
|
859 (when (buffer-live-p buf) buf)) |
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
860 bufs)))) |
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
861 ;; 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
|
862 ;; *Occur* buffer itself. |
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
863 (when (memq occur-buf bufs) |
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
864 (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
|
865 (clone-buffer "*Occur-temp*")) |
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
866 made-temp-buf t)) |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
867 (with-current-buffer occur-buf |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
868 (setq buffer-read-only nil) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
869 (occur-mode) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
870 (erase-buffer) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
871 (let ((count (occur-engine |
45079
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
872 regexp active-bufs occur-buf |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
873 (or nlines list-matching-lines-default-context-lines) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
874 (and case-fold-search |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
875 (isearch-no-upper-case-p regexp t)) |
45689
01fbc1331841
(occur-mode): Don't set up categories.
Colin Walters <walters@gnu.org>
parents:
45529
diff
changeset
|
876 list-matching-lines-buffer-name-face |
01fbc1331841
(occur-mode): Don't set up categories.
Colin Walters <walters@gnu.org>
parents:
45529
diff
changeset
|
877 nil list-matching-lines-face nil))) |
46004
43acdf05b0cf
(occur-1): Avoid invalid message format string.
Andreas Schwab <schwab@suse.de>
parents:
45766
diff
changeset
|
878 (let* ((bufcount (length active-bufs)) |
43acdf05b0cf
(occur-1): Avoid invalid message format string.
Andreas Schwab <schwab@suse.de>
parents:
45766
diff
changeset
|
879 (diff (- (length bufs) bufcount))) |
43acdf05b0cf
(occur-1): Avoid invalid message format string.
Andreas Schwab <schwab@suse.de>
parents:
45766
diff
changeset
|
880 (message "Searched %d buffer%s%s; %s match%s for `%s'" |
43acdf05b0cf
(occur-1): Avoid invalid message format string.
Andreas Schwab <schwab@suse.de>
parents:
45766
diff
changeset
|
881 bufcount (if (= bufcount 1) "" "s") |
43acdf05b0cf
(occur-1): Avoid invalid message format string.
Andreas Schwab <schwab@suse.de>
parents:
45766
diff
changeset
|
882 (if (zerop diff) "" (format " (%d killed)" diff)) |
43acdf05b0cf
(occur-1): Avoid invalid message format string.
Andreas Schwab <schwab@suse.de>
parents:
45766
diff
changeset
|
883 (if (zerop count) "no" (format "%d" count)) |
43acdf05b0cf
(occur-1): Avoid invalid message format string.
Andreas Schwab <schwab@suse.de>
parents:
45766
diff
changeset
|
884 (if (= count 1) "" "es") |
43acdf05b0cf
(occur-1): Avoid invalid message format string.
Andreas Schwab <schwab@suse.de>
parents:
45766
diff
changeset
|
885 regexp)) |
45079
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
886 ;; 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
|
887 ;; buffer now. |
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
888 (when made-temp-buf |
45265
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
889 (with-current-buffer (get-buffer buf-name) |
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
890 (kill-buffer (current-buffer))) |
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
891 (rename-buffer buf-name)) |
45079
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
892 (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
|
893 buffer-read-only t) |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
894 (if (> count 0) |
55067
b335edb455ad
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54778
diff
changeset
|
895 (progn |
b335edb455ad
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54778
diff
changeset
|
896 (display-buffer occur-buf) |
b335edb455ad
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54778
diff
changeset
|
897 (setq next-error-last-buffer occur-buf)) |
47087
756de7be303c
(occur-hook): Renamed from `occur-mode-hook'.
Juanma Barranquero <lekktu@gmail.com>
parents:
46693
diff
changeset
|
898 (kill-buffer occur-buf))) |
756de7be303c
(occur-hook): Renamed from `occur-mode-hook'.
Juanma Barranquero <lekktu@gmail.com>
parents:
46693
diff
changeset
|
899 (run-hooks 'occur-hook)))) |
18991
2cf48aa123b8
(occur): Local variable line-start redundant.
Richard M. Stallman <rms@gnu.org>
parents:
18918
diff
changeset
|
900 |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
901 (defun occur-engine-add-prefix (lines) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
902 (mapcar |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
903 #'(lambda (line) |
47532
e5d8cf249294
(occur-engine-add-prefix): Use 7 spaces.
Richard M. Stallman <rms@gnu.org>
parents:
47375
diff
changeset
|
904 (concat " :" line "\n")) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
905 lines)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
906 |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
907 (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
|
908 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
|
909 (with-current-buffer out-buf |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
910 (setq buffer-read-only nil) |
48276
3a5bc7e171a5
(occur-engine): Set buffer-file-coding-system of
Kenichi Handa <handa@m17n.org>
parents:
48173
diff
changeset
|
911 (let ((globalcount 0) |
3a5bc7e171a5
(occur-engine): Set buffer-file-coding-system of
Kenichi Handa <handa@m17n.org>
parents:
48173
diff
changeset
|
912 (coding nil)) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
913 ;; Map over all the buffers |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
914 (dolist (buf buffers) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
915 (when (buffer-live-p buf) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
916 (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
|
917 (lines 1) ;; line count |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
918 (matchbeg 0) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
919 (matchend 0) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
920 (origpt nil) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
921 (begpt nil) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
922 (endpt nil) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
923 (marker nil) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
924 (curstring "") |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
925 (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
|
926 (save-excursion |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
927 (set-buffer buf) |
48276
3a5bc7e171a5
(occur-engine): Set buffer-file-coding-system of
Kenichi Handa <handa@m17n.org>
parents:
48173
diff
changeset
|
928 (or coding |
3a5bc7e171a5
(occur-engine): Set buffer-file-coding-system of
Kenichi Handa <handa@m17n.org>
parents:
48173
diff
changeset
|
929 ;; Set CODING only if the current buffer locally |
3a5bc7e171a5
(occur-engine): Set buffer-file-coding-system of
Kenichi Handa <handa@m17n.org>
parents:
48173
diff
changeset
|
930 ;; binds buffer-file-coding-system. |
3a5bc7e171a5
(occur-engine): Set buffer-file-coding-system of
Kenichi Handa <handa@m17n.org>
parents:
48173
diff
changeset
|
931 (not (local-variable-p 'buffer-file-coding-system)) |
3a5bc7e171a5
(occur-engine): Set buffer-file-coding-system of
Kenichi Handa <handa@m17n.org>
parents:
48173
diff
changeset
|
932 (setq coding buffer-file-coding-system)) |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
933 (save-excursion |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
934 (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
|
935 (while (not (eobp)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
936 (setq origpt (point)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
937 (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
|
938 (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
|
939 (setq matchbeg (match-beginning 0) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
940 matchend (match-end 0)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
941 (setq begpt (save-excursion |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
942 (goto-char matchbeg) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
943 (line-beginning-position))) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
944 (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
|
945 (setq marker (make-marker)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
946 (set-marker marker matchbeg) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
947 (setq curstring (buffer-substring begpt |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
948 (line-end-position))) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
949 ;; Depropertize the string, and maybe |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
950 ;; highlight the matches |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
951 (let ((len (length curstring)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
952 (start 0)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
953 (unless keep-props |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
954 (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
|
955 (while (and (< start len) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
956 (string-match regexp curstring start)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
957 (add-text-properties (match-beginning 0) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
958 (match-end 0) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
959 (append |
45689
01fbc1331841
(occur-mode): Don't set up categories.
Colin Walters <walters@gnu.org>
parents:
45529
diff
changeset
|
960 `(occur-match t) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
961 (when match-face |
45689
01fbc1331841
(occur-mode): Don't set up categories.
Colin Walters <walters@gnu.org>
parents:
45529
diff
changeset
|
962 `(font-lock-face ,match-face))) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
963 curstring) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
964 (setq start (match-end 0)))) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
965 ;; 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
|
966 (let* ((out-line |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
967 (concat |
47532
e5d8cf249294
(occur-engine-add-prefix): Use 7 spaces.
Richard M. Stallman <rms@gnu.org>
parents:
47375
diff
changeset
|
968 ;; Using 7 digits aligns tabs properly. |
e5d8cf249294
(occur-engine-add-prefix): Use 7 spaces.
Richard M. Stallman <rms@gnu.org>
parents:
47375
diff
changeset
|
969 (apply #'propertize (format "%7d:" lines) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
970 (append |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
971 (when prefix-face |
45689
01fbc1331841
(occur-mode): Don't set up categories.
Colin Walters <walters@gnu.org>
parents:
45529
diff
changeset
|
972 `(font-lock-face prefix-face)) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
973 '(occur-prefix t))) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
974 curstring |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
975 "\n")) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
976 (data |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
977 (if (= nlines 0) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
978 ;; The simple display style |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
979 out-line |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
980 ;; The complex multi-line display |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
981 ;; style. Generate a list of lines, |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
982 ;; concatenate them all together. |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
983 (apply #'concat |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
984 (nconc |
45176
2a245e4bdf59
(occur-unfontify-region-function): Delete.
Colin Walters <walters@gnu.org>
parents:
45079
diff
changeset
|
985 (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
|
986 (list out-line) |
45176
2a245e4bdf59
(occur-unfontify-region-function): Delete.
Colin Walters <walters@gnu.org>
parents:
45079
diff
changeset
|
987 (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
|
988 ;; Actually insert the match display data |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
989 (with-current-buffer out-buf |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
990 (let ((beg (point)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
991 (end (progn (insert data) (point)))) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
992 (unless (= nlines 0) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
993 (insert "-------\n")) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
994 (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
|
995 beg end |
177f92e9f497
(occur-engine): Include all text properties except mouse-face on the
Colin Walters <walters@gnu.org>
parents:
45444
diff
changeset
|
996 `(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
|
997 ;; 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
|
998 ;; because that loses. |
177f92e9f497
(occur-engine): Include all text properties except mouse-face on the
Colin Walters <walters@gnu.org>
parents:
45444
diff
changeset
|
999 (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
|
1000 (goto-char endpt)) |
45265
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
1001 (if endpt |
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
1002 (progn |
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
1003 (setq lines (1+ lines)) |
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
1004 ;; On to the next match... |
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
1005 (forward-line 1)) |
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
1006 (goto-char (point-max)))))) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1007 (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
|
1008 (setq globalcount (+ globalcount matches)) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1009 (with-current-buffer out-buf |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1010 (goto-char headerpt) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1011 (let ((beg (point)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1012 end) |
54778
edec41928fc8
* replace.el (occur-engine): Distinguish between one and several
John Paul Wallington <jpw@pobox.com>
parents:
54375
diff
changeset
|
1013 (insert (format "%d match%s for \"%s\" in buffer: %s\n" |
edec41928fc8
* replace.el (occur-engine): Distinguish between one and several
John Paul Wallington <jpw@pobox.com>
parents:
54375
diff
changeset
|
1014 matches (if (= matches 1) "" "es") |
edec41928fc8
* replace.el (occur-engine): Distinguish between one and several
John Paul Wallington <jpw@pobox.com>
parents:
54375
diff
changeset
|
1015 regexp (buffer-name buf))) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1016 (setq end (point)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1017 (add-text-properties beg end |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1018 (append |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1019 (when title-face |
45689
01fbc1331841
(occur-mode): Don't set up categories.
Colin Walters <walters@gnu.org>
parents:
45529
diff
changeset
|
1020 `(font-lock-face ,title-face)) |
01fbc1331841
(occur-mode): Don't set up categories.
Colin Walters <walters@gnu.org>
parents:
45529
diff
changeset
|
1021 `(occur-title ,buf)))) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1022 (goto-char (point-min))))))) |
48276
3a5bc7e171a5
(occur-engine): Set buffer-file-coding-system of
Kenichi Handa <handa@m17n.org>
parents:
48173
diff
changeset
|
1023 (if coding |
3a5bc7e171a5
(occur-engine): Set buffer-file-coding-system of
Kenichi Handa <handa@m17n.org>
parents:
48173
diff
changeset
|
1024 ;; CODING is buffer-file-coding-system of the first buffer |
3a5bc7e171a5
(occur-engine): Set buffer-file-coding-system of
Kenichi Handa <handa@m17n.org>
parents:
48173
diff
changeset
|
1025 ;; that locally binds it. Let's use it also for the output |
3a5bc7e171a5
(occur-engine): Set buffer-file-coding-system of
Kenichi Handa <handa@m17n.org>
parents:
48173
diff
changeset
|
1026 ;; buffer. |
3a5bc7e171a5
(occur-engine): Set buffer-file-coding-system of
Kenichi Handa <handa@m17n.org>
parents:
48173
diff
changeset
|
1027 (set-buffer-file-coding-system coding)) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1028 ;; Return the number of matches |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1029 globalcount))) |
18991
2cf48aa123b8
(occur): Local variable line-start redundant.
Richard M. Stallman <rms@gnu.org>
parents:
18918
diff
changeset
|
1030 |
61 | 1031 |
2080
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
1032 ;; 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
|
1033 ;; to make that display both SPC and Y. |
61 | 1034 (defconst query-replace-help |
1035 "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
|
1036 RET or `q' to exit, Period to replace one match and exit, |
61 | 1037 Comma to replace but not move point immediately, |
1038 C-r to enter recursive edit (\\[exit-recursive-edit] to get out again), | |
1039 C-w to delete match and recursive edit, | |
1040 C-l to clear the screen, redisplay, and offer same replacement again, | |
1041 ! 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
|
1042 ^ to move point back to previous match, |
be3f5fa41e90
(query-replace-map): Add binding for `E'.
Gerd Moellmann <gerd@gnu.org>
parents:
28706
diff
changeset
|
1043 E to edit the replacement string" |
38036
018637678f29
(case-replace, query-replace-from-history-variable)
Eli Zaretskii <eliz@gnu.org>
parents:
37832
diff
changeset
|
1044 "Help message while in `query-replace'.") |
61 | 1045 |
2080
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
1046 (defvar query-replace-map (make-sparse-keymap) |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
1047 "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
|
1048 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
|
1049 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
|
1050 `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
|
1051 `automatic', `backup', `exit-prefix', and `help'.") |
2080
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
1052 |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
1053 (define-key query-replace-map " " 'act) |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
1054 (define-key query-replace-map "\d" 'skip) |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
1055 (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
|
1056 (define-key query-replace-map [backspace] 'skip) |
2080
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
1057 (define-key query-replace-map "y" 'act) |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
1058 (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
|
1059 (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
|
1060 (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
|
1061 (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
|
1062 (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
|
1063 (define-key query-replace-map "," 'act-and-show) |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
1064 (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
|
1065 (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
|
1066 (define-key query-replace-map [return] 'exit) |
2080
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
1067 (define-key query-replace-map "." 'act-and-exit) |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
1068 (define-key query-replace-map "\C-r" 'edit) |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
1069 (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
|
1070 (define-key query-replace-map "\C-l" 'recenter) |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
1071 (define-key query-replace-map "!" 'automatic) |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
1072 (define-key query-replace-map "^" 'backup) |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
1073 (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
|
1074 (define-key query-replace-map [f1] 'help) |
6be53feb3323
(query-replace-map): Bind f1 and help.
Karl Heuer <kwzh@gnu.org>
parents:
11314
diff
changeset
|
1075 (define-key query-replace-map [help] 'help) |
2080
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
1076 (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
|
1077 (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
|
1078 (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
|
1079 (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
|
1080 (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
|
1081 |
25167
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1082 (defun replace-match-string-symbols (n) |
29051 | 1083 "Process a list (and any sub-lists), expanding certain symbols. |
1084 Symbol Expands To | |
1085 N (match-string N) (where N is a string of digits) | |
1086 #N (string-to-number (match-string N)) | |
1087 & (match-string 0) | |
1088 #& (string-to-number (match-string 0)) | |
56148
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1089 # replace-count |
29051 | 1090 |
1091 Note that these symbols must be preceeded by a backslash in order to | |
1092 type them." | |
25167
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1093 (while n |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1094 (cond |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1095 ((consp (car n)) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1096 (replace-match-string-symbols (car n))) ;Process sub-list |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1097 ((symbolp (car n)) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1098 (let ((name (symbol-name (car n)))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1099 (cond |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1100 ((string-match "^[0-9]+$" name) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1101 (setcar n (list 'match-string (string-to-number name)))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1102 ((string-match "^#[0-9]+$" name) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1103 (setcar n (list 'string-to-number |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1104 (list 'match-string |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1105 (string-to-number (substring name 1)))))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1106 ((string= "&" name) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1107 (setcar n '(match-string 0))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1108 ((string= "#&" name) |
56148
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1109 (setcar n '(string-to-number (match-string 0)))) |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1110 ((string= "#" name) |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1111 (setcar n 'replace-count)))))) |
25167
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1112 (setq n (cdr n)))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1113 |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1114 (defun replace-eval-replacement (expression replace-count) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1115 (let ((replacement (eval expression))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1116 (if (stringp replacement) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1117 replacement |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1118 (prin1-to-string replacement t)))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1119 |
56148
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1120 (defun replace-quote (replacement) |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1121 "Quote a replacement string. |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1122 This just doubles all backslashes in REPLACEMENT and |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1123 returns the resulting string. If REPLACEMENT is not |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1124 a string, it is first passed through `prin1-to-string' |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1125 with the `noescape' argument set. |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1126 |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1127 `match-data' is preserved across the call." |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1128 (save-match-data |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1129 (replace-regexp-in-string "\\\\" "\\\\" |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1130 (if (stringp replacement) |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1131 replacement |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1132 (prin1-to-string replacement t)) |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1133 t t))) |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1134 |
25167
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1135 (defun replace-loop-through-replacements (data replace-count) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1136 ;; DATA is a vector contaning the following values: |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1137 ;; 0 next-rotate-count |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1138 ;; 1 repeat-count |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1139 ;; 2 next-replacement |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1140 ;; 3 replacements |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1141 (if (= (aref data 0) replace-count) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1142 (progn |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1143 (aset data 0 (+ replace-count (aref data 1))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1144 (let ((next (cdr (aref data 2)))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1145 (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
|
1146 (car (aref data 2))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1147 |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1148 (defun replace-match-data (integers reuse &optional new) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1149 "Like `match-data', but markers in REUSE get invalidated. |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1150 If NEW is non-NIL, it is set and returned instead of fresh data, |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1151 but coerced to the correct value of INTEGERS." |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1152 (or (and new |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1153 (progn |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1154 (set-match-data new) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1155 (and (eq new reuse) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1156 (eq (null integers) (markerp (car reuse))) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1157 new))) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1158 (match-data integers |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1159 (prog1 reuse |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1160 (while reuse |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1161 (if (markerp (car reuse)) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1162 (set-marker (car reuse) nil)) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1163 (setq reuse (cdr reuse))))))) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1164 |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1165 (defun replace-match-maybe-edit (newtext fixedcase literal noedit match-data) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1166 "Make a replacement with `replace-match', editing `\\?'. |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1167 NEXTEXT, FIXEDCASE, LITERAL are just passed on. If NOEDIT is true, no |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1168 check for `\\?' is made to save time. MATCH-DATA is used for the |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1169 replacement. In case editing is done, it is changed to use markers. |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1170 |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1171 The return value is non-NIL if there has been no `\\?' or NOEDIT was |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1172 passed in. If LITERAL is set, no checking is done, anyway." |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1173 (unless (or literal noedit) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1174 (setq noedit t) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1175 (while (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\(\\\\\\?\\)" |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1176 newtext) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1177 (setq newtext |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1178 (read-input "Edit replacement string: " |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1179 (prog1 |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1180 (cons |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1181 (replace-match "" t t newtext 3) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1182 (1+ (match-beginning 3))) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1183 (setq match-data |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1184 (replace-match-data |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1185 nil match-data match-data)))) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1186 noedit nil))) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1187 (set-match-data match-data) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1188 (replace-match newtext fixedcase literal) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1189 noedit) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1190 |
46693
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
1191 (defun perform-replace (from-string replacements |
61 | 1192 query-flag regexp-flag delimited-flag |
40254
51c9985454e3
(perform-replace): Move START and END parameters
Gerd Moellmann <gerd@gnu.org>
parents:
38986
diff
changeset
|
1193 &optional repeat-count map start end) |
61 | 1194 "Subroutine of `query-replace'. Its complexity handles interactive queries. |
1195 Don't use this in your own program unless you want to query and set the mark | |
1196 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
|
1197 |
a7b1d283fe97
(perform-replace): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
38414
diff
changeset
|
1198 (while (re-search-forward \"foo[ \\t]+bar\" nil t) |
61 | 1199 (replace-match \"foobar\" nil nil)) |
38675
a7b1d283fe97
(perform-replace): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
38414
diff
changeset
|
1200 |
a7b1d283fe97
(perform-replace): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
38414
diff
changeset
|
1201 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
|
1202 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
|
1203 `case-replace'. |
45014630aeb2
(perform-replace): Document return value. Use `pop'.
Colin Walters <walters@gnu.org>
parents:
45490
diff
changeset
|
1204 |
45014630aeb2
(perform-replace): Document return value. Use `pop'.
Colin Walters <walters@gnu.org>
parents:
45490
diff
changeset
|
1205 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
|
1206 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
|
1207 (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
|
1208 (and query-flag minibuffer-auto-raise |
024d3847af99
(perform-replace): Obey minibuffer-auto-raise.
Richard M. Stallman <rms@gnu.org>
parents:
16129
diff
changeset
|
1209 (raise-frame (window-frame (minibuffer-window)))) |
61 | 1210 (let ((nocasify (not (and case-fold-search case-replace |
1211 (string-equal from-string | |
1212 (downcase from-string))))) | |
25039
7a53fe8294bf
(perform-replace): Turn off case-fold-search
Karl Heuer <kwzh@gnu.org>
parents:
23457
diff
changeset
|
1213 (case-fold-search (and case-fold-search |
7a53fe8294bf
(perform-replace): Turn off case-fold-search
Karl Heuer <kwzh@gnu.org>
parents:
23457
diff
changeset
|
1214 (string-equal from-string |
7a53fe8294bf
(perform-replace): Turn off case-fold-search
Karl Heuer <kwzh@gnu.org>
parents:
23457
diff
changeset
|
1215 (downcase from-string)))) |
53778
7898852aa054
(perform-replace): Allow 'literal argument in
David Kastrup <dak@gnu.org>
parents:
52401
diff
changeset
|
1216 (literal (or (not regexp-flag) (eq regexp-flag 'literal))) |
61 | 1217 (search-function (if regexp-flag 're-search-forward 'search-forward)) |
1218 (search-string from-string) | |
732 | 1219 (real-match-data nil) ; the match data for the current match |
61 | 1220 (next-replacement nil) |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1221 (noedit nil) |
61 | 1222 (keep-going t) |
1223 (stack nil) | |
1224 (replace-count 0) | |
18433
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
1225 (nonempty-match nil) |
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
1226 |
20248
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
1227 ;; 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
|
1228 (limit nil) |
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
1229 |
18433
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
1230 ;; 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
|
1231 ;; (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
|
1232 (match-again t) |
18433
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
1233 |
7258
68c7b93914fe
(perform-replace): Call substitute-command-keys just once
Richard M. Stallman <rms@gnu.org>
parents:
6722
diff
changeset
|
1234 (message |
68c7b93914fe
(perform-replace): Call substitute-command-keys just once
Richard M. Stallman <rms@gnu.org>
parents:
6722
diff
changeset
|
1235 (if query-flag |
68c7b93914fe
(perform-replace): Call substitute-command-keys just once
Richard M. Stallman <rms@gnu.org>
parents:
6722
diff
changeset
|
1236 (substitute-command-keys |
68c7b93914fe
(perform-replace): Call substitute-command-keys just once
Richard M. Stallman <rms@gnu.org>
parents:
6722
diff
changeset
|
1237 "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
|
1238 |
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
1239 ;; 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
|
1240 (when start |
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
1241 (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
|
1242 (goto-char (min start end)) |
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
1243 (deactivate-mark)) |
25167
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1244 |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1245 ;; 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
|
1246 ;; 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
|
1247 ;; called to generate each replacement like this: |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1248 ;; (funcall (car replacements) (cdr replacements) replace-count) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1249 ;; It must return a string. |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1250 (cond |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1251 ((stringp replacements) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1252 (setq next-replacement replacements |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1253 replacements nil)) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1254 ((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
|
1255 (or repeat-count (setq repeat-count 1)) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1256 (setq replacements (cons 'replace-loop-through-replacements |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1257 (vector repeat-count repeat-count |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1258 replacements replacements))))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1259 |
61 | 1260 (if delimited-flag |
1261 (setq search-function 're-search-forward | |
1262 search-string (concat "\\b" | |
1263 (if regexp-flag from-string | |
1264 (regexp-quote from-string)) | |
1265 "\\b"))) | |
1266 (push-mark) | |
1267 (undo-boundary) | |
5393
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1268 (unwind-protect |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1269 ;; Loop finding occurrences that perhaps should be replaced. |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1270 (while (and keep-going |
56006
21eb4b5cef9a
(perform-replace): Use `limit' to terminate the while-loop explicitly.
Juri Linkov <juri@jurta.org>
parents:
55868
diff
changeset
|
1271 (not (or (eobp) (and limit (>= (point) limit)))) |
18433
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
1272 ;; 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
|
1273 ;; 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
|
1274 ;; 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
|
1275 (setq real-match-data |
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
1276 (if (consp match-again) |
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
1277 (progn (goto-char (nth 1 match-again)) |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1278 (replace-match-data t |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1279 real-match-data |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1280 match-again)) |
18433
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
1281 (and (or match-again |
29952
3e2589e69a8a
(perform-replace): Undo change of 2000-04-04.
Gerd Moellmann <gerd@gnu.org>
parents:
29051
diff
changeset
|
1282 ;; MATCH-AGAIN non-nil means we |
3e2589e69a8a
(perform-replace): Undo change of 2000-04-04.
Gerd Moellmann <gerd@gnu.org>
parents:
29051
diff
changeset
|
1283 ;; accept an adjacent match. If |
3e2589e69a8a
(perform-replace): Undo change of 2000-04-04.
Gerd Moellmann <gerd@gnu.org>
parents:
29051
diff
changeset
|
1284 ;; 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
|
1285 ;; right. This takes us a |
3e2589e69a8a
(perform-replace): Undo change of 2000-04-04.
Gerd Moellmann <gerd@gnu.org>
parents:
29051
diff
changeset
|
1286 ;; character too far at the end, |
3e2589e69a8a
(perform-replace): Undo change of 2000-04-04.
Gerd Moellmann <gerd@gnu.org>
parents:
29051
diff
changeset
|
1287 ;; but this is undone after the |
3e2589e69a8a
(perform-replace): Undo change of 2000-04-04.
Gerd Moellmann <gerd@gnu.org>
parents:
29051
diff
changeset
|
1288 ;; while-loop. |
56006
21eb4b5cef9a
(perform-replace): Use `limit' to terminate the while-loop explicitly.
Juri Linkov <juri@jurta.org>
parents:
55868
diff
changeset
|
1289 (progn |
21eb4b5cef9a
(perform-replace): Use `limit' to terminate the while-loop explicitly.
Juri Linkov <juri@jurta.org>
parents:
55868
diff
changeset
|
1290 (forward-char 1) |
21eb4b5cef9a
(perform-replace): Use `limit' to terminate the while-loop explicitly.
Juri Linkov <juri@jurta.org>
parents:
55868
diff
changeset
|
1291 (not (or (eobp) |
21eb4b5cef9a
(perform-replace): Use `limit' to terminate the while-loop explicitly.
Juri Linkov <juri@jurta.org>
parents:
55868
diff
changeset
|
1292 (and limit (>= (point) limit)))))) |
20248
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
1293 (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
|
1294 ;; 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
|
1295 ;; reuse the list used last time. |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1296 (replace-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
|
1297 ;; 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
|
1298 (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
|
1299 (text-property-not-all |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1300 (match-beginning 0) (match-end 0) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1301 'read-only nil)) |
732 | 1302 |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1303 ;; 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
|
1304 ;; repeatedly matching the same empty string. |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1305 (setq nonempty-match |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1306 (/= (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
|
1307 |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1308 ;; 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
|
1309 ;; adjacent. |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1310 |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1311 ;; 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
|
1312 ;; 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
|
1313 ;; 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
|
1314 ;; 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
|
1315 (setq match-again |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1316 (and nonempty-match |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1317 (or (not regexp-flag) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1318 (and (looking-at search-string) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1319 (let ((match (match-data))) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1320 (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
|
1321 match)))))) |
18433
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
1322 |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1323 ;; Calculate the replacement string, if necessary. |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1324 (when replacements |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1325 (set-match-data real-match-data) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1326 (setq next-replacement |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1327 (funcall (car replacements) (cdr replacements) |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1328 replace-count) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1329 noedit nil)) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1330 (if (not query-flag) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1331 (let ((inhibit-read-only query-replace-skip-read-only)) |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1332 (setq noedit |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1333 (replace-match-maybe-edit |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1334 next-replacement nocasify literal |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1335 noedit real-match-data) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1336 replace-count (1+ replace-count))) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1337 (undo-boundary) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1338 (let (done replaced key def) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1339 ;; Loop reading commands until one of them sets done, |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1340 ;; which means it has finished handling this |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1341 ;; occurrence. Any command that sets `done' should |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1342 ;; leave behind proper match data for the stack. |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1343 ;; Commands not setting `done' need to adjust |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1344 ;; `real-match-data'. |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1345 (while (not done) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1346 (set-match-data real-match-data) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1347 (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
|
1348 ;; 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
|
1349 ;; with a bunch of identical messages. |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1350 (let ((message-log-max nil)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1351 (message message from-string next-replacement)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1352 (setq key (read-event)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1353 ;; 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
|
1354 ;; that clobbers the match data. |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1355 (set-match-data real-match-data) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1356 (setq key (vector key)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1357 (setq def (lookup-key map key)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1358 ;; 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
|
1359 (cond ((eq def 'help) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1360 (with-output-to-temp-buffer "*Help*" |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1361 (princ |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1362 (concat "Query replacing " |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1363 (if regexp-flag "regexp " "") |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1364 from-string " with " |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1365 next-replacement ".\n\n" |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1366 (substitute-command-keys |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1367 query-replace-help))) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1368 (with-current-buffer standard-output |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1369 (help-mode)))) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1370 ((eq def 'exit) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1371 (setq keep-going nil) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1372 (setq done t)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1373 ((eq def 'backup) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1374 (if stack |
45529
45014630aeb2
(perform-replace): Document return value. Use `pop'.
Colin Walters <walters@gnu.org>
parents:
45490
diff
changeset
|
1375 (let ((elt (pop stack))) |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1376 (goto-char (nth 0 elt)) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1377 (setq replaced (nth 1 elt) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1378 real-match-data |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1379 (replace-match-data |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1380 t real-match-data |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1381 (nth 2 elt)))) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1382 (message "No previous match") |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1383 (ding 'no-terminate) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1384 (sit-for 1))) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1385 ((eq def 'act) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1386 (or replaced |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1387 (setq noedit |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1388 (replace-match-maybe-edit |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1389 next-replacement nocasify literal |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1390 noedit real-match-data) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1391 replace-count (1+ replace-count))) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1392 (setq done t replaced t)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1393 ((eq def 'act-and-exit) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1394 (or replaced |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1395 (setq noedit |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1396 (replace-match-maybe-edit |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1397 next-replacement nocasify literal |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1398 noedit real-match-data) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1399 replace-count (1+ replace-count))) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1400 (setq keep-going nil) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1401 (setq done t replaced t)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1402 ((eq def 'act-and-show) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1403 (if (not replaced) |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1404 (setq noedit |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1405 (replace-match-maybe-edit |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1406 next-replacement nocasify literal |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1407 noedit real-match-data) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1408 replace-count (1+ replace-count) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1409 real-match-data (replace-match-data |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1410 t real-match-data) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1411 replaced t))) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1412 ((eq def 'automatic) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1413 (or replaced |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1414 (setq noedit |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1415 (replace-match-maybe-edit |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1416 next-replacement nocasify literal |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1417 noedit real-match-data) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1418 replace-count (1+ replace-count))) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1419 (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
|
1420 ((eq def 'skip) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1421 (setq done t)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1422 ((eq def 'recenter) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1423 (recenter nil)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1424 ((eq def 'edit) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1425 (let ((opos (point-marker))) |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1426 (setq real-match-data (replace-match-data |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1427 nil real-match-data |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1428 real-match-data)) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1429 (goto-char (match-beginning 0)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1430 (save-excursion |
44138
f1d7c706f7f7
(query-replace-read-args): New optional arg NOERROR.
Richard M. Stallman <rms@gnu.org>
parents:
43406
diff
changeset
|
1431 (save-window-excursion |
f1d7c706f7f7
(query-replace-read-args): New optional arg NOERROR.
Richard M. Stallman <rms@gnu.org>
parents:
43406
diff
changeset
|
1432 (recursive-edit))) |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1433 (goto-char opos) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1434 (set-marker opos nil)) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1435 ;; Before we make the replacement, |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1436 ;; decide whether the search string |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1437 ;; 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
|
1438 (if (and regexp-flag nonempty-match) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1439 (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
|
1440 (match-data))))) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1441 ;; Edit replacement. |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1442 ((eq def 'edit-replacement) |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1443 (setq real-match-data (replace-match-data |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1444 nil real-match-data |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1445 real-match-data) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1446 next-replacement |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1447 (read-input "Edit replacement string: " |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1448 next-replacement) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1449 noedit nil) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1450 (if replaced |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1451 (set-match-data real-match-data) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1452 (setq noedit |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1453 (replace-match-maybe-edit |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1454 next-replacement nocasify literal noedit |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1455 real-match-data) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1456 replaced t)) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1457 (setq done t)) |
46693
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
1458 |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1459 ((eq def 'delete-and-edit) |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1460 (replace-match "" t t) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1461 (setq real-match-data (replace-match-data |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1462 nil real-match-data)) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1463 (replace-dehighlight) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1464 (save-excursion (recursive-edit)) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1465 (setq replaced t)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1466 ;; 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
|
1467 ;; specially here, since we reread |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1468 ;; any unrecognized character. |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1469 (t |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1470 (setq this-command 'mode-exited) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1471 (setq keep-going nil) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1472 (setq unread-command-events |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1473 (append (listify-key-sequence key) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1474 unread-command-events)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1475 (setq done t)))) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1476 ;; 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
|
1477 ;; 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
|
1478 ;; since lots of markers slow down editing. |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1479 (push (list (point) replaced |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1480 ;;; If the replacement has already happened, all we need is the |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1481 ;;; current match start and end. We could get this with a trivial |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1482 ;;; match like |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1483 ;;; (save-excursion (goto-char (match-beginning 0)) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1484 ;;; (search-forward (match-string 0)) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1485 ;;; (match-data t)) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1486 ;;; if we really wanted to avoid manually constructing match data. |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1487 ;;; Adding current-buffer is necessary so that match-data calls can |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1488 ;;; return markers which are appropriate for editing. |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1489 (if replaced |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1490 (list |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1491 (match-beginning 0) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1492 (match-end 0) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1493 (current-buffer)) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1494 (match-data t))) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1495 stack))))) |
29952
3e2589e69a8a
(perform-replace): Undo change of 2000-04-04.
Gerd Moellmann <gerd@gnu.org>
parents:
29051
diff
changeset
|
1496 |
3e2589e69a8a
(perform-replace): Undo change of 2000-04-04.
Gerd Moellmann <gerd@gnu.org>
parents:
29051
diff
changeset
|
1497 ;; 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
|
1498 ;; 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
|
1499 ;; beyond the last replacement. Undo that. |
3e2589e69a8a
(perform-replace): Undo change of 2000-04-04.
Gerd Moellmann <gerd@gnu.org>
parents:
29051
diff
changeset
|
1500 (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
|
1501 (backward-char 1)) |
46693
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
1502 |
5393
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1503 (replace-dehighlight)) |
10157
7953cde9d951
(perform-replace): Report number of replacements when done.
Richard M. Stallman <rms@gnu.org>
parents:
10155
diff
changeset
|
1504 (or unread-command-events |
7953cde9d951
(perform-replace): Report number of replacements when done.
Richard M. Stallman <rms@gnu.org>
parents:
10155
diff
changeset
|
1505 (message "Replaced %d occurrence%s" |
7953cde9d951
(perform-replace): Report number of replacements when done.
Richard M. Stallman <rms@gnu.org>
parents:
10155
diff
changeset
|
1506 replace-count |
7953cde9d951
(perform-replace): Report number of replacements when done.
Richard M. Stallman <rms@gnu.org>
parents:
10155
diff
changeset
|
1507 (if (= replace-count 1) "" "s"))) |
7953cde9d951
(perform-replace): Report number of replacements when done.
Richard M. Stallman <rms@gnu.org>
parents:
10155
diff
changeset
|
1508 (and keep-going stack))) |
61 | 1509 |
20244
6fbf1436a7f4
(query-replace-highlight): Change default to t.
Karl Heuer <kwzh@gnu.org>
parents:
19551
diff
changeset
|
1510 (defcustom query-replace-highlight t |
17664
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17655
diff
changeset
|
1511 "*Non-nil means to highlight words during query replacement." |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17655
diff
changeset
|
1512 :type 'boolean |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17655
diff
changeset
|
1513 :group 'matching) |
5393
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1514 |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1515 (defvar replace-overlay nil) |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1516 |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1517 (defun replace-dehighlight () |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1518 (and replace-overlay |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1519 (progn |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1520 (delete-overlay replace-overlay) |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1521 (setq replace-overlay nil)))) |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1522 |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1523 (defun replace-highlight (start end) |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1524 (and query-replace-highlight |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1525 (if replace-overlay |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1526 (move-overlay replace-overlay start end (current-buffer)) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1527 (setq replace-overlay (make-overlay start end)) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1528 (overlay-put replace-overlay 'face |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1529 (if (facep 'query-replace) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1530 'query-replace 'region))))) |
5393
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1531 |
52401 | 1532 ;;; arch-tag: 16b4cd61-fd40-497b-b86f-b667c4cf88e4 |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
324
diff
changeset
|
1533 ;;; replace.el ends here |