Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-353
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-354
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-355
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-356
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-183

1 files changed, 4 insertions, 2 deletions

diff --git a/lisp/replace.el b/lisp/replace.el
index e14e1314352..f7afcd594cf 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -36,9 +36,11 @@
 
 (defvar query-replace-history nil)
 
-(defvar query-replace-interactive nil
+(defcustom query-replace-interactive nil
   "Non-nil means `query-replace' uses the last search string.
-That becomes the \"string to replace\".")
+That becomes the \"string to replace\"."
+  :type 'boolean
+  :group 'matching)
 
 (defcustom query-replace-from-history-variable 'query-replace-history
   "History list to use for the FROM argument of `query-replace' commands.