From 8e18eb1fd95180a6ea115a00ce2f045815809b49 Mon Sep 17 00:00:00 2001 From: morioka Date: Tue, 10 Mar 1998 08:33:15 +0000 Subject: [PATCH] tm 7.99. --- ChangeLog | 23 ++++++++++++ Makefile | 2 +- doc/tm-edit-en.info | 79 ++++++++++++++++++++++++++++++++++++++--- doc/tm-edit-en.sgml | 72 ++++++++++++++++++++++++++++++++++--- doc/tm-edit-en.texi | 89 ++++++++++++++++++++++++++++++++++++++++++---- doc/tm-edit-ja.info | 87 ++++++++++++++++++++++++++++++++++++++++----- doc/tm-edit-ja.sgml | 83 +++++++++++++++++++++++++++++++++++++------ doc/tm-edit-ja.texi | 98 ++++++++++++++++++++++++++++++++++++++++++++------- tm-edit.el | 47 +++++++++++------------- 9 files changed, 506 insertions(+), 74 deletions(-) diff --git a/ChangeLog b/ChangeLog index ef6150f..67b12bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +Tue Dec 24 16:00:05 1996 MORIOKA Tomohiko + + * tm: Version 7.99 was released. + + * doc/tm-edit-en.sgml: sync with tm-edit-ja.sgml 6.0. + +Tue Dec 24 15:08:17 1996 MORIOKA Tomohiko + + * doc/tm-edit-ja.sgml (tag specification for inserted file): New + node. + +Tue Dec 24 12:08:50 1996 MORIOKA Tomohiko + + * tm-edit.el (mime-file-types): Use "base64" as default encoding + for *.tar.gz, *.tgz, *.tar.Z, *.taz, *.gz, *.Z, *.lzh, and *.zip. + + (mime-editor/insert-file): Call `mime-prompt-for-encoding' if + optional argument `verbose' is not nil even if it is not called + interactively. (cf. [tm-ja:2202]) + + (mime-prompt-for-encoding): New implementation. + + Mon Dec 23 21:25:12 1996 MORIOKA Tomohiko * emu: Version 7.37.3 was released. diff --git a/Makefile b/Makefile index ff3f6d3..56a62d8 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # $Id: Makefile,v 7.42 1996/12/10 14:57:42 morioka Exp morioka $ # -VERSION = 7.98 +VERSION = 7.99 SHELL = /bin/sh MAKE = make diff --git a/doc/tm-edit-en.info b/doc/tm-edit-en.info index 6c09eca..4218a5c 100644 --- a/doc/tm-edit-en.info +++ b/doc/tm-edit-en.info @@ -7,7 +7,7 @@ using `texinfmt.el' version 2.32 of 19 November 1993.  File: tm-edit-en.info, Node: Top, Next: Introduction, Prev: (dir), Up: (dir) -tm-edit 7.90 Reference Manual (English Version) +tm-edit 7.99 Reference Manual (English Version) *********************************************** @@ -20,6 +20,7 @@ This file documents tm-edit, a MIME composer for GNU Emacs. * single-part operations:: * enclosure operation:: * other operations of mime/editor-mode:: +* tag specification for inserted file:: Default media-type or encoding for inserted file * transfer level:: * header:: Using non-ASCII characters in header * PGP:: @@ -113,7 +114,9 @@ Operations to make single-part are following: Insert single-part tag indicates text part. `C-c C-x C-i' - Insert file as a MIME attachment. + Insert file as a MIME attachment. If `C-u' is followed by it, it + asks media-type, subtype or encoding even if their default values + are specified. (cf. *Note tag specification for inserted file::) `C-c C-x C-e' Insert external part. @@ -178,7 +181,7 @@ Operations to make enclosure are following:  -File: tm-edit-en.info, Node: other operations of mime/editor-mode, Next: transfer level, Prev: enclosure operation, Up: Top +File: tm-edit-en.info, Node: other operations of mime/editor-mode, Next: tag specification for inserted file, Prev: enclosure operation, Up: Top other operations of mime/editor-mode ************************************ @@ -223,7 +226,74 @@ There are another operations in mime/editor-mode.  -File: tm-edit-en.info, Node: transfer level, Next: header, Prev: other operations of mime/editor-mode, Up: Top +File: tm-edit-en.info, Node: tag specification for inserted file, Next: transfer level, Prev: other operations of mime/editor-mode, Up: Top + +Default media-type or encoding for inserted file +************************************************ + +When `C-c C-x C-i' (`mime-editor/insert-file') is pressed, tag +parameters for inserted file, such as media-type or encoding, are +detected by variable `mime-file-types'. + +When `C-u' is followed by it or parameter is not found from the +variable, it asks from user. (When `C-u' is followed by it, detected +value is used as default value) + +If you want to change default value for file names, please change +variable `mime-file-types'. + + + -- Variable: mime-file-types + + Specification of default value of tag for file name of inserted + file. + + It is a list of following list: + + (FILE_PAT TYPE SUBTYPE PARAMS ENCODING + DISPOSITION_TYPE DISPOSITION_PARAMS) + + + Each elements of the list are following: + + `FILE_PAT' + regular expression of file name + + `TYPE' + media type + + `SUBTYPE' + media subtype + + `PARAMS' + parameters of Content-Type field + + `ENCODING' + Content-Transfer-Encoding + + `DISPOSITION_TYPE' + disposition-type + + `DISPOSITION_PARAMS' + parameters of Content-Disposition field + + + Example: Specify application/rtf as default media type for `*.rtf' + + (call-after-loaded + 'tm-edit + (lambda () + (set-alist 'mime-file-types + "\\.rtf$" + '("application" "rtf" nil nil + "attachment" (("filename" . file))) + ))) + + + + + +File: tm-edit-en.info, Node: transfer level, Next: header, Prev: tag specification for inserted file, Up: Top transfer level ************** @@ -481,3 +551,4 @@ Variable Index * mime-editor/transfer-level: transfer level. 33. * mime-eword/charset-encoding-alist: API about header. 35. * mime/field-encoding-method-alist: evil setting in header. 21. +* mime-file-types: tag specification for inserted file. 19. diff --git a/doc/tm-edit-en.sgml b/doc/tm-edit-en.sgml index 3ee593b..261a662 100644 --- a/doc/tm-edit-en.sgml +++ b/doc/tm-edit-en.sgml @@ -1,9 +1,9 @@ - + -tm-edit 7.90 Reference Manual (English Version) +<title>tm-edit 7.99 Reference Manual (English Version) <author>MORIOKA Tomohiko <mail>morioka@jaist.ac.jp</mail> -<date>1996/10/11 +<date>1996/12/25 <toc> </head> @@ -109,7 +109,9 @@ Insert single-part tag indicates text part. </kd> <kt>C-c C-x C-i <kd> -Insert file as a MIME attachment. +Insert file as a MIME attachment. If <kbd>C-u</kbd> is followed by +it, it asks media-type, subtype or encoding even if their default +values are specified. <cf node="tag specification for inserted file"> </kd> <kt>C-c C-x C-e <kd> @@ -227,6 +229,68 @@ Set current editing message to encrypt or not. <cf node="PGP"> </kl> +<h1> Default media-type or encoding for inserted file +<node> tag specification for inserted file +<p> +When <kbd>C-c C-x C-i</kbd> (<code>mime-editor/insert-file</code>) is +pressed, tag parameters for inserted file, such as media-type or +encoding, are detected by variable <code>mime-file-types</code>. +<p> +When <kbd>C-u</kbd> is followed by it or parameter is not found from +the variable, it asks from user. (When <kbd>C-u</kbd> is followed by +it, detected value is used as default value) +<p> +If you want to change default value for file names, please change +variable <code>mime-file-types</code>. + + +<defvar name="mime-file-types"> +<p> +Specification of default value of tag for file name of inserted file. +<p> +It is a list of following list: + +<lisp> + (FILE_PAT TYPE SUBTYPE PARAMS ENCODING + DISPOSITION_TYPE DISPOSITION_PARAMS) +</lisp> + +Each elements of the list are following: + +<dl> +<dt>FILE_PAT +<dd>regular expression of file name +<dt>TYPE +<dd>media type +<dt>SUBTYPE +<dd>media subtype +<dt>PARAMS +<dd>parameters of Content-Type field +<dt>ENCODING +<dd>Content-Transfer-Encoding +<dt>DISPOSITION_TYPE +<dd>disposition-type +<dt>DISPOSITION_PARAMS +<dd>parameters of Content-Disposition field +</dl> + +<noindent> +Example: Specify application/rtf as default media type for +<file>*.rtf</file> + +<lisp> +(call-after-loaded + 'tm-edit + (lambda () + (set-alist 'mime-file-types + "\\.rtf$" + '("application" "rtf" nil nil + "attachment" (("filename" . file))) + ))) +</lisp> +</defvar> + + <h1> transfer level <node> transfer level <p> diff --git a/doc/tm-edit-en.texi b/doc/tm-edit-en.texi index b932eaa..63670db 100644 --- a/doc/tm-edit-en.texi +++ b/doc/tm-edit-en.texi @@ -1,13 +1,13 @@ \input texinfo.tex @setfilename tm-edit-en.info -@settitle{tm-edit 7.90 Reference Manual (English Version)} +@settitle{tm-edit 7.99 Reference Manual (English Version)} @titlepage -@title tm-edit 7.90 Reference Manual (English Version) +@title tm-edit 7.99 Reference Manual (English Version) @author MORIOKA Tomohiko <morioka@@jaist.ac.jp> -@subtitle 1996/10/11 +@subtitle 1996/12/25 @end titlepage @node Top, Introduction, (dir), (dir) -@top tm-edit 7.90 Reference Manual (English Version) +@top tm-edit 7.99 Reference Manual (English Version) @ifinfo @@ -20,6 +20,7 @@ This file documents tm-edit, a MIME composer for GNU Emacs. * single-part operations:: * enclosure operation:: * other operations of mime/editor-mode:: +* tag specification for inserted file:: Default media-type or encoding for inserted file * transfer level:: * header:: Using non-ASCII characters in header * PGP:: @@ -123,7 +124,9 @@ Operations to make single-part are following: Insert single-part tag indicates text part. @item @key{C-c C-x C-i} -Insert file as a MIME attachment. +Insert file as a MIME attachment. If @kbd{C-u} is followed by it, it +asks media-type, subtype or encoding even if their default values are +specified. (cf. @ref{tag specification for inserted file}) @item @key{C-c C-x C-e} Insert external part. @@ -184,7 +187,7 @@ incomplete. Maybe PGP-signature does not work for this enclosure.) -@node other operations of mime/editor-mode, transfer level, enclosure operation, Top +@node other operations of mime/editor-mode, tag specification for inserted file, enclosure operation, Top @chapter other operations of mime/editor-mode There are another operations in mime/editor-mode. @@ -223,7 +226,79 @@ Set current editing message to encrypt or not. (cf. @ref{PGP}) -@node transfer level, header, other operations of mime/editor-mode, Top +@node tag specification for inserted file, transfer level, other operations of mime/editor-mode, Top +@chapter Default media-type or encoding for inserted file + +When @kbd{C-c C-x C-i} (@code{mime-editor/insert-file}) is pressed, tag +parameters for inserted file, such as media-type or encoding, are +detected by variable @code{mime-file-types}.@refill + +When @kbd{C-u} is followed by it or parameter is not found from the +variable, it asks from user. (When @kbd{C-u} is followed by it, +detected value is used as default value)@refill + +If you want to change default value for file names, please change +variable @code{mime-file-types}. + + +@defvar mime-file-types + +Specification of default value of tag for file name of inserted +file.@refill + +It is a list of following list: + +@lisp + (FILE_PAT TYPE SUBTYPE PARAMS ENCODING + DISPOSITION_TYPE DISPOSITION_PARAMS) +@end lisp + + +Each elements of the list are following: + +@table @samp +@item FILE_PAT +regular expression of file name + +@item TYPE +media type + +@item SUBTYPE +media subtype + +@item PARAMS +parameters of Content-Type field + +@item ENCODING +Content-Transfer-Encoding + +@item DISPOSITION_TYPE +disposition-type + +@item DISPOSITION_PARAMS +parameters of Content-Disposition field + +@end table + +@noindent +Example: Specify application/rtf as default media type for +@file{*.rtf} + +@lisp +(call-after-loaded + 'tm-edit + (lambda () + (set-alist 'mime-file-types + "\\.rtf$" + '("application" "rtf" nil nil + "attachment" (("filename" . file))) + ))) +@end lisp +@end defvar + + + +@node transfer level, header, tag specification for inserted file, Top @chapter transfer level Contents inserted in a message are represented by 7bit diff --git a/doc/tm-edit-ja.info b/doc/tm-edit-ja.info index 6a22e82..a41f208 100644 --- a/doc/tm-edit-ja.info +++ b/doc/tm-edit-ja.info @@ -7,7 +7,7 @@ using `texinfmt.el' version 2.32 of 19 November 1993.  File: tm-edit-ja.info, Node: Top, Next: Introduction, Prev: (dir), Up: (dir) -tm-edit 7.90 $B@bL@=q!JF|K\8lHG!K(B +tm-edit 7.99 $B@bL@=q!JF|K\8lHG!K(B ******************************* @@ -22,6 +22,7 @@ GNU Emacs $BMQ$N(B MIME composer $B$G$"$k(B `tm-edit' $B$K$D$$$F@bL@$7$^$9! * single-part operations:: single-part $B$KBP$9$kA`:n(B * enclosure operation:: enclosure $B$KBP$9$kA`:n(B * other operations of mime/editor-mode:: mime/editor-mode $B$K$*$1$k$=$NB>$NA`:n(B +* tag specification for inserted file:: $BA^F~$5$l$k(B file $B$KBP$9$k(B tag $B$N7hDj(B * transfer level:: * header:: header $B$G$NHs(B ASCII $BJ8;z$N;HMQ(B * PGP:: @@ -121,7 +122,9 @@ single-part $B$r:n$k$?$a$NA`:n$K$O0J2<$N$h$&$J$b$N$,$"$j$^$9!#(B text part $B$rI=$9(B single-part tag $B$rA^F~$7$^$9!#(B `C-c C-x C-i' - file $B$r(B MIME part $B$H$7$FE:IU$7$^$9!#(B + file $B$r(B MIME part $B$H$7$FE:IU$7$^$9!#A0$K(B `C-u' $B$rIU$1$?>l9g!">o$K(B + media-type, subtype $BEy$rJ9$$$FMh$^$9!#(B(cf. *Note tag specification + for inserted file::) `C-c C-x C-e' external part $B$rA^F~$7$^$9!#(B @@ -171,10 +174,10 @@ enclosure $B$r:n$k$?$a$NA`:n$H$7$F$O0J2<$N$h$&$J$b$N$,$"$j$^$9!#(B $B;XDj$7$?(B region $B$r(B multipart/digest $B$H$7$F0O$_$^$9!#(B `C-c C-x s' - $B;XDj$7$?(B region $B$KEE;R=pL>$r9T$$$^$9!#(B(*Note PGP::) + $B;XDj$7$?(B region $B$KEE;R=pL>$r9T$$$^$9!#(B(cf. *Note PGP::) `C-c C-x e' - $B;XDj$7$?(B region $B$r0E9f2=$7$^$9!#(B(*Note PGP::) + $B;XDj$7$?(B region $B$r0E9f2=$7$^$9!#(B(cf. *Note PGP::) `C-c C-x q' $B;XDj$7$?(B region $BFb$N(B tag $B$rL58z$K$7!"$=$N(B tag $B$rJ8;zNs$H$7$FMxMQ$G(B @@ -186,7 +189,7 @@ enclosure $B$r:n$k$?$a$NA`:n$H$7$F$O0J2<$N$h$&$J$b$N$,$"$j$^$9!#(B  -File: tm-edit-ja.info, Node: other operations of mime/editor-mode, Next: transfer level, Prev: enclosure operation, Up: Top +File: tm-edit-ja.info, Node: other operations of mime/editor-mode, Next: tag specification for inserted file, Prev: enclosure operation, Up: Top mime/editor-mode $B$K$*$1$k$=$NB>$NA`:n(B ************************************* @@ -197,7 +200,7 @@ mime/editor-mode $B$K$*$1$k$=$NB>$NA`:n$r@bL@$7$^$9!#(B $BJT=8Cf$N(B message $B$rAw?.$7$^$9!#(B `C-c C-x C-p' - $BJT=8Cf$N(B message $B$r(B preview $B$7$^$9!#(B(*Note + $BJT=8Cf$N(B message $B$r(B preview $B$7$^$9!#(B(cf. *Note (tm-view-ja)mime/viewer-mode::) `C-c C-x C-z' @@ -219,10 +222,10 @@ mime/editor-mode $B$K$*$1$k$=$NB>$NA`:n$r@bL@$7$^$9!#(B (tm-ja)8bit::) $B$K$7$^$9!#(B `C-c C-x v' - message $BA4BN$rEE;R=pL>$9$k$+$I$&$+$r7h$a$^$9!#(B(*Note PGP::) + message $BA4BN$rEE;R=pL>$9$k$+$I$&$+$r7h$a$^$9!#(B(cf. *Note PGP::) `C-c C-x h' - message $BA4BN$r0E9f2=$9$k$+$I$&$+$r7h$a$^$9!#(B(*Note PGP::) + message $BA4BN$r0E9f2=$9$k$+$I$&$+$r7h$a$^$9!#(B(cf. *Note PGP::) `C-c C-x ?' help message $B$rI=<($7$^$9!#(B @@ -232,7 +235,72 @@ mime/editor-mode $B$K$*$1$k$=$NB>$NA`:n$r@bL@$7$^$9!#(B  -File: tm-edit-ja.info, Node: transfer level, Next: header, Prev: other operations of mime/editor-mode, Up: Top +File: tm-edit-ja.info, Node: tag specification for inserted file, Next: transfer level, Prev: other operations of mime/editor-mode, Up: Top + +$BA^F~$5$l$k(B file $B$KBP$9$k(B tag $B$N7hDj(B +*********************************** + +`C-c C-x C-i' (`mime-editor/insert-file') $B$r<B9T$7$?;~!"A^F~$5$l$k(B file +$B$KBP$9$k(B media-type $B$d(B encoding $B$J$I$N(B tag $B$N>pJs$OJQ?t(B +`mime-file-types' $B$K$h$C$F(B file $BL>$+$i?dB,$5$l$^$9!#(B + +$BA0$K(B `C-u' $B$rIU$1$?;~!"$*$h$S!"E,Ev$JCM$,8+IU$+$i$J$+$C$?>l9g!"(Buser $B$KBP(B +$B$7$FCM$NF~NO$rB%$7$^$9!#!JA0$K(B `C-u' $B$rIU$1$?;~!"?dB,$5$l$?CM$,4{DjCM$H(B +$B$7$FMQ$$$i$l$^$9!K(B + +file $BL>$KBP$9$k4{DjCM$rJQ$($?$$>l9g$OJQ?t(B `mime-file-types'$B$r@_Dj$7$F2<(B +$B$5$$!#(B + + -- Variable: mime-file-types + + $BA^F~$5$l$k(B file $B$N(B file $BL>$KBP$9$k(B tag $B$N4{DjCM$rM?$($k!#(B + + $B$3$NJQ?t$O(B + + (FILE_PAT TYPE SUBTYPE PARAMS ENCODING + DISPOSITION_TYPE DISPOSITION_PARAMS) + + + $B$H$$$&(B list $B$N(B list $B$G!"3FMWAG$O0J2<$NDL$j$G$"$k!'(B + + `FILE_PAT' + file $BL>$rI=$9@55,I=8=(B + + `TYPE' + media type + + `SUBTYPE' + media subtype + + `PARAMS' + Content-Type field $B$N(B parameter + + `ENCODING' + Content-Transfer-Encoding + + `DISPOSITION_TYPE' + disposition-type + + `DISPOSITION_PARAMS' + Content-Disposition field $B$N(B parameter + + + $B@_DjNc!'(B `*.rtf' $B$KBP$9$k(B media type $B$r(B application/rtf $B$K$9$k>l9g(B + + (call-after-loaded + 'tm-edit + (lambda () + (set-alist 'mime-file-types + "\\.rtf$" + '("application" "rtf" nil nil + "attachment" (("filename" . file))) + ))) + + + + + +File: tm-edit-ja.info, Node: transfer level, Next: header, Prev: tag specification for inserted file, Up: Top transfer level ************** @@ -497,3 +565,4 @@ File: tm-edit-ja.info, Node: Variable Index, Prev: Function Index, Up: Top * mime-editor/transfer-level: transfer level. 34. * mime-eword/charset-encoding-alist: API about header. 38. * mime/field-encoding-method-alist: evil setting in header. 21. +* mime-file-types: tag specification for inserted file. 18. diff --git a/doc/tm-edit-ja.sgml b/doc/tm-edit-ja.sgml index f5d9baf..a0bb4a9 100644 --- a/doc/tm-edit-ja.sgml +++ b/doc/tm-edit-ja.sgml @@ -1,9 +1,9 @@ <!doctype sinfo system> -<!-- $Id: tm-edit-ja.sgml,v 5.0 1996/10/21 02:47:29 morioka Exp $ --> +<!-- $Id: tm-edit-ja.sgml,v 6.0 1996/12/24 15:08:17 morioka Exp $ --> <head> -<title>tm-edit 7.90 $B@bL@=q!JF|K\8lHG!K(B +<title>tm-edit 7.99 $B@bL@=q!JF|K\8lHG!K(B <author>$B<i2,(B $BCNI'(B <mail>morioka@jaist.ac.jp</mail> -<date>1996/10/11 +<date>1996/12/25 <toc> </head> @@ -122,7 +122,9 @@ text part $B$rI=$9(B single-part tag $B$rA^F~$7$^$9!#(B </kd> <kt>C-c C-x C-i <kd> -file $B$r(B MIME part $B$H$7$FE:IU$7$^$9!#(B +file $B$r(B MIME part $B$H$7$FE:IU$7$^$9!#A0$K(B <kbd>C-u</kbd> $B$rIU$1$?>l9g!"(B +$B>o$K(B media-type, subtype $BEy$rJ9$$$FMh$^$9!#(B<cf node="tag specification +for inserted file"> </kd> <kt>C-c C-x C-e <kd> @@ -180,11 +182,11 @@ enclosure $B$r:n$k$?$a$NA`:n$H$7$F$O0J2<$N$h$&$J$b$N$,$"$j$^$9!#(B </kd> <kt>C-c C-x s <kd> -$B;XDj$7$?(B region $B$KEE;R=pL>$r9T$$$^$9!#(B(<ref node="PGP">) +$B;XDj$7$?(B region $B$KEE;R=pL>$r9T$$$^$9!#(B<cf node="PGP"> </kd> <kt>C-c C-x e <kd> -$B;XDj$7$?(B region $B$r0E9f2=$7$^$9!#(B(<ref node="PGP">) +$B;XDj$7$?(B region $B$r0E9f2=$7$^$9!#(B<cf node="PGP"> <kt>C-c C-x q <kd> $B;XDj$7$?(B region $BFb$N(B tag $B$rL58z$K$7!"$=$N(B tag $B$rJ8;zNs$H$7$FMxMQ$G$-$k(B @@ -205,8 +207,8 @@ mime/editor-mode $B$K$*$1$k$=$NB>$NA`:n$r@bL@$7$^$9!#(B </kd> <kt>C-c C-x C-p <kd> -$BJT=8Cf$N(B message $B$r(B preview $B$7$^$9!#(B(<ref file="tm-view-ja" -node="mime/viewer-mode">) +$BJT=8Cf$N(B message $B$r(B preview $B$7$^$9!#(B<cf file="tm-view-ja" +node="mime/viewer-mode"> </kd> <kt>C-c C-x C-z <kd> @@ -231,17 +233,78 @@ help message $B$rI=<($7$^$9!#(B </kd> <kt>C-c C-x v <kd> -message $BA4BN$rEE;R=pL>$9$k$+$I$&$+$r7h$a$^$9!#(B(<ref node="PGP">) +message $BA4BN$rEE;R=pL>$9$k$+$I$&$+$r7h$a$^$9!#(B<cf node="PGP"> </kd> <kt>C-c C-x h <kd> -message $BA4BN$r0E9f2=$9$k$+$I$&$+$r7h$a$^$9!#(B(<ref node="PGP">) +message $BA4BN$r0E9f2=$9$k$+$I$&$+$r7h$a$^$9!#(B<cf node="PGP"> <kt>C-c C-x ? <kd> help message $B$rI=<($7$^$9!#(B </kl> +<h1> $BA^F~$5$l$k(B file $B$KBP$9$k(B tag $B$N7hDj(B +<node> tag specification for inserted file +<p> +<kbd>C-c C-x C-i</kbd> (<code>mime-editor/insert-file</code>) $B$r<B9T$7(B +$B$?;~!"A^F~$5$l$k(B file $B$KBP$9$k(B media-type $B$d(B encoding $B$J$I$N(B tag $B$N>p(B +$BJs$OJQ?t(B <code>mime-file-types</code> $B$K$h$C$F(B file $BL>$+$i?dB,$5$l$^$9!#(B +<p> +$BA0$K(B <kbd>C-u</kbd> $B$rIU$1$?;~!"$*$h$S!"E,Ev$JCM$,8+IU$+$i$J$+$C$?>l9g!"(B +user $B$KBP$7$FCM$NF~NO$rB%$7$^$9!#!JA0$K(B <kbd>C-u</kbd> $B$rIU$1$?;~!"?d(B +$BB,$5$l$?CM$,4{DjCM$H$7$FMQ$$$i$l$^$9!K(B +<p> +file $BL>$KBP$9$k4{DjCM$rJQ$($?$$>l9g$OJQ?t(B <code>mime-file-types</code> +$B$r@_Dj$7$F2<$5$$!#(B + +<defvar name="mime-file-types"> +<p> +$BA^F~$5$l$k(B file $B$N(B file $BL>$KBP$9$k(B tag $B$N4{DjCM$rM?$($k!#(B +<p> +$B$3$NJQ?t$O(B + +<lisp> + (FILE_PAT TYPE SUBTYPE PARAMS ENCODING + DISPOSITION_TYPE DISPOSITION_PARAMS) +</lisp> + +$B$H$$$&(B list $B$N(B list $B$G!"3FMWAG$O0J2<$NDL$j$G$"$k!'(B + +<dl> +<dt>FILE_PAT +<dd>file $BL>$rI=$9@55,I=8=(B +<dt>TYPE +<dd>media type +<dt>SUBTYPE +<dd>media subtype +<dt>PARAMS +<dd>Content-Type field $B$N(B parameter +<dt>ENCODING +<dd>Content-Transfer-Encoding +<dt>DISPOSITION_TYPE +<dd>disposition-type +<dt>DISPOSITION_PARAMS +<dd>Content-Disposition field $B$N(B parameter +</dl> + +<noindent> +$B@_DjNc!'(B <file>*.rtf</file> $B$KBP$9$k(B media type $B$r(B application/rtf $B$K(B +$B$9$k>l9g(B + +<lisp> +(call-after-loaded + 'tm-edit + (lambda () + (set-alist 'mime-file-types + "\\.rtf$" + '("application" "rtf" nil nil + "attachment" (("filename" . file))) + ))) +</lisp> +</defvar> + + <h1> transfer level <node> transfer level <p> diff --git a/doc/tm-edit-ja.texi b/doc/tm-edit-ja.texi index 4ed2fe5..b1c769f 100644 --- a/doc/tm-edit-ja.texi +++ b/doc/tm-edit-ja.texi @@ -1,13 +1,13 @@ \input texinfo.tex @setfilename tm-edit-ja.info -@settitle{tm-edit 7.90 $B@bL@=q!JF|K\8lHG!K(B} +@settitle{tm-edit 7.99 $B@bL@=q!JF|K\8lHG!K(B} @titlepage -@title tm-edit 7.90 $B@bL@=q!JF|K\8lHG!K(B +@title tm-edit 7.99 $B@bL@=q!JF|K\8lHG!K(B @author $B<i2,(B $BCNI'(B <morioka@@jaist.ac.jp> -@subtitle 1996/10/11 +@subtitle 1996/12/25 @end titlepage @node Top, Introduction, (dir), (dir) -@top tm-edit 7.90 $B@bL@=q!JF|K\8lHG!K(B +@top tm-edit 7.99 $B@bL@=q!JF|K\8lHG!K(B @ifinfo @@ -22,6 +22,7 @@ GNU Emacs $BMQ$N(B MIME composer $B$G$"$k(B `tm-edit' $B$K$D$$$F@bL@$7$^$9! * single-part operations:: single-part $B$KBP$9$kA`:n(B * enclosure operation:: enclosure $B$KBP$9$kA`:n(B * other operations of mime/editor-mode:: mime/editor-mode $B$K$*$1$k$=$NB>$NA`:n(B +* tag specification for inserted file:: $BA^F~$5$l$k(B file $B$KBP$9$k(B tag $B$N7hDj(B * transfer level:: * header:: header $B$G$NHs(B ASCII $BJ8;z$N;HMQ(B * PGP:: @@ -134,7 +135,9 @@ single-part $B$r:n$k$?$a$NA`:n$K$O0J2<$N$h$&$J$b$N$,$"$j$^$9!#(B text part $B$rI=$9(B single-part tag $B$rA^F~$7$^$9!#(B @item @key{C-c C-x C-i} -file $B$r(B MIME part $B$H$7$FE:IU$7$^$9!#(B +file $B$r(B MIME part $B$H$7$FE:IU$7$^$9!#A0$K(B @kbd{C-u} $B$rIU$1$?>l9g!">o$K(B +media-type, subtype $BEy$rJ9$$$FMh$^$9!#(B(cf. @ref{tag specification for +inserted file}) @item @key{C-c C-x C-e} external part $B$rA^F~$7$^$9!#(B @@ -182,10 +185,10 @@ enclosure $B$r:n$k$?$a$NA`:n$H$7$F$O0J2<$N$h$&$J$b$N$,$"$j$^$9!#(B $B;XDj$7$?(B region $B$r(B multipart/digest $B$H$7$F0O$_$^$9!#(B @item @key{C-c C-x s} -$B;XDj$7$?(B region $B$KEE;R=pL>$r9T$$$^$9!#(B(@ref{PGP}) +$B;XDj$7$?(B region $B$KEE;R=pL>$r9T$$$^$9!#(B(cf. @ref{PGP}) @item @key{C-c C-x e} -$B;XDj$7$?(B region $B$r0E9f2=$7$^$9!#(B(@ref{PGP}) +$B;XDj$7$?(B region $B$r0E9f2=$7$^$9!#(B(cf. @ref{PGP}) @item @key{C-c C-x q} $B;XDj$7$?(B region $BFb$N(B tag $B$rL58z$K$7!"$=$N(B tag $B$rJ8;zNs$H$7$FMxMQ$G$-$k(B @@ -196,7 +199,7 @@ enclosure $B$r:n$k$?$a$NA`:n$H$7$F$O0J2<$N$h$&$J$b$N$,$"$j$^$9!#(B -@node other operations of mime/editor-mode, transfer level, enclosure operation, Top +@node other operations of mime/editor-mode, tag specification for inserted file, enclosure operation, Top @chapter mime/editor-mode $B$K$*$1$k$=$NB>$NA`:n(B mime/editor-mode $B$K$*$1$k$=$NB>$NA`:n$r@bL@$7$^$9!#(B @@ -206,7 +209,8 @@ mime/editor-mode $B$K$*$1$k$=$NB>$NA`:n$r@bL@$7$^$9!#(B $BJT=8Cf$N(B message $B$rAw?.$7$^$9!#(B @item @key{C-c C-x C-p} -$BJT=8Cf$N(B message $B$r(B preview $B$7$^$9!#(B(@ref{(tm-view-ja)mime/viewer-mode}) +$BJT=8Cf$N(B message $B$r(B preview $B$7$^$9!#(B +(cf. @ref{(tm-view-ja)mime/viewer-mode}) @item @key{C-c C-x C-z} $BJT=8Cf$N(B message $B$rAw?.$9$k$3$H$J$/!"(Bmime/editor-mode $B$r=*N;$7$^$9!#(B @@ -227,10 +231,10 @@ transfer level (@ref{transfer level}) $B$r(B 8bit (@ref{(tm-ja)8bit}) $B$K$7$ $B$9!#(B @item @key{C-c C-x v} -message $BA4BN$rEE;R=pL>$9$k$+$I$&$+$r7h$a$^$9!#(B(@ref{PGP}) +message $BA4BN$rEE;R=pL>$9$k$+$I$&$+$r7h$a$^$9!#(B(cf. @ref{PGP}) @item @key{C-c C-x h} -message $BA4BN$r0E9f2=$9$k$+$I$&$+$r7h$a$^$9!#(B(@ref{PGP}) +message $BA4BN$r0E9f2=$9$k$+$I$&$+$r7h$a$^$9!#(B(cf. @ref{PGP}) @item @key{C-c C-x ?} help message $B$rI=<($7$^$9!#(B @@ -239,7 +243,77 @@ help message $B$rI=<($7$^$9!#(B -@node transfer level, header, other operations of mime/editor-mode, Top +@node tag specification for inserted file, transfer level, other operations of mime/editor-mode, Top +@chapter $BA^F~$5$l$k(B file $B$KBP$9$k(B tag $B$N7hDj(B + +@kbd{C-c C-x C-i} (@code{mime-editor/insert-file}) $B$r<B9T$7$?;~!"A^F~$5(B +$B$l$k(B file $B$KBP$9$k(B media-type $B$d(B encoding $B$J$I$N(B tag $B$N>pJs$OJQ?t(B +@code{mime-file-types} $B$K$h$C$F(B file $BL>$+$i?dB,$5$l$^$9!#(B@refill + +$BA0$K(B @kbd{C-u} $B$rIU$1$?;~!"$*$h$S!"E,Ev$JCM$,8+IU$+$i$J$+$C$?>l9g!"(Buser +$B$KBP$7$FCM$NF~NO$rB%$7$^$9!#!JA0$K(B @kbd{C-u} $B$rIU$1$?;~!"?dB,$5$l$?CM$,(B +$B4{DjCM$H$7$FMQ$$$i$l$^$9!K(B@refill + +file $BL>$KBP$9$k4{DjCM$rJQ$($?$$>l9g$OJQ?t(B @code{mime-file-types} +$B$r@_Dj$7$F2<$5$$!#(B + +@defvar mime-file-types + +$BA^F~$5$l$k(B file $B$N(B file $BL>$KBP$9$k(B tag $B$N4{DjCM$rM?$($k!#(B@refill + +$B$3$NJQ?t$O(B + +@lisp + (FILE_PAT TYPE SUBTYPE PARAMS ENCODING + DISPOSITION_TYPE DISPOSITION_PARAMS) +@end lisp + + +$B$H$$$&(B list $B$N(B list $B$G!"3FMWAG$O0J2<$NDL$j$G$"$k!'(B + +@table @samp +@item FILE_PAT +file $BL>$rI=$9@55,I=8=(B + +@item TYPE +media type + +@item SUBTYPE +media subtype + +@item PARAMS +Content-Type field $B$N(B parameter + +@item ENCODING +Content-Transfer-Encoding + +@item DISPOSITION_TYPE +disposition-type + +@item DISPOSITION_PARAMS +Content-Disposition field $B$N(B parameter + +@end table + +@noindent +$B@_DjNc!'(B @file{*.rtf} $B$KBP$9$k(B media type $B$r(B application/rtf $B$K(B +$B$9$k>l9g(B + +@lisp +(call-after-loaded + 'tm-edit + (lambda () + (set-alist 'mime-file-types + "\\.rtf$" + '("application" "rtf" nil nil + "attachment" (("filename" . file))) + ))) +@end lisp +@end defvar + + + +@node transfer level, header, tag specification for inserted file, Top @chapter transfer level message $B$KA^F~$9$k(B data $B$O(B 7bit (@ref{(tm-ja)7bit}) $B$J$$$7(B 8bit diff --git a/tm-edit.el b/tm-edit.el index 03587b0..70268a2 100644 --- a/tm-edit.el +++ b/tm-edit.el @@ -6,7 +6,7 @@ ;; MORIOKA Tomohiko <morioka@jaist.ac.jp> ;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp> ;; Created: 1994/08/21 renamed from mime.el -;; Version: $Revision: 7.98 $ +;; Version: $Revision: 7.99 $ ;; Keywords: mail, news, MIME, multimedia, multilingual ;; This file is part of tm (Tools for MIME). @@ -120,7 +120,7 @@ ;;; (defconst mime-editor/RCS-ID - "$Id: tm-edit.el,v 7.98 1996/12/23 14:49:34 morioka Exp $") + "$Id: tm-edit.el,v 7.99 1996/12/24 12:08:50 morioka Exp $") (defconst mime-editor/version (get-version-string mime-editor/RCS-ID)) @@ -292,42 +292,42 @@ To insert a signature file automatically, call the function ) ("\\.tar\\.gz$" "application" "octet-stream" (("type" . "tar+gzip")) - nil + "base64" "attachment" (("filename" . file)) ) ("\\.tgz$" "application" "octet-stream" (("type" . "tar+gzip")) - nil + "base64" "attachment" (("filename" . file)) ) ("\\.tar\\.Z$" "application" "octet-stream" (("type" . "tar+compress")) - nil + "base64" "attachment" (("filename" . file)) ) ("\\.taz$" "application" "octet-stream" (("type" . "tar+compress")) - nil + "base64" "attachment" (("filename" . file)) ) ("\\.gz$" "application" "octet-stream" (("type" . "gzip")) - nil + "base64" "attachment" (("filename" . file)) ) ("\\.Z$" "application" "octet-stream" (("type" . "compress")) - nil + "base64" "attachment" (("filename" . file)) ) ("\\.lzh$" "application" "octet-stream" (("type" . "lha")) - nil + "base64" "attachment" (("filename" . file)) ) ("\\.zip$" "application" "zip" nil - nil + "base64" "attachment" (("filename" . file)) ) ("\\.diff$" @@ -898,7 +898,7 @@ Charset is automatically obtained from the `mime/lc-charset-alist'." (setq type (mime-prompt-for-type type) subtype (mime-prompt-for-subtype type subtype) )) - (if (interactive-p) + (if (or (interactive-p) verbose) (setq encoding (mime-prompt-for-encoding encoding)) ) (if (or (consp parameters) (stringp disposition-type)) @@ -1387,22 +1387,15 @@ Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))." (defun mime-prompt-for-encoding (default) "Ask for Content-Transfer-Encoding. [tm-edit.el]" - (let ((ret - (completing-read - (concat "What transfer encoding" - (if default - (concat " (default " - (if (string-equal default "") - "\"\"" - default) - ")" - )) - ": ") - mime-file-encoding-method-alist nil t nil) - )) - (if (string= ret "") - default - ret))) + (let (encoding) + (while (string= + (setq encoding + (completing-read + "What transfer encoding: " + mime-file-encoding-method-alist nil t default) + ) + "")) + encoding)) ;;; @ Translate the tagged MIME messages into a MIME compliant message. -- 1.7.10.4