[Emacs-diffs] /srv/bzr/emacs/trunk r99385: Fix erc reconnection via non-default connectors (Bug#4958).

[Chong Yidong]

------------------------------------------------------------
revno: 99385
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Mon 2010-01-25 13:49:23 -0500
message:
  Fix erc reconnection via non-default connectors (Bug#4958).
  
  * erc-backend.el (erc-session-connector): New var.
  (erc-server-reconnect): Use it to reconnect via old connector (Bug#4958).
  
  * erc.el (erc-determine-parameters): Save erc-server-connect-function to 
erc-session-connector.
modified:
  lisp/erc/ChangeLog
  lisp/erc/erc-backend.el
  lisp/erc/erc.el

=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog        2010-01-13 08:35:10 +0000
+++ b/lisp/erc/ChangeLog        2010-01-25 18:49:23 +0000
@@ -1,3 +1,12 @@
+2010-01-25  Vivek Dasmohapatra  <address@hidden>
+
+       * erc-backend.el (erc-session-connector): New var.
+       (erc-server-reconnect): Use it to reconnect via old
+       connector (Bug#4958).
+
+       * erc.el (erc-determine-parameters): Save
+       erc-server-connect-function to erc-session-connector.
+
 2009-11-03  Stefan Monnier  <address@hidden>
 
        * erc.el (erc-display-line-1, erc-process-away):

=== modified file 'lisp/erc/erc-backend.el'
--- a/lisp/erc/erc-backend.el   2010-01-13 08:35:10 +0000
+++ b/lisp/erc/erc-backend.el   2010-01-25 18:49:23 +0000
@@ -130,6 +130,10 @@
   "The server name used to connect to for this session.")
 (make-variable-buffer-local 'erc-session-server)
 
+(defvar erc-session-connector nil
+  "The function used to connect to this session (nil for the default).")
+(make-variable-buffer-local 'erc-session-connector)
+
 (defvar erc-session-port nil
   "The port used to connect to.")
 (make-variable-buffer-local 'erc-session-port)
@@ -538,8 +542,10 @@
       (erc-set-active-buffer (current-buffer))
       (setq erc-server-last-sent-time 0)
       (setq erc-server-lines-sent 0)
-      (erc-open erc-session-server erc-session-port erc-server-current-nick
-                erc-session-user-full-name t erc-session-password))))
+      (let ((erc-server-connect-function (or erc-session-connector
+                                             'open-network-stream)))
+        (erc-open erc-session-server erc-session-port erc-server-current-nick
+                  erc-session-user-full-name t erc-session-password)))))
 
 (defun erc-server-filter-function (process string)
   "The process filter for the ERC server."

=== modified file 'lisp/erc/erc.el'
--- a/lisp/erc/erc.el   2010-01-13 08:35:10 +0000
+++ b/lisp/erc/erc.el   2010-01-25 18:49:23 +0000
@@ -5654,11 +5654,13 @@
   "Determine the connection and authentication parameters.
 Sets the buffer local variables:
 
+- `erc-session-connector'
 - `erc-session-server'
 - `erc-session-port'
 - `erc-session-full-name'
 - `erc-server-current-nick'"
-  (setq erc-session-server (erc-compute-server server)
+  (setq erc-session-connector erc-server-connect-function
+        erc-session-server (erc-compute-server server)
        erc-session-port (or port erc-default-port)
        erc-session-user-full-name (erc-compute-full-name name))
   (erc-set-current-nick (erc-compute-nick nick)))