Use query-replace-{from,to}-history-variable in more places.

* replace.el (query-replace-history): Give it a doc string.
(map-query-replace-regexp): Use query-replace-from-history-variable
and query-replace-to-history-variable.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 42e857db9f5783bfa849ca7dc0ba583f7252fd3d..c45096b9742142b8bae6f21b46a4684c9077d2b5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2010-03-18  Glenn Morris  <rgm@gnu.org>
 
+       * replace.el (query-replace-history): Give it a doc string.
+       (map-query-replace-regexp): Use query-replace-from-history-variable
+       and query-replace-to-history-variable.
+
        * mail/hashcash.el (declare-function): Remove duplicate definition.
 
        * mail/emacsbug.el (report-emacs-bug-pretest-address):

diff --git a/lisp/replace.el b/lisp/replace.el
index 57b294426051ce857c367fafa93d96f18977493b..92edd2e2657aef4d7101a553ffdf62756d7bec87 100644 (file)
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -33,7 +33,10 @@
   :type 'boolean
   :group 'matching)
 
-(defvar query-replace-history nil)
+(defvar query-replace-history nil
+  "Default history list for query-replace commands.
+See `query-replace-from-history-variable' and
+`query-replace-to-history-variable'.")
 
 (defvar query-replace-defaults nil
   "Default values of FROM-STRING and TO-STRING for `query-replace'.
@@ -394,12 +397,13 @@ Fourth and fifth arg START and END specify the region to operate on."
                    (car regexp-search-ring)
                  (read-from-minibuffer "Map query replace (regexp): "
                                        nil nil nil
-                                       'query-replace-history nil t)))
+                                       query-replace-from-history-variable
+                                       nil t)))
          (to (read-from-minibuffer
               (format "Query replace %s with (space-separated strings): "
                       (query-replace-descr from))
               nil nil nil
-              'query-replace-history from t)))
+              query-replace-to-history-variable from t)))
      (list from to
           (and current-prefix-arg
                (prefix-numeric-value current-prefix-arg))