# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 946859361 0
# Node ID 6500fd0a7d8e6d77913669bddfd329e99637ffc0
# Parent  4b1a67a46d8c8013491ce4c47eaeabb376827930
*** empty log message ***

diff -r 4b1a67a46d8c -r 6500fd0a7d8e etc/NEWS
--- a/etc/NEWS	Mon Jan 03 00:19:17 2000 +0000
+++ b/etc/NEWS	Mon Jan 03 00:29:21 2000 +0000
@@ -13,6 +13,10 @@
 
 * 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 @@
 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 @@
 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 @@
 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 -r 4b1a67a46d8c -r 6500fd0a7d8e man/search.texi
--- a/man/search.texi	Mon Jan 03 00:19:17 2000 +0000
+++ b/man/search.texi	Mon Jan 03 00:29:21 2000 +0000
@@ -407,6 +407,12 @@
 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