* NEWS: Mention `query-replace-regexp-eval' being deprecated.

* replace.el (query-replace-regexp-eval): Deprecate.

4 files changed, 24 insertions, 6 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 1f2b33fe8a8..9003f73da96 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-17  David Kastrup  <dak@gnu.org>
+
+	* NEWS: Mention `query-replace-regexp-eval' being deprecated.
+
 2007-04-15  Glenn Morris  <rgm@gnu.org>
 
 	* FTP: Make it a duplicate of ../FTP.
diff --git a/etc/NEWS b/etc/NEWS
index 9e18d887834..be01229237e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -633,12 +633,12 @@ a match if part of it has a read-only property.
 *** When used interactively, the commands `query-replace-regexp' and
 `replace-regexp' allow \,expr to be used in a replacement string,
 where expr is an arbitrary Lisp expression evaluated at replacement
-time.  In many cases, this will be more convenient than using
-`query-replace-regexp-eval'.  `\#' in a replacement string now refers
-to the count of replacements already made by the replacement command.
-All regular expression replacement commands now allow `\?' in the
-replacement string to specify a position where the replacement string
-can be edited for each replacement.
+time.  `\#' in a replacement string now refers to the count of
+replacements already made by the replacement command.  All regular
+expression replacement commands now allow `\?' in the replacement
+string to specify a position where the replacement string can be
+edited for each replacement.  `query-replace-regexp-eval' is now
+deprecated since it offers no additional functionality.
 
 +++
 *** query-replace uses isearch lazy highlighting when the new user option
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 44ae91ba0aa..ffc605eaedc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-17  David Kastrup  <dak@gnu.org>
+
+	* replace.el (query-replace-regexp-eval): Deprecate.
+
 2007-04-17  Alan Mackenzie  <acm@muc.de>
 
 	* progmodes/cc-cmds.el (c-beginning-of-defun): With -ve arg and
diff --git a/lisp/replace.el b/lisp/replace.el
index a8dfd043c72..ed1fa9a6b59 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -303,6 +303,11 @@ Use \\[repeat-complex-command] after this command for details."
 
 (defun query-replace-regexp-eval (regexp to-expr &optional delimited start end)
   "Replace some things after point matching REGEXP with the result of TO-EXPR.
+
+Interactive use of this function is deprecated in favor of the
+`\\,' feature of `query-replace-regexp'.  For non-interactive use, a loop
+using `search-forward-regexp' and `replace-match' is preferred.
+
 As each match is found, the user must type a character saying
 what to do with it.  For directions, type \\[help-command] at that time.
 
@@ -354,6 +359,11 @@ Fourth and fifth arg START and END specify the region to operate on."
   (perform-replace regexp (cons 'replace-eval-replacement to-expr)
 		   t 'literal delimited nil nil start end))
 
+(make-obsolete 'query-replace-regexp-eval
+  "for interactive use, use the special `\\,' feature of
+`query-replace-regexp' instead.  Non-interactively, a loop
+using `search-forward-regexp' and `replace-match' is preferred." "22.1")
+
 (defun map-query-replace-regexp (regexp to-strings &optional n start end)
   "Replace some matches for REGEXP with various strings, in rotation.
 The second argument TO-STRINGS contains the replacement strings,