* Sync up with the latest semi-1_13.

diff --git a/ChangeLog b/ChangeLog
index ec63cd9..47118ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+1999-03-30  Keiichi Suzuki  <kei-suzu@mail.wbs.ne.jp>
+
+       * mime-edit.el (mime-edit-decode-single-part-in-buffer): Normalize
+       EOL code in MIME encoded text part.
+
+1999-03-27  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-view.el (mime-preview-follow-current-entity): Don't copy
+       header if current entity is root.
+
 1999-03-11  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * mime-edit.el (mime-charset-type-list): Add `tis-620'.

diff --git a/mime-edit.el b/mime-edit.el
index 0c04b97..cc66009 100644 (file)
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -2704,9 +2704,15 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
                              encoding nil)
                        )))))))
     (if (or encoded (not not-decode-text))
-       (decode-mime-charset-region (point-min)(point-max)
-                                   (or charset default-mime-charset))
-      )
+       (progn
+         (save-excursion
+           (goto-char (point-min))
+           (while (re-search-forward "\r\n" nil t)
+             (replace-match "\n")
+             ))
+         (decode-mime-charset-region (point-min)(point-max)
+                                     (or charset default-mime-charset))
+         ))
     (let ((he (if (re-search-forward "^$" nil t)
                  (match-end 0)
                (point-min)

diff --git a/mime-view.el b/mime-view.el
index cc80b6e..c4fc3cf 100644 (file)
--- a/mime-view.el
+++ b/mime-view.el
@@ -1186,9 +1186,10 @@ It calls following-method selected from variable
                           (concat "^"
                                   (apply (function regexp-or) fields)
                                   ":") ""))))
-                    (if (and
-                         (eq (mime-entity-media-type ci) 'message)
-                         (eq (mime-entity-media-subtype ci) 'rfc822))
+                    (if (or (null entity-node-id)
+                            (and
+                             (eq (mime-entity-media-type ci) 'message)
+                             (eq (mime-entity-media-subtype ci) 'rfc822)))
                         nil
                       (if str
                           (insert str)