* elmo-pop3.el (elmo-pop3-read-contents): Add `elmo-pop3-read-point' barrier.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 1a4c4ba..ed61bf3 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,6 +1,7 @@
 2008-07-06  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
        * elmo-pop3.el (elmo-pop3-read-contents): Fix double `goto-char'.
+       Add `elmo-pop3-read-point' barrier.
 
 2008-07-06 YAMASHITA Junji <ysiijj@gmail.com>
 

diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index 43932de..321af6b 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