diff options
| author | Miles Bader | 2005-05-20 04:22:05 +0000 |
|---|---|---|
| committer | Miles Bader | 2005-05-20 04:22:05 +0000 |
| commit | 64e9342958694825be1664890dcd22fffcd50d3a (patch) | |
| tree | a43e1796f5a49ae7eeec671447d10ac3731a1834 /lisp/replace.el | |
| parent | 5447510256e5a1b371407b751ddcc461044da5df (diff) | |
| parent | a18ff9886771c41186eebf8d7984fee2120dbe36 (diff) | |
| download | emacs-64e9342958694825be1664890dcd22fffcd50d3a.tar.gz emacs-64e9342958694825be1664890dcd22fffcd50d3a.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-53
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 302-319)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 69)
- Update from CVS
Diffstat (limited to 'lisp/replace.el')
| -rw-r--r-- | lisp/replace.el | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lisp/replace.el b/lisp/replace.el index 1cef7ecc52a..c9c70b59de5 100644 --- a/lisp/replace.el +++ b/lisp/replace.el | |||
| @@ -1288,14 +1288,14 @@ passed in. If LITERAL is set, no checking is done, anyway." | |||
| 1288 | (while (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\(\\\\\\?\\)" | 1288 | (while (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\(\\\\\\?\\)" |
| 1289 | newtext) | 1289 | newtext) |
| 1290 | (setq newtext | 1290 | (setq newtext |
| 1291 | (read-input "Edit replacement string: " | 1291 | (read-string "Edit replacement string: " |
| 1292 | (prog1 | 1292 | (prog1 |
| 1293 | (cons | 1293 | (cons |
| 1294 | (replace-match "" t t newtext 3) | 1294 | (replace-match "" t t newtext 3) |
| 1295 | (1+ (match-beginning 3))) | 1295 | (1+ (match-beginning 3))) |
| 1296 | (setq match-data | 1296 | (setq match-data |
| 1297 | (replace-match-data | 1297 | (replace-match-data |
| 1298 | nil match-data match-data)))) | 1298 | nil match-data match-data)))) |
| 1299 | noedit nil))) | 1299 | noedit nil))) |
| 1300 | (set-match-data match-data) | 1300 | (set-match-data match-data) |
| 1301 | (replace-match newtext fixedcase literal) | 1301 | (replace-match newtext fixedcase literal) |
| @@ -1571,8 +1571,8 @@ make, or the user didn't cancel the call." | |||
| 1571 | nil real-match-data | 1571 | nil real-match-data |
| 1572 | real-match-data) | 1572 | real-match-data) |
| 1573 | next-replacement | 1573 | next-replacement |
| 1574 | (read-input "Edit replacement string: " | 1574 | (read-string "Edit replacement string: " |
| 1575 | next-replacement) | 1575 | next-replacement) |
| 1576 | noedit nil) | 1576 | noedit nil) |
| 1577 | (if replaced | 1577 | (if replaced |
| 1578 | (set-match-data real-match-data) | 1578 | (set-match-data real-match-data) |