Synch with the semi-1_14 branch.

diff --git a/ChangeLog b/ChangeLog
index e297c0f..dc0e9c5 100644 (file)
--- 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-08-28  Katsumi Yamaoka   <yamaoka@jpl.org>
 
        * mime-edit.el (mime-edit-user-agent-value): Add

diff --git a/mime-edit.el b/mime-edit.el
index b319ffe..3b6d5fa 100644 (file)
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -327,7 +327,7 @@ To insert a signature file automatically, call the function
 
     ;;  Pure binary
 
-    ("\\.jpg$"
+    ("\\.jpg$\\|\\.jpeg$"
      "image"   "jpeg"          nil
      "base64"
      "inline"          (("filename" . file)))
@@ -2864,14 +2864,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))))