From: yamaoka <yamaoka>
Date: Tue, 5 Nov 2002 05:32:53 +0000 (+0000)
Subject: Synch with the semi-1_14 branch.
X-Git-Tag: emiko-1_14-epg-branchpoint~45
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa05fe5f61c48ad105d80e89bc161c9586e32403;p=elisp%2Fsemi.git

Synch with the semi-1_14 branch.
---

diff --git a/ChangeLog b/ChangeLog
index 83845ba..4fdf377 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-03  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+	* mime-edit.el (mime-edit-decode-single-part-in-buffer): Decode text
+	part only.
+
 2002-11-05  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* mime-view.el (mime-view-insert-fontified-text-content): Make
diff --git a/mime-edit.el b/mime-edit.el
index 13b59d6..a2ce830 100644
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -2670,14 +2670,15 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
 			 (match-end 0)(point-max) encoding)
 			(setq encoded t
 			      encoding nil))))))))
-    (if (or encoded (not not-decode-text))
- 	(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))))
+    (if (and (eq type 'text)
+	     (or encoded (not not-decode-text)))
+	(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))))