From f33a5dc9475ae43bb2477e648befd6a893d216f1 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 '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. * etc/NEWS: Describe imaps mapping change. --- etc/NEWS | 6 ++++++ lisp/gnus/nnimap.el | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/etc/NEWS b/etc/NEWS index a9c009e9d21..72a6b385a82 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -590,6 +590,12 @@ Of course it will still find it if you have it in ~/.ecompleterc ** Gnus +--- +*** Gnus now maps imaps to 993 only on old MS-Windows versions. +The nnimap backend used to do this unconditionally to work around +problems on old versions of MS-Windows. This is now done only for +Windows XP and older. + +++ *** The nnimap backend now has support for IMAP namespaces. This feature can be enabled by setting the new 'nnimap-use-namespaces' diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 75b5af8aabd..9646bb51d08 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -413,8 +413,11 @@ textual parts.") 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.39.5