aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2014-02-07 19:55:27 -0800
committerLars Ingebrigtsen2014-02-07 19:55:27 -0800
commitf7a17bb38a72e64128850c0b67f7421bd50c7a79 (patch)
tree588398e77e4dd98b30a84800226876f98280a689
parentfff711eeb11f752c5cd84e6a9e4fc8af0f7563f5 (diff)
downloademacs-f7a17bb38a72e64128850c0b67f7421bd50c7a79.tar.gz
emacs-f7a17bb38a72e64128850c0b67f7421bd50c7a79.zip
* replace.el (replace-match-maybe-edit): Doc clarification.
Fixes: debbugs:15632
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/replace.el8
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fe5e2914ee1..c3609617467 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12014-02-08 Lars Ingebrigtsen <larsi@gnus.org> 12014-02-08 Lars Ingebrigtsen <larsi@gnus.org>
2 2
3 * replace.el (replace-match-maybe-edit): Doc clarification
4 (bug#15632).
5
3 * subr.el (add-to-list): Refill the paragraphs (bug#15791). 6 * subr.el (add-to-list): Refill the paragraphs (bug#15791).
4 7
5 * macros.el (insert-kbd-macro): Doc fix (bug#16025). 8 * macros.el (insert-kbd-macro): Doc fix (bug#16025).
diff --git a/lisp/replace.el b/lisp/replace.el
index cce431f0248..945316f586d 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1891,9 +1891,11 @@ but coerced to the correct value of INTEGERS."
1891 1891
1892(defun replace-match-maybe-edit (newtext fixedcase literal noedit match-data backward) 1892(defun replace-match-maybe-edit (newtext fixedcase literal noedit match-data backward)
1893 "Make a replacement with `replace-match', editing `\\?'. 1893 "Make a replacement with `replace-match', editing `\\?'.
1894NEWTEXT, FIXEDCASE, LITERAL are just passed on. If NOEDIT is true, no 1894FIXEDCASE, LITERAL are passed to `replace-match' (which see).
1895check for `\\?' is made to save time. MATCH-DATA is used for the 1895After possibly editing it (if `\\?' is present), NEWTEXT is also
1896replacement. In case editing is done, it is changed to use markers. 1896passed to `replace-match'. If NOEDIT is true, no check for `\\?'
1897is made (to save time). MATCH-DATA is used for the replacement.
1898In case editing is done, it is changed to use markers.
1897 1899
1898The return value is non-nil if there has been no `\\?' or NOEDIT was 1900The return value is non-nil if there has been no `\\?' or NOEDIT was
1899passed in. If LITERAL is set, no checking is done, anyway." 1901passed in. If LITERAL is set, no checking is done, anyway."