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 | 535cc4c81a91d0661418ce59be951dda9e233a2e (patch) | |
| tree | 21a8ffb4232696d04d90069a8b8631248c0772fc /lisp/erc | |
| parent | 77d6351d60d3c741550d990fbf97184433b7b59a (diff) | |
| download | emacs-535cc4c81a91d0661418ce59be951dda9e233a2e.tar.gz emacs-535cc4c81a91d0661418ce59be951dda9e233a2e.tar.bz2 emacs-535cc4c81a91d0661418ce59be951dda9e233a2e.zip | |
Add optional server param to erc-networks--determine
* lisp/erc/erc-networks.el (erc-networks--determine): Accept optional
`server' argument.
* test/lisp/erc/erc-networks-tests.el (erc-networks--determine): Add
test. (Bug#56514.)
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/erc-networks.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/erc/erc-networks.el b/lisp/erc/erc-networks.el index dba6ead073b..b3e5fcf1a30 100644 --- a/lisp/erc/erc-networks.el +++ b/lisp/erc/erc-networks.el @@ -1256,14 +1256,15 @@ server name and search for a match in `erc-networks-alist'." (defconst erc-networks--name-missing-sentinel (gensym "Unknown ") "Value to cover rare case of a literal NETWORK=nil.") -(defun erc-networks--determine () +(defun erc-networks--determine (&optional server) "Return the name of the network as a symbol. -Search `erc-networks-alist' for a known entity matching +Search `erc-networks-alist' for a known entity matching SERVER or `erc-server-announced-name'. If that fails, use the display name given by the `RPL_ISUPPORT' NETWORK parameter." (or (cl-loop for (name matcher) in erc-networks-alist - when (and matcher (string-match (concat matcher "\\'") - erc-server-announced-name)) + when (and matcher + (string-match (concat matcher "\\'") + (or server erc-server-announced-name))) return name) (and-let* ((vanity (erc--get-isupport-entry 'NETWORK 'single)) ((intern vanity)))) |