From 4db8c6a8dc6813b0d955b9f9e29663d7630c6e42 Mon Sep 17 00:00:00 2001 From: morioka Date: Thu, 12 Mar 1998 20:39:54 +0000 Subject: [PATCH] Sync with JR-Himi branch. --- ChangeLog | 12 ++++++++-- SEMI-CFG | 2 +- SEMI-MK | 2 +- eword-encode.el | 2 +- mime-def.el | 2 +- mime-pgp.el | 12 +++++----- mime-play.el | 9 ++++++-- mime-view.el | 65 ++++++++++++++++--------------------------------------- 8 files changed, 46 insertions(+), 60 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0baaf03..d7def14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 1998-03-12 MORIOKA Tomohiko + * 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. + +1998-03-12 MORIOKA Tomohiko + * mime-pgp.el: Rename `mime-pgp-add-keys' -> `mime-method-to-add-application/pgp-keys'. @@ -108,7 +116,7 @@ 1998-02-25 MORIOKA Tomohiko - * SEMI: Version 1.0.0 (Nukaj-Dþtaku-mae)-A was released. + * SEMI: Version 1.0.0 (Nukaj-Dþtaku-mae) was released.-A * SEMI-ELS: Remove mime-tar.el. @@ -245,7 +253,7 @@ 1997-11-16 MORIOKA Tomohiko - * SEMI: Version 0.116 (D-Dòhòji)-A was released. + * SEMI: Version 0.116 (D-Dòhòji) was released.-A 1997-11-15 MORIOKA Tomohiko diff --git a/SEMI-CFG b/SEMI-CFG index 61a3adb..21eee8a 100644 --- 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.1.2.1 1998-03-12 20:39:45 morioka Exp $ ;;; (defvar default-load-path load-path) diff --git a/SEMI-MK b/SEMI-MK index 0467074..57bf2c4 100644 --- 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.1.2.1 1998-03-12 20:39:47 morioka Exp $ ;;; ;;; Code: diff --git a/eword-encode.el b/eword-encode.el index 6dbbea3..43aa491 100644 --- 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.1.2.1 1998-03-12 20:39:48 morioka Exp $") (defconst eword-encode-version (get-version-string eword-encode-RCS-ID)) diff --git a/mime-def.el b/mime-def.el index 08f71d8..b9d0d56 100644 --- a/mime-def.el +++ b/mime-def.el @@ -51,7 +51,7 @@ x)))) ) -(defconst semi-version '("Nonoichi-K,Dr(Bdaimae" 1 0 2) +(defconst semi-version '("Himi" 1 0 2 1) "Version name and numbers of SEMI-kernel package.") (autoload 'mule-caesar-region "mule-caesar" diff --git a/mime-pgp.el b/mime-pgp.el index 146ac5c..ab1e668 100644 --- 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 --- 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 --- 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") ) -- 1.7.10.4