bug#4048: 23.1; erc-server-reconnect-attempts does not work

[Vivek Dasmohapatra <vivek@etla.org>]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 537 bytes --]

Tags: patch

Does this patch make the problem go away? It seems to work here.

The problem was that erc-mode was killing all local variables, even when
the mode was already erc-mode : The patch makes it preserve the
reconnection count in that case, which seems to have the desired effect
without adversely affecting anything else.

[ Stomping on the route didn't work for me as the existing connection was
   grandfathered in by the kernel: Installing a local ircd and shutting it
   down behind the client's back worked nicely though. ]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: TEXT/x-diff; name=0001-Preserve-the-reconnection-count-when-reinitialising-.patch, Size: 572 bytes --]

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -1445,7 +1445,10 @@ Special commands:
 \\{erc-mode-map}
 
 Turning on `erc-mode' runs the hook `erc-mode-hook'."
-  (kill-all-local-variables)
+  (let ((recon-count erc-server-reconnect-count) (old-mode major-mode))
+    (kill-all-local-variables)
+    (if (and (eq old-mode 'erc-mode) (integerp recon-count) (< 0 recon-count)) 
+	(setq erc-server-reconnect-count recon-count)))
   (use-local-map erc-mode-map)
   (setq mode-name "ERC"
 	major-mode 'erc-mode