* elmo-imap4.el (elmo-imap4-parse-address-list)

[elisp/wanderlust.git] / elmo / elmo-pop3.el

diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index 43932de..0f05663 100644 (file)
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -472,7 +472,8 @@ until the login delay period has expired"))
          (point elmo-pop3-read-point))
       (while (and (goto-char (- point 2))
                  (not (search-forward "\r\n.\r\n" nil t)))
-       (setq point (- (point-max) 2)) ; Care of \r\n.\r[EOF] case
+       (setq point (max (- (point-max) 2) ; Care of \r\n.\r[EOF] case
+                        elmo-pop3-read-point))
        (accept-process-output process 1))
       (elmo-delete-cr
        (buffer-substring elmo-pop3-read-point
@@ -638,8 +639,7 @@ until the login delay period has expired"))
     nil)))
 
 (defun elmo-pop3-retrieve-headers (process tobuffer articles)
-  (save-excursion
-    (set-buffer (process-buffer process))
+  (with-current-buffer (process-buffer process)
     (erase-buffer)
     (let ((count 0)
          (received 0)