diff options
| author | Miles Bader <miles@gnu.org> | 2004-09-10 21:36:15 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2004-09-10 21:36:15 +0000 |
| commit | 7cb0aa56ca5374e0cff9bf0ff815559bb5954a52 (patch) | |
| tree | 4c6de170cf680ea1a6c85a8a6b5d97e0484c0e14 /lisp/gnus/nnimap.el | |
| parent | d528bff7457eee0a714a17b8f8f68e2cfe4d3314 (diff) | |
| download | emacs-7cb0aa56ca5374e0cff9bf0ff815559bb5954a52.tar.gz | |
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-539
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-21
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-22
Update from CVS: lisp/nndb.el (require): Remove tcp and duplicate cl.
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-23
Update from CVS
Diffstat (limited to 'lisp/gnus/nnimap.el')
| -rw-r--r-- | lisp/gnus/nnimap.el | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index fc33b9a48eb..782e987862b 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -723,10 +723,15 @@ If EXAMINE is non-nil the group is selected read-only." (int-to-string nnimap-server-port) "imap")) (alist (or (gnus-netrc-machine list server port "imap") + (gnus-netrc-machine list server port "imaps") (gnus-netrc-machine list (or nnimap-server-address nnimap-address) - port "imap"))) + port "imap")) + (gnus-netrc-machine list + (or nnimap-server-address + nnimap-address) + port "imaps"))) (user (gnus-netrc-get alist "login")) (passwd (gnus-netrc-get alist "password"))) (if (imap-authenticate user passwd nnimap-server-buffer) |