diff options
| author | Juanma Barranquero | 2006-12-10 23:47:52 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2006-12-10 23:47:52 +0000 |
| commit | 6a964bb15341b4c8fa4ddc16569438daedb2d9a4 (patch) | |
| tree | 753a3c056e23eea8b61568c413ce7fe6e299b848 | |
| parent | 1bcdbb7855e77b387a450440572cfb1dd54e25f3 (diff) | |
| download | emacs-6a964bb15341b4c8fa4ddc16569438daedb2d9a4.tar.gz emacs-6a964bb15341b4c8fa4ddc16569438daedb2d9a4.zip | |
(replace-match-data, replace-match-maybe-edit): Doc fix.
| -rw-r--r-- | lisp/replace.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/replace.el b/lisp/replace.el index 4275aef8d87..610fd9d2e9f 100644 --- a/lisp/replace.el +++ b/lisp/replace.el | |||
| @@ -1341,7 +1341,7 @@ with the `noescape' argument set. | |||
| 1341 | 1341 | ||
| 1342 | (defun replace-match-data (integers reuse &optional new) | 1342 | (defun replace-match-data (integers reuse &optional new) |
| 1343 | "Like `match-data', but markers in REUSE get invalidated. | 1343 | "Like `match-data', but markers in REUSE get invalidated. |
| 1344 | If NEW is non-NIL, it is set and returned instead of fresh data, | 1344 | If NEW is non-nil, it is set and returned instead of fresh data, |
| 1345 | but coerced to the correct value of INTEGERS." | 1345 | but coerced to the correct value of INTEGERS." |
| 1346 | (or (and new | 1346 | (or (and new |
| 1347 | (progn | 1347 | (progn |
| @@ -1357,7 +1357,7 @@ NEWTEXT, FIXEDCASE, LITERAL are just passed on. If NOEDIT is true, no | |||
| 1357 | check for `\\?' is made to save time. MATCH-DATA is used for the | 1357 | check for `\\?' is made to save time. MATCH-DATA is used for the |
| 1358 | replacement. In case editing is done, it is changed to use markers. | 1358 | replacement. In case editing is done, it is changed to use markers. |
| 1359 | 1359 | ||
| 1360 | The return value is non-NIL if there has been no `\\?' or NOEDIT was | 1360 | The return value is non-nil if there has been no `\\?' or NOEDIT was |
| 1361 | passed in. If LITERAL is set, no checking is done, anyway." | 1361 | passed in. If LITERAL is set, no checking is done, anyway." |
| 1362 | (unless (or literal noedit) | 1362 | (unless (or literal noedit) |
| 1363 | (setq noedit t) | 1363 | (setq noedit t) |
| @@ -1486,7 +1486,7 @@ make, or the user didn't cancel the call." | |||
| 1486 | ;; For speed, use only integers and | 1486 | ;; For speed, use only integers and |
| 1487 | ;; reuse the list used last time. | 1487 | ;; reuse the list used last time. |
| 1488 | (replace-match-data t real-match-data))))) | 1488 | (replace-match-data t real-match-data))))) |
| 1489 | 1489 | ||
| 1490 | ;; Record whether the match is nonempty, to avoid an infinite loop | 1490 | ;; Record whether the match is nonempty, to avoid an infinite loop |
| 1491 | ;; repeatedly matching the same empty string. | 1491 | ;; repeatedly matching the same empty string. |
| 1492 | (setq nonempty-match | 1492 | (setq nonempty-match |