From 696e57b862b9d525aae1a735f922025d8fa40bfd Mon Sep 17 00:00:00 2001 From: Robert Pluim Date: Sun, 27 Jan 2019 16:13:46 +0100 Subject: [PATCH] Don't map imaps to 993 anymore except on old Windows versions To: emacs-devel@gnu.org 'open-network-stream' will do the imaps service lookup itself, and using 993 forced the user to use the numeric value in .authinfo for certificate lookups. * lisp/gnus/nnimap.el (nnimap-map-port): Only do mapping for Windows XP or earlier. --- lisp/gnus/nnimap.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 75b5af8aab..9646bb51d0 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -413,8 +413,11 @@ nnimap-open-connection nil stream))) +;; This is only needed for Windows XP or earlier (defun nnimap-map-port (port) - (if (equal port "imaps") + (if (and (eq system-type 'windows-nt) + (<= (car (x-server-version)) 5) + (equal port "imaps")) "993" port)) -- 2.20.1.142.g77556354bb