Mercurial > emacs

comparison lisp/gnus/nnimap.el @ 94837:55eb2a3c59b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from gnus--devo--0 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1153
author Miles Bader <miles@gnu.org>
date Sat, 10 May 2008 05:34:55 +0000
parents f42ef85caf91
children 51e9d65c90fc
comparison
equal deleted inserted replaced
94836:3cb546529dde 94837:55eb2a3c59b4
68 (require 'gnus-range) 68 (require 'gnus-range)
69 (require 'gnus-start) 69 (require 'gnus-start)
70 (require 'gnus-int) 70 (require 'gnus-int)
71 71
72 (eval-when-compile (require 'cl)) 72 (eval-when-compile (require 'cl))
73
74 (eval-and-compile
75 (autoload 'auth-source-user-or-password "auth-source"))
73 76
74 (nnoo-declare nnimap) 77 (nnoo-declare nnimap)
75 78
76 (defconst nnimap-version "nnimap 1.0") 79 (defconst nnimap-version "nnimap 1.0")
77 80
794 nnimap-authinfo-file) 797 nnimap-authinfo-file)
795 (netrc-parse nnimap-authinfo-file))) 798 (netrc-parse nnimap-authinfo-file)))
796 (port (if nnimap-server-port 799 (port (if nnimap-server-port
797 (int-to-string nnimap-server-port) 800 (int-to-string nnimap-server-port)
798 "imap")) 801 "imap"))
799 (user (netrc-machine-user-or-password 802 (user (or
800 "login" 803 (auth-source-user-or-password "login" server port) ; this is preferred to netrc-*
801 list 804 (netrc-machine-user-or-password
802 (list server 805 "login"
803 (or nnimap-server-address 806 list
804 nnimap-address)) 807 (list server
805 (list port) 808 (or nnimap-server-address
806 (list "imap" "imaps" "143" "993"))) 809 nnimap-address))
807 (passwd (netrc-machine-user-or-password 810 (list port)
808 "password" 811 (list "imap" "imaps" "143" "993"))))
809 list 812 (passwd (or
810 (list server 813 (auth-source-user-or-password "login" server port) ; this is preferred to netrc-*
811 (or nnimap-server-address 814 (netrc-machine-user-or-password
812 nnimap-address)) 815 "password"
813 (list port) 816 list
814 (list "imap" "imaps" "143" "993")))) 817 (list server
818 (or nnimap-server-address
819 nnimap-address))
820 (list port)
821 (list "imap" "imaps" "143" "993")))))
815 (if (imap-authenticate user passwd nnimap-server-buffer) 822 (if (imap-authenticate user passwd nnimap-server-buffer)
816 (prog2 823 (prog2
817 (setq nnimap-server-buffer-alist 824 (setq nnimap-server-buffer-alist
818 (nnimap-remove-server-from-buffer-alist 825 (nnimap-remove-server-from-buffer-alist
819 server 826 server