(mime-acting-condition): Separate type and subtype.

diff --git a/mime-view.el b/mime-view.el
index f365499..ef05a15 100644 (file)
--- a/mime-view.el
+++ b/mime-view.el
@@ -47,82 +47,55 @@
 ;;;
 
 (defvar mime-acting-condition
-  '(((type . "text/plain")
-     (method "tm-plain" nil 'file 'type 'encoding 'mode 'name)
+  '(((type . text)(subtype . plain)
+     (method "tm-plain" nil 'file "" 'encoding 'mode 'name)
      (mode "play" "print")
      )
-    ((type . "text/html")
-     (method "tm-html" nil 'file 'type 'encoding 'mode 'name)
+    ((type . text)(subtype . html)
+     (method "tm-html" nil 'file "" 'encoding 'mode 'name)
      (mode . "play")
      )
-    ((type . "text/x-rot13-47")
+    ((type . text)(subtype . x-rot13-47)
      (method . mime-method-to-display-caesar)
      (mode . "play")
      )
-    ((type . "text/x-rot13-47-48")
+    ((type . text)(subtype . x-rot13-47-48)
      (method . mime-method-to-display-caesar)
      (mode . "play")
      )
-    ((type . "audio/basic")
-     (method "tm-au"    nil 'file 'type 'encoding 'mode 'name)
+
+    ((type . audio)(subtype . basic)
+     (method "tm-au"    nil 'file "" 'encoding 'mode 'name)
      (mode . "play")
      )
     
-    ((type . "image/jpeg")
-     (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
-     (mode "play" "print")
-     )
-    ((type . "image/gif")
-     (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
-     (mode "play" "print")
-     )
-    ((type . "image/png")
-     (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
-     (mode "play" "print")
-     )
-    ((type . "image/tiff")
-     (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
-     (mode "play" "print")
-     )
-    ((type . "image/x-tiff")
-     (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
-     (mode "play" "print")
-     )
-    ((type . "image/x-xbm")
-     (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
-     (mode "play" "print")
-     )
-    ((type . "image/x-pic")
-     (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
-     (mode "play" "print")
-     )
-    ((type . "image/x-mag")
-     (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
+    ((type . image)
+     (method "tm-image" nil 'file "" 'encoding 'mode 'name)
      (mode "play" "print")
      )
     
-    ((type . "video/mpeg")
-     (method "tm-mpeg"  nil 'file 'type 'encoding 'mode 'name)
+    ((type . video)(subtype . mpeg)
+     (method "tm-mpeg"  nil 'file "" 'encoding 'mode 'name)
      (mode . "play")
      )
     
-    ((type . "application/postscript")
-     (method "tm-ps" nil 'file 'type 'encoding 'mode 'name)
+    ((type . application)(subtype . postscript)
+     (method "tm-ps" nil 'file "" 'encoding 'mode 'name)
      (mode "play" "print")
      )
-    ((type . "application/octet-stream")
+    ((type . application)(subtype . octet-stream)
      (method . mime-method-to-save)(mode "play" "print")
      )
 
-    ((type . "message/external-body")
+    ((type . message)(subtype . external-body)
      ("access-type" . "anon-ftp")
      (method . mime-method-to-display-message/external-ftp)
      )
-    ((type . "message/rfc822")
+    ((type . message)(subtype . rfc822)
      (method . mime-method-to-display-message/rfc822)
      (mode . "play")
      )
-    ((type . "message/partial")
+    ((type . message)(subtype . partial)
      (method . mime-method-to-store-message/partial)
      (mode . "play")
      )