Sync from upstream ERC

 - Parse 307 (nick has identified) responses.
 - Only activate some things if the connection has been established.

1 files changed, 16 insertions, 0 deletions

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index b7f40c39411..232e004602f 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-29  Giorgos Keramidas  <keramida@ceid.upatras.gr>
+
+        * erc-backend.el, erc.el:
+        Parse 307 (nick has identified) responses.
+
 2007-11-15  Juanma Barranquero  <lekktu@gmail.com>
 
         * erc.el (erc-open):
@@ -5,6 +10,17 @@
         * erc-log.el (log):
         * erc-match.el (erc-log-matches): Fix typos in docstrings.
 
+2007-11-11  Michael Olson  <mwolson@gnu.org>
+
+        * erc-autoaway.el (erc-autoaway-possibly-set-away):
+        * erc-netsplit.el (erc-netsplit-timer):
+        * erc-notify.el (erc-notify-timer):
+        * erc-track.el (erc-user-is-active): Only run if we have
+        successfully established a connection to the server and have
+        logged in.  I suspect that sending messages too soon may make some
+        IRC servers not respond well, particularly when the network
+        connection is iffy or subject to traffic-shaping.
+
 2007-11-01  Michael Olson  <mwolson@gnu.org>
 
         * erc-compat.el (erc-set-write-file-functions): New compatibility