* wl-e21.el (wl-draft-insert-signature): Fix comment style.

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

diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index 321af6b..aff5d75 100644 (file)
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -228,7 +228,8 @@ CODE is one of the following:
          (goto-char elmo-pop3-read-point))
        (setq match-end (point))
        (setq response-string
-             (buffer-substring elmo-pop3-read-point (- match-end 2)))
+             (buffer-substring elmo-pop3-read-point
+                               (max (- match-end 2) elmo-pop3-read-point)))
        (goto-char elmo-pop3-read-point)
        (if (looking-at "\\+.*$")
            (progn
@@ -639,8 +640,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)
@@ -652,7 +652,7 @@ until the login delay period has expired"))
          (elmo-pop3-send-command process
                                  (format "top %s 0" (car articles))
                                  'no-erase)
-         ;;;   (accept-process-output process 1)
+;;;      (accept-process-output process 1)
          (setq articles (cdr articles))
          (setq count (1+ count))
          ;; Every 200 requests we have to read the stream in
@@ -672,7 +672,7 @@ until the login delay period has expired"))
                     (< received count))
              (elmo-progress-notify 'elmo-retrieve-header :set received)
              (accept-process-output process 1)
-             ;;;           (accept-process-output process)
+;;;          (accept-process-output process)
              (discard-input)))))
       ;; Replace all CRLF with LF.
       (elmo-delete-cr-buffer)