From: yoichi <yoichi>
Date: Tue, 5 Nov 2002 05:05:32 +0000 (+0000)
Subject: Merge from emiko-1_14 branch:
X-Git-Tag: semi-1_14_5~7
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c48b1114e037fe7450cfa5d78e33aa7807ba5959;p=elisp%2Fsemi.git

Merge from emiko-1_14 branch:
2002-04-16   Daiki Ueno  <ueno@unixuser.org>

	* mime-edit.el (mime-file-types): Add setting of *.jpeg for image/jpeg.
---

diff --git a/ChangeLog b/ChangeLog
index 31faa4e..0e404fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+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 f29bc23..42e792e 100644
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -339,7 +339,7 @@ To insert a signature file automatically, call the function
 
     ;;  Pure binary
 
-    ("\\.jpg$"
+    ("\\.jpg$\\|\\.jpeg$"
      "image"	"jpeg"		nil
      "base64"
      "inline"		(("filename" . file))