Mercurial > emacs
changeset 110219:cee903f20270
nnimap.el (nnimap-open-connection): Revert the change that would look into authinfo for imaps instead of imap.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Mon, 06 Sep 2010 00:33:15 +0000 |
| parents | f9aca84de985 |
| children | b38765bfe949 |
| files | lisp/gnus/ChangeLog lisp/gnus/nnimap.el |
| diffstat | 2 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Mon Sep 06 00:20:42 2010 +0000 +++ b/lisp/gnus/ChangeLog Mon Sep 06 00:33:15 2010 +0000 @@ -1,5 +1,8 @@ 2010-09-05 Lars Magne Ingebrigtsen <larsi@gnus.org> + * 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.
--- a/lisp/gnus/nnimap.el Mon Sep 06 00:20:42 2010 +0000 +++ b/lisp/gnus/nnimap.el Mon Sep 06 00:33:15 2010 +0000 @@ -833,13 +833,9 @@ (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))