This commit was generated by cvs2svn to compensate for changes in r143,

[elisp/tm.git] / mime-setup.el

diff --git a/mime-setup.el b/mime-setup.el
index 068711b..a1d8148 100644 (file)
--- a/mime-setup.el
+++ b/mime-setup.el
@@ -1,5 +1,5 @@
 ;;;
-;;; $Id: mime-setup.el,v 5.0 1994/09/26 15:04:55 morioka Exp $
+;;; $Id: mime-setup.el,v 6.0 1995/05/30 12:49:34 morioka Exp $
 ;;;
 
 (provide 'mime-setup)
@@ -76,9 +76,16 @@
         ("richtext"
          ;;("charset" "" "ISO-2022-JP" "US-ASCII" "ISO-8859-1" "ISO-8859-8")
          )
+        ("enriched"
+         ;;("charset" "" "ISO-2022-JP" "US-ASCII" "ISO-8859-1" "ISO-8859-8")
+         )
         ("x-latex"
          ("x-name")
          ;;("charset" "" "ISO-2022-JP" "US-ASCII" "ISO-8859-1" "ISO-8859-8")
+         )
+        ("html"
+         ("x-name")
+         ;;("charset" "" "ISO-2022-JP" "US-ASCII" "ISO-8859-1" "ISO-8859-8")
          ))
        ("message"
         ("external-body"
@@ -128,6 +135,7 @@
 
 (setq mime-file-types
       '(("\\.rtf$"     "text"  "richtext"      nil     nil)
+       ("\\.html$"     "text"  "html"  nil     nil)
        ("\\.ps$"       "application"   "postscript"    nil     "quoted-printable")
        ("\\.gif$"      "image"         "gif"   nil     "base64")
        ("\\.jpg$"      "image"         "jpeg"  nil     "base64")