diff options
| author | F. Jason Park <jp@neverwas.me> | 2022-07-11 05:14:57 -0700 |
|---|---|---|
| committer | F. Jason Park <jp@neverwas.me> | 2022-11-16 21:34:36 -0800 |
| commit | 77d6351d60d3c741550d990fbf97184433b7b59a (patch) | |
| tree | 64d9253c0848e77cf81e2d8bc5d85d59db7989f4 /lisp/erc/erc.el | |
| parent | 46c765ed09422767306bd7acfc8422d5ad4cea4a (diff) | |
| download | emacs-77d6351d60d3c741550d990fbf97184433b7b59a.tar.gz | |
Default to TLS port when calling erc-tls from lisp
* lisp/erc/erc.el (erc-normalize-port): Add standard IANA port-name
mappings for 6667 and 6697.
(erc-open): Add note to doc string explaining that params `connect'
and `channel' are mutually exclusive.
(erc-tls): Call `erc-compute-port' with override.
(erc-compute-port): Call `erc-normalize-port' with result'.
* test/lisp/erc/erc-tests.el (erc-tls): Add simplistic test focusing
on default parameters. (Bug#56514.)
Diffstat (limited to 'lisp/erc/erc.el')
| -rw-r--r-- | lisp/erc/erc.el | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index badda3ab84c..897357e16be 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -1542,6 +1542,11 @@ symbol, it may have these values: * ircs -> 994 * ircd -> 6667 * ircd-dalnet -> 7000" + ;; These were updated somewhat in 2022 to reflect modern standards + ;; and practices. See also: + ;; + ;; https://datatracker.ietf.org/doc/html/rfc7194#section-1 + ;; https://www.iana.org/assignments/service-names-port-numbers (cond ((symbolp port) (erc-normalize-port (symbol-name port))) @@ -1554,8 +1559,10 @@ symbol, it may have these values: 194) ((string-equal port "ircs") 994) - ((string-equal port "ircd") + ((string-equal port "ircu") 6667) ; 6665-6669 + ((string-equal port "ircd") ; nonstandard (irc-serv is 529) 6667) + ((string-equal port "ircs-u") 6697) ((string-equal port "ircd-dalnet") 7000) (t @@ -1924,7 +1931,9 @@ removed from the list will be disabled." If CONNECT is non-nil, connect to the server. Otherwise assume already connected and just create a separate buffer for the new -target CHANNEL. +target given by CHANNEL, meaning these parameters are mutually +exclusive. Note that CHANNEL may also be a query; its name has +been retained for historical reasons. Use PASSWD as user password on the server. If TGT-LIST is non-nil, use it to initialize `erc-default-recipients'. @@ -2183,7 +2192,7 @@ interactively." ;;;###autoload (cl-defun erc-tls (&key (server (erc-compute-server)) - (port (erc-compute-port)) + (port (erc-compute-port 'ircs-u)) (nick (erc-compute-nick)) (user (erc-compute-user)) password @@ -6404,7 +6413,7 @@ non-nil value is found. - PORT (the argument passed to this function) - The `erc-port' option - The `erc-default-port' variable" - (or port erc-port erc-default-port)) + (erc-normalize-port (or port erc-port erc-default-port))) ;; time routines |