Mercurial > emacs
annotate lisp/replace.el @ 82426:a86fcb95bff2
*** empty log message ***
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Fri, 17 Aug 2007 07:31:52 +0000 |
parents | b98604865ea0 |
children | 2c176c668b7a f55f9811f5d7 |
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 |
64762
41bb365f41c4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64503
diff
changeset
|
3 ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1996, 1997, 2000, 2001, |
75347 | 4 ;; 2002, 2003, 2004, 2005, 2006, 2007 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 | |
78236
9355f9b7bbff
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
78112
diff
changeset
|
12 ;; the Free Software Foundation; either version 3, 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 |
64091 | 22 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
23 ;; Boston, MA 02110-1301, 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 |
71025
82d1f472baee
* replace.el (query-replace-defaults): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
70936
diff
changeset
|
39 (defvar query-replace-defaults nil |
82d1f472baee
* replace.el (query-replace-defaults): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
70936
diff
changeset
|
40 "Default values of FROM-STRING and TO-STRING for `query-replace'. |
82d1f472baee
* replace.el (query-replace-defaults): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
70936
diff
changeset
|
41 This is a cons cell (FROM-STRING . TO-STRING), or nil if there is |
82d1f472baee
* replace.el (query-replace-defaults): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
70936
diff
changeset
|
42 no default value.") |
82d1f472baee
* replace.el (query-replace-defaults): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
70936
diff
changeset
|
43 |
56350
cae4ae1c68a9
(query-replace-interactive, query-replace-read-args):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56328
diff
changeset
|
44 (defvar query-replace-interactive nil |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
45 "Non-nil means `query-replace' uses the last search string. |
56350
cae4ae1c68a9
(query-replace-interactive, query-replace-read-args):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56328
diff
changeset
|
46 That becomes the \"string to replace\".") |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
47 |
20806
24a1fcdc31d7
(query-replace-from-history-variable): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20658
diff
changeset
|
48 (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
|
49 "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
|
50 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
|
51 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
|
52 or patterns to be replaced." |
24a1fcdc31d7
(query-replace-from-history-variable): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20658
diff
changeset
|
53 :group 'matching |
21669
9861518505cb
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21294
diff
changeset
|
54 :type 'symbol |
9861518505cb
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21294
diff
changeset
|
55 :version "20.3") |
20806
24a1fcdc31d7
(query-replace-from-history-variable): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20658
diff
changeset
|
56 |
24a1fcdc31d7
(query-replace-from-history-variable): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20658
diff
changeset
|
57 (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
|
58 "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
|
59 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
|
60 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
|
61 strings or patterns." |
24a1fcdc31d7
(query-replace-from-history-variable): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20658
diff
changeset
|
62 :group 'matching |
21669
9861518505cb
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21294
diff
changeset
|
63 :type 'symbol |
9861518505cb
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21294
diff
changeset
|
64 :version "20.3") |
20806
24a1fcdc31d7
(query-replace-from-history-variable): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20658
diff
changeset
|
65 |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
66 (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
|
67 "*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
|
68 :type 'boolean |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
69 :group 'matching |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59570
diff
changeset
|
70 :version "22.1") |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
71 |
59479
fea2bcedb7bf
(query-replace-lazy-highlight): Add lazy-highlight group.
Juri Linkov <juri@jurta.org>
parents:
59341
diff
changeset
|
72 (defcustom query-replace-highlight t |
fea2bcedb7bf
(query-replace-lazy-highlight): Add lazy-highlight group.
Juri Linkov <juri@jurta.org>
parents:
59341
diff
changeset
|
73 "*Non-nil means to highlight matches during query replacement." |
fea2bcedb7bf
(query-replace-lazy-highlight): Add lazy-highlight group.
Juri Linkov <juri@jurta.org>
parents:
59341
diff
changeset
|
74 :type 'boolean |
fea2bcedb7bf
(query-replace-lazy-highlight): Add lazy-highlight group.
Juri Linkov <juri@jurta.org>
parents:
59341
diff
changeset
|
75 :group 'matching) |
fea2bcedb7bf
(query-replace-lazy-highlight): Add lazy-highlight group.
Juri Linkov <juri@jurta.org>
parents:
59341
diff
changeset
|
76 |
fea2bcedb7bf
(query-replace-lazy-highlight): Add lazy-highlight group.
Juri Linkov <juri@jurta.org>
parents:
59341
diff
changeset
|
77 (defcustom query-replace-lazy-highlight t |
fea2bcedb7bf
(query-replace-lazy-highlight): Add lazy-highlight group.
Juri Linkov <juri@jurta.org>
parents:
59341
diff
changeset
|
78 "*Controls the lazy-highlighting during query replacements. |
fea2bcedb7bf
(query-replace-lazy-highlight): Add lazy-highlight group.
Juri Linkov <juri@jurta.org>
parents:
59341
diff
changeset
|
79 When non-nil, all text in the buffer matching the current match |
fea2bcedb7bf
(query-replace-lazy-highlight): Add lazy-highlight group.
Juri Linkov <juri@jurta.org>
parents:
59341
diff
changeset
|
80 is highlighted lazily using isearch lazy highlighting (see |
fea2bcedb7bf
(query-replace-lazy-highlight): Add lazy-highlight group.
Juri Linkov <juri@jurta.org>
parents:
59341
diff
changeset
|
81 `lazy-highlight-initial-delay' and `lazy-highlight-interval')." |
fea2bcedb7bf
(query-replace-lazy-highlight): Add lazy-highlight group.
Juri Linkov <juri@jurta.org>
parents:
59341
diff
changeset
|
82 :type 'boolean |
fea2bcedb7bf
(query-replace-lazy-highlight): Add lazy-highlight group.
Juri Linkov <juri@jurta.org>
parents:
59341
diff
changeset
|
83 :group 'lazy-highlight |
fea2bcedb7bf
(query-replace-lazy-highlight): Add lazy-highlight group.
Juri Linkov <juri@jurta.org>
parents:
59341
diff
changeset
|
84 :group 'matching |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59570
diff
changeset
|
85 :version "22.1") |
59479
fea2bcedb7bf
(query-replace-lazy-highlight): Add lazy-highlight group.
Juri Linkov <juri@jurta.org>
parents:
59341
diff
changeset
|
86 |
fea2bcedb7bf
(query-replace-lazy-highlight): Add lazy-highlight group.
Juri Linkov <juri@jurta.org>
parents:
59341
diff
changeset
|
87 (defface query-replace |
fea2bcedb7bf
(query-replace-lazy-highlight): Add lazy-highlight group.
Juri Linkov <juri@jurta.org>
parents:
59341
diff
changeset
|
88 '((t (:inherit isearch))) |
fea2bcedb7bf
(query-replace-lazy-highlight): Add lazy-highlight group.
Juri Linkov <juri@jurta.org>
parents:
59341
diff
changeset
|
89 "Face for highlighting query replacement matches." |
fea2bcedb7bf
(query-replace-lazy-highlight): Add lazy-highlight group.
Juri Linkov <juri@jurta.org>
parents:
59341
diff
changeset
|
90 :group 'matching |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59570
diff
changeset
|
91 :version "22.1") |
59479
fea2bcedb7bf
(query-replace-lazy-highlight): Add lazy-highlight group.
Juri Linkov <juri@jurta.org>
parents:
59341
diff
changeset
|
92 |
56355
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
93 (defun query-replace-descr (string) |
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
94 (mapconcat 'isearch-text-char-description string "")) |
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
95 |
64866
6f20cb2a3b72
(query-replace-read-from, query-replace-read-to)
Juri Linkov <juri@jurta.org>
parents:
64823
diff
changeset
|
96 (defun query-replace-read-from (prompt regexp-flag) |
56355
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
97 "Query and return the `from' argument of a query-replace operation. |
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
98 The return value can also be a pair (FROM . TO) indicating that the user |
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
99 wants to replace FROM with TO." |
56351
d073da76f0a5
(query-replace-read-from, query-replace-read-to): New funs extracted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56350
diff
changeset
|
100 (if query-replace-interactive |
d073da76f0a5
(query-replace-read-from, query-replace-read-to): New funs extracted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56350
diff
changeset
|
101 (car (if regexp-flag regexp-search-ring search-ring)) |
71125
21306dd42b3c
(query-replace-read-from, query-replace-read-to):
Juri Linkov <juri@jurta.org>
parents:
71026
diff
changeset
|
102 (let* ((history-add-new-input nil) |
21306dd42b3c
(query-replace-read-from, query-replace-read-to):
Juri Linkov <juri@jurta.org>
parents:
71026
diff
changeset
|
103 (from |
56351
d073da76f0a5
(query-replace-read-from, query-replace-read-to): New funs extracted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56350
diff
changeset
|
104 ;; The save-excursion here is in case the user marks and copies |
d073da76f0a5
(query-replace-read-from, query-replace-read-to): New funs extracted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56350
diff
changeset
|
105 ;; a region in order to specify the minibuffer input. |
d073da76f0a5
(query-replace-read-from, query-replace-read-to): New funs extracted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56350
diff
changeset
|
106 ;; That should not clobber the region for the query-replace itself. |
d073da76f0a5
(query-replace-read-from, query-replace-read-to): New funs extracted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56350
diff
changeset
|
107 (save-excursion |
d073da76f0a5
(query-replace-read-from, query-replace-read-to): New funs extracted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56350
diff
changeset
|
108 (read-from-minibuffer |
71025
82d1f472baee
* replace.el (query-replace-defaults): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
70936
diff
changeset
|
109 (if query-replace-defaults |
64866
6f20cb2a3b72
(query-replace-read-from, query-replace-read-to)
Juri Linkov <juri@jurta.org>
parents:
64823
diff
changeset
|
110 (format "%s (default %s -> %s): " prompt |
71025
82d1f472baee
* replace.el (query-replace-defaults): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
70936
diff
changeset
|
111 (query-replace-descr (car query-replace-defaults)) |
82d1f472baee
* replace.el (query-replace-defaults): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
70936
diff
changeset
|
112 (query-replace-descr (cdr query-replace-defaults))) |
64866
6f20cb2a3b72
(query-replace-read-from, query-replace-read-to)
Juri Linkov <juri@jurta.org>
parents:
64823
diff
changeset
|
113 (format "%s: " prompt)) |
56351
d073da76f0a5
(query-replace-read-from, query-replace-read-to): New funs extracted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56350
diff
changeset
|
114 nil nil nil |
d073da76f0a5
(query-replace-read-from, query-replace-read-to): New funs extracted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56350
diff
changeset
|
115 query-replace-from-history-variable |
70936
83ce2ddffd16
(query-replace-read-from, query-replace-read-to):
Juri Linkov <juri@jurta.org>
parents:
70349
diff
changeset
|
116 nil t)))) |
71025
82d1f472baee
* replace.el (query-replace-defaults): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
70936
diff
changeset
|
117 (if (and (zerop (length from)) query-replace-defaults) |
71026 | 118 (cons (car query-replace-defaults) |
119 (query-replace-compile-replacement | |
120 (cdr query-replace-defaults) regexp-flag)) | |
71125
21306dd42b3c
(query-replace-read-from, query-replace-read-to):
Juri Linkov <juri@jurta.org>
parents:
71026
diff
changeset
|
121 (add-to-history query-replace-from-history-variable from nil t) |
56355
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
122 ;; Warn if user types \n or \t, but don't reject the input. |
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
123 (and regexp-flag |
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
124 (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\(\\\\[nt]\\)" from) |
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
125 (let ((match (match-string 3 from))) |
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
126 (cond |
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
127 ((string= match "\\n") |
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
128 (message "Note: `\\n' here doesn't match a newline; to do that, type C-q C-j instead")) |
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
129 ((string= match "\\t") |
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
130 (message "Note: `\\t' here doesn't match a tab; to do that, just type TAB"))) |
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
131 (sit-for 2))) |
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
132 from)))) |
41761
878a3e2e7cfa
(query-replace-read-args): Display message if FROM contains `\n' or `\t'.
Richard M. Stallman <rms@gnu.org>
parents:
41329
diff
changeset
|
133 |
56581
6cfb1ef9200f
(query-replace-read-from): Use
David Kastrup <dak@gnu.org>
parents:
56520
diff
changeset
|
134 (defun query-replace-compile-replacement (to regexp-flag) |
6cfb1ef9200f
(query-replace-read-from): Use
David Kastrup <dak@gnu.org>
parents:
56520
diff
changeset
|
135 "Maybe convert a regexp replacement TO to Lisp. |
6cfb1ef9200f
(query-replace-read-from): Use
David Kastrup <dak@gnu.org>
parents:
56520
diff
changeset
|
136 Returns a list suitable for `perform-replace' if necessary, |
6cfb1ef9200f
(query-replace-read-from): Use
David Kastrup <dak@gnu.org>
parents:
56520
diff
changeset
|
137 the original string if not." |
6cfb1ef9200f
(query-replace-read-from): Use
David Kastrup <dak@gnu.org>
parents:
56520
diff
changeset
|
138 (if (and regexp-flag |
6cfb1ef9200f
(query-replace-read-from): Use
David Kastrup <dak@gnu.org>
parents:
56520
diff
changeset
|
139 (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\\\[,#]" to)) |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
140 (let (pos list char) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
141 (while |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
142 (progn |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
143 (setq pos (match-end 0)) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
144 (push (substring to 0 (- pos 2)) list) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
145 (setq char (aref to (1- pos)) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
146 to (substring to pos)) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
147 (cond ((eq char ?\#) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
148 (push '(number-to-string replace-count) list)) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
149 ((eq char ?\,) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
150 (setq pos (read-from-string to)) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
151 (push `(replace-quote ,(car pos)) list) |
56325
06c785c5e655
(query-replace-read-args): Swallow space after symbols, not after
Richard M. Stallman <rms@gnu.org>
parents:
56304
diff
changeset
|
152 (let ((end |
06c785c5e655
(query-replace-read-args): Swallow space after symbols, not after
Richard M. Stallman <rms@gnu.org>
parents:
56304
diff
changeset
|
153 ;; Swallow a space after a symbol |
06c785c5e655
(query-replace-read-args): Swallow space after symbols, not after
Richard M. Stallman <rms@gnu.org>
parents:
56304
diff
changeset
|
154 ;; if there is a space. |
06c785c5e655
(query-replace-read-args): Swallow space after symbols, not after
Richard M. Stallman <rms@gnu.org>
parents:
56304
diff
changeset
|
155 (if (and (or (symbolp (car pos)) |
06c785c5e655
(query-replace-read-args): Swallow space after symbols, not after
Richard M. Stallman <rms@gnu.org>
parents:
56304
diff
changeset
|
156 ;; Swallow a space after 'foo |
06c785c5e655
(query-replace-read-args): Swallow space after symbols, not after
Richard M. Stallman <rms@gnu.org>
parents:
56304
diff
changeset
|
157 ;; but not after (quote foo). |
06c785c5e655
(query-replace-read-args): Swallow space after symbols, not after
Richard M. Stallman <rms@gnu.org>
parents:
56304
diff
changeset
|
158 (and (eq (car-safe (car pos)) 'quote) |
56328
cc1deb864ed6
(query-replace-read-args): Swallow space after 'foo,
Juri Linkov <juri@jurta.org>
parents:
56325
diff
changeset
|
159 (not (= ?\( (aref to 0))))) |
cc1deb864ed6
(query-replace-read-args): Swallow space after 'foo,
Juri Linkov <juri@jurta.org>
parents:
56325
diff
changeset
|
160 (eq (string-match " " to (cdr pos)) |
cc1deb864ed6
(query-replace-read-args): Swallow space after 'foo,
Juri Linkov <juri@jurta.org>
parents:
56325
diff
changeset
|
161 (cdr pos))) |
56325
06c785c5e655
(query-replace-read-args): Swallow space after symbols, not after
Richard M. Stallman <rms@gnu.org>
parents:
56304
diff
changeset
|
162 (1+ (cdr pos)) |
06c785c5e655
(query-replace-read-args): Swallow space after symbols, not after
Richard M. Stallman <rms@gnu.org>
parents:
56304
diff
changeset
|
163 (cdr pos)))) |
06c785c5e655
(query-replace-read-args): Swallow space after symbols, not after
Richard M. Stallman <rms@gnu.org>
parents:
56304
diff
changeset
|
164 (setq to (substring to end))))) |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
165 (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\\\[,#]" to))) |
56581
6cfb1ef9200f
(query-replace-read-from): Use
David Kastrup <dak@gnu.org>
parents:
56520
diff
changeset
|
166 (setq to (nreverse (delete "" (cons to list)))) |
6cfb1ef9200f
(query-replace-read-from): Use
David Kastrup <dak@gnu.org>
parents:
56520
diff
changeset
|
167 (replace-match-string-symbols to) |
6cfb1ef9200f
(query-replace-read-from): Use
David Kastrup <dak@gnu.org>
parents:
56520
diff
changeset
|
168 (cons 'replace-eval-replacement |
6cfb1ef9200f
(query-replace-read-from): Use
David Kastrup <dak@gnu.org>
parents:
56520
diff
changeset
|
169 (if (cdr to) |
6cfb1ef9200f
(query-replace-read-from): Use
David Kastrup <dak@gnu.org>
parents:
56520
diff
changeset
|
170 (cons 'concat to) |
6cfb1ef9200f
(query-replace-read-from): Use
David Kastrup <dak@gnu.org>
parents:
56520
diff
changeset
|
171 (car to)))) |
56351
d073da76f0a5
(query-replace-read-from, query-replace-read-to): New funs extracted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56350
diff
changeset
|
172 to)) |
d073da76f0a5
(query-replace-read-from, query-replace-read-to): New funs extracted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56350
diff
changeset
|
173 |
56581
6cfb1ef9200f
(query-replace-read-from): Use
David Kastrup <dak@gnu.org>
parents:
56520
diff
changeset
|
174 |
64866
6f20cb2a3b72
(query-replace-read-from, query-replace-read-to)
Juri Linkov <juri@jurta.org>
parents:
64823
diff
changeset
|
175 (defun query-replace-read-to (from prompt regexp-flag) |
56581
6cfb1ef9200f
(query-replace-read-from): Use
David Kastrup <dak@gnu.org>
parents:
56520
diff
changeset
|
176 "Query and return the `to' argument of a query-replace operation." |
6cfb1ef9200f
(query-replace-read-from): Use
David Kastrup <dak@gnu.org>
parents:
56520
diff
changeset
|
177 (query-replace-compile-replacement |
6cfb1ef9200f
(query-replace-read-from): Use
David Kastrup <dak@gnu.org>
parents:
56520
diff
changeset
|
178 (save-excursion |
71125
21306dd42b3c
(query-replace-read-from, query-replace-read-to):
Juri Linkov <juri@jurta.org>
parents:
71026
diff
changeset
|
179 (let* ((history-add-new-input nil) |
21306dd42b3c
(query-replace-read-from, query-replace-read-to):
Juri Linkov <juri@jurta.org>
parents:
71026
diff
changeset
|
180 (to (read-from-minibuffer |
21306dd42b3c
(query-replace-read-from, query-replace-read-to):
Juri Linkov <juri@jurta.org>
parents:
71026
diff
changeset
|
181 (format "%s %s with: " prompt (query-replace-descr from)) |
21306dd42b3c
(query-replace-read-from, query-replace-read-to):
Juri Linkov <juri@jurta.org>
parents:
71026
diff
changeset
|
182 nil nil nil |
21306dd42b3c
(query-replace-read-from, query-replace-read-to):
Juri Linkov <juri@jurta.org>
parents:
71026
diff
changeset
|
183 query-replace-to-history-variable from t))) |
21306dd42b3c
(query-replace-read-from, query-replace-read-to):
Juri Linkov <juri@jurta.org>
parents:
71026
diff
changeset
|
184 (add-to-history query-replace-to-history-variable to nil t) |
71025
82d1f472baee
* replace.el (query-replace-defaults): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
70936
diff
changeset
|
185 (setq query-replace-defaults (cons from to)) |
82d1f472baee
* replace.el (query-replace-defaults): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
70936
diff
changeset
|
186 to)) |
56581
6cfb1ef9200f
(query-replace-read-from): Use
David Kastrup <dak@gnu.org>
parents:
56520
diff
changeset
|
187 regexp-flag)) |
6cfb1ef9200f
(query-replace-read-from): Use
David Kastrup <dak@gnu.org>
parents:
56520
diff
changeset
|
188 |
64866
6f20cb2a3b72
(query-replace-read-from, query-replace-read-to)
Juri Linkov <juri@jurta.org>
parents:
64823
diff
changeset
|
189 (defun query-replace-read-args (prompt regexp-flag &optional noerror) |
56351
d073da76f0a5
(query-replace-read-from, query-replace-read-to): New funs extracted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56350
diff
changeset
|
190 (unless noerror |
d073da76f0a5
(query-replace-read-from, query-replace-read-to): New funs extracted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56350
diff
changeset
|
191 (barf-if-buffer-read-only)) |
64866
6f20cb2a3b72
(query-replace-read-from, query-replace-read-to)
Juri Linkov <juri@jurta.org>
parents:
64823
diff
changeset
|
192 (let* ((from (query-replace-read-from prompt regexp-flag)) |
56355
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
193 (to (if (consp from) (prog1 (cdr from) (setq from (car from))) |
64866
6f20cb2a3b72
(query-replace-read-from, query-replace-read-to)
Juri Linkov <juri@jurta.org>
parents:
64823
diff
changeset
|
194 (query-replace-read-to from prompt regexp-flag)))) |
49958
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
195 (list from to current-prefix-arg))) |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
862
diff
changeset
|
196 |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
197 (defun query-replace (from-string to-string &optional delimited start end) |
260 | 198 "Replace some occurrences of FROM-STRING with TO-STRING. |
199 As each match is found, the user must type a character saying | |
200 what to do with it. For directions, type \\[help-command] at that time. | |
201 | |
20248
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
202 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
|
203 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
|
204 |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
205 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
|
206 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
|
207 minibuffer. |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
208 |
48173
b0db4f794e73
(query-replace, query-replace-regexp): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
47593
diff
changeset
|
209 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
|
210 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
|
211 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
|
212 `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
|
213 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
|
214 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
|
215 or capitalized.) |
10104
8a04af3511c1
(replace-string, query-replace): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
10069
diff
changeset
|
216 |
6707 | 217 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
|
218 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
|
219 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
|
220 |
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
221 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
|
222 (interactive (let ((common |
63150
571afd8b238a
(replace-match-data): Pass RESEAT arg `t' to
Kim F. Storm <storm@cua.dk>
parents:
62737
diff
changeset
|
223 (query-replace-read-args |
60174
85f04f438e03
(query-replace, query-replace-regexp)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60159
diff
changeset
|
224 (if (and transient-mark-mode mark-active) |
85f04f438e03
(query-replace, query-replace-regexp)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60159
diff
changeset
|
225 "Query replace in region" |
85f04f438e03
(query-replace, query-replace-regexp)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60159
diff
changeset
|
226 "Query replace") |
85f04f438e03
(query-replace, query-replace-regexp)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60159
diff
changeset
|
227 nil))) |
49958
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
228 (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
|
229 ;; These are done separately here |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
230 ;; 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
|
231 ;; 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
|
232 (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
|
233 (region-beginning)) |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
234 (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
|
235 (region-end))))) |
40254
51c9985454e3
(perform-replace): Move START and END parameters
Gerd Moellmann <gerd@gnu.org>
parents:
38986
diff
changeset
|
236 (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
|
237 |
268 | 238 (define-key esc-map "%" 'query-replace) |
260 | 239 |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
240 (defun query-replace-regexp (regexp to-string &optional delimited start end) |
260 | 241 "Replace some things after point matching REGEXP with TO-STRING. |
242 As each match is found, the user must type a character saying | |
243 what to do with it. For directions, type \\[help-command] at that time. | |
244 | |
20248
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
245 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
|
246 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
|
247 |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
248 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
|
249 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
|
250 minibuffer. |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
251 |
48173
b0db4f794e73
(query-replace, query-replace-regexp): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
47593
diff
changeset
|
252 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
|
253 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
|
254 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
|
255 `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
|
256 \(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
|
257 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
|
258 capitalized.) |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
259 |
6707 | 260 Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace |
260 | 261 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
|
262 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
|
263 |
6707 | 264 In TO-STRING, `\\&' stands for whatever matched the whole of REGEXP, |
265 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
|
266 whatever what matched the Nth `\\(...\\)' in REGEXP. |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
267 `\\?' 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
|
268 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
|
269 |
56245
93e88c0fb51c
(query-replace-read-args): Swallow space after \,SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
56228
diff
changeset
|
270 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
|
271 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
|
272 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
|
273 string. Inside of that expression, `\\&' is a string denoting the |
56328
cc1deb864ed6
(query-replace-read-args): Swallow space after 'foo,
Juri Linkov <juri@jurta.org>
parents:
56325
diff
changeset
|
274 whole match as a string, `\\N' for a partial match, `\\#&' and `\\#N' |
56245
93e88c0fb51c
(query-replace-read-args): Swallow space after \,SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
56228
diff
changeset
|
275 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
|
276 `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
|
277 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
|
278 |
56245
93e88c0fb51c
(query-replace-read-args): Swallow space after \,SYMBOL.
Richard M. Stallman <rms@gnu.org>
parents:
56228
diff
changeset
|
279 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
|
280 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
|
281 |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
282 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
|
283 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
|
284 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
|
285 (interactive |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
286 (let ((common |
63150
571afd8b238a
(replace-match-data): Pass RESEAT arg `t' to
Kim F. Storm <storm@cua.dk>
parents:
62737
diff
changeset
|
287 (query-replace-read-args |
60174
85f04f438e03
(query-replace, query-replace-regexp)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60159
diff
changeset
|
288 (if (and transient-mark-mode mark-active) |
85f04f438e03
(query-replace, query-replace-regexp)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60159
diff
changeset
|
289 "Query replace regexp in region" |
85f04f438e03
(query-replace, query-replace-regexp)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60159
diff
changeset
|
290 "Query replace regexp") |
85f04f438e03
(query-replace, query-replace-regexp)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60159
diff
changeset
|
291 t))) |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
292 (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
|
293 ;; These are done separately here |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
294 ;; so that command-history will record these expressions |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
295 ;; rather than the values they had this time. |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
296 (if (and transient-mark-mode mark-active) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
297 (region-beginning)) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
298 (if (and transient-mark-mode mark-active) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
299 (region-end))))) |
56148
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
300 (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
|
301 |
22353
402ebb81ae84
(esc-map): Bind C-M-% to query-replace-regexp.
Karl Heuer <kwzh@gnu.org>
parents:
21669
diff
changeset
|
302 (define-key esc-map [?\C-%] 'query-replace-regexp) |
260 | 303 |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
304 (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
|
305 "Replace some things after point matching REGEXP with the result of TO-EXPR. |
77286
0f67bcedb447
* NEWS: Mention `query-replace-regexp-eval' being deprecated.
David Kastrup <dak@gnu.org>
parents:
76749
diff
changeset
|
306 |
0f67bcedb447
* NEWS: Mention `query-replace-regexp-eval' being deprecated.
David Kastrup <dak@gnu.org>
parents:
76749
diff
changeset
|
307 Interactive use of this function is deprecated in favor of the |
0f67bcedb447
* NEWS: Mention `query-replace-regexp-eval' being deprecated.
David Kastrup <dak@gnu.org>
parents:
76749
diff
changeset
|
308 `\\,' feature of `query-replace-regexp'. For non-interactive use, a loop |
0f67bcedb447
* NEWS: Mention `query-replace-regexp-eval' being deprecated.
David Kastrup <dak@gnu.org>
parents:
76749
diff
changeset
|
309 using `search-forward-regexp' and `replace-match' is preferred. |
0f67bcedb447
* NEWS: Mention `query-replace-regexp-eval' being deprecated.
David Kastrup <dak@gnu.org>
parents:
76749
diff
changeset
|
310 |
25167
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
311 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
|
312 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
|
313 |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
314 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
|
315 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
|
316 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
|
317 `prin1-to-string' with the NOESCAPE argument (which see). |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
318 |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
319 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
|
320 `\\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
|
321 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
|
322 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
|
323 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
|
324 |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
325 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
|
326 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
|
327 |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
328 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
|
329 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
|
330 minibuffer. |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
331 |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
332 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
|
333 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
|
334 |
25167
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
335 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
|
336 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
|
337 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
|
338 (interactive |
56360
a9b695d281d4
(query-replace-regexp-eval): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56355
diff
changeset
|
339 (progn |
56355
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
340 (barf-if-buffer-read-only) |
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
341 (let* ((from |
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
342 ;; Let-bind the history var to disable the "foo -> bar" default. |
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
343 ;; Maybe we shouldn't disable this default, but for now I'll |
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
344 ;; leave it off. --Stef |
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
345 (let ((query-replace-to-history-variable nil)) |
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
346 (query-replace-read-from "Query replace regexp" t))) |
56350
cae4ae1c68a9
(query-replace-interactive, query-replace-read-args):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56328
diff
changeset
|
347 (to (list (read-from-minibuffer |
56355
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
348 (format "Query replace regexp %s with eval: " |
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
349 (query-replace-descr from)) |
56350
cae4ae1c68a9
(query-replace-interactive, query-replace-read-args):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56328
diff
changeset
|
350 nil nil t query-replace-to-history-variable from t)))) |
25167
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
351 ;; 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
|
352 ;; and the user might enter a single token. |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
353 (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
|
354 (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
|
355 (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
|
356 (region-beginning)) |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
357 (if (and transient-mark-mode mark-active) |
56360
a9b695d281d4
(query-replace-regexp-eval): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56355
diff
changeset
|
358 (region-end)))))) |
27391
abaa4ac29f51
(query-replace): Rename last arg to DELIMITED.
Richard M. Stallman <rms@gnu.org>
parents:
25167
diff
changeset
|
359 (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
|
360 t 'literal delimited nil nil start end)) |
25167
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
361 |
77286
0f67bcedb447
* NEWS: Mention `query-replace-regexp-eval' being deprecated.
David Kastrup <dak@gnu.org>
parents:
76749
diff
changeset
|
362 (make-obsolete 'query-replace-regexp-eval |
0f67bcedb447
* NEWS: Mention `query-replace-regexp-eval' being deprecated.
David Kastrup <dak@gnu.org>
parents:
76749
diff
changeset
|
363 "for interactive use, use the special `\\,' feature of |
0f67bcedb447
* NEWS: Mention `query-replace-regexp-eval' being deprecated.
David Kastrup <dak@gnu.org>
parents:
76749
diff
changeset
|
364 `query-replace-regexp' instead. Non-interactively, a loop |
0f67bcedb447
* NEWS: Mention `query-replace-regexp-eval' being deprecated.
David Kastrup <dak@gnu.org>
parents:
76749
diff
changeset
|
365 using `search-forward-regexp' and `replace-match' is preferred." "22.1") |
0f67bcedb447
* NEWS: Mention `query-replace-regexp-eval' being deprecated.
David Kastrup <dak@gnu.org>
parents:
76749
diff
changeset
|
366 |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
367 (defun map-query-replace-regexp (regexp to-strings &optional n start end) |
260 | 368 "Replace some matches for REGEXP with various strings, in rotation. |
29051 | 369 The second argument TO-STRINGS contains the replacement strings, |
370 separated by spaces. Third arg DELIMITED (prefix arg if interactive), | |
371 if non-nil, means replace only matches surrounded by word boundaries. | |
372 This command works like `query-replace-regexp' except that each | |
373 successive replacement uses the next successive replacement string, | |
260 | 374 wrapping around from the last such string to the first. |
375 | |
20248
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
376 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
|
377 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
|
378 |
260 | 379 Non-interactively, TO-STRINGS may be a list of replacement strings. |
380 | |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
381 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
|
382 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
|
383 |
260 | 384 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
|
385 before rotating to the next. |
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
386 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
|
387 (interactive |
56350
cae4ae1c68a9
(query-replace-interactive, query-replace-read-args):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56328
diff
changeset
|
388 (let* ((from (if query-replace-interactive |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
389 (car regexp-search-ring) |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
390 (read-from-minibuffer "Map query replace (regexp): " |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
391 nil nil nil |
19551
256843b0f804
(query-replace-read-args): Locally bind
Kenichi Handa <handa@m17n.org>
parents:
18991
diff
changeset
|
392 'query-replace-history nil t))) |
56350
cae4ae1c68a9
(query-replace-interactive, query-replace-read-args):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56328
diff
changeset
|
393 (to (read-from-minibuffer |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
862
diff
changeset
|
394 (format "Query replace %s with (space-separated strings): " |
56355
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
395 (query-replace-descr from)) |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
862
diff
changeset
|
396 nil nil nil |
56350
cae4ae1c68a9
(query-replace-interactive, query-replace-read-args):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56328
diff
changeset
|
397 'query-replace-history from t))) |
50030
1ec92786c9eb
(query-replace-read-args): Use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
49958
diff
changeset
|
398 (list from to |
1ec92786c9eb
(query-replace-read-args): Use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
49958
diff
changeset
|
399 (and current-prefix-arg |
1ec92786c9eb
(query-replace-read-args): Use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
49958
diff
changeset
|
400 (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
|
401 (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
|
402 (region-beginning)) |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
403 (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
|
404 (region-end))))) |
260 | 405 (let (replacements) |
406 (if (listp to-strings) | |
407 (setq replacements to-strings) | |
408 (while (/= (length to-strings) 0) | |
409 (if (string-match " " to-strings) | |
410 (setq replacements | |
411 (append replacements | |
412 (list (substring to-strings 0 | |
413 (string-match " " to-strings)))) | |
414 to-strings (substring to-strings | |
415 (1+ (string-match " " to-strings)))) | |
416 (setq replacements (append replacements (list to-strings)) | |
417 to-strings "")))) | |
40254
51c9985454e3
(perform-replace): Move START and END parameters
Gerd Moellmann <gerd@gnu.org>
parents:
38986
diff
changeset
|
418 (perform-replace regexp replacements t t nil n nil start end))) |
260 | 419 |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
420 (defun replace-string (from-string to-string &optional delimited start end) |
260 | 421 "Replace occurrences of FROM-STRING with TO-STRING. |
422 Preserve case in each match if `case-replace' and `case-fold-search' | |
423 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
|
424 \(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
|
425 then its replacement is upcased or capitalized.) |
8a04af3511c1
(replace-string, query-replace): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
10069
diff
changeset
|
426 |
20248
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
427 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
|
428 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
|
429 |
6707 | 430 Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace |
260 | 431 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
|
432 Fourth and fifth arg START and END specify the region to operate on. |
260 | 433 |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
434 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
|
435 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
|
436 minibuffer. |
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
437 |
260 | 438 This function is usually the wrong thing to use in a Lisp program. |
439 What you probably want is a loop like this: | |
6707 | 440 (while (search-forward FROM-STRING nil t) |
441 (replace-match TO-STRING nil t)) | |
17211
ecf78b4eb138
(replace-string): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17010
diff
changeset
|
442 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
|
443 \(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
|
444 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
|
445 (interactive |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
446 (let ((common |
63150
571afd8b238a
(replace-match-data): Pass RESEAT arg `t' to
Kim F. Storm <storm@cua.dk>
parents:
62737
diff
changeset
|
447 (query-replace-read-args |
60174
85f04f438e03
(query-replace, query-replace-regexp)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60159
diff
changeset
|
448 (if (and transient-mark-mode mark-active) |
85f04f438e03
(query-replace, query-replace-regexp)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60159
diff
changeset
|
449 "Replace string in region" |
85f04f438e03
(query-replace, query-replace-regexp)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60159
diff
changeset
|
450 "Replace string") |
85f04f438e03
(query-replace, query-replace-regexp)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60159
diff
changeset
|
451 nil))) |
49958
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
452 (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
|
453 (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
|
454 (region-beginning)) |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
455 (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
|
456 (region-end))))) |
40254
51c9985454e3
(perform-replace): Move START and END parameters
Gerd Moellmann <gerd@gnu.org>
parents:
38986
diff
changeset
|
457 (perform-replace from-string to-string nil nil delimited nil nil start end)) |
260 | 458 |
28706
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
459 (defun replace-regexp (regexp to-string &optional delimited start end) |
260 | 460 "Replace things after point matching REGEXP with TO-STRING. |
6707 | 461 Preserve case in each match if `case-replace' and `case-fold-search' |
260 | 462 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
|
463 |
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
464 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
|
465 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
|
466 |
6707 | 467 Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace |
260 | 468 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
|
469 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
|
470 |
6707 | 471 In TO-STRING, `\\&' stands for whatever matched the whole of REGEXP, |
472 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
|
473 whatever what matched the Nth `\\(...\\)' in REGEXP. |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
474 `\\?' 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
|
475 at the given position for each replacement. |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
476 |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
477 In interactive calls, the replacement text may contain `\\,' |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
478 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
|
479 text. Inside of that expression, `\\&' is a string denoting the |
75131
61dcb71f259c
(replace-regexp): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
74578
diff
changeset
|
480 whole match, `\\N' a partial match, `\\#&' and `\\#N' the respective |
61dcb71f259c
(replace-regexp): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
74578
diff
changeset
|
481 numeric values from `string-to-number', and `\\#' itself for |
61dcb71f259c
(replace-regexp): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
74578
diff
changeset
|
482 `replace-count', the number of replacements occurred so far. |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
483 |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
484 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
|
485 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
|
486 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
|
487 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
|
488 replacement text directly. |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
489 |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
490 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
|
491 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
|
492 Use \\[repeat-complex-command] after this command for details. |
260 | 493 |
8935
0e9e6ff083e8
(query-replace-interactive): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
8664
diff
changeset
|
494 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
|
495 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
|
496 |
260 | 497 This function is usually the wrong thing to use in a Lisp program. |
498 What you probably want is a loop like this: | |
499 (while (re-search-forward REGEXP nil t) | |
6707 | 500 (replace-match TO-STRING nil nil)) |
260 | 501 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
|
502 (interactive |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
503 (let ((common |
63150
571afd8b238a
(replace-match-data): Pass RESEAT arg `t' to
Kim F. Storm <storm@cua.dk>
parents:
62737
diff
changeset
|
504 (query-replace-read-args |
60174
85f04f438e03
(query-replace, query-replace-regexp)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60159
diff
changeset
|
505 (if (and transient-mark-mode mark-active) |
63150
571afd8b238a
(replace-match-data): Pass RESEAT arg `t' to
Kim F. Storm <storm@cua.dk>
parents:
62737
diff
changeset
|
506 "Replace regexp in region" |
571afd8b238a
(replace-match-data): Pass RESEAT arg `t' to
Kim F. Storm <storm@cua.dk>
parents:
62737
diff
changeset
|
507 "Replace regexp") |
60174
85f04f438e03
(query-replace, query-replace-regexp)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60159
diff
changeset
|
508 t))) |
49958
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
509 (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
|
510 (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
|
511 (region-beginning)) |
4b86a185b11d
(query-replace-read-args): Return just 3 values.
Richard M. Stallman <rms@gnu.org>
parents:
49597
diff
changeset
|
512 (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
|
513 (region-end))))) |
40254
51c9985454e3
(perform-replace): Move START and END parameters
Gerd Moellmann <gerd@gnu.org>
parents:
38986
diff
changeset
|
514 (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
|
515 |
2408
a9c05a12b615
(regexp-history): New history list.
Richard M. Stallman <rms@gnu.org>
parents:
2327
diff
changeset
|
516 |
a9c05a12b615
(regexp-history): New history list.
Richard M. Stallman <rms@gnu.org>
parents:
2327
diff
changeset
|
517 (defvar regexp-history nil |
a9c05a12b615
(regexp-history): New history list.
Richard M. Stallman <rms@gnu.org>
parents:
2327
diff
changeset
|
518 "History list for some commands that read regular expressions.") |
260 | 519 |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
520 |
2571
b65cf676a09b
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2408
diff
changeset
|
521 (defalias 'delete-non-matching-lines 'keep-lines) |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
522 (defalias 'delete-matching-lines 'flush-lines) |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
523 (defalias 'count-matches 'how-many) |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
524 |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
525 |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
526 (defun keep-lines-read-args (prompt) |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
527 "Read arguments for `keep-lines' and friends. |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
528 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
|
529 Value is a list, (REGEXP)." |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
530 (list (read-from-minibuffer prompt nil nil nil |
63779
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
531 'regexp-history nil t) |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
532 nil nil t)) |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
533 |
63779
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
534 (defun keep-lines (regexp &optional rstart rend interactive) |
61 | 535 "Delete all lines except those containing matches for REGEXP. |
536 A match split across lines preserves all the lines it lies in. | |
63779
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
537 When called from Lisp (and usually interactively as well, see below) |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
538 applies to all lines starting after point. |
23457
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
539 |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
540 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
|
541 the matching is case-sensitive. |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
542 |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
543 Second and third arg RSTART and REND specify the region to operate on. |
63779
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
544 This command operates on (the accessible part of) all lines whose |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
545 accessible part is entirely contained in the region determined by RSTART |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
546 and REND. (A newline ending a line counts as part of that line.) |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
547 |
38040
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
548 Interactively, in Transient Mark mode when the mark is active, operate |
63779
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
549 on all lines whose accessible part is entirely contained in the region. |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
550 Otherwise, the command applies to all lines starting after point. |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
551 When calling this function from Lisp, you can pretend that it was |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
552 called interactively by passing a non-nil INTERACTIVE argument. |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
553 |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
554 This function starts looking for the next match from the end of |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
555 the previous match. Hence, it ignores matches that overlap |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
556 a previously found match." |
38040
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
557 |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
558 (interactive |
46519
6de9114ee49a
(keep-lines, flush-lines): Interactively report
Richard M. Stallman <rms@gnu.org>
parents:
46335
diff
changeset
|
559 (progn |
6de9114ee49a
(keep-lines, flush-lines): Interactively report
Richard M. Stallman <rms@gnu.org>
parents:
46335
diff
changeset
|
560 (barf-if-buffer-read-only) |
6de9114ee49a
(keep-lines, flush-lines): Interactively report
Richard M. Stallman <rms@gnu.org>
parents:
46335
diff
changeset
|
561 (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
|
562 (if rstart |
46335
b4e553fa1fa8
(flush-lines, keep-lines): Convert REND to a marker.
Richard M. Stallman <rms@gnu.org>
parents:
46004
diff
changeset
|
563 (progn |
b4e553fa1fa8
(flush-lines, keep-lines): Convert REND to a marker.
Richard M. Stallman <rms@gnu.org>
parents:
46004
diff
changeset
|
564 (goto-char (min rstart rend)) |
63779
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
565 (setq rend |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
566 (progn |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
567 (save-excursion |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
568 (goto-char (max rstart rend)) |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
569 (unless (or (bolp) (eobp)) |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
570 (forward-line 0)) |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
571 (point-marker))))) |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
572 (if (and interactive transient-mark-mode mark-active) |
38040
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
573 (setq rstart (region-beginning) |
63779
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
574 rend (progn |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
575 (goto-char (region-end)) |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
576 (unless (or (bolp) (eobp)) |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
577 (forward-line 0)) |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
578 (point-marker))) |
38040
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
579 (setq rstart (point) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
580 rend (point-max-marker))) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
581 (goto-char rstart)) |
61 | 582 (save-excursion |
583 (or (bolp) (forward-line 1)) | |
23457
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
584 (let ((start (point)) |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
585 (case-fold-search (and case-fold-search |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
586 (isearch-no-upper-case-p regexp t)))) |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
587 (while (< (point) rend) |
61 | 588 ;; 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
|
589 (if (not (re-search-forward regexp rend 'move)) |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
590 (delete-region start rend) |
61 | 591 (let ((end (save-excursion (goto-char (match-beginning 0)) |
63779
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
592 (forward-line 0) |
61 | 593 (point)))) |
594 ;; Now end is first char preserved by the new match. | |
595 (if (< start end) | |
596 (delete-region start end)))) | |
46693
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
597 |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
598 (setq start (save-excursion (forward-line 1) (point))) |
61 | 599 ;; 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
|
600 (and (< (point) rend) |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
601 (= (match-beginning 0) (match-end 0)) |
63779
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
602 (forward-char 1))))) |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
603 (set-marker rend nil) |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
604 nil) |
61 | 605 |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
606 |
63779
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
607 (defun flush-lines (regexp &optional rstart rend interactive) |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
608 "Delete lines containing matches for REGEXP. |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
609 When called from Lisp (and usually when called interactively as |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
610 well, see below), applies to the part of the buffer after point. |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
611 The line point is in is deleted if and only if it contains a |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
612 match for regexp starting after point. |
23457
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
613 |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
614 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
|
615 the matching is case-sensitive. |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
616 |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
617 Second and third arg RSTART and REND specify the region to operate on. |
63779
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
618 Lines partially contained in this region are deleted if and only if |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
619 they contain a match entirely contained in it. |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
620 |
38040
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
621 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
|
622 on the contents of the region. Otherwise, operate from point to the |
63779
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
623 end of (the accessible portion of) the buffer. When calling this function |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
624 from Lisp, you can pretend that it was called interactively by passing |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
625 a non-nil INTERACTIVE argument. |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
626 |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
627 If a match is split across lines, all the lines it lies in are deleted. |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
628 They are deleted _before_ looking for the next match. Hence, a match |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
629 starting on the same line at which another match ended is ignored." |
38040
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
630 |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
631 (interactive |
46519
6de9114ee49a
(keep-lines, flush-lines): Interactively report
Richard M. Stallman <rms@gnu.org>
parents:
46335
diff
changeset
|
632 (progn |
6de9114ee49a
(keep-lines, flush-lines): Interactively report
Richard M. Stallman <rms@gnu.org>
parents:
46335
diff
changeset
|
633 (barf-if-buffer-read-only) |
6de9114ee49a
(keep-lines, flush-lines): Interactively report
Richard M. Stallman <rms@gnu.org>
parents:
46335
diff
changeset
|
634 (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
|
635 (if rstart |
46335
b4e553fa1fa8
(flush-lines, keep-lines): Convert REND to a marker.
Richard M. Stallman <rms@gnu.org>
parents:
46004
diff
changeset
|
636 (progn |
b4e553fa1fa8
(flush-lines, keep-lines): Convert REND to a marker.
Richard M. Stallman <rms@gnu.org>
parents:
46004
diff
changeset
|
637 (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
|
638 (setq rend (copy-marker (max rstart rend)))) |
63779
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
639 (if (and interactive transient-mark-mode mark-active) |
38040
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
640 (setq rstart (region-beginning) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
641 rend (copy-marker (region-end))) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
642 (setq rstart (point) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
643 rend (point-max-marker))) |
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
644 (goto-char rstart)) |
23457
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
645 (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
|
646 (isearch-no-upper-case-p regexp t)))) |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
647 (save-excursion |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
648 (while (and (< (point) rend) |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
649 (re-search-forward regexp rend t)) |
23457
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
650 (delete-region (save-excursion (goto-char (match-beginning 0)) |
63779
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
651 (forward-line 0) |
23457
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
652 (point)) |
63779
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
653 (progn (forward-line 1) (point)))))) |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
654 (set-marker rend nil) |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
655 nil) |
61 | 656 |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
657 |
63779
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
658 (defun how-many (regexp &optional rstart rend interactive) |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
659 "Print and return number of matches for REGEXP following point. |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
660 When called from Lisp and INTERACTIVE is omitted or nil, just return |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
661 the number, do not print it; if INTERACTIVE is t, the function behaves |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
662 in all respects has if it had been called interactively. |
23457
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
663 |
3ca22a873859
(keep-lines, flush-lines, how-many):
Richard M. Stallman <rms@gnu.org>
parents:
23384
diff
changeset
|
664 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
|
665 the matching is case-sensitive. |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
666 |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
667 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
|
668 |
38040
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
669 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
|
670 on the contents of the region. Otherwise, operate from point to the |
63779
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
671 end of (the accessible portion of) the buffer. |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
672 |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
673 This function starts looking for the next match from the end of |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
674 the previous match. Hence, it ignores matches that overlap |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
675 a previously found match." |
38040
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
676 |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
677 (interactive |
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
678 (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
|
679 (save-excursion |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
680 (if rstart |
63779
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
681 (progn |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
682 (goto-char (min rstart rend)) |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
683 (setq rend (max rstart rend))) |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
684 (if (and interactive transient-mark-mode mark-active) |
38040
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
685 (setq rstart (region-beginning) |
63779
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
686 rend (region-end)) |
38040
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
687 (setq rstart (point) |
63779
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
688 rend (point-max))) |
38040
79be85ef3a31
(keep-lines-read-args): Return just a regexp.
Richard M. Stallman <rms@gnu.org>
parents:
38036
diff
changeset
|
689 (goto-char rstart)) |
37832
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
690 (let ((count 0) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
691 opoint |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
692 (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
|
693 (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
|
694 (while (and (< (point) rend) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
695 (progn (setq opoint (point)) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
696 (re-search-forward regexp rend t))) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
697 (if (= opoint (point)) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
698 (forward-char 1) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
699 (setq count (1+ count)))) |
63779
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
700 (when interactive (message "%d occurrence%s" |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
701 count |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
702 (if (= count 1) "" "s"))) |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
703 count))) |
32036
29b572780dea
(keep-lines-read-args): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
30562
diff
changeset
|
704 |
2408
a9c05a12b615
(regexp-history): New history list.
Richard M. Stallman <rms@gnu.org>
parents:
2327
diff
changeset
|
705 |
37832
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
706 (defvar occur-mode-map |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
707 (let ((map (make-sparse-keymap))) |
67187
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
708 ;; We use this alternative name, so we can use \\[occur-mode-mouse-goto]. |
37832
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
709 (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
|
710 (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
|
711 (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
|
712 (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
|
713 (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
|
714 (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
|
715 (define-key map "\M-p" 'occur-prev) |
46693
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
716 (define-key map "r" 'occur-rename-buffer) |
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
717 (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
|
718 (define-key map "g" 'revert-buffer) |
46693
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
719 (define-key map "q" 'quit-window) |
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
720 (define-key map "z" 'kill-this-buffer) |
57023
cf85be0f7afa
(perform-replace): Use `query-replace-descr'.
Juri Linkov <juri@jurta.org>
parents:
56922
diff
changeset
|
721 (define-key map "\C-c\C-f" 'next-error-follow-minor-mode) |
37832
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
722 map) |
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
723 "Keymap for `occur-mode'.") |
61 | 724 |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
725 (defvar occur-revert-arguments nil |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
726 "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
|
727 See `occur-revert-function'.") |
61 | 728 |
47111
356bbdda5f67
(occur-mode-hook): New hook.
Juanma Barranquero <lekktu@gmail.com>
parents:
47087
diff
changeset
|
729 (defcustom occur-mode-hook '(turn-on-font-lock) |
356bbdda5f67
(occur-mode-hook): New hook.
Juanma Barranquero <lekktu@gmail.com>
parents:
47087
diff
changeset
|
730 "Hook run when entering Occur mode." |
356bbdda5f67
(occur-mode-hook): New hook.
Juanma Barranquero <lekktu@gmail.com>
parents:
47087
diff
changeset
|
731 :type 'hook |
356bbdda5f67
(occur-mode-hook): New hook.
Juanma Barranquero <lekktu@gmail.com>
parents:
47087
diff
changeset
|
732 :group 'matching) |
356bbdda5f67
(occur-mode-hook): New hook.
Juanma Barranquero <lekktu@gmail.com>
parents:
47087
diff
changeset
|
733 |
356bbdda5f67
(occur-mode-hook): New hook.
Juanma Barranquero <lekktu@gmail.com>
parents:
47087
diff
changeset
|
734 (defcustom occur-hook nil |
63970
01120e702316
(occur-hook): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
63919
diff
changeset
|
735 "Hook run by Occur when there are any matches." |
45444
84e0e49bfb75
(occur-engine): Increment globalcount all at once after searching a buffer.
Colin Walters <walters@gnu.org>
parents:
45308
diff
changeset
|
736 :type 'hook |
84e0e49bfb75
(occur-engine): Increment globalcount all at once after searching a buffer.
Colin Walters <walters@gnu.org>
parents:
45308
diff
changeset
|
737 :group 'matching) |
84e0e49bfb75
(occur-engine): Increment globalcount all at once after searching a buffer.
Colin Walters <walters@gnu.org>
parents:
45308
diff
changeset
|
738 |
17655
8e35bb3ec2e2
(occur-mode): Add a mode-class property.
Richard M. Stallman <rms@gnu.org>
parents:
17638
diff
changeset
|
739 (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
|
740 (defun occur-mode () |
61 | 741 "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
|
742 \\<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
|
743 \\[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
|
744 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
|
745 |
61 | 746 \\{occur-mode-map}" |
47130
454f46344502
(occur-mode): Add interactive declaration.
Juanma Barranquero <lekktu@gmail.com>
parents:
47111
diff
changeset
|
747 (interactive) |
41329
040cb763bd64
(occur-mode): Undo 2001-5-20 change.
Richard M. Stallman <rms@gnu.org>
parents:
40925
diff
changeset
|
748 (kill-all-local-variables) |
040cb763bd64
(occur-mode): Undo 2001-5-20 change.
Richard M. Stallman <rms@gnu.org>
parents:
40925
diff
changeset
|
749 (use-local-map occur-mode-map) |
040cb763bd64
(occur-mode): Undo 2001-5-20 change.
Richard M. Stallman <rms@gnu.org>
parents:
40925
diff
changeset
|
750 (setq major-mode 'occur-mode) |
040cb763bd64
(occur-mode): Undo 2001-5-20 change.
Richard M. Stallman <rms@gnu.org>
parents:
40925
diff
changeset
|
751 (setq mode-name "Occur") |
37832
dd9ddcbf2b5f
(keep-lines-read-args): Use `copy-marker'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37536
diff
changeset
|
752 (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
|
753 (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
|
754 (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
|
755 (setq next-error-function 'occur-next-error) |
62737
f5aef2123438
(occur-mode): Use run-mode-hooks.
Lute Kamstra <lute@gnu.org>
parents:
62458
diff
changeset
|
756 (run-mode-hooks 'occur-mode-hook)) |
61 | 757 |
16864
59ed508195a4
(occur-mode-map): Bind g to revert-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
16819
diff
changeset
|
758 (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
|
759 "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
|
760 (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
|
761 |
6596
80df3b456672
(occur-mode-find-occurrence): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
6410
diff
changeset
|
762 (defun occur-mode-find-occurrence () |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
763 (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
|
764 (unless pos |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
765 (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
|
766 (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
|
767 (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
|
768 pos)) |
6596
80df3b456672
(occur-mode-find-occurrence): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
6410
diff
changeset
|
769 |
67187
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
770 (defalias 'occur-mode-mouse-goto 'occur-mode-goto-occurrence) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
771 (defun occur-mode-goto-occurrence (&optional event) |
6596
80df3b456672
(occur-mode-find-occurrence): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
6410
diff
changeset
|
772 "Go to the occurrence the current line describes." |
67187
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
773 (interactive (list last-nonmenu-event)) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
774 (let ((pos |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
775 (if (null event) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
776 ;; Actually `event-end' works correctly with a nil argument as |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
777 ;; well, so we could dispense with this test, but let's not |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
778 ;; rely on this undocumented behavior. |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
779 (occur-mode-find-occurrence) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
780 (with-current-buffer (window-buffer (posn-window (event-end event))) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
781 (save-excursion |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
782 (goto-char (posn-point (event-end event))) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
783 (occur-mode-find-occurrence))))) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
784 same-window-buffer-names |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
785 same-window-regexps) |
67179
cfc0110bc143
* replace.el (occur-mode-goto-occurrence): Pop, don't switch.
Chong Yidong <cyd@stupidchicken.com>
parents:
66756
diff
changeset
|
786 (pop-to-buffer (marker-buffer pos)) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
787 (goto-char pos))) |
18918
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
788 |
42604
a49b37e22b38
(occur-mode-goto-occurrence-other-window): New command.
Richard M. Stallman <rms@gnu.org>
parents:
42430
diff
changeset
|
789 (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
|
790 "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
|
791 (interactive) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
792 (let ((pos (occur-mode-find-occurrence))) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
793 (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
|
794 (goto-char pos))) |
42604
a49b37e22b38
(occur-mode-goto-occurrence-other-window): New command.
Richard M. Stallman <rms@gnu.org>
parents:
42430
diff
changeset
|
795 |
42294
d1c81a1250f2
(occur-mode-display-occurrence): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41761
diff
changeset
|
796 (defun occur-mode-display-occurrence () |
d1c81a1250f2
(occur-mode-display-occurrence): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41761
diff
changeset
|
797 "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
|
798 (interactive) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
799 (let ((pos (occur-mode-find-occurrence)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
800 window |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
801 ;; 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
|
802 same-window-buffer-names |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
803 same-window-regexps) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
804 (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
|
805 ;; 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
|
806 (save-selected-window |
d1c81a1250f2
(occur-mode-display-occurrence): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41761
diff
changeset
|
807 (select-window window) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
808 (goto-char pos)))) |
42294
d1c81a1250f2
(occur-mode-display-occurrence): New function.
Richard M. Stallman <rms@gnu.org>
parents:
41761
diff
changeset
|
809 |
47593
b052c0d51fd4
(occur-find-match): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
47532
diff
changeset
|
810 (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
|
811 (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
|
812 (let ((r)) |
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
813 (while (> n 0) |
47593
b052c0d51fd4
(occur-find-match): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
47532
diff
changeset
|
814 (setq r (funcall search (point) 'occur-match)) |
b052c0d51fd4
(occur-find-match): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
47532
diff
changeset
|
815 (and r |
b052c0d51fd4
(occur-find-match): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
47532
diff
changeset
|
816 (get-text-property r 'occur-match) |
b052c0d51fd4
(occur-find-match): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
47532
diff
changeset
|
817 (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
|
818 (if r |
47593
b052c0d51fd4
(occur-find-match): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
47532
diff
changeset
|
819 (goto-char r) |
b052c0d51fd4
(occur-find-match): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
47532
diff
changeset
|
820 (error message)) |
18918
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
821 (setq n (1- n))))) |
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
822 |
47593
b052c0d51fd4
(occur-find-match): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
47532
diff
changeset
|
823 (defun occur-next (&optional n) |
b052c0d51fd4
(occur-find-match): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
47532
diff
changeset
|
824 "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
|
825 (interactive "p") |
b052c0d51fd4
(occur-find-match): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
47532
diff
changeset
|
826 (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
|
827 |
18918
0e0935f23d39
(occur): Use text property `occur' to store the
Richard M. Stallman <rms@gnu.org>
parents:
18443
diff
changeset
|
828 (defun occur-prev (&optional n) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
829 "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
|
830 (interactive "p") |
47593
b052c0d51fd4
(occur-find-match): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
47532
diff
changeset
|
831 (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
|
832 |
b335edb455ad
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54778
diff
changeset
|
833 (defun occur-next-error (&optional argp reset) |
b335edb455ad
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54778
diff
changeset
|
834 "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
|
835 Compatibility function for \\[next-error] invocations." |
b335edb455ad
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54778
diff
changeset
|
836 (interactive "p") |
58625
31d0b9422d7b
simple.el (next-error-buffer-p): allow for inclusive and
Teodor Zlatanov <tzz@lifelogs.com>
parents:
58362
diff
changeset
|
837 ;; we need to run occur-find-match from within the Occur buffer |
58995
feb3eb61d019
(occur-accumulate-lines, occur-engine):
Juri Linkov <juri@jurta.org>
parents:
58987
diff
changeset
|
838 (with-current-buffer |
59290
285e069cecd2
(occur-1): If the output buffer is also an input, don't kill it, rename it.
Richard M. Stallman <rms@gnu.org>
parents:
59029
diff
changeset
|
839 ;; Choose the buffer and make it current. |
58625
31d0b9422d7b
simple.el (next-error-buffer-p): allow for inclusive and
Teodor Zlatanov <tzz@lifelogs.com>
parents:
58362
diff
changeset
|
840 (if (next-error-buffer-p (current-buffer)) |
31d0b9422d7b
simple.el (next-error-buffer-p): allow for inclusive and
Teodor Zlatanov <tzz@lifelogs.com>
parents:
58362
diff
changeset
|
841 (current-buffer) |
59290
285e069cecd2
(occur-1): If the output buffer is also an input, don't kill it, rename it.
Richard M. Stallman <rms@gnu.org>
parents:
59029
diff
changeset
|
842 (next-error-find-buffer nil nil |
285e069cecd2
(occur-1): If the output buffer is also an input, don't kill it, rename it.
Richard M. Stallman <rms@gnu.org>
parents:
59029
diff
changeset
|
843 (lambda () |
285e069cecd2
(occur-1): If the output buffer is also an input, don't kill it, rename it.
Richard M. Stallman <rms@gnu.org>
parents:
59029
diff
changeset
|
844 (eq major-mode 'occur-mode)))) |
58995
feb3eb61d019
(occur-accumulate-lines, occur-engine):
Juri Linkov <juri@jurta.org>
parents:
58987
diff
changeset
|
845 |
feb3eb61d019
(occur-accumulate-lines, occur-engine):
Juri Linkov <juri@jurta.org>
parents:
58987
diff
changeset
|
846 (goto-char (cond (reset (point-min)) |
feb3eb61d019
(occur-accumulate-lines, occur-engine):
Juri Linkov <juri@jurta.org>
parents:
58987
diff
changeset
|
847 ((< argp 0) (line-beginning-position)) |
67180
8d028f859146
(occur-mode-mouse-goto): Pop, don't switch.
Juri Linkov <juri@jurta.org>
parents:
67179
diff
changeset
|
848 ((> argp 0) (line-end-position)) |
8d028f859146
(occur-mode-mouse-goto): Pop, don't switch.
Juri Linkov <juri@jurta.org>
parents:
67179
diff
changeset
|
849 ((point)))) |
58625
31d0b9422d7b
simple.el (next-error-buffer-p): allow for inclusive and
Teodor Zlatanov <tzz@lifelogs.com>
parents:
58362
diff
changeset
|
850 (occur-find-match |
58995
feb3eb61d019
(occur-accumulate-lines, occur-engine):
Juri Linkov <juri@jurta.org>
parents:
58987
diff
changeset
|
851 (abs argp) |
feb3eb61d019
(occur-accumulate-lines, occur-engine):
Juri Linkov <juri@jurta.org>
parents:
58987
diff
changeset
|
852 (if (> 0 argp) |
58625
31d0b9422d7b
simple.el (next-error-buffer-p): allow for inclusive and
Teodor Zlatanov <tzz@lifelogs.com>
parents:
58362
diff
changeset
|
853 #'previous-single-property-change |
31d0b9422d7b
simple.el (next-error-buffer-p): allow for inclusive and
Teodor Zlatanov <tzz@lifelogs.com>
parents:
58362
diff
changeset
|
854 #'next-single-property-change) |
31d0b9422d7b
simple.el (next-error-buffer-p): allow for inclusive and
Teodor Zlatanov <tzz@lifelogs.com>
parents:
58362
diff
changeset
|
855 "No more matches") |
31d0b9422d7b
simple.el (next-error-buffer-p): allow for inclusive and
Teodor Zlatanov <tzz@lifelogs.com>
parents:
58362
diff
changeset
|
856 ;; In case the *Occur* buffer is visible in a nonselected window. |
76749
6a1a4e97079e
(occur-next-error): *Occur* might not be displayed in the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76466
diff
changeset
|
857 (let ((win (get-buffer-window (current-buffer) t))) |
6a1a4e97079e
(occur-next-error): *Occur* might not be displayed in the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76466
diff
changeset
|
858 (if win (set-window-point win (point)))) |
58625
31d0b9422d7b
simple.el (next-error-buffer-p): allow for inclusive and
Teodor Zlatanov <tzz@lifelogs.com>
parents:
58362
diff
changeset
|
859 (occur-mode-goto-occurrence))) |
2408
a9c05a12b615
(regexp-history): New history list.
Richard M. Stallman <rms@gnu.org>
parents:
2327
diff
changeset
|
860 |
58987 | 861 (defface match |
862 '((((class color) (min-colors 88) (background light)) | |
78112
6ad309ee5f4e
* replace.el (match): Use yellow1 instead of yellow.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
77286
diff
changeset
|
863 :background "yellow1") |
58987 | 864 (((class color) (min-colors 88) (background dark)) |
64503
791fa2059b5e
(match): Use slightly more light RoyalBlue3 instead of dark RoyalBlue4.
Juri Linkov <juri@jurta.org>
parents:
64135
diff
changeset
|
865 :background "RoyalBlue3") |
76466
08ea848cd1f3
(match): Use yellow background on light-bg terminals.
Richard M. Stallman <rms@gnu.org>
parents:
76392
diff
changeset
|
866 (((class color) (min-colors 8) (background light)) |
08ea848cd1f3
(match): Use yellow background on light-bg terminals.
Richard M. Stallman <rms@gnu.org>
parents:
76392
diff
changeset
|
867 :background "yellow" :foreground "black") |
08ea848cd1f3
(match): Use yellow background on light-bg terminals.
Richard M. Stallman <rms@gnu.org>
parents:
76392
diff
changeset
|
868 (((class color) (min-colors 8) (background dark)) |
58987 | 869 :background "blue" :foreground "white") |
870 (((type tty) (class mono)) | |
871 :inverse-video t) | |
872 (t :background "gray")) | |
873 "Face used to highlight matches permanently." | |
874 :group 'matching | |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59570
diff
changeset
|
875 :version "22.1") |
58987 | 876 |
17664
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17655
diff
changeset
|
877 (defcustom list-matching-lines-default-context-lines 0 |
29051 | 878 "*Default number of context lines included around `list-matching-lines' matches. |
879 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
|
880 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
|
881 :type 'integer |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17655
diff
changeset
|
882 :group 'matching) |
61 | 883 |
2571
b65cf676a09b
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2408
diff
changeset
|
884 (defalias 'list-matching-lines 'occur) |
61 | 885 |
58987 | 886 (defcustom list-matching-lines-face 'match |
29051 | 887 "*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
|
888 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
|
889 :type 'face |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
890 :group 'matching) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
891 |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
892 (defcustom list-matching-lines-buffer-name-face 'underline |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
893 "*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
|
894 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
|
895 :type 'face |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
896 :group 'matching) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
897 |
66756
670149b47c39
(occur-excluded-properties): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
66720
diff
changeset
|
898 (defcustom occur-excluded-properties |
670149b47c39
(occur-excluded-properties): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
66720
diff
changeset
|
899 '(read-only invisible intangible field mouse-face help-echo local-map keymap |
670149b47c39
(occur-excluded-properties): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
66720
diff
changeset
|
900 yank-handler follow-link) |
670149b47c39
(occur-excluded-properties): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
66720
diff
changeset
|
901 "*Text properties to discard when copying lines to the *Occur* buffer. |
670149b47c39
(occur-excluded-properties): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
66720
diff
changeset
|
902 The value should be a list of text properties to discard or t, |
670149b47c39
(occur-excluded-properties): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
66720
diff
changeset
|
903 which means to discard all text properties." |
670149b47c39
(occur-excluded-properties): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
66720
diff
changeset
|
904 :type '(choice (const :tag "All" t) (repeat symbol)) |
670149b47c39
(occur-excluded-properties): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
66720
diff
changeset
|
905 :group 'matching |
670149b47c39
(occur-excluded-properties): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
66720
diff
changeset
|
906 :version "22.1") |
670149b47c39
(occur-excluded-properties): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
66720
diff
changeset
|
907 |
58741
5ffd11b70941
(occur-1): Specify t for KEEP-PROPS to occur-engine.
Richard M. Stallman <rms@gnu.org>
parents:
58625
diff
changeset
|
908 (defun occur-accumulate-lines (count &optional keep-props) |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
909 (save-excursion |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
910 (let ((forwardp (> count 0)) |
58995
feb3eb61d019
(occur-accumulate-lines, occur-engine):
Juri Linkov <juri@jurta.org>
parents:
58987
diff
changeset
|
911 result beg end) |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
912 (while (not (or (zerop count) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
913 (if forwardp |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
914 (eobp) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
915 (bobp)))) |
45176
2a245e4bdf59
(occur-unfontify-region-function): Delete.
Colin Walters <walters@gnu.org>
parents:
45079
diff
changeset
|
916 (setq count (+ count (if forwardp -1 1))) |
58995
feb3eb61d019
(occur-accumulate-lines, occur-engine):
Juri Linkov <juri@jurta.org>
parents:
58987
diff
changeset
|
917 (setq beg (line-beginning-position) |
feb3eb61d019
(occur-accumulate-lines, occur-engine):
Juri Linkov <juri@jurta.org>
parents:
58987
diff
changeset
|
918 end (line-end-position)) |
59570
3d6f4d8e0b8b
(occur-accumulate-lines, occur-engine): Avoid warnings.
Richard M. Stallman <rms@gnu.org>
parents:
59479
diff
changeset
|
919 (if (and keep-props (if (boundp 'jit-lock-mode) jit-lock-mode) |
58995
feb3eb61d019
(occur-accumulate-lines, occur-engine):
Juri Linkov <juri@jurta.org>
parents:
58987
diff
changeset
|
920 (text-property-not-all beg end 'fontified t)) |
59570
3d6f4d8e0b8b
(occur-accumulate-lines, occur-engine): Avoid warnings.
Richard M. Stallman <rms@gnu.org>
parents:
59479
diff
changeset
|
921 (if (fboundp 'jit-lock-fontify-now) |
3d6f4d8e0b8b
(occur-accumulate-lines, occur-engine): Avoid warnings.
Richard M. Stallman <rms@gnu.org>
parents:
59479
diff
changeset
|
922 (jit-lock-fontify-now beg end))) |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
923 (push |
66756
670149b47c39
(occur-excluded-properties): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
66720
diff
changeset
|
924 (if (and keep-props (not (eq occur-excluded-properties t))) |
670149b47c39
(occur-excluded-properties): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
66720
diff
changeset
|
925 (let ((str (buffer-substring beg end))) |
670149b47c39
(occur-excluded-properties): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
66720
diff
changeset
|
926 (remove-list-of-text-properties |
670149b47c39
(occur-excluded-properties): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
66720
diff
changeset
|
927 0 (length str) occur-excluded-properties str) |
670149b47c39
(occur-excluded-properties): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
66720
diff
changeset
|
928 str) |
670149b47c39
(occur-excluded-properties): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
66720
diff
changeset
|
929 (buffer-substring-no-properties beg end)) |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
930 result) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
931 (forward-line (if forwardp 1 -1))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
932 (nreverse result)))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
933 |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
934 (defun occur-read-primary-args () |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
935 (list (let* ((default (car regexp-history)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
936 (input |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
937 (read-from-minibuffer |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
938 (if default |
65680
ed770a0a7846
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents:
64866
diff
changeset
|
939 (format "List lines matching regexp (default %s): " |
56355
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
940 (query-replace-descr default)) |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
941 "List lines matching regexp: ") |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
942 nil |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
943 nil |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
944 nil |
56449
84df5471b01e
(occur-read-primary-args): Pass default to read-from-minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
56360
diff
changeset
|
945 'regexp-history |
84df5471b01e
(occur-read-primary-args): Pass default to read-from-minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
56360
diff
changeset
|
946 default))) |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
947 (if (equal input "") |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
948 default |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
949 input)) |
45308
abd8a68f87a7
(occur-read-primary-args): Handle a bare 'C-u' correctly.
Colin Walters <walters@gnu.org>
parents:
45265
diff
changeset
|
950 (when current-prefix-arg |
abd8a68f87a7
(occur-read-primary-args): Handle a bare 'C-u' correctly.
Colin Walters <walters@gnu.org>
parents:
45265
diff
changeset
|
951 (prefix-numeric-value current-prefix-arg)))) |
16818
6de559d0b20f
(list-matching-lines-face): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16758
diff
changeset
|
952 |
64135
fe83c61c82da
(occur-rename-buffer): Use `generate-new-buffer' also when called
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
953 (defun occur-rename-buffer (&optional unique-p interactive-p) |
46693
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
954 "Rename the current *Occur* buffer to *Occur: original-buffer-name*. |
64135
fe83c61c82da
(occur-rename-buffer): Use `generate-new-buffer' also when called
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
955 Here `original-buffer-name' is the buffer name were Occur was originally run. |
fe83c61c82da
(occur-rename-buffer): Use `generate-new-buffer' also when called
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
956 When given the prefix argument, or called non-interactively, the renaming |
fe83c61c82da
(occur-rename-buffer): Use `generate-new-buffer' also when called
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
957 will not clobber the existing buffer(s) of that name, but use |
fe83c61c82da
(occur-rename-buffer): Use `generate-new-buffer' also when called
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
958 `generate-new-buffer-name' instead. You can add this to `occur-hook' |
fe83c61c82da
(occur-rename-buffer): Use `generate-new-buffer' also when called
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
959 if you always want a separate *Occur* buffer for each buffer where you |
fe83c61c82da
(occur-rename-buffer): Use `generate-new-buffer' also when called
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
960 invoke `occur'." |
fe83c61c82da
(occur-rename-buffer): Use `generate-new-buffer' also when called
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
961 (interactive "P\np") |
46693
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
962 (with-current-buffer |
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
963 (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
|
964 (rename-buffer (concat "*Occur: " |
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
965 (mapconcat #'buffer-name |
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
966 (car (cddr occur-revert-arguments)) "/") |
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
967 "*") |
64135
fe83c61c82da
(occur-rename-buffer): Use `generate-new-buffer' also when called
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
968 (or unique-p (not interactive-p))))) |
46693
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
969 |
61 | 970 (defun occur (regexp &optional nlines) |
1427
c49077849583
(occur): Always search entire buffer.
Richard M. Stallman <rms@gnu.org>
parents:
866
diff
changeset
|
971 "Show all lines in the current buffer containing a match for REGEXP. |
63779
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
972 This function can not handle matches that span more than one line. |
260 | 973 |
974 Each line is displayed with NLINES lines before and after, or -NLINES | |
975 before if NLINES is negative. | |
976 NLINES defaults to `list-matching-lines-default-context-lines'. | |
61 | 977 Interactively it is the prefix arg. |
978 | |
2408
a9c05a12b615
(regexp-history): New history list.
Richard M. Stallman <rms@gnu.org>
parents:
2327
diff
changeset
|
979 The lines are shown in a buffer named `*Occur*'. |
61 | 980 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
|
981 \\<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
|
982 |
17655
8e35bb3ec2e2
(occur-mode): Add a mode-class property.
Richard M. Stallman <rms@gnu.org>
parents:
17638
diff
changeset
|
983 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
|
984 the matching is case-sensitive." |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
985 (interactive (occur-read-primary-args)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
986 (occur-1 regexp nlines (list (current-buffer)))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
987 |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
988 (defun multi-occur (bufs regexp &optional nlines) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
989 "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
|
990 This function acts on multiple buffers; otherwise, it is exactly like |
68504
5e010e843834
(multi-occur): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67839
diff
changeset
|
991 `occur'. When you invoke this command interactively, you must specify |
5e010e843834
(multi-occur): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67839
diff
changeset
|
992 the buffer names that you want, one by one." |
15040
04f81516b6e0
(occur): Fix up interactive code.
Richard M. Stallman <rms@gnu.org>
parents:
14819
diff
changeset
|
993 (interactive |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
994 (cons |
47204
539aabdebd62
(multi-occur): Made "ido-aware":
Kim F. Storm <storm@cua.dk>
parents:
47130
diff
changeset
|
995 (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
|
996 (current-buffer) t))) |
539aabdebd62
(multi-occur): Made "ido-aware":
Kim F. Storm <storm@cua.dk>
parents:
47130
diff
changeset
|
997 (buf nil) |
539aabdebd62
(multi-occur): Made "ido-aware":
Kim F. Storm <storm@cua.dk>
parents:
47130
diff
changeset
|
998 (ido-ignore-item-temp-list bufs)) |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
999 (while (not (string-equal |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48276
diff
changeset
|
1000 (setq buf (read-buffer |
47204
539aabdebd62
(multi-occur): Made "ido-aware":
Kim F. Storm <storm@cua.dk>
parents:
47130
diff
changeset
|
1001 (if (eq read-buffer-function 'ido-read-buffer) |
539aabdebd62
(multi-occur): Made "ido-aware":
Kim F. Storm <storm@cua.dk>
parents:
47130
diff
changeset
|
1002 "Next buffer to search (C-j to end): " |
539aabdebd62
(multi-occur): Made "ido-aware":
Kim F. Storm <storm@cua.dk>
parents:
47130
diff
changeset
|
1003 "Next buffer to search (RET to end): ") |
539aabdebd62
(multi-occur): Made "ido-aware":
Kim F. Storm <storm@cua.dk>
parents:
47130
diff
changeset
|
1004 nil t)) |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1005 "")) |
47204
539aabdebd62
(multi-occur): Made "ido-aware":
Kim F. Storm <storm@cua.dk>
parents:
47130
diff
changeset
|
1006 (add-to-list 'bufs buf) |
539aabdebd62
(multi-occur): Made "ido-aware":
Kim F. Storm <storm@cua.dk>
parents:
47130
diff
changeset
|
1007 (setq ido-ignore-item-temp-list bufs)) |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1008 (nreverse (mapcar #'get-buffer bufs))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1009 (occur-read-primary-args))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1010 (occur-1 regexp nlines bufs)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1011 |
68504
5e010e843834
(multi-occur): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67839
diff
changeset
|
1012 (defun multi-occur-in-matching-buffers (bufregexp regexp &optional allbufs) |
5e010e843834
(multi-occur): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67839
diff
changeset
|
1013 "Show all lines matching REGEXP in buffers specified by BUFREGEXP. |
5e010e843834
(multi-occur): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67839
diff
changeset
|
1014 Normally BUFREGEXP matches against each buffer's visited file name, |
5e010e843834
(multi-occur): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67839
diff
changeset
|
1015 but if you specify a prefix argument, it matches against the buffer name. |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1016 See also `multi-occur'." |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1017 (interactive |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1018 (cons |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1019 (let* ((default (car regexp-history)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1020 (input |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1021 (read-from-minibuffer |
68536
4bad00cd1b68
(multi-occur-in-matching-buffers): Fix prev change.
Richard M. Stallman <rms@gnu.org>
parents:
68504
diff
changeset
|
1022 (if current-prefix-arg |
68504
5e010e843834
(multi-occur): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67839
diff
changeset
|
1023 "List lines in buffers whose names match regexp: " |
5e010e843834
(multi-occur): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67839
diff
changeset
|
1024 "List lines in buffers whose filenames match regexp: ") |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1025 nil |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1026 nil |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1027 nil |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1028 'regexp-history))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1029 (if (equal input "") |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1030 default |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1031 input)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1032 (occur-read-primary-args))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1033 (when bufregexp |
68536
4bad00cd1b68
(multi-occur-in-matching-buffers): Fix prev change.
Richard M. Stallman <rms@gnu.org>
parents:
68504
diff
changeset
|
1034 (occur-1 regexp nil |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1035 (delq nil |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1036 (mapcar (lambda (buf) |
68504
5e010e843834
(multi-occur): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67839
diff
changeset
|
1037 (when (if allbufs |
5e010e843834
(multi-occur): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67839
diff
changeset
|
1038 (string-match bufregexp |
5e010e843834
(multi-occur): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67839
diff
changeset
|
1039 (buffer-name buf)) |
5e010e843834
(multi-occur): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67839
diff
changeset
|
1040 (and (buffer-file-name buf) |
5e010e843834
(multi-occur): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67839
diff
changeset
|
1041 (string-match bufregexp |
5e010e843834
(multi-occur): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67839
diff
changeset
|
1042 (buffer-file-name buf)))) |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1043 buf)) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1044 (buffer-list)))))) |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1045 |
45265
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
1046 (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
|
1047 (unless buf-name |
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
1048 (setq buf-name "*Occur*")) |
59290
285e069cecd2
(occur-1): If the output buffer is also an input, don't kill it, rename it.
Richard M. Stallman <rms@gnu.org>
parents:
59029
diff
changeset
|
1049 (let (occur-buf |
45079
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
1050 (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
|
1051 (when (buffer-live-p buf) buf)) |
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
1052 bufs)))) |
bf76420e3297
(occur-mode-map): Bind "q" to `delete-window'.
Colin Walters <walters@gnu.org>
parents:
45078
diff
changeset
|
1053 ;; Handle the case where one of the buffers we're searching is the |
59290
285e069cecd2
(occur-1): If the output buffer is also an input, don't kill it, rename it.
Richard M. Stallman <rms@gnu.org>
parents:
59029
diff
changeset
|
1054 ;; output buffer. Just rename it. |
285e069cecd2
(occur-1): If the output buffer is also an input, don't kill it, rename it.
Richard M. Stallman <rms@gnu.org>
parents:
59029
diff
changeset
|
1055 (when (member buf-name (mapcar 'buffer-name active-bufs)) |
285e069cecd2
(occur-1): If the output buffer is also an input, don't kill it, rename it.
Richard M. Stallman <rms@gnu.org>
parents:
59029
diff
changeset
|
1056 (with-current-buffer (get-buffer buf-name) |
285e069cecd2
(occur-1): If the output buffer is also an input, don't kill it, rename it.
Richard M. Stallman <rms@gnu.org>
parents:
59029
diff
changeset
|
1057 (rename-uniquely))) |
285e069cecd2
(occur-1): If the output buffer is also an input, don't kill it, rename it.
Richard M. Stallman <rms@gnu.org>
parents:
59029
diff
changeset
|
1058 |
285e069cecd2
(occur-1): If the output buffer is also an input, don't kill it, rename it.
Richard M. Stallman <rms@gnu.org>
parents:
59029
diff
changeset
|
1059 ;; Now find or create the output buffer. |
285e069cecd2
(occur-1): If the output buffer is also an input, don't kill it, rename it.
Richard M. Stallman <rms@gnu.org>
parents:
59029
diff
changeset
|
1060 ;; If we just renamed that buffer, we will make a new one here. |
285e069cecd2
(occur-1): If the output buffer is also an input, don't kill it, rename it.
Richard M. Stallman <rms@gnu.org>
parents:
59029
diff
changeset
|
1061 (setq occur-buf (get-buffer-create buf-name)) |
285e069cecd2
(occur-1): If the output buffer is also an input, don't kill it, rename it.
Richard M. Stallman <rms@gnu.org>
parents:
59029
diff
changeset
|
1062 |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1063 (with-current-buffer occur-buf |
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1064 (occur-mode) |
76392
8d2b12834458
(occur-engine): buffer-undo-list binding moved...
Chong Yidong <cyd@stupidchicken.com>
parents:
76252
diff
changeset
|
1065 (let ((inhibit-read-only t) |
8d2b12834458
(occur-engine): buffer-undo-list binding moved...
Chong Yidong <cyd@stupidchicken.com>
parents:
76252
diff
changeset
|
1066 ;; Don't generate undo entries for creation of the initial contents. |
8d2b12834458
(occur-engine): buffer-undo-list binding moved...
Chong Yidong <cyd@stupidchicken.com>
parents:
76252
diff
changeset
|
1067 (buffer-undo-list t)) |
62147
94214f10d9c4
(occur-1): Bind inhibit-read-only so that erase-buffer doesn't barf
Eli Zaretskii <eliz@gnu.org>
parents:
60713
diff
changeset
|
1068 (erase-buffer) |
94214f10d9c4
(occur-1): Bind inhibit-read-only so that erase-buffer doesn't barf
Eli Zaretskii <eliz@gnu.org>
parents:
60713
diff
changeset
|
1069 (let ((count (occur-engine |
94214f10d9c4
(occur-1): Bind inhibit-read-only so that erase-buffer doesn't barf
Eli Zaretskii <eliz@gnu.org>
parents:
60713
diff
changeset
|
1070 regexp active-bufs occur-buf |
94214f10d9c4
(occur-1): Bind inhibit-read-only so that erase-buffer doesn't barf
Eli Zaretskii <eliz@gnu.org>
parents:
60713
diff
changeset
|
1071 (or nlines list-matching-lines-default-context-lines) |
94214f10d9c4
(occur-1): Bind inhibit-read-only so that erase-buffer doesn't barf
Eli Zaretskii <eliz@gnu.org>
parents:
60713
diff
changeset
|
1072 (and case-fold-search |
94214f10d9c4
(occur-1): Bind inhibit-read-only so that erase-buffer doesn't barf
Eli Zaretskii <eliz@gnu.org>
parents:
60713
diff
changeset
|
1073 (isearch-no-upper-case-p regexp t)) |
94214f10d9c4
(occur-1): Bind inhibit-read-only so that erase-buffer doesn't barf
Eli Zaretskii <eliz@gnu.org>
parents:
60713
diff
changeset
|
1074 list-matching-lines-buffer-name-face |
66756
670149b47c39
(occur-excluded-properties): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
66720
diff
changeset
|
1075 nil list-matching-lines-face |
670149b47c39
(occur-excluded-properties): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
66720
diff
changeset
|
1076 (not (eq occur-excluded-properties t))))) |
62147
94214f10d9c4
(occur-1): Bind inhibit-read-only so that erase-buffer doesn't barf
Eli Zaretskii <eliz@gnu.org>
parents:
60713
diff
changeset
|
1077 (let* ((bufcount (length active-bufs)) |
94214f10d9c4
(occur-1): Bind inhibit-read-only so that erase-buffer doesn't barf
Eli Zaretskii <eliz@gnu.org>
parents:
60713
diff
changeset
|
1078 (diff (- (length bufs) bufcount))) |
94214f10d9c4
(occur-1): Bind inhibit-read-only so that erase-buffer doesn't barf
Eli Zaretskii <eliz@gnu.org>
parents:
60713
diff
changeset
|
1079 (message "Searched %d buffer%s%s; %s match%s for `%s'" |
94214f10d9c4
(occur-1): Bind inhibit-read-only so that erase-buffer doesn't barf
Eli Zaretskii <eliz@gnu.org>
parents:
60713
diff
changeset
|
1080 bufcount (if (= bufcount 1) "" "s") |
94214f10d9c4
(occur-1): Bind inhibit-read-only so that erase-buffer doesn't barf
Eli Zaretskii <eliz@gnu.org>
parents:
60713
diff
changeset
|
1081 (if (zerop diff) "" (format " (%d killed)" diff)) |
94214f10d9c4
(occur-1): Bind inhibit-read-only so that erase-buffer doesn't barf
Eli Zaretskii <eliz@gnu.org>
parents:
60713
diff
changeset
|
1082 (if (zerop count) "no" (format "%d" count)) |
94214f10d9c4
(occur-1): Bind inhibit-read-only so that erase-buffer doesn't barf
Eli Zaretskii <eliz@gnu.org>
parents:
60713
diff
changeset
|
1083 (if (= count 1) "" "es") |
94214f10d9c4
(occur-1): Bind inhibit-read-only so that erase-buffer doesn't barf
Eli Zaretskii <eliz@gnu.org>
parents:
60713
diff
changeset
|
1084 regexp)) |
94214f10d9c4
(occur-1): Bind inhibit-read-only so that erase-buffer doesn't barf
Eli Zaretskii <eliz@gnu.org>
parents:
60713
diff
changeset
|
1085 (setq occur-revert-arguments (list regexp nlines bufs)) |
63970
01120e702316
(occur-hook): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
63919
diff
changeset
|
1086 (if (= count 0) |
01120e702316
(occur-hook): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
63919
diff
changeset
|
1087 (kill-buffer occur-buf) |
01120e702316
(occur-hook): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
63919
diff
changeset
|
1088 (display-buffer occur-buf) |
01120e702316
(occur-hook): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
63919
diff
changeset
|
1089 (setq next-error-last-buffer occur-buf) |
01120e702316
(occur-hook): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
63919
diff
changeset
|
1090 (setq buffer-read-only t) |
01120e702316
(occur-hook): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
63919
diff
changeset
|
1091 (set-buffer-modified-p nil) |
01120e702316
(occur-hook): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
63919
diff
changeset
|
1092 (run-hooks 'occur-hook))))))) |
18991
2cf48aa123b8
(occur): Local variable line-start redundant.
Richard M. Stallman <rms@gnu.org>
parents:
18918
diff
changeset
|
1093 |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1094 (defun occur-engine-add-prefix (lines) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1095 (mapcar |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1096 #'(lambda (line) |
47532
e5d8cf249294
(occur-engine-add-prefix): Use 7 spaces.
Richard M. Stallman <rms@gnu.org>
parents:
47375
diff
changeset
|
1097 (concat " :" line "\n")) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1098 lines)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1099 |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1100 (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
|
1101 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
|
1102 (with-current-buffer out-buf |
48276
3a5bc7e171a5
(occur-engine): Set buffer-file-coding-system of
Kenichi Handa <handa@m17n.org>
parents:
48173
diff
changeset
|
1103 (let ((globalcount 0) |
3a5bc7e171a5
(occur-engine): Set buffer-file-coding-system of
Kenichi Handa <handa@m17n.org>
parents:
48173
diff
changeset
|
1104 (coding nil)) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1105 ;; Map over all the buffers |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1106 (dolist (buf buffers) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1107 (when (buffer-live-p buf) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1108 (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
|
1109 (lines 1) ;; line count |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1110 (matchbeg 0) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1111 (origpt nil) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1112 (begpt nil) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1113 (endpt nil) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1114 (marker nil) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1115 (curstring "") |
70349
71e8fc4fc523
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-261
Miles Bader <miles@gnu.org>
parents:
68651
diff
changeset
|
1116 (inhibit-field-text-motion t) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1117 (headerpt (with-current-buffer out-buf (point)))) |
67187
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1118 (with-current-buffer buf |
48276
3a5bc7e171a5
(occur-engine): Set buffer-file-coding-system of
Kenichi Handa <handa@m17n.org>
parents:
48173
diff
changeset
|
1119 (or coding |
3a5bc7e171a5
(occur-engine): Set buffer-file-coding-system of
Kenichi Handa <handa@m17n.org>
parents:
48173
diff
changeset
|
1120 ;; 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
|
1121 ;; binds buffer-file-coding-system. |
3a5bc7e171a5
(occur-engine): Set buffer-file-coding-system of
Kenichi Handa <handa@m17n.org>
parents:
48173
diff
changeset
|
1122 (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
|
1123 (setq coding buffer-file-coding-system)) |
44794
3b95c81de514
(toplevel): Require `cl' while compiling.
Colin Walters <walters@gnu.org>
parents:
44138
diff
changeset
|
1124 (save-excursion |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1125 (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
|
1126 (while (not (eobp)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1127 (setq origpt (point)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1128 (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
|
1129 (setq matches (1+ matches)) ;; increment match count |
56350
cae4ae1c68a9
(query-replace-interactive, query-replace-read-args):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56328
diff
changeset
|
1130 (setq matchbeg (match-beginning 0)) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1131 (setq lines (+ lines (1- (count-lines origpt endpt)))) |
58995
feb3eb61d019
(occur-accumulate-lines, occur-engine):
Juri Linkov <juri@jurta.org>
parents:
58987
diff
changeset
|
1132 (save-excursion |
feb3eb61d019
(occur-accumulate-lines, occur-engine):
Juri Linkov <juri@jurta.org>
parents:
58987
diff
changeset
|
1133 (goto-char matchbeg) |
feb3eb61d019
(occur-accumulate-lines, occur-engine):
Juri Linkov <juri@jurta.org>
parents:
58987
diff
changeset
|
1134 (setq begpt (line-beginning-position) |
feb3eb61d019
(occur-accumulate-lines, occur-engine):
Juri Linkov <juri@jurta.org>
parents:
58987
diff
changeset
|
1135 endpt (line-end-position))) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1136 (setq marker (make-marker)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1137 (set-marker marker matchbeg) |
59570
3d6f4d8e0b8b
(occur-accumulate-lines, occur-engine): Avoid warnings.
Richard M. Stallman <rms@gnu.org>
parents:
59479
diff
changeset
|
1138 (if (and keep-props |
3d6f4d8e0b8b
(occur-accumulate-lines, occur-engine): Avoid warnings.
Richard M. Stallman <rms@gnu.org>
parents:
59479
diff
changeset
|
1139 (if (boundp 'jit-lock-mode) jit-lock-mode) |
58995
feb3eb61d019
(occur-accumulate-lines, occur-engine):
Juri Linkov <juri@jurta.org>
parents:
58987
diff
changeset
|
1140 (text-property-not-all begpt endpt 'fontified t)) |
59570
3d6f4d8e0b8b
(occur-accumulate-lines, occur-engine): Avoid warnings.
Richard M. Stallman <rms@gnu.org>
parents:
59479
diff
changeset
|
1141 (if (fboundp 'jit-lock-fontify-now) |
3d6f4d8e0b8b
(occur-accumulate-lines, occur-engine): Avoid warnings.
Richard M. Stallman <rms@gnu.org>
parents:
59479
diff
changeset
|
1142 (jit-lock-fontify-now begpt endpt))) |
66756
670149b47c39
(occur-excluded-properties): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
66720
diff
changeset
|
1143 (if (and keep-props (not (eq occur-excluded-properties t))) |
670149b47c39
(occur-excluded-properties): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
66720
diff
changeset
|
1144 (progn |
670149b47c39
(occur-excluded-properties): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
66720
diff
changeset
|
1145 (setq curstring (buffer-substring begpt endpt)) |
670149b47c39
(occur-excluded-properties): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
66720
diff
changeset
|
1146 (remove-list-of-text-properties |
670149b47c39
(occur-excluded-properties): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
66720
diff
changeset
|
1147 0 (length curstring) occur-excluded-properties curstring)) |
670149b47c39
(occur-excluded-properties): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
66720
diff
changeset
|
1148 (setq curstring (buffer-substring-no-properties begpt endpt))) |
670149b47c39
(occur-excluded-properties): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
66720
diff
changeset
|
1149 ;; Highlight the matches |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1150 (let ((len (length curstring)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1151 (start 0)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1152 (while (and (< start len) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1153 (string-match regexp curstring start)) |
58995
feb3eb61d019
(occur-accumulate-lines, occur-engine):
Juri Linkov <juri@jurta.org>
parents:
58987
diff
changeset
|
1154 (add-text-properties |
feb3eb61d019
(occur-accumulate-lines, occur-engine):
Juri Linkov <juri@jurta.org>
parents:
58987
diff
changeset
|
1155 (match-beginning 0) (match-end 0) |
feb3eb61d019
(occur-accumulate-lines, occur-engine):
Juri Linkov <juri@jurta.org>
parents:
58987
diff
changeset
|
1156 (append |
feb3eb61d019
(occur-accumulate-lines, occur-engine):
Juri Linkov <juri@jurta.org>
parents:
58987
diff
changeset
|
1157 `(occur-match t) |
feb3eb61d019
(occur-accumulate-lines, occur-engine):
Juri Linkov <juri@jurta.org>
parents:
58987
diff
changeset
|
1158 (when match-face |
feb3eb61d019
(occur-accumulate-lines, occur-engine):
Juri Linkov <juri@jurta.org>
parents:
58987
diff
changeset
|
1159 ;; Use `face' rather than `font-lock-face' here |
feb3eb61d019
(occur-accumulate-lines, occur-engine):
Juri Linkov <juri@jurta.org>
parents:
58987
diff
changeset
|
1160 ;; so as to override faces copied from the buffer. |
feb3eb61d019
(occur-accumulate-lines, occur-engine):
Juri Linkov <juri@jurta.org>
parents:
58987
diff
changeset
|
1161 `(face ,match-face))) |
feb3eb61d019
(occur-accumulate-lines, occur-engine):
Juri Linkov <juri@jurta.org>
parents:
58987
diff
changeset
|
1162 curstring) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1163 (setq start (match-end 0)))) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1164 ;; 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
|
1165 (let* ((out-line |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1166 (concat |
47532
e5d8cf249294
(occur-engine-add-prefix): Use 7 spaces.
Richard M. Stallman <rms@gnu.org>
parents:
47375
diff
changeset
|
1167 ;; Using 7 digits aligns tabs properly. |
66473
2aa1446214fe
(occur-engine): Include colon in mouse-face highlight.
Romain Francoise <romain@orebokech.com>
parents:
66372
diff
changeset
|
1168 (apply #'propertize (format "%7d:" lines) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1169 (append |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1170 (when prefix-face |
45689
01fbc1331841
(occur-mode): Don't set up categories.
Colin Walters <walters@gnu.org>
parents:
45529
diff
changeset
|
1171 `(font-lock-face prefix-face)) |
66473
2aa1446214fe
(occur-engine): Include colon in mouse-face highlight.
Romain Francoise <romain@orebokech.com>
parents:
66372
diff
changeset
|
1172 `(occur-prefix t mouse-face (highlight) |
66372
abd51aa4052e
(occur-engine): Rearrange text properties.
Romain Francoise <romain@orebokech.com>
parents:
66249
diff
changeset
|
1173 occur-target ,marker follow-link t |
abd51aa4052e
(occur-engine): Rearrange text properties.
Romain Francoise <romain@orebokech.com>
parents:
66249
diff
changeset
|
1174 help-echo "mouse-2: go to this occurrence"))) |
58995
feb3eb61d019
(occur-accumulate-lines, occur-engine):
Juri Linkov <juri@jurta.org>
parents:
58987
diff
changeset
|
1175 ;; We don't put `mouse-face' on the newline, |
feb3eb61d019
(occur-accumulate-lines, occur-engine):
Juri Linkov <juri@jurta.org>
parents:
58987
diff
changeset
|
1176 ;; because that loses. And don't put it |
feb3eb61d019
(occur-accumulate-lines, occur-engine):
Juri Linkov <juri@jurta.org>
parents:
58987
diff
changeset
|
1177 ;; on context lines to reduce flicker. |
66473
2aa1446214fe
(occur-engine): Include colon in mouse-face highlight.
Romain Francoise <romain@orebokech.com>
parents:
66372
diff
changeset
|
1178 (propertize curstring 'mouse-face (list 'highlight) |
66372
abd51aa4052e
(occur-engine): Rearrange text properties.
Romain Francoise <romain@orebokech.com>
parents:
66249
diff
changeset
|
1179 'occur-target marker |
abd51aa4052e
(occur-engine): Rearrange text properties.
Romain Francoise <romain@orebokech.com>
parents:
66249
diff
changeset
|
1180 'follow-link t |
abd51aa4052e
(occur-engine): Rearrange text properties.
Romain Francoise <romain@orebokech.com>
parents:
66249
diff
changeset
|
1181 'help-echo |
abd51aa4052e
(occur-engine): Rearrange text properties.
Romain Francoise <romain@orebokech.com>
parents:
66249
diff
changeset
|
1182 "mouse-2: go to this occurrence") |
66720
f41b7662a7a5
(occur-engine): Add marker at end of line, too.
Romain Francoise <romain@orebokech.com>
parents:
66537
diff
changeset
|
1183 ;; Add marker at eol, but no mouse props. |
f41b7662a7a5
(occur-engine): Add marker at end of line, too.
Romain Francoise <romain@orebokech.com>
parents:
66537
diff
changeset
|
1184 (propertize "\n" 'occur-target marker))) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1185 (data |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1186 (if (= nlines 0) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1187 ;; The simple display style |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1188 out-line |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1189 ;; The complex multi-line display |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1190 ;; style. Generate a list of lines, |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1191 ;; concatenate them all together. |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1192 (apply #'concat |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1193 (nconc |
56520
feaa69f279aa
(occur-next-error): Call set-window-point.
Richard M. Stallman <rms@gnu.org>
parents:
56449
diff
changeset
|
1194 (occur-engine-add-prefix (nreverse (cdr (occur-accumulate-lines (- (1+ (abs nlines))) keep-props)))) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1195 (list out-line) |
56520
feaa69f279aa
(occur-next-error): Call set-window-point.
Richard M. Stallman <rms@gnu.org>
parents:
56449
diff
changeset
|
1196 (if (> nlines 0) |
feaa69f279aa
(occur-next-error): Call set-window-point.
Richard M. Stallman <rms@gnu.org>
parents:
56449
diff
changeset
|
1197 (occur-engine-add-prefix |
feaa69f279aa
(occur-next-error): Call set-window-point.
Richard M. Stallman <rms@gnu.org>
parents:
56449
diff
changeset
|
1198 (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
|
1199 ;; Actually insert the match display data |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1200 (with-current-buffer out-buf |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1201 (let ((beg (point)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1202 (end (progn (insert data) (point)))) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1203 (unless (= nlines 0) |
66372
abd51aa4052e
(occur-engine): Rearrange text properties.
Romain Francoise <romain@orebokech.com>
parents:
66249
diff
changeset
|
1204 (insert "-------\n"))))) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1205 (goto-char endpt)) |
45265
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
1206 (if endpt |
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
1207 (progn |
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
1208 (setq lines (1+ lines)) |
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
1209 ;; On to the next match... |
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
1210 (forward-line 1)) |
06efd7086835
(occur-1): New optional argument `buf-name'.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
1211 (goto-char (point-max)))))) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1212 (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
|
1213 (setq globalcount (+ globalcount matches)) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1214 (with-current-buffer out-buf |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1215 (goto-char headerpt) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1216 (let ((beg (point)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1217 end) |
54778
edec41928fc8
* replace.el (occur-engine): Distinguish between one and several
John Paul Wallington <jpw@pobox.com>
parents:
54375
diff
changeset
|
1218 (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
|
1219 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
|
1220 regexp (buffer-name buf))) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1221 (setq end (point)) |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1222 (add-text-properties beg end |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1223 (append |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1224 (when title-face |
45689
01fbc1331841
(occur-mode): Don't set up categories.
Colin Walters <walters@gnu.org>
parents:
45529
diff
changeset
|
1225 `(font-lock-face ,title-face)) |
01fbc1331841
(occur-mode): Don't set up categories.
Colin Walters <walters@gnu.org>
parents:
45529
diff
changeset
|
1226 `(occur-title ,buf)))) |
44924
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1227 (goto-char (point-min))))))) |
48276
3a5bc7e171a5
(occur-engine): Set buffer-file-coding-system of
Kenichi Handa <handa@m17n.org>
parents:
48173
diff
changeset
|
1228 (if coding |
3a5bc7e171a5
(occur-engine): Set buffer-file-coding-system of
Kenichi Handa <handa@m17n.org>
parents:
48173
diff
changeset
|
1229 ;; 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
|
1230 ;; 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
|
1231 ;; buffer. |
3a5bc7e171a5
(occur-engine): Set buffer-file-coding-system of
Kenichi Handa <handa@m17n.org>
parents:
48173
diff
changeset
|
1232 (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
|
1233 ;; Return the number of matches |
4a1d60fe2473
(occur-accumulate-lines): Avoid incf and decf.
Richard M. Stallman <rms@gnu.org>
parents:
44865
diff
changeset
|
1234 globalcount))) |
18991
2cf48aa123b8
(occur): Local variable line-start redundant.
Richard M. Stallman <rms@gnu.org>
parents:
18918
diff
changeset
|
1235 |
61 | 1236 |
2080
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
1237 ;; 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
|
1238 ;; to make that display both SPC and Y. |
61 | 1239 (defconst query-replace-help |
1240 "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
|
1241 RET or `q' to exit, Period to replace one match and exit, |
61 | 1242 Comma to replace but not move point immediately, |
1243 C-r to enter recursive edit (\\[exit-recursive-edit] to get out again), | |
1244 C-w to delete match and recursive edit, | |
1245 C-l to clear the screen, redisplay, and offer same replacement again, | |
1246 ! 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
|
1247 ^ to move point back to previous match, |
be3f5fa41e90
(query-replace-map): Add binding for `E'.
Gerd Moellmann <gerd@gnu.org>
parents:
28706
diff
changeset
|
1248 E to edit the replacement string" |
38036
018637678f29
(case-replace, query-replace-from-history-variable)
Eli Zaretskii <eliz@gnu.org>
parents:
37832
diff
changeset
|
1249 "Help message while in `query-replace'.") |
61 | 1250 |
67187
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1251 (defvar query-replace-map |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1252 (let ((map (make-sparse-keymap))) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1253 (define-key map " " 'act) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1254 (define-key map "\d" 'skip) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1255 (define-key map [delete] 'skip) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1256 (define-key map [backspace] 'skip) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1257 (define-key map "y" 'act) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1258 (define-key map "n" 'skip) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1259 (define-key map "Y" 'act) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1260 (define-key map "N" 'skip) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1261 (define-key map "e" 'edit-replacement) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1262 (define-key map "E" 'edit-replacement) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1263 (define-key map "," 'act-and-show) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1264 (define-key map "q" 'exit) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1265 (define-key map "\r" 'exit) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1266 (define-key map [return] 'exit) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1267 (define-key map "." 'act-and-exit) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1268 (define-key map "\C-r" 'edit) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1269 (define-key map "\C-w" 'delete-and-edit) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1270 (define-key map "\C-l" 'recenter) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1271 (define-key map "!" 'automatic) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1272 (define-key map "^" 'backup) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1273 (define-key map "\C-h" 'help) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1274 (define-key map [f1] 'help) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1275 (define-key map [help] 'help) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1276 (define-key map "?" 'help) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1277 (define-key map "\C-g" 'quit) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1278 (define-key map "\C-]" 'quit) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1279 (define-key map "\e" 'exit-prefix) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1280 (define-key map [escape] 'exit-prefix) |
805356939662
(query-replace-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67180
diff
changeset
|
1281 map) |
2080
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
1282 "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
|
1283 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
|
1284 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
|
1285 `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
|
1286 `automatic', `backup', `exit-prefix', and `help'.") |
2080
6ee99287dbc6
(query-replace-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
1820
diff
changeset
|
1287 |
25167
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1288 (defun replace-match-string-symbols (n) |
29051 | 1289 "Process a list (and any sub-lists), expanding certain symbols. |
1290 Symbol Expands To | |
1291 N (match-string N) (where N is a string of digits) | |
1292 #N (string-to-number (match-string N)) | |
1293 & (match-string 0) | |
1294 #& (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
|
1295 # replace-count |
29051 | 1296 |
1297 Note that these symbols must be preceeded by a backslash in order to | |
72095
2a66d3b6c808
(replace-match-string-symbols): Handle dotted lists.
Richard M. Stallman <rms@gnu.org>
parents:
71125
diff
changeset
|
1298 type them using Lisp syntax." |
2a66d3b6c808
(replace-match-string-symbols): Handle dotted lists.
Richard M. Stallman <rms@gnu.org>
parents:
71125
diff
changeset
|
1299 (while (consp n) |
25167
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1300 (cond |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1301 ((consp (car n)) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1302 (replace-match-string-symbols (car n))) ;Process sub-list |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1303 ((symbolp (car n)) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1304 (let ((name (symbol-name (car n)))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1305 (cond |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1306 ((string-match "^[0-9]+$" name) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1307 (setcar n (list 'match-string (string-to-number name)))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1308 ((string-match "^#[0-9]+$" name) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1309 (setcar n (list 'string-to-number |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1310 (list 'match-string |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1311 (string-to-number (substring name 1)))))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1312 ((string= "&" name) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1313 (setcar n '(match-string 0))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1314 ((string= "#&" name) |
56148
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1315 (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
|
1316 ((string= "#" name) |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1317 (setcar n 'replace-count)))))) |
25167
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1318 (setq n (cdr n)))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1319 |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1320 (defun replace-eval-replacement (expression replace-count) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1321 (let ((replacement (eval expression))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1322 (if (stringp replacement) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1323 replacement |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1324 (prin1-to-string replacement t)))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1325 |
56148
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1326 (defun replace-quote (replacement) |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1327 "Quote a replacement string. |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1328 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
|
1329 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
|
1330 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
|
1331 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
|
1332 |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1333 `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
|
1334 (save-match-data |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1335 (replace-regexp-in-string "\\\\" "\\\\" |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1336 (if (stringp replacement) |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1337 replacement |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1338 (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
|
1339 t t))) |
dbab365230eb
(query-replace-read-args): Only warn about use of \n
David Kastrup <dak@gnu.org>
parents:
56006
diff
changeset
|
1340 |
25167
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1341 (defun replace-loop-through-replacements (data replace-count) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1342 ;; DATA is a vector contaning the following values: |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1343 ;; 0 next-rotate-count |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1344 ;; 1 repeat-count |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1345 ;; 2 next-replacement |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1346 ;; 3 replacements |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1347 (if (= (aref data 0) replace-count) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1348 (progn |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1349 (aset data 0 (+ replace-count (aref data 1))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1350 (let ((next (cdr (aref data 2)))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1351 (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
|
1352 (car (aref data 2))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1353 |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1354 (defun replace-match-data (integers reuse &optional new) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1355 "Like `match-data', but markers in REUSE get invalidated. |
74578
34b20acf743f
(replace-match-data, replace-match-maybe-edit): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
72095
diff
changeset
|
1356 If NEW is non-nil, it is set and returned instead of fresh data, |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1357 but coerced to the correct value of INTEGERS." |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1358 (or (and new |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1359 (progn |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1360 (set-match-data new) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1361 (and (eq new reuse) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1362 (eq (null integers) (markerp (car reuse))) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1363 new))) |
63150
571afd8b238a
(replace-match-data): Pass RESEAT arg `t' to
Kim F. Storm <storm@cua.dk>
parents:
62737
diff
changeset
|
1364 (match-data integers reuse t))) |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1365 |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1366 (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
|
1367 "Make a replacement with `replace-match', editing `\\?'. |
58913
0b183affb969
(replace-match-maybe-edit): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
58741
diff
changeset
|
1368 NEWTEXT, FIXEDCASE, LITERAL are just passed on. If NOEDIT is true, no |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1369 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
|
1370 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
|
1371 |
74578
34b20acf743f
(replace-match-data, replace-match-maybe-edit): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
72095
diff
changeset
|
1372 The return value is non-nil if there has been no `\\?' or NOEDIT was |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1373 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
|
1374 (unless (or literal noedit) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1375 (setq noedit t) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1376 (while (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\(\\\\\\?\\)" |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1377 newtext) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1378 (setq newtext |
62458
2c228409c44d
Replace `read-input' by `read-string'.
Juanma Barranquero <lekktu@gmail.com>
parents:
62147
diff
changeset
|
1379 (read-string "Edit replacement string: " |
2c228409c44d
Replace `read-input' by `read-string'.
Juanma Barranquero <lekktu@gmail.com>
parents:
62147
diff
changeset
|
1380 (prog1 |
2c228409c44d
Replace `read-input' by `read-string'.
Juanma Barranquero <lekktu@gmail.com>
parents:
62147
diff
changeset
|
1381 (cons |
2c228409c44d
Replace `read-input' by `read-string'.
Juanma Barranquero <lekktu@gmail.com>
parents:
62147
diff
changeset
|
1382 (replace-match "" t t newtext 3) |
2c228409c44d
Replace `read-input' by `read-string'.
Juanma Barranquero <lekktu@gmail.com>
parents:
62147
diff
changeset
|
1383 (1+ (match-beginning 3))) |
2c228409c44d
Replace `read-input' by `read-string'.
Juanma Barranquero <lekktu@gmail.com>
parents:
62147
diff
changeset
|
1384 (setq match-data |
2c228409c44d
Replace `read-input' by `read-string'.
Juanma Barranquero <lekktu@gmail.com>
parents:
62147
diff
changeset
|
1385 (replace-match-data |
2c228409c44d
Replace `read-input' by `read-string'.
Juanma Barranquero <lekktu@gmail.com>
parents:
62147
diff
changeset
|
1386 nil match-data match-data)))) |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1387 noedit nil))) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1388 (set-match-data match-data) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1389 (replace-match newtext fixedcase literal) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1390 noedit) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1391 |
46693
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
1392 (defun perform-replace (from-string replacements |
61 | 1393 query-flag regexp-flag delimited-flag |
40254
51c9985454e3
(perform-replace): Move START and END parameters
Gerd Moellmann <gerd@gnu.org>
parents:
38986
diff
changeset
|
1394 &optional repeat-count map start end) |
61 | 1395 "Subroutine of `query-replace'. Its complexity handles interactive queries. |
1396 Don't use this in your own program unless you want to query and set the mark | |
1397 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
|
1398 |
a7b1d283fe97
(perform-replace): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
38414
diff
changeset
|
1399 (while (re-search-forward \"foo[ \\t]+bar\" nil t) |
61 | 1400 (replace-match \"foobar\" nil nil)) |
38675
a7b1d283fe97
(perform-replace): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
38414
diff
changeset
|
1401 |
a7b1d283fe97
(perform-replace): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
38414
diff
changeset
|
1402 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
|
1403 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
|
1404 `case-replace'. |
45014630aeb2
(perform-replace): Document return value. Use `pop'.
Colin Walters <walters@gnu.org>
parents:
45490
diff
changeset
|
1405 |
45014630aeb2
(perform-replace): Document return value. Use `pop'.
Colin Walters <walters@gnu.org>
parents:
45490
diff
changeset
|
1406 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
|
1407 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
|
1408 (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
|
1409 (and query-flag minibuffer-auto-raise |
024d3847af99
(perform-replace): Obey minibuffer-auto-raise.
Richard M. Stallman <rms@gnu.org>
parents:
16129
diff
changeset
|
1410 (raise-frame (window-frame (minibuffer-window)))) |
82072
7894e62e5b10
(perform-replace): Use isearch-no-upper-case-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78112
diff
changeset
|
1411 (let* ((case-fold-search |
7894e62e5b10
(perform-replace): Use isearch-no-upper-case-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78112
diff
changeset
|
1412 (and case-fold-search |
7894e62e5b10
(perform-replace): Use isearch-no-upper-case-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78112
diff
changeset
|
1413 (isearch-no-upper-case-p from-string regexp-flag))) |
7894e62e5b10
(perform-replace): Use isearch-no-upper-case-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78112
diff
changeset
|
1414 (nocasify (not (and case-replace case-fold-search))) |
7894e62e5b10
(perform-replace): Use isearch-no-upper-case-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78112
diff
changeset
|
1415 (literal (or (not regexp-flag) (eq regexp-flag 'literal))) |
7894e62e5b10
(perform-replace): Use isearch-no-upper-case-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78112
diff
changeset
|
1416 (search-function (if regexp-flag 're-search-forward 'search-forward)) |
7894e62e5b10
(perform-replace): Use isearch-no-upper-case-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78112
diff
changeset
|
1417 (search-string from-string) |
7894e62e5b10
(perform-replace): Use isearch-no-upper-case-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78112
diff
changeset
|
1418 (real-match-data nil) ; The match data for the current match. |
7894e62e5b10
(perform-replace): Use isearch-no-upper-case-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78112
diff
changeset
|
1419 (next-replacement nil) |
7894e62e5b10
(perform-replace): Use isearch-no-upper-case-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78112
diff
changeset
|
1420 ;; This is non-nil if we know there is nothing for the user |
7894e62e5b10
(perform-replace): Use isearch-no-upper-case-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78112
diff
changeset
|
1421 ;; to edit in the replacement. |
7894e62e5b10
(perform-replace): Use isearch-no-upper-case-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78112
diff
changeset
|
1422 (noedit nil) |
7894e62e5b10
(perform-replace): Use isearch-no-upper-case-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78112
diff
changeset
|
1423 (keep-going t) |
7894e62e5b10
(perform-replace): Use isearch-no-upper-case-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78112
diff
changeset
|
1424 (stack nil) |
7894e62e5b10
(perform-replace): Use isearch-no-upper-case-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78112
diff
changeset
|
1425 (replace-count 0) |
7894e62e5b10
(perform-replace): Use isearch-no-upper-case-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78112
diff
changeset
|
1426 (nonempty-match nil) |
18433
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
1427 |
82072
7894e62e5b10
(perform-replace): Use isearch-no-upper-case-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78112
diff
changeset
|
1428 ;; If non-nil, it is marker saying where in the buffer to stop. |
7894e62e5b10
(perform-replace): Use isearch-no-upper-case-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78112
diff
changeset
|
1429 (limit nil) |
20248
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
1430 |
82072
7894e62e5b10
(perform-replace): Use isearch-no-upper-case-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78112
diff
changeset
|
1431 ;; Data for the next match. If a cons, it has the same format as |
7894e62e5b10
(perform-replace): Use isearch-no-upper-case-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78112
diff
changeset
|
1432 ;; (match-data); otherwise it is t if a match is possible at point. |
7894e62e5b10
(perform-replace): Use isearch-no-upper-case-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78112
diff
changeset
|
1433 (match-again t) |
18433
1de7cef26431
(perform-replace): When matching regexps, if the next match is
Paul Eggert <eggert@twinsun.com>
parents:
17933
diff
changeset
|
1434 |
82072
7894e62e5b10
(perform-replace): Use isearch-no-upper-case-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78112
diff
changeset
|
1435 (message |
7894e62e5b10
(perform-replace): Use isearch-no-upper-case-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78112
diff
changeset
|
1436 (if query-flag |
7894e62e5b10
(perform-replace): Use isearch-no-upper-case-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78112
diff
changeset
|
1437 (apply 'propertize |
7894e62e5b10
(perform-replace): Use isearch-no-upper-case-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78112
diff
changeset
|
1438 (substitute-command-keys |
7894e62e5b10
(perform-replace): Use isearch-no-upper-case-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78112
diff
changeset
|
1439 "Query replacing %s with %s: (\\<query-replace-map>\\[help] for help) ") |
7894e62e5b10
(perform-replace): Use isearch-no-upper-case-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78112
diff
changeset
|
1440 minibuffer-prompt-properties)))) |
20248
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
1441 |
b87f3ba0e1d7
(perform-replace): In Transient Mark mode, if
Karl Heuer <kwzh@gnu.org>
parents:
20244
diff
changeset
|
1442 ;; 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
|
1443 (when start |
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
1444 (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
|
1445 (goto-char (min start end)) |
29790e97da09
(perform-replace): Add parameters START and END. Use
Gerd Moellmann <gerd@gnu.org>
parents:
28502
diff
changeset
|
1446 (deactivate-mark)) |
25167
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1447 |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1448 ;; 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
|
1449 ;; 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
|
1450 ;; called to generate each replacement like this: |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1451 ;; (funcall (car replacements) (cdr replacements) replace-count) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1452 ;; It must return a string. |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1453 (cond |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1454 ((stringp replacements) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1455 (setq next-replacement replacements |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1456 replacements nil)) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1457 ((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
|
1458 (or repeat-count (setq repeat-count 1)) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1459 (setq replacements (cons 'replace-loop-through-replacements |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1460 (vector repeat-count repeat-count |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1461 replacements replacements))))) |
8a881b02ea7b
(query-replace-regexp-eval)
Richard M. Stallman <rms@gnu.org>
parents:
25039
diff
changeset
|
1462 |
61 | 1463 (if delimited-flag |
1464 (setq search-function 're-search-forward | |
1465 search-string (concat "\\b" | |
1466 (if regexp-flag from-string | |
1467 (regexp-quote from-string)) | |
1468 "\\b"))) | |
58973
7fed010105d9
(perform-replace): Add isearch-case-fold-search.
Juri Linkov <juri@jurta.org>
parents:
58914
diff
changeset
|
1469 (when query-replace-lazy-highlight |
60713
77391bae98f1
(perform-replace): Remove bindings of global
Juri Linkov <juri@jurta.org>
parents:
60240
diff
changeset
|
1470 (setq isearch-lazy-highlight-last-string nil)) |
58914
f55019d052ed
* replace.el (query-replace-highlight): Add new value `isearch'
Juri Linkov <juri@jurta.org>
parents:
58913
diff
changeset
|
1471 |
61 | 1472 (push-mark) |
1473 (undo-boundary) | |
5393
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1474 (unwind-protect |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1475 ;; Loop finding occurrences that perhaps should be replaced. |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1476 (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
|
1477 (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
|
1478 ;; 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
|
1479 ;; 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
|
1480 ;; 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
|
1481 (setq real-match-data |
76236
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1482 (cond ((consp match-again) |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1483 (goto-char (nth 1 match-again)) |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1484 (replace-match-data |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1485 t real-match-data match-again)) |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1486 ;; MATCH-AGAIN non-nil means accept an |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1487 ;; adjacent match. |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1488 (match-again |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1489 (and |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1490 (funcall search-function search-string |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1491 limit t) |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1492 ;; For speed, use only integers and |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1493 ;; reuse the list used last time. |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1494 (replace-match-data t real-match-data))) |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1495 ((and (< (1+ (point)) (point-max)) |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1496 (or (null limit) |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1497 (< (1+ (point)) limit))) |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1498 ;; If not accepting adjacent matches, |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1499 ;; move one char to the right before |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1500 ;; searching again. Undo the motion |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1501 ;; if the search fails. |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1502 (let ((opoint (point))) |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1503 (forward-char 1) |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1504 (if (funcall |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1505 search-function search-string |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1506 limit t) |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1507 (replace-match-data |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1508 t real-match-data) |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1509 (goto-char opoint) |
91de64a1c05e
(perform-replace): Undo forward-char immediately if non-adjacent
Chong Yidong <cyd@stupidchicken.com>
parents:
75921
diff
changeset
|
1510 nil)))))) |
74578
34b20acf743f
(replace-match-data, replace-match-maybe-edit): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
72095
diff
changeset
|
1511 |
67839
33258a660650
(perform-replace): Calculate match-again
Richard M. Stallman <rms@gnu.org>
parents:
67426
diff
changeset
|
1512 ;; Record whether the match is nonempty, to avoid an infinite loop |
33258a660650
(perform-replace): Calculate match-again
Richard M. Stallman <rms@gnu.org>
parents:
67426
diff
changeset
|
1513 ;; repeatedly matching the same empty string. |
33258a660650
(perform-replace): Calculate match-again
Richard M. Stallman <rms@gnu.org>
parents:
67426
diff
changeset
|
1514 (setq nonempty-match |
33258a660650
(perform-replace): Calculate match-again
Richard M. Stallman <rms@gnu.org>
parents:
67426
diff
changeset
|
1515 (/= (nth 0 real-match-data) (nth 1 real-match-data))) |
33258a660650
(perform-replace): Calculate match-again
Richard M. Stallman <rms@gnu.org>
parents:
67426
diff
changeset
|
1516 |
33258a660650
(perform-replace): Calculate match-again
Richard M. Stallman <rms@gnu.org>
parents:
67426
diff
changeset
|
1517 ;; If the match is empty, record that the next one can't be |
33258a660650
(perform-replace): Calculate match-again
Richard M. Stallman <rms@gnu.org>
parents:
67426
diff
changeset
|
1518 ;; adjacent. |
33258a660650
(perform-replace): Calculate match-again
Richard M. Stallman <rms@gnu.org>
parents:
67426
diff
changeset
|
1519 |
33258a660650
(perform-replace): Calculate match-again
Richard M. Stallman <rms@gnu.org>
parents:
67426
diff
changeset
|
1520 ;; Otherwise, if matching a regular expression, do the next |
33258a660650
(perform-replace): Calculate match-again
Richard M. Stallman <rms@gnu.org>
parents:
67426
diff
changeset
|
1521 ;; match now, since the replacement for this match may |
33258a660650
(perform-replace): Calculate match-again
Richard M. Stallman <rms@gnu.org>
parents:
67426
diff
changeset
|
1522 ;; affect whether the next match is adjacent to this one. |
33258a660650
(perform-replace): Calculate match-again
Richard M. Stallman <rms@gnu.org>
parents:
67426
diff
changeset
|
1523 ;; If that match is empty, don't use it. |
33258a660650
(perform-replace): Calculate match-again
Richard M. Stallman <rms@gnu.org>
parents:
67426
diff
changeset
|
1524 (setq match-again |
33258a660650
(perform-replace): Calculate match-again
Richard M. Stallman <rms@gnu.org>
parents:
67426
diff
changeset
|
1525 (and nonempty-match |
33258a660650
(perform-replace): Calculate match-again
Richard M. Stallman <rms@gnu.org>
parents:
67426
diff
changeset
|
1526 (or (not regexp-flag) |
33258a660650
(perform-replace): Calculate match-again
Richard M. Stallman <rms@gnu.org>
parents:
67426
diff
changeset
|
1527 (and (looking-at search-string) |
33258a660650
(perform-replace): Calculate match-again
Richard M. Stallman <rms@gnu.org>
parents:
67426
diff
changeset
|
1528 (let ((match (match-data))) |
33258a660650
(perform-replace): Calculate match-again
Richard M. Stallman <rms@gnu.org>
parents:
67426
diff
changeset
|
1529 (and (/= (nth 0 match) (nth 1 match)) |
33258a660650
(perform-replace): Calculate match-again
Richard M. Stallman <rms@gnu.org>
parents:
67426
diff
changeset
|
1530 match)))))) |
33258a660650
(perform-replace): Calculate match-again
Richard M. Stallman <rms@gnu.org>
parents:
67426
diff
changeset
|
1531 |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1532 ;; 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
|
1533 (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
|
1534 (text-property-not-all |
67839
33258a660650
(perform-replace): Calculate match-again
Richard M. Stallman <rms@gnu.org>
parents:
67426
diff
changeset
|
1535 (nth 0 real-match-data) (nth 1 real-match-data) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1536 'read-only nil)) |
732 | 1537 |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1538 ;; Calculate the replacement string, if necessary. |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1539 (when replacements |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1540 (set-match-data real-match-data) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1541 (setq next-replacement |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1542 (funcall (car replacements) (cdr replacements) |
75212
dbdc8c2aae7f
(perform-replace): Remove leftover code.
Juanma Barranquero <lekktu@gmail.com>
parents:
75208
diff
changeset
|
1543 replace-count))) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1544 (if (not query-flag) |
56262
29d03615f533
(perform-replace): Highlight the match even in
David Kastrup <dak@gnu.org>
parents:
56245
diff
changeset
|
1545 (let ((inhibit-read-only |
29d03615f533
(perform-replace): Highlight the match even in
David Kastrup <dak@gnu.org>
parents:
56245
diff
changeset
|
1546 query-replace-skip-read-only)) |
58913
0b183affb969
(replace-match-maybe-edit): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
58741
diff
changeset
|
1547 (unless (or literal noedit) |
60713
77391bae98f1
(perform-replace): Remove bindings of global
Juri Linkov <juri@jurta.org>
parents:
60240
diff
changeset
|
1548 (replace-highlight |
77391bae98f1
(perform-replace): Remove bindings of global
Juri Linkov <juri@jurta.org>
parents:
60240
diff
changeset
|
1549 (nth 0 real-match-data) (nth 1 real-match-data) |
77391bae98f1
(perform-replace): Remove bindings of global
Juri Linkov <juri@jurta.org>
parents:
60240
diff
changeset
|
1550 start end search-string |
77391bae98f1
(perform-replace): Remove bindings of global
Juri Linkov <juri@jurta.org>
parents:
60240
diff
changeset
|
1551 (or delimited-flag regexp-flag) case-fold-search)) |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1552 (setq noedit |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1553 (replace-match-maybe-edit |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1554 next-replacement nocasify literal |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1555 noedit real-match-data) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1556 replace-count (1+ replace-count))) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1557 (undo-boundary) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1558 (let (done replaced key def) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1559 ;; 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
|
1560 ;; which means it has finished handling this |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1561 ;; occurrence. Any command that sets `done' should |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1562 ;; leave behind proper match data for the stack. |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1563 ;; Commands not setting `done' need to adjust |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1564 ;; `real-match-data'. |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1565 (while (not done) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1566 (set-match-data real-match-data) |
60713
77391bae98f1
(perform-replace): Remove bindings of global
Juri Linkov <juri@jurta.org>
parents:
60240
diff
changeset
|
1567 (replace-highlight |
77391bae98f1
(perform-replace): Remove bindings of global
Juri Linkov <juri@jurta.org>
parents:
60240
diff
changeset
|
1568 (match-beginning 0) (match-end 0) |
77391bae98f1
(perform-replace): Remove bindings of global
Juri Linkov <juri@jurta.org>
parents:
60240
diff
changeset
|
1569 start end search-string |
77391bae98f1
(perform-replace): Remove bindings of global
Juri Linkov <juri@jurta.org>
parents:
60240
diff
changeset
|
1570 (or delimited-flag regexp-flag) case-fold-search) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1571 ;; 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
|
1572 ;; with a bunch of identical messages. |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1573 (let ((message-log-max nil)) |
57023
cf85be0f7afa
(perform-replace): Use `query-replace-descr'.
Juri Linkov <juri@jurta.org>
parents:
56922
diff
changeset
|
1574 (message message |
cf85be0f7afa
(perform-replace): Use `query-replace-descr'.
Juri Linkov <juri@jurta.org>
parents:
56922
diff
changeset
|
1575 (query-replace-descr from-string) |
cf85be0f7afa
(perform-replace): Use `query-replace-descr'.
Juri Linkov <juri@jurta.org>
parents:
56922
diff
changeset
|
1576 (query-replace-descr next-replacement))) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1577 (setq key (read-event)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1578 ;; 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
|
1579 ;; that clobbers the match data. |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1580 (set-match-data real-match-data) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1581 (setq key (vector key)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1582 (setq def (lookup-key map key)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1583 ;; 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
|
1584 (cond ((eq def 'help) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1585 (with-output-to-temp-buffer "*Help*" |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1586 (princ |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1587 (concat "Query replacing " |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1588 (if regexp-flag "regexp " "") |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1589 from-string " with " |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1590 next-replacement ".\n\n" |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1591 (substitute-command-keys |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1592 query-replace-help))) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1593 (with-current-buffer standard-output |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1594 (help-mode)))) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1595 ((eq def 'exit) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1596 (setq keep-going nil) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1597 (setq done t)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1598 ((eq def 'backup) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1599 (if stack |
45529
45014630aeb2
(perform-replace): Document return value. Use `pop'.
Colin Walters <walters@gnu.org>
parents:
45490
diff
changeset
|
1600 (let ((elt (pop stack))) |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1601 (goto-char (nth 0 elt)) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1602 (setq replaced (nth 1 elt) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1603 real-match-data |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1604 (replace-match-data |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1605 t real-match-data |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1606 (nth 2 elt)))) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1607 (message "No previous match") |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1608 (ding 'no-terminate) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1609 (sit-for 1))) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1610 ((eq def 'act) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1611 (or replaced |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1612 (setq noedit |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1613 (replace-match-maybe-edit |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1614 next-replacement nocasify literal |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1615 noedit real-match-data) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1616 replace-count (1+ replace-count))) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1617 (setq done t replaced t)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1618 ((eq def 'act-and-exit) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1619 (or replaced |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1620 (setq noedit |
56273
610a9a9c39d0
(query-replace-read-args): Swallow a space after
Juri Linkov <juri@jurta.org>
parents:
56262
diff
changeset
|
1621 (replace-match-maybe-edit |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1622 next-replacement nocasify literal |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1623 noedit real-match-data) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1624 replace-count (1+ replace-count))) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1625 (setq keep-going nil) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1626 (setq done t replaced t)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1627 ((eq def 'act-and-show) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1628 (if (not replaced) |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1629 (setq noedit |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1630 (replace-match-maybe-edit |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1631 next-replacement nocasify literal |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1632 noedit real-match-data) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1633 replace-count (1+ replace-count) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1634 real-match-data (replace-match-data |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1635 t real-match-data) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1636 replaced t))) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1637 ((eq def 'automatic) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1638 (or replaced |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1639 (setq noedit |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1640 (replace-match-maybe-edit |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1641 next-replacement nocasify literal |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1642 noedit real-match-data) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1643 replace-count (1+ replace-count))) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1644 (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
|
1645 ((eq def 'skip) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1646 (setq done t)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1647 ((eq def 'recenter) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1648 (recenter nil)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1649 ((eq def 'edit) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1650 (let ((opos (point-marker))) |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1651 (setq real-match-data (replace-match-data |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1652 nil real-match-data |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1653 real-match-data)) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1654 (goto-char (match-beginning 0)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1655 (save-excursion |
44138
f1d7c706f7f7
(query-replace-read-args): New optional arg NOERROR.
Richard M. Stallman <rms@gnu.org>
parents:
43406
diff
changeset
|
1656 (save-window-excursion |
f1d7c706f7f7
(query-replace-read-args): New optional arg NOERROR.
Richard M. Stallman <rms@gnu.org>
parents:
43406
diff
changeset
|
1657 (recursive-edit))) |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1658 (goto-char opos) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1659 (set-marker opos nil)) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1660 ;; Before we make the replacement, |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1661 ;; decide whether the search string |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1662 ;; 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
|
1663 (if (and regexp-flag nonempty-match) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1664 (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
|
1665 (match-data))))) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1666 ;; Edit replacement. |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1667 ((eq def 'edit-replacement) |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1668 (setq real-match-data (replace-match-data |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1669 nil real-match-data |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1670 real-match-data) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1671 next-replacement |
62458
2c228409c44d
Replace `read-input' by `read-string'.
Juanma Barranquero <lekktu@gmail.com>
parents:
62147
diff
changeset
|
1672 (read-string "Edit replacement string: " |
2c228409c44d
Replace `read-input' by `read-string'.
Juanma Barranquero <lekktu@gmail.com>
parents:
62147
diff
changeset
|
1673 next-replacement) |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1674 noedit nil) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1675 (if replaced |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1676 (set-match-data real-match-data) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1677 (setq noedit |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1678 (replace-match-maybe-edit |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1679 next-replacement nocasify literal noedit |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1680 real-match-data) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1681 replaced t)) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1682 (setq done t)) |
46693
4ed23f64c88c
(occur-rename-buffer): New command.
Sam Steingold <sds@gnu.org>
parents:
46519
diff
changeset
|
1683 |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1684 ((eq def 'delete-and-edit) |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1685 (replace-match "" t t) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1686 (setq real-match-data (replace-match-data |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1687 nil real-match-data)) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1688 (replace-dehighlight) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1689 (save-excursion (recursive-edit)) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1690 (setq replaced t)) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1691 ;; 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
|
1692 ;; specially here, since we reread |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1693 ;; any unrecognized character. |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1694 (t |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1695 (setq this-command 'mode-exited) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1696 (setq keep-going nil) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1697 (setq unread-command-events |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1698 (append (listify-key-sequence key) |
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1699 unread-command-events)) |
58914
f55019d052ed
* replace.el (query-replace-highlight): Add new value `isearch'
Juri Linkov <juri@jurta.org>
parents:
58913
diff
changeset
|
1700 (setq done t))) |
58973
7fed010105d9
(perform-replace): Add isearch-case-fold-search.
Juri Linkov <juri@jurta.org>
parents:
58914
diff
changeset
|
1701 (when query-replace-lazy-highlight |
7fed010105d9
(perform-replace): Add isearch-case-fold-search.
Juri Linkov <juri@jurta.org>
parents:
58914
diff
changeset
|
1702 ;; Force lazy rehighlighting only after replacements |
58914
f55019d052ed
* replace.el (query-replace-highlight): Add new value `isearch'
Juri Linkov <juri@jurta.org>
parents:
58913
diff
changeset
|
1703 (if (not (memq def '(skip backup))) |
58973
7fed010105d9
(perform-replace): Add isearch-case-fold-search.
Juri Linkov <juri@jurta.org>
parents:
58914
diff
changeset
|
1704 (setq isearch-lazy-highlight-last-string nil)))) |
40925
8733f6312f8a
(query-replace-skip-read-only): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
40254
diff
changeset
|
1705 ;; 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
|
1706 ;; 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
|
1707 ;; since lots of markers slow down editing. |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1708 (push (list (point) replaced |
63779
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
1709 ;;; If the replacement has already happened, all we need is the |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
1710 ;;; current match start and end. We could get this with a trivial |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
1711 ;;; match like |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
1712 ;;; (save-excursion (goto-char (match-beginning 0)) |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
1713 ;;; (search-forward (match-string 0)) |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
1714 ;;; (match-data t)) |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
1715 ;;; if we really wanted to avoid manually constructing match data. |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
1716 ;;; Adding current-buffer is necessary so that match-data calls can |
98208dd356b4
(keep-lines-read-args): Add INTERACTIVE arg.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63736
diff
changeset
|
1717 ;;; return markers which are appropriate for editing. |
56228
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1718 (if replaced |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1719 (list |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1720 (match-beginning 0) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1721 (match-end 0) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1722 (current-buffer)) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1723 (match-data t))) |
4e0ea2b75232
(query-replace-read-args): Implement `\,' and `\#'
David Kastrup <dak@gnu.org>
parents:
56148
diff
changeset
|
1724 stack))))) |
29952
3e2589e69a8a
(perform-replace): Undo change of 2000-04-04.
Gerd Moellmann <gerd@gnu.org>
parents:
29051
diff
changeset
|
1725 |
5393
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1726 (replace-dehighlight)) |
10157
7953cde9d951
(perform-replace): Report number of replacements when done.
Richard M. Stallman <rms@gnu.org>
parents:
10155
diff
changeset
|
1727 (or unread-command-events |
7953cde9d951
(perform-replace): Report number of replacements when done.
Richard M. Stallman <rms@gnu.org>
parents:
10155
diff
changeset
|
1728 (message "Replaced %d occurrence%s" |
7953cde9d951
(perform-replace): Report number of replacements when done.
Richard M. Stallman <rms@gnu.org>
parents:
10155
diff
changeset
|
1729 replace-count |
7953cde9d951
(perform-replace): Report number of replacements when done.
Richard M. Stallman <rms@gnu.org>
parents:
10155
diff
changeset
|
1730 (if (= replace-count 1) "" "s"))) |
7953cde9d951
(perform-replace): Report number of replacements when done.
Richard M. Stallman <rms@gnu.org>
parents:
10155
diff
changeset
|
1731 (and keep-going stack))) |
61 | 1732 |
5393
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1733 (defvar replace-overlay nil) |
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1734 |
60713
77391bae98f1
(perform-replace): Remove bindings of global
Juri Linkov <juri@jurta.org>
parents:
60240
diff
changeset
|
1735 (defun replace-highlight (match-beg match-end range-beg range-end |
77391bae98f1
(perform-replace): Remove bindings of global
Juri Linkov <juri@jurta.org>
parents:
60240
diff
changeset
|
1736 string regexp case-fold) |
58973
7fed010105d9
(perform-replace): Add isearch-case-fold-search.
Juri Linkov <juri@jurta.org>
parents:
58914
diff
changeset
|
1737 (if query-replace-highlight |
7fed010105d9
(perform-replace): Add isearch-case-fold-search.
Juri Linkov <juri@jurta.org>
parents:
58914
diff
changeset
|
1738 (if replace-overlay |
60101
aa148fbcec2e
(perform-replace): Pass new args to replace-highlight.
Richard M. Stallman <rms@gnu.org>
parents:
59996
diff
changeset
|
1739 (move-overlay replace-overlay match-beg match-end (current-buffer)) |
aa148fbcec2e
(perform-replace): Pass new args to replace-highlight.
Richard M. Stallman <rms@gnu.org>
parents:
59996
diff
changeset
|
1740 (setq replace-overlay (make-overlay match-beg match-end)) |
67426
eac49762e6b9
(replace-highlight): Change overlay priority from 1 to 1001.
Juri Linkov <juri@jurta.org>
parents:
67187
diff
changeset
|
1741 (overlay-put replace-overlay 'priority 1001) ;higher than lazy overlays |
58973
7fed010105d9
(perform-replace): Add isearch-case-fold-search.
Juri Linkov <juri@jurta.org>
parents:
58914
diff
changeset
|
1742 (overlay-put replace-overlay 'face 'query-replace))) |
60713
77391bae98f1
(perform-replace): Remove bindings of global
Juri Linkov <juri@jurta.org>
parents:
60240
diff
changeset
|
1743 (if query-replace-lazy-highlight |
77391bae98f1
(perform-replace): Remove bindings of global
Juri Linkov <juri@jurta.org>
parents:
60240
diff
changeset
|
1744 (let ((isearch-string string) |
77391bae98f1
(perform-replace): Remove bindings of global
Juri Linkov <juri@jurta.org>
parents:
60240
diff
changeset
|
1745 (isearch-regexp regexp) |
75921
1c3c5aeeb934
(replace-highlight): Bind search-whitespace-regexp to nil.
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
1746 (search-whitespace-regexp nil) |
60713
77391bae98f1
(perform-replace): Remove bindings of global
Juri Linkov <juri@jurta.org>
parents:
60240
diff
changeset
|
1747 (isearch-case-fold-search case-fold)) |
77391bae98f1
(perform-replace): Remove bindings of global
Juri Linkov <juri@jurta.org>
parents:
60240
diff
changeset
|
1748 (isearch-lazy-highlight-new-loop range-beg range-end)))) |
5393
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1749 |
58973
7fed010105d9
(perform-replace): Add isearch-case-fold-search.
Juri Linkov <juri@jurta.org>
parents:
58914
diff
changeset
|
1750 (defun replace-dehighlight () |
7fed010105d9
(perform-replace): Add isearch-case-fold-search.
Juri Linkov <juri@jurta.org>
parents:
58914
diff
changeset
|
1751 (when replace-overlay |
7fed010105d9
(perform-replace): Add isearch-case-fold-search.
Juri Linkov <juri@jurta.org>
parents:
58914
diff
changeset
|
1752 (delete-overlay replace-overlay)) |
7fed010105d9
(perform-replace): Add isearch-case-fold-search.
Juri Linkov <juri@jurta.org>
parents:
58914
diff
changeset
|
1753 (when query-replace-lazy-highlight |
60713
77391bae98f1
(perform-replace): Remove bindings of global
Juri Linkov <juri@jurta.org>
parents:
60240
diff
changeset
|
1754 (lazy-highlight-cleanup lazy-highlight-cleanup) |
58973
7fed010105d9
(perform-replace): Add isearch-case-fold-search.
Juri Linkov <juri@jurta.org>
parents:
58914
diff
changeset
|
1755 (setq isearch-lazy-highlight-last-string nil))) |
5393
cfd16a1af914
(query-replace-highlight): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5337
diff
changeset
|
1756 |
56355
ac4a6e4361cf
(query-replace-descr): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56351
diff
changeset
|
1757 ;; arch-tag: 16b4cd61-fd40-497b-b86f-b667c4cf88e4 |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
324
diff
changeset
|
1758 ;;; replace.el ends here |