[Emacs-diffs] /srv/bzr/emacs/trunk r99683: Use query-replace-{from, to}-history-variable in more places.

[Glenn Morris]

------------------------------------------------------------
revno: 99683
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2010-03-17 23:44:36 -0700
message:
  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.
modified:
  lisp/ChangeLog
  lisp/replace.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-03-18 06:21:21 +0000
+++ b/lisp/ChangeLog    2010-03-18 06:44:36 +0000
@@ -1,5 +1,9 @@
 2010-03-18  Glenn Morris  <address@hidden>
 
+       * 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):

=== modified file 'lisp/replace.el'
--- a/lisp/replace.el   2010-01-13 08:35:10 +0000
+++ b/lisp/replace.el   2010-03-18 06:44:36 +0000
@@ -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 @@
                    (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))