3 files changed, 10 insertions, 44 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 28bbcc341ea..1db55dcdc3f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,10 @@
 2010-09-09  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+        * mail-source.el (mail-source-fetch-pop): Use pop3-movemail again.
+
+        * pop3.el (pop3-movemail): Removed.
+        (pop3-streaming-movemail): Renamed to pop3-movemail.
+
         * gnus-html.el (gnus-html-wash-tags): Refactor out the image bit, and
         don't restrict end-tag searches to the end of the line.
 
diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el
index d3ceb6dfd07..662b999c288 100644
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -34,7 +34,7 @@
   (require 'cl)
   (require 'imap))
 (autoload 'auth-source-user-or-password "auth-source")
-(autoload 'pop3-streaming-movemail "pop3")
+(autoload 'pop3-movemail "pop3")
 (autoload 'pop3-get-message-count "pop3")
 (autoload 'nnheader-cancel-timer "nnheader")
 (require 'mm-util)
@@ -839,11 +839,9 @@ Deleting old (> %s day(s)) incoming mail file `%s'." diff bfile)
                      (if (eq authentication 'apop) 'apop 'pass))
                     (pop3-stream-type stream))
                 (if (or debug-on-quit debug-on-error)
-                    (save-excursion (pop3-streaming-movemail
-                                     mail-source-crash-box))
+                    (save-excursion (pop3-movemail mail-source-crash-box))
                   (condition-case err
-                      (save-excursion (pop3-streaming-movemail
-                                       mail-source-crash-box))
+                      (save-excursion (pop3-movemail mail-source-crash-box))
                     (error
                      ;; We nix out the password in case the error
                      ;; was because of a wrong password being given.
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index a5470d7d818..4f28dcdca46 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -129,7 +129,8 @@ Shorter values mean quicker response, but are more CPU intensive.")
                        (truncate pop3-read-timeout))
                     1000))))))
 
-(defun pop3-streaming-movemail (file)
+;;;###autoload
+(defun pop3-movemail (file)
   "Transfer contents of a maildrop to the specified FILE.
 Use streaming commands."
   (let* ((process (pop3-open-server pop3-mailhost pop3-port))
@@ -227,44 +228,6 @@ Use streaming commands."
            (pop3-pass process))
           (t (error "Invalid POP3 authentication scheme")))))
 
-(defun pop3-movemail (&optional crashbox)
-  "Transfer contents of a maildrop to the specified CRASHBOX."
-  (or crashbox (setq crashbox (expand-file-name "~/.crashbox")))
-  (let* ((process (pop3-open-server pop3-mailhost pop3-port))
-         (crashbuf (get-buffer-create " *pop3-retr*"))
-         (n 1)
-         message-count
-         message-sizes)
-    (pop3-logon process)
-    (setq message-count (car (pop3-stat process)))
-    (when (> message-count 0)
-      (setq message-sizes (pop3-list process)))
-    (unwind-protect
-        (while (<= n message-count)
-          (message "Retrieving message %d of %d from %s... (%.1fk)"
-                   n message-count pop3-mailhost
-                   (/ (cdr (assoc n message-sizes))
-                      1024.0))
-          (pop3-retr process n crashbuf)
-          (save-excursion
-            (set-buffer crashbuf)
-            (let ((coding-system-for-write 'binary))
-              (write-region (point-min) (point-max) crashbox t 'nomesg))
-            (set-buffer (process-buffer process))
-            (erase-buffer))
-          (unless pop3-leave-mail-on-server
-            (pop3-dele process n))
-          (setq n (+ 1 n))
-          (pop3-accept-process-output process))
-      (when (and pop3-leave-mail-on-server
-                 (> n 1))
-        (message "pop3.el doesn't support UIDL.  Setting `pop3-leave-mail-on-server'
-to %s might not give the result you'd expect." pop3-leave-mail-on-server)
-        (sit-for 1))
-      (pop3-quit process))
-    (kill-buffer crashbuf))
-  t)
-
 (defun pop3-get-message-count ()
   "Return the number of messages in the maildrop."
   (let* ((process (pop3-open-server pop3-mailhost pop3-port))