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