Merge from erc--main--0

Highlights:

 - Display messages starting with "/" but are not commands correctly.
 - Add erc-capab.el file, with capab-identify module.
 - Fix various ERC menu bugs and add "Current channel" submenu.
 - Make header-line display look nicer.
 - Fix warning when auto-authenticating to bitlbee.
 - New option erc-system-name allows the hostname next to your nick to be
   customized.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-599
Creator:  Michael Olson <mwolson@gnu.org>

2 files changed, 15 insertions, 0 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 50a18ac4187..a01984d0bac 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-13  Michael Olson  <mwolson@gnu.org>
+
+        * ERC-NEWS: Mention new erc-capab.el file.
+
 2007-01-13  Glenn Morris  <rgm@gnu.org>
 
         * MACHINES: Add information on compiling 32-bit Emacs on 64-bit
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index a927419c8c7..d2dcb0b00a1 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -22,6 +22,17 @@ reconnection attempts that ERC will make per server.
 amount of time, in seconds, that ERC will wait between successive
 reconnect attempts.
 
+** New face: `erc-my-nick-face'
+This helps make it easier to distinguish messages sent by yourself
+from messages sent by other users when the value of the variable
+`erc-show-my-nick' is non-nil.
+
+** New modules
+
+*** Capab identify (erc-capab.el)
+Mark users who haven't identified to NickServ on servers supporting
+CAPAB IDENTIFY-MSG.
+
 ** Changes and additions to modules
 
 *** Channel lists (erc-list.el)