From d32fac699422013af0b1de0d4ff5bbf1ec613ab7 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Mon, 6 Sep 2010 00:33:15 +0000 Subject: [PATCH] nnimap.el (nnimap-open-connection): Revert the change that would look into authinfo for imaps instead of imap. --- lisp/gnus/ChangeLog | 3 +++ lisp/gnus/nnimap.el | 10 +++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 0beb0bcb2e0..45018de0e4f 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,5 +1,8 @@ 2010-09-05 Lars Magne Ingebrigtsen + * nnimap.el (nnimap-open-connection): Revert the change that would look + into authinfo for imaps instead of imap. + * gnus-start.el (gnus-activate-group): Take an optional parameter to say that you don't want to call gnus-request-group with don-check, but do check the reponse. This is for virtual groups only. diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index e6a7f740d23..d412af46d0c 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -833,13 +833,9 @@ If EXAMINE is non-nil the group is selected read-only." (let* ((list (progn (gnus-message 7 "Parsing authinfo file `%s'." nnimap-authinfo-file) (netrc-parse nnimap-authinfo-file))) - (port (cond - (nnimap-server-port - (int-to-string nnimap-server-port)) - ((eq nnimap-stream 'ssl) - "imaps") - (t - "imap"))) + (port (if nnimap-server-port + (int-to-string nnimap-server-port) + "imap")) (auth-info (auth-source-user-or-password '("login" "password") server port)) (auth-user (nth 0 auth-info)) -- 2.39.2