diff options
| author | Joakim Verona <joakim@verona.se> | 2015-12-27 09:19:21 +0100 |
|---|---|---|
| committer | Joakim Verona <joakim@verona.se> | 2015-12-27 09:19:21 +0100 |
| commit | 2d27e24a37b514e7c07c120cc4f3984ae3b0c53e (patch) | |
| tree | 720dbc648f0efc31db99562790eb4099cb987688 /lisp/erc | |
| parent | 3e73732ac1e52343a1886a7a3f786565118d6b80 (diff) | |
| parent | 531b28b4d96adf39d853fcb5e0bba7251fcce4b6 (diff) | |
| download | emacs-2d27e24a37b514e7c07c120cc4f3984ae3b0c53e.tar.gz | |
merge master
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/erc.el | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 8e26db1d9d3..cd8c8a817e1 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -1471,6 +1471,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. @@ -2194,7 +2198,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))) |