[Emacs-diffs] Changes to emacs/lisp/replace.el

[Richard M. Stallman]

Index: emacs/lisp/replace.el
diff -c emacs/lisp/replace.el:1.130 emacs/lisp/replace.el:1.131
*** emacs/lisp/replace.el:1.130 Mon Feb 18 15:30:19 2002
--- emacs/lisp/replace.el       Sun Mar 24 19:38:46 2002
***************
*** 62,69 ****
    :group 'matching
    :version "21.3")
  
! (defun query-replace-read-args (string regexp-flag)
!   (barf-if-buffer-read-only)
    (let (from to)
      (if query-replace-interactive
        (setq from (car (if regexp-flag regexp-search-ring search-ring)))
--- 62,70 ----
    :group 'matching
    :version "21.3")
  
! (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,1134 ****
                           (save-excursion
                             (funcall search-function search-string limit t)
                             (setq real-match-data (match-data)))
!                          (save-excursion (recursive-edit))
                           (goto-char opos))
                         (set-match-data real-match-data)
                         ;; Before we make the replacement,
--- 1129,1137 ----
                           (save-excursion
                             (funcall search-function search-string limit t)
                             (setq real-match-data (match-data)))
!                          (save-excursion
!                            (save-window-excursion
!                              (recursive-edit)))
                           (goto-char opos))
                         (set-match-data real-match-data)
                         ;; Before we make the replacement,