diff options
| author | Philip Kaludercic | 2023-05-01 13:53:52 +0200 |
|---|---|---|
| committer | Philip Kaludercic | 2023-05-04 10:06:32 +0200 |
| commit | ab44c8a6f9d7926a00dd1dfe49fa8ae07b5e7030 (patch) | |
| tree | 1cabdff24163c60cc7a2869044c4f094ad023bfd /lisp | |
| parent | 8eb6e33691d1c8e95e25e086e1b04669ea4fffdb (diff) | |
| download | emacs-ab44c8a6f9d7926a00dd1dfe49fa8ae07b5e7030.tar.gz emacs-ab44c8a6f9d7926a00dd1dfe49fa8ae07b5e7030.zip | |
Fix order of rcirc-connect arguments
* 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 b79cb838a477ee5a5c3660e81264991ff833a82f.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/net/rcirc.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 937f4046adb..cf1b952086a 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el | |||
| @@ -584,7 +584,7 @@ If ARG is non-nil, instead prompt for connection parameters." | |||
| 584 | (condition-case nil | 584 | (condition-case nil |
| 585 | (let ((process (rcirc-connect server port nick user-name | 585 | (let ((process (rcirc-connect server port nick user-name |
| 586 | full-name channels password encryption | 586 | full-name channels password encryption |
| 587 | client-cert server-alias))) | 587 | server-alias client-cert))) |
| 588 | (when rcirc-display-server-buffer | 588 | (when rcirc-display-server-buffer |
| 589 | (pop-to-buffer-same-window (process-buffer process)))) | 589 | (pop-to-buffer-same-window (process-buffer process)))) |
| 590 | (quit (message "Quit connecting to %s" | 590 | (quit (message "Quit connecting to %s" |
| @@ -680,7 +680,7 @@ See `rcirc-connect' for more details on these variables.") | |||
| 680 | ;;;###autoload | 680 | ;;;###autoload |
| 681 | (defun rcirc-connect (server &optional port nick user-name | 681 | (defun rcirc-connect (server &optional port nick user-name |
| 682 | full-name startup-channels password encryption | 682 | full-name startup-channels password encryption |
| 683 | certfp server-alias) | 683 | server-alias certfp) |
| 684 | "Connect to SERVER. | 684 | "Connect to SERVER. |
| 685 | The arguments PORT, NICK, USER-NAME, FULL-NAME, PASSWORD, | 685 | The arguments PORT, NICK, USER-NAME, FULL-NAME, PASSWORD, |
| 686 | ENCRYPTION, CERTFP, SERVER-ALIAS are interpreted as in | 686 | ENCRYPTION, CERTFP, SERVER-ALIAS are interpreted as in |