Mercurial > emacs

diff lisp/mh-e/mh-mime.el @ 83467:d04d8ccb3c41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-41 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-42 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-43 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-44 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-45 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-46 Merge from erc--emacs--0 * emacs@sv.gnu.org/emacs--devo--0--patch-47 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-48 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-14 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-15 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-16 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-17 Merge from emacs--devo--0 git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-507
author Karoly Lorentey <lorentey@elte.hu>
date Mon, 06 Feb 2006 18:44:57 +0000
parents f58b821a2f40
children bbac579a3af5 c5406394f567
line wrap: on
line diff
--- a/lisp/mh-e/mh-mime.el	Fri Feb 03 15:24:23 2006 +0000
+++ b/lisp/mh-e/mh-mime.el	Mon Feb 06 18:44:57 2006 +0000
@@ -1733,7 +1733,19 @@
 (defvar mh-file-mime-type-substitutions
   '(("application/msword" "\.xls" "application/ms-excel")
     ("application/msword" "\.ppt" "application/ms-powerpoint")
-    ("text/plain" "\.vcf" "text/x-vcard"))
+    ("text/plain" "\.vcf" "text/x-vcard")
+    ("text/rtf" "\.rtf" "application/rtf")
+    ("application/x-zip" "\.sxc" "application/vnd.sun.xml.calc")
+    ("application/x-zip" "\.sxd" "application/vnd.sun.xml.draw")
+    ("application/x-zip" "\.sxi" "application/vnd.sun.xml.impress")
+    ("application/x-zip" "\.sxw" "application/vnd.sun.xml.writer")
+    ("application/x-zip" "\.odg" "application/vnd.oasis.opendocument.graphics")
+    ("application/x-zip" "\.odi" "application/vnd.oasis.opendocument.image")
+    ("application/x-zip" "\.odp" 
+     "application/vnd.oasis.opendocument.presentation")
+    ("application/x-zip" "\.ods" 
+     "application/vnd.oasis.opendocument.spreadsheet")
+    ("application/x-zip" "\.odt" "application/vnd.oasis.opendocument.text"))
   "Substitutions to make for Content-Type returned from file command.
 The first element is the Content-Type returned by the file command.
 The second element is a regexp matching the file name, usually the