From e43c5298bb288099406b09f3be0a918eabdefa3c Mon Sep 17 00:00:00 2001
From: teranisi <teranisi>
Date: Fri, 13 Feb 2004 12:45:19 +0000
Subject: [PATCH] * elmo.el (elmo-message-fetch-with-cache-process): Don't
 call elmo-delete-cr-buffer.

* elmo-imap4.el (elmo-imap4-message-fetch): Call elmo-delete-cr-buffer.

* elmo-pop3.el (elmo-message-fetch-plugged): Ditto.

* elmo-nntp.el (elmo-nntp-read-body): Ditto.
---
 elmo/ChangeLog     |    9 +++++++++
 elmo/elmo-imap4.el |    1 +
 elmo/elmo-nntp.el  |    3 ++-
 elmo/elmo-pop3.el  |    1 +
 elmo/elmo.el       |    1 -
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index c709995..c386d4e 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,5 +1,14 @@
 2004-02-13  Yuuichi Teranishi  <teranisi@gohome.org>
 
+	* elmo.el (elmo-message-fetch-with-cache-process): Don't call
+	elmo-delete-cr-buffer.
+
+	* elmo-imap4.el (elmo-imap4-message-fetch): Call elmo-delete-cr-buffer.
+
+	* elmo-pop3.el (elmo-message-fetch-plugged): Ditto.
+
+	* elmo-nntp.el (elmo-nntp-read-body): Ditto.
+
 	* elmo-file.el (elmo-map-message-fetch): Decode body only when content
 	type seems to be a text.
 
diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index ae79ff3..01cd9c7 100644
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -2684,6 +2684,7 @@ If optional argument REMOVE is non-nil, remove FLAG."
 	(with-current-buffer outbuf
 	  (erase-buffer)
 	  (insert response)
+	  (elmo-delete-cr-buffer)
 	  t))))
 
 (luna-define-method elmo-message-fetch-plugged ((folder elmo-imap4-folder)
diff --git a/elmo/elmo-nntp.el b/elmo/elmo-nntp.el
index dbd373e..df6e816 100644
--- a/elmo/elmo-nntp.el
+++ b/elmo/elmo-nntp.el
@@ -417,7 +417,8 @@ Don't cache if nil.")
       (with-current-buffer outbuf
 	(erase-buffer)
 	(insert-buffer-substring (elmo-network-session-buffer session)
-				 start (- end 3))))
+				 start (- end 3))
+	(elmo-delete-cr-buffer)))
     t))
 
 (defun elmo-nntp-select-group (session group &optional force)
diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index a0a95c4..cc4405b 100644
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -880,6 +880,7 @@ If IF-EXISTS is `any-exists', get BIFF session or normal session if exists."
 	(while (re-search-forward "^\\." nil t)
 	  (replace-match "")
 	  (forward-line))
+	(elmo-delete-cr-buffer)
 	response))))
 
 (defun elmo-pop3-delete-msg (process number loc-alist)
diff --git a/elmo/elmo.el b/elmo/elmo.el
index 039702a..5603a18 100644
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -1339,7 +1339,6 @@ If Optional LOCAL is non-nil, don't update server flag."
 							   unread)
 			    (error (setq err error) nil))
 			  (> (buffer-size) 0))
-		 (elmo-delete-cr-buffer)
 		 (when (and (elmo-fetch-strategy-save-cache strategy)
 			    cache-path)
 		   (elmo-file-cache-save cache-path section))
-- 
1.7.10.4