diff options
Diffstat (limited to 'lisp/erc/erc.el')
| -rw-r--r-- | lisp/erc/erc.el | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 3e96bb279e8..b7f40a878a9 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -1473,6 +1473,10 @@ Defaults to the server buffer." (defconst erc-default-port 6667 "IRC port to use if it cannot be detected otherwise.") +(defconst erc-default-port-tls 6697 + "IRC port to use for encrypted connections if it cannot be + detected otherwise.") + (defcustom erc-join-buffer 'buffer "Determines how to display a newly created IRC buffer. @@ -2199,7 +2203,8 @@ be invoked for the values of the other parameters." (defun erc-tls (&rest r) "Interactively select TLS connection parameters and run ERC. Arguments are the same as for `erc'." - (interactive (erc-select-read-args)) + (interactive (let ((erc-default-port erc-default-port-tls)) + (erc-select-read-args))) (let ((erc-server-connect-function 'erc-open-tls-stream)) (apply #'erc r))) @@ -4825,7 +4830,7 @@ channel." ((pred (eq op-ch)) op) ((pred (eq adm-ch)) admin) ((pred (eq own-ch)) owner) - (_ (error "Unknown prefix char `%S'" ch) voice)) + (_ (message "Unknown prefix char `%S'" ch) voice)) 'on))) (when updatep ;; If we didn't issue the NAMES request (consider two clients |