Merge JR-Himi.

diff --git a/ChangeLog b/ChangeLog
index a9afc11..fc49b02 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,21 @@
+1998-03-12  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-partial.el: Rename
+       `mime-combine-message/partials-automatically' ->
+       `mime-method-to-combine-message/partial-pieces'.
+
+1998-03-12  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-pgp.el (mime-acting-condition): Separate type and subtype.
+
+       * mime-view.el (mime-acting-condition): Separate type and subtype.
+
+       * mime-play.el (mime-playback-entity): Separate type and subtype.
+
+\f
 1998-03-13  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.0.2 (Nonoichi-K\e-Dòdaimae)\e-A was released.
+       * SEMI: Version 1.0.2 (Nonoichi-K\e-Dòdaimae) was released.\e-A
 
 1998-03-12  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -112,7 +127,7 @@
 \f
 1998-02-25  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.0.0 (Nukaj\e-Dþtaku-mae)\e-A was released.
+       * SEMI: Version 1.0.0 (Nukaj\e-Dþtaku-mae) was released.\e-A
 
        * SEMI-ELS: Remove mime-tar.el.
 
@@ -249,7 +264,7 @@
 \f
 1997-11-16  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 0.116 (D\e-Dòhòji)\e-A was released.
+       * SEMI: Version 0.116 (D\e-Dòhòji) was released.\e-A
 
 1997-11-15  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 

diff --git a/SEMI-CFG b/SEMI-CFG
index 61a3adb..beb079d 100644 (file)
--- a/SEMI-CFG
+++ b/SEMI-CFG
@@ -1,6 +1,6 @@
 ;;; -*-Emacs-Lisp-*-
 ;;;
-;;; $Id: SEMI-CFG,v 1.1 1998-03-12 19:00:46 morioka Exp $
+;;; $Id: SEMI-CFG,v 1.2 1998-03-13 12:55:51 morioka Exp $
 ;;;
 
 (defvar default-load-path load-path)

diff --git a/SEMI-MK b/SEMI-MK
index 0467074..5abe824 100644 (file)
--- a/SEMI-MK
+++ b/SEMI-MK
@@ -1,6 +1,6 @@
 ;;; -*-Emacs-Lisp-*-
 ;;;
-;;; $Id: SEMI-MK,v 1.1 1998-03-12 19:06:44 morioka Exp $
+;;; $Id: SEMI-MK,v 1.2 1998-03-13 12:55:52 morioka Exp $
 ;;;
 ;;; Code:
 

diff --git a/eword-encode.el b/eword-encode.el
index 6dbbea3..ee3f95c 100644 (file)
--- a/eword-encode.el
+++ b/eword-encode.el
@@ -35,7 +35,7 @@
 ;;;
 
 (defconst eword-encode-RCS-ID
-  "$Id: eword-encode.el,v 1.1 1998-03-12 19:10:12 morioka Exp $")
+  "$Id: eword-encode.el,v 1.2 1998-03-13 12:55:54 morioka Exp $")
 (defconst eword-encode-version (get-version-string eword-encode-RCS-ID))
 
 

diff --git a/mime-partial.el b/mime-partial.el
index 4cef03a..ee401f5 100644 (file)
--- a/mime-partial.el
+++ b/mime-partial.el
@@ -40,7 +40,7 @@
        (error "Fatal. Unsupported mode")
        ))))
 
-(defun mime-combine-message/partials-automatically (beg end cal)
+(defun mime-method-to-combine-message/partial-pieces (beg end cal)
   "Internal method for mime-view to combine message/partial messages
 automatically.  This function refers variable
 `mime-view-partial-message-method-alist' to select function to display

diff --git a/mime-pgp.el b/mime-pgp.el
index 146ac5c..ab1e668 100644 (file)
--- a/mime-pgp.el
+++ b/mime-pgp.el
@@ -103,12 +103,12 @@
     ))
 
 (set-atype 'mime-acting-condition
-          '((type . "application/pgp")
+          '((type . application)(subtype . pgp)
             (method . mime-method-for-application/pgp)
             ))
 
 (set-atype 'mime-acting-condition
-          '((type . "text/x-pgp")
+          '((type . text)(subtype . x-pgp)
             (method . mime-method-for-application/pgp)
             ))
 
@@ -126,7 +126,7 @@
     ))
 
 (set-atype 'mime-acting-condition
-          '((type . "multipart/signed")
+          '((type . multipart)(subtype . signed)
             (method . mime-method-to-verify-multipart/signed)
             ))
 
@@ -251,7 +251,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
       )))
 
 (set-atype 'mime-acting-condition
-          '((type . "application/pgp-signature")
+          '((type . application)(subtype . pgp-signature)
             (method . mime-method-to-verify-application/pgp-signature)
             ))
 
@@ -277,7 +277,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
     ))
 
 (set-atype 'mime-acting-condition
-          '((type . "application/pgp-encrypted")
+          '((type . application)(subtype . pgp-encrypted)
             (method . mime-method-to-decrypt-application/pgp-encrypted)
             ))
 
@@ -306,7 +306,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
     ))
 
 (set-atype 'mime-acting-condition
-          '((type . "application/pgp-keys")
+          '((type . application)(subtype . pgp-keys)
             (method . mime-method-to-add-application/pgp-keys)
             ))
 

diff --git a/mime-play.el b/mime-play.el
index 65b9fcf..435aa46 100644 (file)
--- a/mime-play.el
+++ b/mime-play.el
@@ -63,10 +63,14 @@ If MODE is specified, play as it.  Default MODE is \"play\"."
 (defun mime-playback-entity (cinfo &optional mode)
   (let ((beg (mime-entity-info-point-min cinfo))
        (end (mime-entity-info-point-max cinfo))
-       (ctype (or (mime-entity-info-type/subtype cinfo) "text/plain"))
+       (c-type (mime-entity-info-media-type cinfo))
+       (c-subtype (mime-entity-info-media-subtype cinfo))
        (params (mime-entity-info-parameters cinfo))
        (encoding (mime-entity-info-encoding cinfo))
        )
+    (or c-type
+       (setq c-type 'text
+             c-subtype 'plain))
     ;; Check for VM
     (if (< beg (point-min))
        (setq beg (point-min))
@@ -75,7 +79,8 @@ If MODE is specified, play as it.  Default MODE is \"play\"."
        (setq end (point-max))
       )
     (let (method cal ret)
-      (setq cal (list* (cons 'type ctype)
+      (setq cal (list* (cons 'type c-type)
+                      (cons 'subtype c-subtype)
                       (cons 'encoding encoding)
                       (cons 'major-mode major-mode)
                       params))

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")
      )