* elmo-util.el (elmo-msgdb-insert-file-header): Call

`elmo-delete-cr-buffer'.

* elmo-localdir.el (elmo-message-fetch-internal): Use
`insert-file-contents-as-raw-text' instead of
`insert-file-contents-as-binary'.

* elmo-maildir.el (elmo-map-message-fetch): Ditto.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 99935c7..4a2ec63 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,14 @@
+2007-01-16  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * elmo-util.el (elmo-msgdb-insert-file-header): Call
+       `elmo-delete-cr-buffer'.
+
+       * elmo-localdir.el (elmo-message-fetch-internal): Use
+       `insert-file-contents-as-raw-text' instead of
+       `insert-file-contents-as-binary'.
+
+       * elmo-maildir.el (elmo-map-message-fetch): Ditto.
+
 2006-12-03  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * elmo-imap4.el (elmo-network-initialize-session): Check to

diff --git a/elmo/elmo-localdir.el b/elmo/elmo-localdir.el
index 3006dec..723a219 100644 (file)
--- a/elmo/elmo-localdir.el
+++ b/elmo/elmo-localdir.el
@@ -258,9 +258,9 @@
 (luna-define-method elmo-message-fetch-internal ((folder elmo-localdir-folder)
                                                 number strategy
                                                 &optional section unread)
-  (when (file-exists-p (elmo-message-file-name folder number))
-    (insert-file-contents-as-binary
-     (elmo-message-file-name folder number))))
+  (let ((filename (elmo-message-file-name folder number)))
+    (when (file-exists-p filename)
+      (insert-file-contents-as-raw-text filename))))
 
 (luna-define-method elmo-folder-list-messages-internal
   ((folder elmo-localdir-folder) &optional nohide)

diff --git a/elmo/elmo-maildir.el b/elmo/elmo-maildir.el
index fe80803..c236770 100644 (file)
--- a/elmo/elmo-maildir.el
+++ b/elmo/elmo-maildir.el
@@ -528,7 +528,7 @@ file name for maildir directories."
                                            &optional section unseen)
   (let ((file (elmo-maildir-message-file-name folder location)))
     (when (file-exists-p file)
-      (insert-file-contents-as-binary file)
+      (insert-file-contents-as-raw-text file)
       (unless unseen
        (elmo-map-folder-set-flag folder (list location) 'read))
       t)))

diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index 641c218..e8eb757 100644 (file)
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -2262,7 +2262,8 @@ If ALIST is nil, `elmo-obsolete-variable-alist' is used."
                            file nil beg
                            (incf beg elmo-msgdb-file-header-chop-length))))
                  (prog1 (not (search-forward "\n\n" nil t))
-                   (goto-char (point-max))))))))
+                   (goto-char (point-max)))))
+      (elmo-delete-cr-buffer))))
 
 ;;
 ;; overview handling