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

[Dan Nicolaescu]

Index: emacs/lisp/replace.el
diff -c emacs/lisp/replace.el:1.205 emacs/lisp/replace.el:1.206
*** emacs/lisp/replace.el:1.205 Sat Feb 19 13:09:37 2005
--- emacs/lisp/replace.el       Sat Feb 19 21:08:43 2005
***************
*** 217,223 ****
  
  To customize possible responses, change the \"bindings\" in 
`query-replace-map'."
    (interactive (let ((common
!                     (query-replace-read-args "Query replace" nil)))
                 (list (nth 0 common) (nth 1 common) (nth 2 common)
                       ;; These are done separately here
                       ;; so that command-history will record these expressions
--- 217,227 ----
  
  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")
!                        nil)))
                 (list (nth 0 common) (nth 1 common) (nth 2 common)
                       ;; These are done separately here
                       ;; so that command-history will record these expressions
***************
*** 277,283 ****
  Use \\[repeat-complex-command] after this command for details."
    (interactive
     (let ((common
!         (query-replace-read-args "Query replace regexp" t)))
       (list (nth 0 common) (nth 1 common) (nth 2 common)
           ;; These are done separately here
           ;; so that command-history will record these expressions
--- 281,291 ----
  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")
!          t)))
       (list (nth 0 common) (nth 1 common) (nth 2 common)
           ;; These are done separately here
           ;; so that command-history will record these expressions
***************
*** 423,429 ****
  and TO-STRING is also null.)"
    (interactive
     (let ((common
!         (query-replace-read-args "Replace string" nil)))
       (list (nth 0 common) (nth 1 common) (nth 2 common)
           (if (and transient-mark-mode mark-active)
               (region-beginning))
--- 431,441 ----
  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")
!          nil)))
       (list (nth 0 common) (nth 1 common) (nth 2 common)
           (if (and transient-mark-mode mark-active)
               (region-beginning))
***************
*** 477,483 ****
  which will run faster and will not set the mark or print anything."
    (interactive
     (let ((common
!         (query-replace-read-args "Replace regexp" t)))
       (list (nth 0 common) (nth 1 common) (nth 2 common)
           (if (and transient-mark-mode mark-active)
               (region-beginning))
--- 489,499 ----
  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)
               (region-beginning))