procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clarify the documentation of back-references in replacements

Browse source 
* doc/emacs/search.texi (Regexp Replace): Clarify that \D starts
with \1, not \0.

* lisp/replace.el (query-replace-regexp)
(query-replace-regexp-eval, replace-regexp): Doc fix (Bug#23884)
This commit is contained in:
Eli Zaretskii 2016-07-02 18:03:09 +03:00
parent d039fc4ff6
commit 38f4b8ea61
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
doc/emacs/search.texi
View file

@ -1356,12 +1356,12 @@ Replace every match for @var{regexp} with @var{newstring}.
it can refer to all or part of what is matched by the @var{regexp}.
@samp{\&} in @var{newstring} stands for the entire match being
replaced. @samp{\@var{d}} in @var{newstring}, where @var{d} is a
digit, stands for whatever matched the @var{d}th parenthesized
grouping in @var{regexp}. (This is called a ``back reference''.)
@samp{\#} refers to the count of replacements already made in this
command, as a decimal number. In the first replacement, @samp{\#}
stands for @samp{0}; in the second, for @samp{1}; and so on. For
example,
digit starting from 1, stands for whatever matched the @var{d}th
parenthesized grouping in @var{regexp}. (This is called a ``back
reference''.) @samp{\#} refers to the count of replacements already
made in this command, as a decimal number. In the first replacement,
@samp{\#} stands for @samp{0}; in the second, for @samp{1}; and so on.
For example,
@example
M-x replace-regexp @key{RET} c[ad]+r @key{RET} \&-safe @key{RET}

17
lisp/replace.el
View file

@ -391,9 +391,10 @@ replace backward.
Fourth and fifth arg START and END specify the region to operate on.
In TO-STRING, `\\&' stands for whatever matched the whole of REGEXP,
and `\\=\\N' (where N is a digit) stands for
whatever what matched the Nth `\\(...\\)' in REGEXP.
In TO-STRING, `\\&' or `\\0' stands for whatever matched the whole of
REGEXP, and `\\=\\N' (where N is a digit) stands for whatever matched
the Nth `\\(...\\)' (1-based) in REGEXP. The `\\(...\\)' groups are
counted from 1.
`\\?' lets you edit the replacement text in the minibuffer
at the given position for each replacement.
@ -451,7 +452,9 @@ If the result of TO-EXPR is not a string, it is converted to one using
For convenience, when entering TO-EXPR interactively, you can use `\\&' or
`\\0' to stand for whatever matched the whole of REGEXP, and `\\N' (where
N is a digit) to stand for whatever matched the Nth `\\(...\\)' in REGEXP.
N is a digit) to stand for whatever matched the Nth `\\(...\\)' (1-based)
in REGEXP.
Use `\\#&' or `\\#N' if you want a number instead of a string.
In interactive use, `\\#' in itself stands for `replace-count'.
@ -635,9 +638,9 @@ replace backward.
Fourth and fifth arg START and END specify the region to operate on.
In TO-STRING, `\\&' stands for whatever matched the whole of REGEXP,
and `\\=\\N' (where N is a digit) stands for
whatever what matched the Nth `\\(...\\)' in REGEXP.
In TO-STRING, `\\&' or `\\0' stands for whatever matched the whole of
REGEXP, and `\\=\\N' (where N is a digit) stands for
whatever matched the Nth `\\(...\\)' (1-based) in REGEXP.
`\\?' lets you edit the replacement text in the minibuffer
at the given position for each replacement.