# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1017016726 0
# Node ID f1d7c706f7f75f52ad3e84e3c1a345501ac7ca75
# Parent  32c7d9355caf60966db8b1f9cd4a7aa6414bb493
(query-replace-read-args): New optional arg NOERROR.
(perform-replace): Use save-window-excursion around recursive edit.

diff -r 32c7d9355caf -r f1d7c706f7f7 lisp/replace.el
--- a/lisp/replace.el	Sun Mar 24 21:33:26 2002 +0000
+++ b/lisp/replace.el	Mon Mar 25 00:38:46 2002 +0000
@@ -62,8 +62,9 @@
   :group 'matching
   :version "21.3")
 
-(defun query-replace-read-args (string regexp-flag)
-  (barf-if-buffer-read-only)
+(defun query-replace-read-args (string regexp-flag &optional noerror)
+  (unless noerror
+    (barf-if-buffer-read-only))
   (let (from to)
     (if query-replace-interactive
 	(setq from (car (if regexp-flag regexp-search-ring search-ring)))
@@ -1128,7 +1129,9 @@
 			   (save-excursion
 			     (funcall search-function search-string limit t)
 			     (setq real-match-data (match-data)))
-			   (save-excursion (recursive-edit))
+			   (save-excursion
+			     (save-window-excursion
+			       (recursive-edit)))
 			   (goto-char opos))
 			 (set-match-data real-match-data)
 			 ;; Before we make the replacement,