*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index 216ceb0d01489d15474e1078ce109c184cb3d265..cc582aa7f572630e7f2190e307477325b8d893fa 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -13,6 +13,10 @@ the --without-pop configure option, should that be necessary.
 \f
 * Changes in Emacs 21.1
 
+** You can now easily create new *Info* buffers using either M-x clone-buffer
+or C-u m <entry> RET.  M-x clone-buffer can also be used on *Help* and
+several other special buffers.
+
 ** Emacs can now support 'wheeled' mice (such as the MS IntelliMouse)
 under XFree86.  To enable this, simply put (mwheel-install) in your
 .emacs file.
@@ -750,6 +754,9 @@ course, after a `do .. while' statement), and C++ functions with
 reference parameters are recognized.  The modes require font-lock mode
 to be enabled.
 
+*** smerge-mode.el provides `smerge-mode', a simple minor-mode for files
+containing diff3-style conflict markers, such as generated by RCS.
+
 *** 5x5.el is a simple puzzle game.
 
 *** hl-line.el provides a minor mode to highlight the current line.
@@ -860,6 +867,9 @@ Note that +++ before an item means the Lisp manual has been updated.
 When you add a new item, please add it without either +++ or ---
 so I will know I still need to look at it -- rms.
 
+** easy-mmode-define-minor-mode now takes an additional BODY argument
+and is renamed `define-minor-mode'.
+
 ** If an abbrevs has only a hook, and that hooks has a non-nil
 `no-self-insert' property, the return value of the hook specifies
 whether an expansion has been done or not.  If it returns nil, no
@@ -881,6 +891,9 @@ TABLE.  The current syntax table is saved, BODY is evaluated, and the
 saved table is restored, even in case of an abnormal exit.  Value is
 what BODY returns.
 
+** Regular expressions now support Perl's non-greedy *? +? and ??
+operators.
+
 ** The optional argument BUFFER of function file-local-copy has been
 removed since it wasn't used by anything.
 

diff --git a/man/search.texi b/man/search.texi
index 09c66bca0afd7291b85b4af35dc5b48fd5d9f1e1..a4f4d87dabaeb0a0be7ea2c44c94bea2db84b521 100644 (file)
--- a/man/search.texi
+++ b/man/search.texi
@@ -407,6 +407,12 @@ is a postfix operator, similar to @samp{*} except that it can match the
 preceding expression either once or not at all.  For example,
 @samp{ca?r} matches @samp{car} or @samp{cr}; nothing else.
 
+@item *?, +?, ??
+are non-greedy variants of the operators above.  The normal operators
+@samp{*, +, ?} are greedy in that they match as much as they can,
+while if you prepend a @samp{?} after them, it makes them non-greedy
+in that they will match as little as possible.
+
 @item [ @dots{} ]
 is a @dfn{character set}, which begins with @samp{[} and is terminated
 by @samp{]}.  In the simplest case, the characters between the two