From 5917b504874faaa849f3976e0bfd75383745bd44 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=81ukasz=20Stelmach?= Date: Sat, 26 Dec 2015 03:47:21 +0100 Subject: [PATCH] Use a different port for TLS erc * lisp/erc/erc.el (erc-default-port-tls): New variable (bug#19497). * lisp/erc/erc.el (erc-tls): Use it. Copyright-paperwork-exempt: yes --- etc/NEWS | 3 +++ lisp/erc/erc.el | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/etc/NEWS b/etc/NEWS index edd81476c17..20a12329edc 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -376,6 +376,9 @@ hide all messages of the specified type, where `erc-network-hide-list' and `erc-channel-hide-list' will only hide the specified message types for the respective specified targets. +*** New variable `erc-default-port-tls' used to connect to TLS IRC +servers. + ** Midnight-mode *** `midnight-mode' is a proper minor mode. *** clean-buffer-*-regexps can now specify buffers via predicate functions. 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))) -- 2.39.2