Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 545-562)

   - Update from CVS
   - Update from erc--emacs--22
   - Merge from gnus--rel--5.10
   - erc-iswitchb: Temporarily enable iswitchb mode

 * gnus--rel--5.10  (patch 172-176)

   - Merge from emacs--devo--0
   - Update from CVS
   - Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice.

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-156

1 files changed, 5 insertions, 5 deletions

diff --git a/etc/NEWS b/etc/NEWS
index df87c7d1851..a9928b4ec7d 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1945,10 +1945,10 @@ are left unspecified and can be bound individually through the global
 or local keymaps.
 
 +++
-** The new kmacro package provides a simpler user interface to
-emacs' keyboard macro facilities.
+** Emacs' keyboard macro facilities have been enhanced by the new
+kmacro package.
 
-Basically, it uses two function keys (default F3 and F4) like this:
+Keyboard macros are now defined and executed via the F3 and F4 keys:
 F3 starts a macro, F4 ends the macro, and pressing F4 again executes
 the last macro.  While defining the macro, F3 inserts a counter value
 which automatically increments every time the macro is executed.
@@ -1963,8 +1963,8 @@ manipulating the macro counter and format via C-x C-k C-c,
 C-x C-k C-a, and C-x C-k C-f.  See the commentary in kmacro.el
 for more commands.
 
-The normal macro bindings C-x (, C-x ), and C-x e now interfaces to
-the keyboard macro ring.
+The original macro bindings C-x (, C-x ), and C-x e are still
+available, but they now interface to the keyboard macro ring too.
 
 The C-x e command now automatically terminates the current macro
 before calling it, if used while defining a macro.