From: Glenn Morris <rgm@gnu.org>
Date: Thu, 18 Mar 2010 06:44:36 +0000 (-0700)
Subject: Use query-replace-{from,to}-history-variable in more places.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~722
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=84d0a5f881b8e2d11ef537dbda4acfe64c067e93;p=emacs.git

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 42e857db9f5..c45096b9742 100644
--- 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 57b29442605..92edd2e2657 100644
--- 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))