Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-13

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-83
 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-89
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-90
   Update from CVS: man/calc.texi: Add macro for LaTeX for info output.

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-91
 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-94
   Update from CVS

1 files changed, 4 insertions, 4 deletions

diff --git a/lisp/replace.el b/lisp/replace.el
index 82b2a993fdb..42480b656d6 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -62,7 +62,7 @@ strings or patterns."
   "*Non-nil means `query-replace' and friends ignore read-only matches."
   :type 'boolean
   :group 'matching
-  :version "21.4")
+  :version "22.1")
 
 (defcustom query-replace-highlight t
   "*Non-nil means to highlight matches during query replacement."
@@ -77,13 +77,13 @@ is highlighted lazily using isearch lazy highlighting (see
   :type 'boolean
   :group 'lazy-highlight
   :group 'matching
-  :version "21.4")
+  :version "22.1")
 
 (defface query-replace
   '((t (:inherit isearch)))
   "Face for highlighting query replacement matches."
   :group 'matching
-  :version "21.4")
+  :version "22.1")
 
 (defun query-replace-descr (string)
   (mapconcat 'isearch-text-char-description string ""))
@@ -789,7 +789,7 @@ Compatibility function for \\[next-error] invocations."
     (t :background "gray"))
   "Face used to highlight matches permanently."
   :group 'matching
-  :version "21.4")
+  :version "22.1")
 
 (defcustom list-matching-lines-default-context-lines 0
   "*Default number of context lines included around `list-matching-lines' matches.