2 files changed, 24 insertions, 8 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 94c4c3d87e1..72486c248c7 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-24  David Kastrup  <dak@gnu.org>
+
+        * NEWS: Move description from new paragraph-start and
+        indent-line-function defaults to general news instead of new
+        packages.  Same for query-replace-skip-read-only.  Add
+        description of new `\,' and `\?' replacement string features.
+
 2004-06-23  Luc Teirlinck  <teirllm@auburn.edu>
 
         * MORE.STUFF: Delete obsolete URL.
diff --git a/etc/NEWS b/etc/NEWS
index 4c9564b24ea..e2d2ac64be8 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -914,6 +914,23 @@ buffers to search by their filename.  Internally, Occur mode has been
 rewritten, and now uses font-lock, among other changes.
 
 +++
+** The default values of paragraph-start and indent-line-function have
+been changed to reflect those used in Text mode rather than those used
+in Indented-Text mode.
+
+** New user option `query-replace-skip-read-only': when non-nil,
+`query-replace' and related functions simply ignore
+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'.  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.
+
 ** Emacs normally highlights mouse sensitive text whenever the mouse
 is over the text.  By setting the new variable `mouse-highlight', you
 can optionally enable mouse highlighting only after you move the
@@ -2135,14 +2152,6 @@ mode-lines in inverse-video.
 ** New package benchmark.el contains simple support for convenient
 timing measurements of code (including the garbage collection component).
 
-** The default values of paragraph-start and indent-line-function have
-been changed to reflect those used in Text mode rather than those used
-in Indented-Text mode.
-
-** If you set `query-replace-skip-read-only' non-nil,
-`query-replace' and related functions simply ignore
-a match if part of it has a read-only property.
-
 ** The new Lisp library fringe.el controls the apperance of fringes.
 
 ** `cfengine-mode' is a major mode for editing GNU Cfengine