From 598cf175b1d4f1b7370a7fcd5e57814149bab906 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Tue, 5 Nov 2002 05:33:01 +0000
Subject: [PATCH] Synch with the semi-1_14 branch.

---
 ChangeLog    |    9 +++++++++
 mime-edit.el |   21 +++++++++++----------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d6a1ba1..6b3b86c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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-04-16   Daiki Ueno  <ueno@unixuser.org>
+
+	* mime-edit.el (mime-file-types): Add setting of *.jpeg for image/jpeg.
+
 2002-10-26  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
 
 	* mime-view.el (mime-preview-find-boundary-info): Fix logic. Do not
diff --git a/mime-edit.el b/mime-edit.el
index 80718f9..b88be20 100644
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -340,7 +340,7 @@ To insert a signature file automatically, call the function
 
     ;;  Pure binary
 
-    ("\\.jpg$"
+    ("\\.jpg$\\|\\.jpeg$"
      "image"	"jpeg"		nil
      "base64"
      "inline"		(("filename" . file))
@@ -2940,15 +2940,16 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
 			(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)
-- 
1.7.10.4