Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-585
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-586
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-587
   Update from erc--emacs--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-588
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-589
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-590
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-591
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-592

1 files changed, 75 insertions, 3 deletions

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index b356f83b0b2..fa087fb513f 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,56 @@
+2006-12-28  Michael Olson  <mwolson@gnu.org>
+
+        * erc-list.el: Change header to mention that this is part of ERC,
+        rather than GNU Emacs.
+
+        * erc-networks.el (erc-server-alist): Add Ars OpenIRC and
+        LinuxChix networks.  Thanks to Angelina Carlton for mentioning
+        them.  Properly escape periods in Konfido.Net and Kewl.Org.
+        (erc-networks-alist): Add entries for Ars and LinuxChix, though
+        the latter does not actually provide an announced network name.
+
+        * erc-services.el (erc-nickserv-identify-mode): Add 'both method,
+        which waits for a NickServ message if the network supports it,
+        otherwise sends the password after connecting.
+        (erc-nickserv-identify-mode): Default to 'both.
+        (erc-nickserv-passwords): Add OFTC and Azzurra to custom options.
+        (erc-nickserv-alist): Indentation fix.
+        (erc-nickserv-identify-on-connect)
+        (erc-nickserv-identify-on-nick-change): Handle 'both method.
+
+2006-12-28  Leo  <sdl.web@gmail.com>  (tiny change)
+
+        * erc.el (erc-iswitchb): Wrap body in unwind-protect so that
+        hitting C-g does not leave iswitchb-mode on.
+
+2006-12-27  Michael Olson  <mwolson@gnu.org>
+
+        * erc.el (erc-cmd-RECONNECT): New command that calls
+        erc-server-reconnect.
+
+        * erc-backend.el (erc-server-reconnect-count): New server variable
+        that keeps track of reconnection attempts.
+        (erc-server-reconnect-attempts): New option that determines the
+        number of reconnection attempts that ERC will make per server.
+        (erc-server-reconnect-timeout): New option that determines the
+        amount of time, in seconds, that ERC will wait between successive
+        reconnect attempts.
+        (erc-server-reconnect): New function that reestablishes the
+        current IRC connection.  Move some commands from
+        erc-process-sentinel-1 here.
+        (erc-process-sentinel-1): If we have been disconnected, loop until
+        we either reconnect or run out of attempts.
+        (erc-server-reconnect-p): Move higher and make this a defsubst,
+        since I'm worried about the current buffer changing from
+        underneath us.  Implement limit of number of reconnect attempts..
+
+        * erc.texi (Getting Started): Update for /RECONNECT command.
+
+2006-12-26  Michael Olson  <mwolson@gnu.org>
+
+        * erc.el (erc-open): Restore old point correctly, or at least get
+        closer to doing so than before.
+
 2006-12-13  Leo  <sdl.web@gmail.com>  (tiny change)
 
         * erc.el (erc-iswitchb): Temporarily enable iswitchb mode if it
@@ -38,7 +91,7 @@
         (erc-update-current-channel-member, erc-load-script):
         (erc-mode-line-away-status-format): Doc fixes.
 
-2006-11-20  Andrea Russo  <rastandy@inventati.org>
+2006-11-20  Andrea Russo  <rastandy@inventati.org>  (tiny change)
 
         * erc-dcc.el (erc-dcc-chat-setup): Initialize `erc-input-marker'
         before calling `erc-display-prompt'.
@@ -111,7 +164,7 @@
         `erc-show-my-nick' is non-nil.
         (erc-compute-server): Doc fix.
 
-2006-10-01  John J Foerch  <jjfoerch@earthlink.net>
+2006-10-01  John J Foerch  <jjfoerch@earthlink.net>  (tiny change)
 
         * erc-stamp.el (erc-insert-timestamp-right): Exclude the newline
         from the erc-timestamp field.
@@ -121,7 +174,7 @@
         * erc-nicklist.el (erc-nicklist-insert-contents): Add missing
         parenthesis.  Thanks to Stephan Stahl for the report.
 
-2006-09-10  Eric Hanchrow  <offby1@blarg.net>
+2006-09-10  Eric Hanchrow  <offby1@blarg.net>  (tiny change)
 
         * erc.el (erc-cmd-IGNORE): Prompt user if this might be a regexp
         instead of a single user.
@@ -230,6 +283,13 @@
 
         * NEWS: Added note about these changes.
 
+2006-08-20  Diane Murray  <disumu@x3y2z1.net>
+
+        * erc-backend.el (erc-process-sentinel-1): Doc fix.  Let
+        `erc-server-reconnect-p' check all condition cases.
+        (erc-server-reconnect-p): Moved rest of checks from
+        `erc-process-sentinel-1' to here.  Now takes an argument, EVENT.
+
 2006-08-21  Diane Murray  <disumu@x3y2z1.net>
 
         * erc-track.el (erc-track-mode-line-mouse-face): New variable.
@@ -242,6 +302,18 @@
         (erc-menu-definition): Name the menu "ERC" instead of "IRC" to
         avoid confusion with rcirc and other clients.
 
+        * erc-backend.el (erc-server-banned): New variable.
+        (erc-server-connect): Set `erc-server-banned' to nil.
+        (erc-process-sentinel-1): Use `erc-server-reconnect-p'.
+        (erc-server-reconnect-p): New function.  Return non-nil if the
+        user wants automatic reconnects and if the user has not been
+        banned from the server.  This should fix a bug where ERC gets into
+        a loop trying to reconnect with no way to stop it when the user is
+        denied access to the server due to a server ban.  It might also
+        help when Tor users are blocked from freenode if freenode servers
+        send the 465 message before disconnecting.
+        (465): Handle "banned from server" error notices.
+
 2006-08-13  Romain Francoise  <romain@orebokech.com>
 
         * erc-match.el (erc-log-matches-make-buffer): End `y-or-n-p'