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

[Juri Linkov]

Index: emacs/lisp/replace.el
diff -c emacs/lisp/replace.el:1.222 emacs/lisp/replace.el:1.223
*** emacs/lisp/replace.el:1.222 Tue Aug  9 11:29:18 2005
--- emacs/lisp/replace.el       Tue Aug  9 21:39:09 2005
***************
*** 88,94 ****
  (defun query-replace-descr (string)
    (mapconcat 'isearch-text-char-description string ""))
  
! (defun query-replace-read-from (string regexp-flag)
    "Query and return the `from' argument of a query-replace operation.
  The return value can also be a pair (FROM . TO) indicating that the user
  wants to replace FROM with TO."
--- 88,94 ----
  (defun query-replace-descr (string)
    (mapconcat 'isearch-text-char-description string ""))
  
! (defun query-replace-read-from (prompt regexp-flag)
    "Query and return the `from' argument of a query-replace operation.
  The return value can also be a pair (FROM . TO) indicating that the user
  wants to replace FROM with TO."
***************
*** 107,116 ****
                                      query-replace-from-history-variable))))
              (read-from-minibuffer
               (if (and lastto lastfrom)
!                  (format "%s (default %s -> %s): " string
                           (query-replace-descr lastfrom)
                           (query-replace-descr lastto))
!                (format "%s: " string))
               nil nil nil
               query-replace-from-history-variable
               nil t t))))
--- 107,116 ----
                                      query-replace-from-history-variable))))
              (read-from-minibuffer
               (if (and lastto lastfrom)
!                  (format "%s (default %s -> %s): " prompt
                           (query-replace-descr lastfrom)
                           (query-replace-descr lastto))
!                (format "%s: " prompt))
               nil nil nil
               query-replace-from-history-variable
               nil t t))))
***************
*** 173,194 ****
      to))
  
  
! (defun query-replace-read-to (from string regexp-flag)
    "Query and return the `to' argument of a query-replace operation."
    (query-replace-compile-replacement
     (save-excursion
       (read-from-minibuffer
!       (format "%s %s with: " string (query-replace-descr from))
        nil nil nil
        query-replace-to-history-variable from t t))
     regexp-flag))
  
! (defun query-replace-read-args (string regexp-flag &optional noerror)
    (unless noerror
      (barf-if-buffer-read-only))
!   (let* ((from (query-replace-read-from string regexp-flag))
         (to (if (consp from) (prog1 (cdr from) (setq from (car from)))
!              (query-replace-read-to from string regexp-flag))))
      (list from to current-prefix-arg)))
  
  (defun query-replace (from-string to-string &optional delimited start end)
--- 173,194 ----
      to))
  
  
! (defun query-replace-read-to (from prompt regexp-flag)
    "Query and return the `to' argument of a query-replace operation."
    (query-replace-compile-replacement
     (save-excursion
       (read-from-minibuffer
!       (format "%s %s with: " prompt (query-replace-descr from))
        nil nil nil
        query-replace-to-history-variable from t t))
     regexp-flag))
  
! (defun query-replace-read-args (prompt regexp-flag &optional noerror)
    (unless noerror
      (barf-if-buffer-read-only))
!   (let* ((from (query-replace-read-from prompt regexp-flag))
         (to (if (consp from) (prog1 (cdr from) (setq from (car from)))
!              (query-replace-read-to from prompt regexp-flag))))
      (list from to current-prefix-arg)))
  
  (defun query-replace (from-string to-string &optional delimited start end)