diff options
| author | Stefan Monnier | 2004-07-06 12:31:24 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2004-07-06 12:31:24 +0000 |
| commit | cc0aea1a20e2afff0524de88f4e708f4e0fc0bae (patch) | |
| tree | cc1e3b52a42b2d5fc4d508022c0560bcb4554b86 /lisp | |
| parent | fa164e6ae7aa9a26a9a5b08400175becaa0e7724 (diff) | |
| download | emacs-cc0aea1a20e2afff0524de88f4e708f4e0fc0bae.tar.gz emacs-cc0aea1a20e2afff0524de88f4e708f4e0fc0bae.zip | |
(query-replace-regexp-eval): Fix last change.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/replace.el | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 92552debee2..32abe4c4ae7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2004-07-06 Stefan <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * replace.el (query-replace-regexp-eval): Fix last change. | ||
| 4 | |||
| 1 | 2004-07-05 Stefan <monnier@iro.umontreal.ca> | 5 | 2004-07-05 Stefan <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * replace.el (query-replace-descr): New fun. | 7 | * replace.el (query-replace-descr): New fun. |
diff --git a/lisp/replace.el b/lisp/replace.el index a7c8b859402..60c28d6c48a 100644 --- a/lisp/replace.el +++ b/lisp/replace.el | |||
| @@ -287,6 +287,7 @@ Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace | |||
| 287 | only matches that are surrounded by word boundaries. | 287 | only matches that are surrounded by word boundaries. |
| 288 | Fourth and fifth arg START and END specify the region to operate on." | 288 | Fourth and fifth arg START and END specify the region to operate on." |
| 289 | (interactive | 289 | (interactive |
| 290 | (progn | ||
| 290 | (barf-if-buffer-read-only) | 291 | (barf-if-buffer-read-only) |
| 291 | (let* ((from | 292 | (let* ((from |
| 292 | ;; Let-bind the history var to disable the "foo -> bar" default. | 293 | ;; Let-bind the history var to disable the "foo -> bar" default. |
| @@ -305,7 +306,7 @@ Fourth and fifth arg START and END specify the region to operate on." | |||
| 305 | (if (and transient-mark-mode mark-active) | 306 | (if (and transient-mark-mode mark-active) |
| 306 | (region-beginning)) | 307 | (region-beginning)) |
| 307 | (if (and transient-mark-mode mark-active) | 308 | (if (and transient-mark-mode mark-active) |
| 308 | (region-end))))) | 309 | (region-end)))))) |
| 309 | (perform-replace regexp (cons 'replace-eval-replacement to-expr) | 310 | (perform-replace regexp (cons 'replace-eval-replacement to-expr) |
| 310 | t 'literal delimited nil nil start end)) | 311 | t 'literal delimited nil nil start end)) |
| 311 | 312 | ||