diff options
| author | F. Jason Park <jp@neverwas.me> | 2022-12-29 06:43:19 -0800 |
|---|---|---|
| committer | F. Jason Park <jp@neverwas.me> | 2023-01-02 05:48:39 -0800 |
| commit | ff35ac9dfabf7ac33199c42bc56c8bb0f53eebc4 (patch) | |
| tree | d9b8e9a8f20a71ab86dfef976da05ea92bb5739b /test/lisp/erc | |
| parent | b7ad0b40148bd5905497a4c05fced4e0b9099812 (diff) | |
| download | emacs-ff35ac9dfabf7ac33199c42bc56c8bb0f53eebc4.tar.gz emacs-ff35ac9dfabf7ac33199c42bc56c8bb0f53eebc4.tar.bz2 emacs-ff35ac9dfabf7ac33199c42bc56c8bb0f53eebc4.zip | |
Fix default-port regression in erc-select-read-args
* lisp/erc/erc.el (erc--warn-unencrypted): New function, likely
temporary, to warn new users connecting interactively to the default
server, "irc.libara.chat", via the default non-TLS port, 6667.
(erc-select-read-args): Remove stray code from incomplete feature
introduced by bug#56514. Ensure connecting always works with default
port, which is non-TLS. Respect `erc-prompt-for-password' when user
pastes URL containing password component into "server" prompt. Maybe
add `erc--warn-unencrypted' as one-off hook for impending connection.
* test/lisp/erc/erc-tests.el (erc-select-read-args): Always expect
password prompt and sometimes a non-TLS port when `erc' called
interactively. (Bug#60428.)
Diffstat (limited to 'test/lisp/erc')
| -rw-r--r-- | test/lisp/erc/erc-tests.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/lisp/erc/erc-tests.el b/test/lisp/erc/erc-tests.el index 6807b24bfc6..85506c3d27e 100644 --- a/test/lisp/erc/erc-tests.el +++ b/test/lisp/erc/erc-tests.el @@ -1001,11 +1001,11 @@ (ert-deftest erc-select-read-args () - (ert-info ("Defaults to TLS") + (ert-info ("Does not default to TLS") (should (equal (ert-simulate-keys "\r\r\r\r" (erc-select-read-args)) (list :server "irc.libera.chat" - :port 6697 + :port 6667 :nick (user-login-name) :password nil)))) @@ -1036,7 +1036,7 @@ :password nil)))) (ert-info ("Address includes nick and password") - (should (equal (ert-simulate-keys "nick:sesame@localhost:6667\r" + (should (equal (ert-simulate-keys "nick:sesame@localhost:6667\r\r" (erc-select-read-args)) (list :server "localhost" :port 6667 |