(pop3-logon): Fix up unbound variable typo.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3d7c4cb..811cad1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,11 @@
 2010-09-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * pop3.el (pop3-logon): Fix up unbound variable typo.
+
+       * mail-source.el (pop3-streaming-movemail): Autoload.
+
        * pop3.el (pop3-streaming-movemail): Respect
-       pop3-leave-mail-on-server. 
+       pop3-leave-mail-on-server.
 
        * mail-source.el (mail-source-fetch-pop): Use streaming pop3
        retrieval.

diff --git a/lisp/mail-source.el b/lisp/mail-source.el
index 70f354e..422ef31 100644 (file)
--- a/lisp/mail-source.el
+++ b/lisp/mail-source.el
@@ -34,7 +34,7 @@
   (require 'cl)
   (require 'imap))
 (autoload 'auth-source-user-or-password "auth-source")
-(autoload 'pop3-movemail "pop3")
+(autoload 'pop3-streaming-movemail "pop3")
 (autoload 'pop3-get-message-count "pop3")
 (autoload 'nnheader-cancel-timer "nnheader")
 (require 'mm-util)

diff --git a/lisp/pop3.el b/lisp/pop3.el
index 9874882..ca92046 100644 (file)
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -133,7 +133,7 @@ Shorter values mean quicker response, but are more CPU intensive.")
 Use streaming commands."
   (let* ((process (pop3-open-server pop3-mailhost pop3-port))
         message-count message-total-size)
-    (pop3-logon)
+    (pop3-logon process)
     (with-current-buffer (process-buffer process)
       (let ((size (pop3-stat process)))
        (setq message-count (car size)
@@ -210,7 +210,7 @@ Use streaming commands."
        (incf responses)))
     responses))
 
-(defun pop3-logon ()
+(defun pop3-logon (process)
   (let ((pop3-password pop3-password))
     ;; for debugging only
     (if pop3-debug (switch-to-buffer (process-buffer process)))
@@ -233,10 +233,9 @@ Use streaming commands."
         (n 1)
         message-count
         message-sizes)
-    (pop3-logon)
+    (pop3-logon process)
     (setq message-count (car (pop3-stat process)))
-    (when (and pop3-display-message-size-flag
-              (> message-count 0))
+    (when (> message-count 0)
       (setq message-sizes (pop3-list process)))
     (unwind-protect
        (while (<= n message-count)