]> git.eshelyaron.com Git - emacs.git/commit
Favor network identities in erc-join
authorF. Jason Park <jp@neverwas.me>
Sun, 30 May 2021 07:50:50 +0000 (00:50 -0700)
committerF. Jason Park <jp@neverwas.me>
Thu, 30 Jun 2022 22:17:47 +0000 (15:17 -0700)
commit959fbcf34b5dd04e1b4bf87c0b73afd784a41f7f
tree516efe8d3bc63f57bdc290fefddc8529de3c4b3c
parent1767b0bd7e2883c9467ebf0e0aedee1fd90bcf92
Favor network identities in erc-join

* lisp/erc/erc-join.el (erc-autojoin-server-match): Favor network
identities, falling back on old definition.
(erc-autojoin--join): Add new helper containing common code from
hookees `erc-autojoin-after-ident' and `erc-autojoin-channels'.
(erc-autojoin-after-ident, erc-autojoin-channels): No longer make a
point of returning nil because the hooks they're registered on,
`erc-nickserv-identified-hook' and `erc-after-connect', don't stop on
success.
(erc-autojoin--mutate): Add helper for `erc-autojoin-add' and
`erc-autojoin-remove'.
(erc-autojoin-add, erc-autojoin-remove): Favor given network
identities, over networks, when matching keys for
`erc-autojoin-channels-alist'.

* test/lisp/erc/erc-scenarios-base-reconnect.el: New file.
* test/lisp/erc/erc-scenarios-join-netid-newcmd-id.el: New file.
* test/lisp/erc/erc-scenarios-join-netid-newcmd.el: New file.
* test/lisp/erc/erc-scenarios-join-netid-recon-id.el: New file.
* test/lisp/erc/erc-scenarios-join-netid-recon.el: New file.
* test/lisp/erc/resources/erc-scenarios-common.el: New file.
* test/lisp/erc/resources/join/legacy/foonet.eld: New file.
* test/lisp/erc/resources/join/network-id/barnet.eld: New file.
* test/lisp/erc/resources/join/network-id/foonet-again.eld: New file.
* test/lisp/erc/resources/join/network-id/foonet.eld: New file.
* test/lisp/erc/resources/join/reconnect/foonet-again.eld: New file.
* test/lisp/erc/resources/join/reconnect/foonet.eld: New file.
14 files changed:
lisp/erc/erc-join.el
test/lisp/erc/erc-join-tests.el [new file with mode: 0644]
test/lisp/erc/erc-scenarios-base-reconnect.el
test/lisp/erc/erc-scenarios-join-netid-newcmd-id.el [new file with mode: 0644]
test/lisp/erc/erc-scenarios-join-netid-newcmd.el [new file with mode: 0644]
test/lisp/erc/erc-scenarios-join-netid-recon-id.el [new file with mode: 0644]
test/lisp/erc/erc-scenarios-join-netid-recon.el [new file with mode: 0644]
test/lisp/erc/resources/erc-scenarios-common.el
test/lisp/erc/resources/join/legacy/foonet.eld [new file with mode: 0644]
test/lisp/erc/resources/join/network-id/barnet.eld [new file with mode: 0644]
test/lisp/erc/resources/join/network-id/foonet-again.eld [new file with mode: 0644]
test/lisp/erc/resources/join/network-id/foonet.eld [new file with mode: 0644]
test/lisp/erc/resources/join/reconnect/foonet-again.eld [new file with mode: 0644]
test/lisp/erc/resources/join/reconnect/foonet.eld [new file with mode: 0644]