Mercurial > emacs

comparison lisp/gnus/mail-source.el @ 110296:ef15e8533a1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove pop3-movemail and rename pop3-streaming-movemail to pop3-movemail.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Fri, 10 Sep 2010 00:08:31 +0000
parents 6cdcc53703e4
children 6c6f3972c99c
comparison
equal deleted inserted replaced
110295:f70d39f7b8fd 110296:ef15e8533a1c
32 (require 'format-spec) 32 (require 'format-spec)
33 (eval-when-compile 33 (eval-when-compile
34 (require 'cl) 34 (require 'cl)
35 (require 'imap)) 35 (require 'imap))
36 (autoload 'auth-source-user-or-password "auth-source") 36 (autoload 'auth-source-user-or-password "auth-source")
37 (autoload 'pop3-streaming-movemail "pop3") 37 (autoload 'pop3-movemail "pop3")
38 (autoload 'pop3-get-message-count "pop3") 38 (autoload 'pop3-get-message-count "pop3")
39 (autoload 'nnheader-cancel-timer "nnheader") 39 (autoload 'nnheader-cancel-timer "nnheader")
40 (require 'mm-util) 40 (require 'mm-util)
41 (require 'message) ;; for `message-directory' 41 (require 'message) ;; for `message-directory'
42 42
837 (pop3-port port) 837 (pop3-port port)
838 (pop3-authentication-scheme 838 (pop3-authentication-scheme
839 (if (eq authentication 'apop) 'apop 'pass)) 839 (if (eq authentication 'apop) 'apop 'pass))
840 (pop3-stream-type stream)) 840 (pop3-stream-type stream))
841 (if (or debug-on-quit debug-on-error) 841 (if (or debug-on-quit debug-on-error)
842 (save-excursion (pop3-streaming-movemail 842 (save-excursion (pop3-movemail mail-source-crash-box))
843 mail-source-crash-box))
844 (condition-case err 843 (condition-case err
845 (save-excursion (pop3-streaming-movemail 844 (save-excursion (pop3-movemail mail-source-crash-box))
846 mail-source-crash-box))
847 (error 845 (error
848 ;; We nix out the password in case the error 846 ;; We nix out the password in case the error
849 ;; was because of a wrong password being given. 847 ;; was because of a wrong password being given.
850 (setq mail-source-password-cache 848 (setq mail-source-password-cache
851 (delq (assoc from mail-source-password-cache) 849 (delq (assoc from mail-source-password-cache)