This commit was manufactured by cvs2svn to create branch 'elmo-imap4-new-

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

diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index 0f05663..07555c6 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
@@ -651,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
@@ -671,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)
@@ -785,8 +786,9 @@ until the login delay period has expired"))
       t)))
 
 (luna-define-method elmo-folder-open-internal ((folder elmo-pop3-folder))
-  (when (elmo-pop3-folder-use-uidl folder)
-    (elmo-location-map-load folder (elmo-folder-msgdb-path folder))))
+  (unless (elmo-location-map-alist folder)
+    (when (elmo-pop3-folder-use-uidl folder)
+      (elmo-location-map-load folder (elmo-folder-msgdb-path folder)))))
 
 (luna-define-method elmo-folder-commit :after ((folder elmo-pop3-folder))
   (when (and (not elmo-inhibit-number-mapping)