comparison lisp/net/imap.el @ 87454:0cbc451989a7

Merge from gnus--devo--0 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-967
author Miles Bader <miles@gnu.org>
date Fri, 28 Dec 2007 22:26:31 +0000
parents bc4976b7380e
children 107ccd98fa12
comparison
equal deleted inserted replaced
87453:cdd30283527d 87454:0cbc451989a7
1175 (make-local-variable 'imap-password) 1175 (make-local-variable 'imap-password)
1176 (if user (setq imap-username user)) 1176 (if user (setq imap-username user))
1177 (if passwd (setq imap-password passwd)) 1177 (if passwd (setq imap-password passwd))
1178 (if imap-auth 1178 (if imap-auth
1179 (and (funcall (nth 2 (assq imap-auth 1179 (and (funcall (nth 2 (assq imap-auth
1180 imap-authenticator-alist)) buffer) 1180 imap-authenticator-alist)) (current-buffer))
1181 (setq imap-state 'auth)) 1181 (setq imap-state 'auth))
1182 ;; Choose authenticator. 1182 ;; Choose authenticator.
1183 (let ((auths imap-authenticators) 1183 (let ((auths imap-authenticators)
1184 auth) 1184 auth)
1185 (while (setq auth (pop auths)) 1185 (while (setq auth (pop auths))
1186 ;; OK to use authenticator? 1186 ;; OK to use authenticator?
1187 (when (funcall (nth 1 (assq auth imap-authenticator-alist)) buffer) 1187 (when (funcall (nth 1 (assq auth imap-authenticator-alist)) (current-buffer))
1188 (message "imap: Authenticating to `%s' using `%s'..." 1188 (message "imap: Authenticating to `%s' using `%s'..."
1189 imap-server auth) 1189 imap-server auth)
1190 (setq imap-auth auth) 1190 (setq imap-auth auth)
1191 (if (funcall (nth 2 (assq auth imap-authenticator-alist)) buffer) 1191 (if (funcall (nth 2 (assq auth imap-authenticator-alist)) (current-buffer))
1192 (progn 1192 (progn
1193 (message "imap: Authenticating to `%s' using `%s'...done" 1193 (message "imap: Authenticating to `%s' using `%s'...done"
1194 imap-server auth) 1194 imap-server auth)
1195 (setq auths nil)) 1195 (setq auths nil))
1196 (message "imap: Authenticating to `%s' using `%s'...failed" 1196 (message "imap: Authenticating to `%s' using `%s'...failed"