(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
(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
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)
(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
(< 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)
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)