mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Fix erc reconnection via non-default connectors (Bug#4958).

Browse source 
* 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.
This commit is contained in:
Chong Yidong 2010-01-25 13:49:23 -05:00
parent e2396d80cb
commit 361bbf574b
3 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lisp/erc/ChangeLog
View file

@ -1,3 +1,12 @@
2010-01-25 Vivek Dasmohapatra <vivek@etla.org>
* 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 <monnier@iro.umontreal.ca>
* erc.el (erc-display-line-1, erc-process-away):

10
lisp/erc/erc-backend.el
View file

@ -130,6 +130,10 @@ Use `erc-current-nick' to access this.")
"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 @@ Make sure you are in an ERC buffer when running this."
(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."

4
lisp/erc/erc.el
View file

@ -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)))