Mercurial > emacs
comparison lisp/gnus/nnimap.el @ 92147:773ae07da318
Merge from gnus--devo--0
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1073
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 24 Feb 2008 06:43:15 +0000 |
parents | 107ccd98fa12 |
children | b7f1378e2a2c |
comparison
equal
deleted
inserted
replaced
92146:7289437eb685 | 92147:773ae07da318 |
---|---|
800 list | 800 list |
801 (list server | 801 (list server |
802 (or nnimap-server-address | 802 (or nnimap-server-address |
803 nnimap-address)) | 803 nnimap-address)) |
804 (list port) | 804 (list port) |
805 (list "imap" "imaps"))) | 805 (list "imap" "imaps" "143" "993"))) |
806 (passwd (netrc-machine-user-or-password | 806 (passwd (netrc-machine-user-or-password |
807 "password" | 807 "password" |
808 list | 808 list |
809 (list server | 809 (list server |
810 (or nnimap-server-address | 810 (or nnimap-server-address |
811 nnimap-address)) | 811 nnimap-address)) |
812 (list port) | 812 (list port) |
813 (list "imap" "imaps")))) | 813 (list "imap" "imaps" "143" "993")))) |
814 (if (imap-authenticate user passwd nnimap-server-buffer) | 814 (if (imap-authenticate user passwd nnimap-server-buffer) |
815 (prog2 | 815 (prog2 |
816 (setq nnimap-server-buffer-alist | 816 (setq nnimap-server-buffer-alist |
817 (nnimap-remove-server-from-buffer-alist | 817 (nnimap-remove-server-from-buffer-alist |
818 server | 818 server |