masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-04 03:13:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix order of rcirc-connect arguments

Browse source 
* lisp/net/rcirc.el (rcirc): Pass SERVER-ALIAS before CLIENT-CERT.
(rcirc-connect): Take SERVER-ALIAS before CLIENT-CERT.

This is necessary for the 'rcirc-reconnect' trick to work that applies
the contents of 'rcirc-connection-info' to 'rcirc-connect', otherwise
the server alias gets lost as certfp information.

This addresses a change made in b79cb838a4.
This commit is contained in:
Philip Kaludercic 2023-05-01 13:53:52 +02:00
parent 8eb6e33691
commit ab44c8a6f9
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/net/rcirc.el
View file

@ -584,7 +584,7 @@ If ARG is non-nil, instead prompt for connection parameters."
(condition-case nil (condition-case nil
(let ((process (rcirc-connect server port nick user-name (let ((process (rcirc-connect server port nick user-name
full-name channels password encryption full-name channels password encryption
client-cert server-alias))) server-alias client-cert)))
(when rcirc-display-server-buffer (when rcirc-display-server-buffer
(pop-to-buffer-same-window (process-buffer process)))) (pop-to-buffer-same-window (process-buffer process))))
(quit (message "Quit connecting to %s" (quit (message "Quit connecting to %s"
@ -680,7 +680,7 @@ See `rcirc-connect' for more details on these variables.")
;;;###autoload ;;;###autoload
(defun rcirc-connect (server &optional port nick user-name (defun rcirc-connect (server &optional port nick user-name
full-name startup-channels password encryption full-name startup-channels password encryption
certfp server-alias) server-alias certfp)
"Connect to SERVER. "Connect to SERVER.
The arguments PORT, NICK, USER-NAME, FULL-NAME, PASSWORD, The arguments PORT, NICK, USER-NAME, FULL-NAME, PASSWORD,
ENCRYPTION, CERTFP, SERVER-ALIAS are interpreted as in ENCRYPTION, CERTFP, SERVER-ALIAS are interpreted as in