diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-01-25 13:49:23 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-01-25 13:49:23 -0500 |
| commit | 361bbf574b7ae0e0a3975307b8f00c355870a3e0 (patch) | |
| tree | fe72731cbf34243917fc9d5c8e9586ad6486924b /lisp/erc/erc.el | |
| parent | e2396d80cbf7e9d20c05eff44c1c8f04ecb9341c (diff) | |
| download | emacs-361bbf574b7ae0e0a3975307b8f00c355870a3e0.tar.gz emacs-361bbf574b7ae0e0a3975307b8f00c355870a3e0.tar.bz2 emacs-361bbf574b7ae0e0a3975307b8f00c355870a3e0.zip | |
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.
Diffstat (limited to 'lisp/erc/erc.el')
| -rw-r--r-- | lisp/erc/erc.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index d2445414c83..b76f486f155 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -5654,11 +5654,13 @@ user input." "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))) |