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

[Kim F . Storm]

Index: emacs/lisp/replace.el
diff -c emacs/lisp/replace.el:1.211 emacs/lisp/replace.el:1.212
*** emacs/lisp/replace.el:1.211 Thu May 26 13:08:57 2005
--- emacs/lisp/replace.el       Wed Jun  8 22:37:13 2005
***************
*** 217,223 ****
  
  To customize possible responses, change the \"bindings\" in 
`query-replace-map'."
    (interactive (let ((common
!                     (query-replace-read-args 
                       (if (and transient-mark-mode mark-active)
                         "Query replace in region"
                         "Query replace")
--- 217,223 ----
  
  To customize possible responses, change the \"bindings\" in 
`query-replace-map'."
    (interactive (let ((common
!                     (query-replace-read-args
                       (if (and transient-mark-mode mark-active)
                         "Query replace in region"
                         "Query replace")
***************
*** 281,287 ****
  Use \\[repeat-complex-command] after this command for details."
    (interactive
     (let ((common
!         (query-replace-read-args 
           (if (and transient-mark-mode mark-active)
               "Query replace regexp in region"
             "Query replace regexp")
--- 281,287 ----
  Use \\[repeat-complex-command] after this command for details."
    (interactive
     (let ((common
!         (query-replace-read-args
           (if (and transient-mark-mode mark-active)
               "Query replace regexp in region"
             "Query replace regexp")
***************
*** 431,437 ****
  and TO-STRING is also null.)"
    (interactive
     (let ((common
!         (query-replace-read-args 
           (if (and transient-mark-mode mark-active)
               "Replace string in region"
             "Replace string")
--- 431,437 ----
  and TO-STRING is also null.)"
    (interactive
     (let ((common
!         (query-replace-read-args
           (if (and transient-mark-mode mark-active)
               "Replace string in region"
             "Replace string")
***************
*** 489,498 ****
  which will run faster and will not set the mark or print anything."
    (interactive
     (let ((common
!         (query-replace-read-args 
           (if (and transient-mark-mode mark-active)
!              "Replace regexp in region" 
!            "Replace regexp") 
           t)))
       (list (nth 0 common) (nth 1 common) (nth 2 common)
           (if (and transient-mark-mode mark-active)
--- 489,498 ----
  which will run faster and will not set the mark or print anything."
    (interactive
     (let ((common
!         (query-replace-read-args
           (if (and transient-mark-mode mark-active)
!              "Replace regexp in region"
!            "Replace regexp")
           t)))
       (list (nth 0 common) (nth 1 common) (nth 2 common)
           (if (and transient-mark-mode mark-active)
***************
*** 1268,1279 ****
             (and (eq new reuse)
                  (eq (null integers) (markerp (car reuse)))
                  new)))
!       (match-data integers
!                 (prog1 reuse
!                   (while reuse
!                     (if (markerp (car reuse))
!                         (set-marker (car reuse) nil))
!                     (setq reuse (cdr reuse)))))))
  
  (defun replace-match-maybe-edit (newtext fixedcase literal noedit match-data)
    "Make a replacement with `replace-match', editing `\\?'.
--- 1268,1274 ----
             (and (eq new reuse)
                  (eq (null integers) (markerp (car reuse)))
                  new)))
!       (match-data integers reuse t)))
  
  (defun replace-match-maybe-edit (newtext fixedcase literal noedit match-data)
    "Make a replacement with `replace-match', editing `\\?'.