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

which included commits to RCS files with non-trunk default branches.

diff --git a/ChangeLog b/ChangeLog
index ef6150f..67b12bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+Tue Dec 24 16:00:05 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * 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  <morioka@jaist.ac.jp>
+
+       * doc/tm-edit-ja.sgml (tag specification for inserted file): New
+       node.
+
+Tue Dec 24 12:08:50 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * 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.
+
+\f
 Mon Dec 23 21:25:12 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * emu: Version 7.37.3 was released.

diff --git a/Makefile b/Makefile
index ff3f6d3..56a62d8 100644 (file)
--- 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 (file)
--- 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.
 \1f
 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:
 
 
 \1f
-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.
 
 
 \1f
-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)))
+                     )))
+
+
+
+
+\1f
+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 (file)
--- a/doc/tm-edit-en.sgml
+++ b/doc/tm-edit-en.sgml
@@ -1,9 +1,9 @@
 <!doctype sinfo system>
-<!-- $Id: tm-edit-en.sgml,v 1.1 1996/11/29 19:09:44 morioka Exp $ -->
+<!-- $Id: tm-edit-en.sgml,v 2.0 1996/12/24 16:00:05 morioka Exp $ -->
 <head>
-<title>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 (file)
--- 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 (file)
--- 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.
 \1f
 File: tm-edit-ja.info, Node: Top, Next: Introduction, Prev: (dir), Up: (dir)
 
-tm-edit 7.90 \e$B@bL@=q!JF|K\8lHG!K\e(B
+tm-edit 7.99 \e$B@bL@=q!JF|K\8lHG!K\e(B
 *******************************
 
 
@@ -22,6 +22,7 @@ GNU Emacs \e$BMQ$N\e(B MIME composer \e$B$G$"$k\e(B `tm-edit' \e$B$K$D$$$F@bL@$7$^$9!
 * single-part operations::      single-part \e$B$KBP$9$kA`:n\e(B
 * enclosure operation::         enclosure \e$B$KBP$9$kA`:n\e(B
 * other operations of mime/editor-mode::  mime/editor-mode \e$B$K$*$1$k$=$NB>$NA`:n\e(B
+* tag specification for inserted file::  \e$BA^F~$5$l$k\e(B file \e$B$KBP$9$k\e(B tag \e$B$N7hDj\e(B
 * transfer level::              
 * header::                      header \e$B$G$NHs\e(B ASCII \e$BJ8;z$N;HMQ\e(B
 * PGP::                         
@@ -121,7 +122,9 @@ single-part \e$B$r:n$k$?$a$NA`:n$K$O0J2<$N$h$&$J$b$N$,$"$j$^$9!#\e(B
      text part \e$B$rI=$9\e(B single-part tag \e$B$rA^F~$7$^$9!#\e(B
 
 `C-c C-x C-i'
-     file \e$B$r\e(B MIME part \e$B$H$7$FE:IU$7$^$9!#\e(B
+     file \e$B$r\e(B MIME part \e$B$H$7$FE:IU$7$^$9!#A0$K\e(B `C-u' \e$B$rIU$1$?>l9g!">o$K\e(B 
+     media-type, subtype \e$BEy$rJ9$$$FMh$^$9!#\e(B(cf. *Note tag specification
+     for inserted file::)
 
 `C-c C-x C-e'
      external part \e$B$rA^F~$7$^$9!#\e(B
@@ -171,10 +174,10 @@ enclosure \e$B$r:n$k$?$a$NA`:n$H$7$F$O0J2<$N$h$&$J$b$N$,$"$j$^$9!#\e(B
      \e$B;XDj$7$?\e(B region \e$B$r\e(B multipart/digest \e$B$H$7$F0O$_$^$9!#\e(B
 
 `C-c C-x s'
-     \e$B;XDj$7$?\e(B region \e$B$KEE;R=pL>$r9T$$$^$9!#\e(B(*Note PGP::)
+     \e$B;XDj$7$?\e(B region \e$B$KEE;R=pL>$r9T$$$^$9!#\e(B(cf. *Note PGP::)
 
 `C-c C-x e'
-     \e$B;XDj$7$?\e(B region \e$B$r0E9f2=$7$^$9!#\e(B(*Note PGP::)
+     \e$B;XDj$7$?\e(B region \e$B$r0E9f2=$7$^$9!#\e(B(cf. *Note PGP::)
 
 `C-c C-x q'
      \e$B;XDj$7$?\e(B region \e$BFb$N\e(B tag \e$B$rL58z$K$7!"$=$N\e(B tag \e$B$rJ8;zNs$H$7$FMxMQ$G\e(B
@@ -186,7 +189,7 @@ enclosure \e$B$r:n$k$?$a$NA`:n$H$7$F$O0J2<$N$h$&$J$b$N$,$"$j$^$9!#\e(B
 
 
 \1f
-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 \e$B$K$*$1$k$=$NB>$NA`:n\e(B
 *************************************
@@ -197,7 +200,7 @@ mime/editor-mode \e$B$K$*$1$k$=$NB>$NA`:n$r@bL@$7$^$9!#\e(B
      \e$BJT=8Cf$N\e(B message \e$B$rAw?.$7$^$9!#\e(B
 
 `C-c C-x C-p'
-     \e$BJT=8Cf$N\e(B message \e$B$r\e(B preview \e$B$7$^$9!#\e(B(*Note
+     \e$BJT=8Cf$N\e(B message \e$B$r\e(B preview \e$B$7$^$9!#\e(B(cf. *Note
      (tm-view-ja)mime/viewer-mode::)
 
 `C-c C-x C-z'
@@ -219,10 +222,10 @@ mime/editor-mode \e$B$K$*$1$k$=$NB>$NA`:n$r@bL@$7$^$9!#\e(B
      (tm-ja)8bit::) \e$B$K$7$^$9!#\e(B
 
 `C-c C-x v'
-     message \e$BA4BN$rEE;R=pL>$9$k$+$I$&$+$r7h$a$^$9!#\e(B(*Note PGP::)
+     message \e$BA4BN$rEE;R=pL>$9$k$+$I$&$+$r7h$a$^$9!#\e(B(cf. *Note PGP::)
 
 `C-c C-x h'
-     message \e$BA4BN$r0E9f2=$9$k$+$I$&$+$r7h$a$^$9!#\e(B(*Note PGP::)
+     message \e$BA4BN$r0E9f2=$9$k$+$I$&$+$r7h$a$^$9!#\e(B(cf. *Note PGP::)
 
 `C-c C-x ?'
      help message \e$B$rI=<($7$^$9!#\e(B
@@ -232,7 +235,72 @@ mime/editor-mode \e$B$K$*$1$k$=$NB>$NA`:n$r@bL@$7$^$9!#\e(B
 
 
 \1f
-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
+
+\e$BA^F~$5$l$k\e(B file \e$B$KBP$9$k\e(B tag \e$B$N7hDj\e(B
+***********************************
+
+`C-c C-x C-i' (`mime-editor/insert-file') \e$B$r<B9T$7$?;~!"A^F~$5$l$k\e(B file 
+\e$B$KBP$9$k\e(B media-type \e$B$d\e(B encoding \e$B$J$I$N\e(B tag \e$B$N>pJs$OJQ?t\e(B 
+`mime-file-types' \e$B$K$h$C$F\e(B file \e$BL>$+$i?dB,$5$l$^$9!#\e(B
+
+\e$BA0$K\e(B `C-u' \e$B$rIU$1$?;~!"$*$h$S!"E,Ev$JCM$,8+IU$+$i$J$+$C$?>l9g!"\e(Buser \e$B$KBP\e(B
+\e$B$7$FCM$NF~NO$rB%$7$^$9!#!JA0$K\e(B `C-u' \e$B$rIU$1$?;~!"?dB,$5$l$?CM$,4{DjCM$H\e(B
+\e$B$7$FMQ$$$i$l$^$9!K\e(B
+
+file \e$BL>$KBP$9$k4{DjCM$rJQ$($?$$>l9g$OJQ?t\e(B `mime-file-types'\e$B$r@_Dj$7$F2<\e(B
+\e$B$5$$!#\e(B
+
+ -- Variable: mime-file-types
+
+     \e$BA^F~$5$l$k\e(B file \e$B$N\e(B file \e$BL>$KBP$9$k\e(B tag \e$B$N4{DjCM$rM?$($k!#\e(B
+
+     \e$B$3$NJQ?t$O\e(B
+
+               (FILE_PAT TYPE SUBTYPE PARAMS ENCODING
+                DISPOSITION_TYPE DISPOSITION_PARAMS)
+
+
+     \e$B$H$$$&\e(B list \e$B$N\e(B list \e$B$G!"3FMWAG$O0J2<$NDL$j$G$"$k!'\e(B
+
+     `FILE_PAT'
+          file \e$BL>$rI=$9@55,I=8=\e(B
+
+     `TYPE'
+          media type
+
+     `SUBTYPE'
+          media subtype
+
+     `PARAMS'
+          Content-Type field \e$B$N\e(B parameter
+
+     `ENCODING'
+          Content-Transfer-Encoding
+
+     `DISPOSITION_TYPE'
+          disposition-type
+
+     `DISPOSITION_PARAMS'
+          Content-Disposition field \e$B$N\e(B parameter
+
+
+     \e$B@_DjNc!'\e(B `*.rtf' \e$B$KBP$9$k\e(B media type \e$B$r\e(B application/rtf \e$B$K$9$k>l9g\e(B
+
+          (call-after-loaded
+           'tm-edit
+           (lambda ()
+             (set-alist 'mime-file-types
+                     "\\.rtf$"
+                     '("application" "rtf" nil nil
+                       "attachment" (("filename" . file)))
+                     )))
+
+
+
+
+\1f
+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 (file)
--- 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 \e$B@bL@=q!JF|K\8lHG!K\e(B
+<title>tm-edit 7.99 \e$B@bL@=q!JF|K\8lHG!K\e(B
 <author>\e$B<i2,\e(B \e$BCNI'\e(B <mail>morioka@jaist.ac.jp</mail>
-<date>1996/10/11
+<date>1996/12/25
 
 <toc>
 </head>
@@ -122,7 +122,9 @@ text part \e$B$rI=$9\e(B single-part tag \e$B$rA^F~$7$^$9!#\e(B
 </kd>
 <kt>C-c C-x C-i
 <kd>
-file \e$B$r\e(B MIME part \e$B$H$7$FE:IU$7$^$9!#\e(B
+file \e$B$r\e(B MIME part \e$B$H$7$FE:IU$7$^$9!#A0$K\e(B <kbd>C-u</kbd> \e$B$rIU$1$?>l9g!"\e(B
+\e$B>o$K\e(B media-type, subtype \e$BEy$rJ9$$$FMh$^$9!#\e(B<cf node="tag specification
+for inserted file">
 </kd>
 <kt>C-c C-x C-e
 <kd>
@@ -180,11 +182,11 @@ enclosure \e$B$r:n$k$?$a$NA`:n$H$7$F$O0J2<$N$h$&$J$b$N$,$"$j$^$9!#\e(B
 </kd>
 <kt>C-c C-x s
 <kd>
-\e$B;XDj$7$?\e(B region \e$B$KEE;R=pL>$r9T$$$^$9!#\e(B(<ref node="PGP">)
+\e$B;XDj$7$?\e(B region \e$B$KEE;R=pL>$r9T$$$^$9!#\e(B<cf node="PGP">
 </kd>
 <kt>C-c C-x e
 <kd>
-\e$B;XDj$7$?\e(B region \e$B$r0E9f2=$7$^$9!#\e(B(<ref node="PGP">)
+\e$B;XDj$7$?\e(B region \e$B$r0E9f2=$7$^$9!#\e(B<cf node="PGP">
 <kt>C-c C-x q
 <kd>
 \e$B;XDj$7$?\e(B region \e$BFb$N\e(B tag \e$B$rL58z$K$7!"$=$N\e(B tag \e$B$rJ8;zNs$H$7$FMxMQ$G$-$k\e(B
@@ -205,8 +207,8 @@ mime/editor-mode \e$B$K$*$1$k$=$NB>$NA`:n$r@bL@$7$^$9!#\e(B
 </kd>
 <kt>C-c C-x C-p
 <kd>
-\e$BJT=8Cf$N\e(B message \e$B$r\e(B preview \e$B$7$^$9!#\e(B(<ref file="tm-view-ja"
-node="mime/viewer-mode">)
+\e$BJT=8Cf$N\e(B message \e$B$r\e(B preview \e$B$7$^$9!#\e(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 \e$B$rI=<($7$^$9!#\e(B
 </kd>
 <kt>C-c C-x v
 <kd>
-message \e$BA4BN$rEE;R=pL>$9$k$+$I$&$+$r7h$a$^$9!#\e(B(<ref node="PGP">)
+message \e$BA4BN$rEE;R=pL>$9$k$+$I$&$+$r7h$a$^$9!#\e(B<cf node="PGP">
 </kd>
 <kt>C-c C-x h
 <kd>
-message \e$BA4BN$r0E9f2=$9$k$+$I$&$+$r7h$a$^$9!#\e(B(<ref node="PGP">)
+message \e$BA4BN$r0E9f2=$9$k$+$I$&$+$r7h$a$^$9!#\e(B<cf node="PGP">
 <kt>C-c C-x ?
 <kd>
 help message \e$B$rI=<($7$^$9!#\e(B
 </kl>
 
 
+<h1> \e$BA^F~$5$l$k\e(B file \e$B$KBP$9$k\e(B tag \e$B$N7hDj\e(B
+<node> tag specification for inserted file
+<p>
+<kbd>C-c C-x C-i</kbd> (<code>mime-editor/insert-file</code>) \e$B$r<B9T$7\e(B
+\e$B$?;~!"A^F~$5$l$k\e(B file \e$B$KBP$9$k\e(B media-type \e$B$d\e(B encoding \e$B$J$I$N\e(B tag \e$B$N>p\e(B
+\e$BJs$OJQ?t\e(B <code>mime-file-types</code> \e$B$K$h$C$F\e(B file \e$BL>$+$i?dB,$5$l$^$9!#\e(B
+<p>
+\e$BA0$K\e(B <kbd>C-u</kbd> \e$B$rIU$1$?;~!"$*$h$S!"E,Ev$JCM$,8+IU$+$i$J$+$C$?>l9g!"\e(B
+user \e$B$KBP$7$FCM$NF~NO$rB%$7$^$9!#!JA0$K\e(B <kbd>C-u</kbd> \e$B$rIU$1$?;~!"?d\e(B
+\e$BB,$5$l$?CM$,4{DjCM$H$7$FMQ$$$i$l$^$9!K\e(B
+<p>
+file \e$BL>$KBP$9$k4{DjCM$rJQ$($?$$>l9g$OJQ?t\e(B <code>mime-file-types</code>
+\e$B$r@_Dj$7$F2<$5$$!#\e(B
+
+<defvar name="mime-file-types">
+<p>
+\e$BA^F~$5$l$k\e(B file \e$B$N\e(B file \e$BL>$KBP$9$k\e(B tag \e$B$N4{DjCM$rM?$($k!#\e(B
+<p>
+\e$B$3$NJQ?t$O\e(B
+
+<lisp>
+       (FILE_PAT TYPE SUBTYPE PARAMS ENCODING
+        DISPOSITION_TYPE DISPOSITION_PARAMS)
+</lisp>
+
+\e$B$H$$$&\e(B list \e$B$N\e(B list \e$B$G!"3FMWAG$O0J2<$NDL$j$G$"$k!'\e(B
+
+<dl>
+<dt>FILE_PAT
+<dd>file \e$BL>$rI=$9@55,I=8=\e(B
+<dt>TYPE
+<dd>media type
+<dt>SUBTYPE
+<dd>media subtype
+<dt>PARAMS
+<dd>Content-Type field \e$B$N\e(B parameter
+<dt>ENCODING
+<dd>Content-Transfer-Encoding
+<dt>DISPOSITION_TYPE
+<dd>disposition-type
+<dt>DISPOSITION_PARAMS
+<dd>Content-Disposition field \e$B$N\e(B parameter
+</dl>
+
+<noindent>
+\e$B@_DjNc!'\e(B <file>*.rtf</file> \e$B$KBP$9$k\e(B media type \e$B$r\e(B application/rtf \e$B$K\e(B
+\e$B$9$k>l9g\e(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 (file)
--- 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 \e$B@bL@=q!JF|K\8lHG!K\e(B}
+@settitle{tm-edit 7.99 \e$B@bL@=q!JF|K\8lHG!K\e(B}
 @titlepage
-@title tm-edit 7.90 \e$B@bL@=q!JF|K\8lHG!K\e(B
+@title tm-edit 7.99 \e$B@bL@=q!JF|K\8lHG!K\e(B
 @author \e$B<i2,\e(B \e$BCNI'\e(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 \e$B@bL@=q!JF|K\8lHG!K\e(B
+@top tm-edit 7.99 \e$B@bL@=q!JF|K\8lHG!K\e(B
 
 @ifinfo
 
@@ -22,6 +22,7 @@ GNU Emacs \e$BMQ$N\e(B MIME composer \e$B$G$"$k\e(B `tm-edit' \e$B$K$D$$$F@bL@$7$^$9!
 * single-part operations::      single-part \e$B$KBP$9$kA`:n\e(B
 * enclosure operation::         enclosure \e$B$KBP$9$kA`:n\e(B
 * other operations of mime/editor-mode::  mime/editor-mode \e$B$K$*$1$k$=$NB>$NA`:n\e(B
+* tag specification for inserted file::  \e$BA^F~$5$l$k\e(B file \e$B$KBP$9$k\e(B tag \e$B$N7hDj\e(B
 * transfer level::              
 * header::                      header \e$B$G$NHs\e(B ASCII \e$BJ8;z$N;HMQ\e(B
 * PGP::                         
@@ -134,7 +135,9 @@ single-part \e$B$r:n$k$?$a$NA`:n$K$O0J2<$N$h$&$J$b$N$,$"$j$^$9!#\e(B
 text part \e$B$rI=$9\e(B single-part tag \e$B$rA^F~$7$^$9!#\e(B
 
 @item @key{C-c C-x C-i}
-file \e$B$r\e(B MIME part \e$B$H$7$FE:IU$7$^$9!#\e(B
+file \e$B$r\e(B MIME part \e$B$H$7$FE:IU$7$^$9!#A0$K\e(B @kbd{C-u} \e$B$rIU$1$?>l9g!">o$K\e(B 
+media-type, subtype \e$BEy$rJ9$$$FMh$^$9!#\e(B(cf. @ref{tag specification for
+inserted file})
 
 @item @key{C-c C-x C-e}
 external part \e$B$rA^F~$7$^$9!#\e(B
@@ -182,10 +185,10 @@ enclosure \e$B$r:n$k$?$a$NA`:n$H$7$F$O0J2<$N$h$&$J$b$N$,$"$j$^$9!#\e(B
 \e$B;XDj$7$?\e(B region \e$B$r\e(B multipart/digest \e$B$H$7$F0O$_$^$9!#\e(B
 
 @item @key{C-c C-x s}
-\e$B;XDj$7$?\e(B region \e$B$KEE;R=pL>$r9T$$$^$9!#\e(B(@ref{PGP})
+\e$B;XDj$7$?\e(B region \e$B$KEE;R=pL>$r9T$$$^$9!#\e(B(cf. @ref{PGP})
 
 @item @key{C-c C-x e}
-\e$B;XDj$7$?\e(B region \e$B$r0E9f2=$7$^$9!#\e(B(@ref{PGP})
+\e$B;XDj$7$?\e(B region \e$B$r0E9f2=$7$^$9!#\e(B(cf. @ref{PGP})
 
 @item @key{C-c C-x q}
 \e$B;XDj$7$?\e(B region \e$BFb$N\e(B tag \e$B$rL58z$K$7!"$=$N\e(B tag \e$B$rJ8;zNs$H$7$FMxMQ$G$-$k\e(B
@@ -196,7 +199,7 @@ enclosure \e$B$r:n$k$?$a$NA`:n$H$7$F$O0J2<$N$h$&$J$b$N$,$"$j$^$9!#\e(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 \e$B$K$*$1$k$=$NB>$NA`:n\e(B
 
 mime/editor-mode \e$B$K$*$1$k$=$NB>$NA`:n$r@bL@$7$^$9!#\e(B
@@ -206,7 +209,8 @@ mime/editor-mode \e$B$K$*$1$k$=$NB>$NA`:n$r@bL@$7$^$9!#\e(B
 \e$BJT=8Cf$N\e(B message \e$B$rAw?.$7$^$9!#\e(B
 
 @item @key{C-c C-x C-p}
-\e$BJT=8Cf$N\e(B message \e$B$r\e(B preview \e$B$7$^$9!#\e(B(@ref{(tm-view-ja)mime/viewer-mode})
+\e$BJT=8Cf$N\e(B message \e$B$r\e(B preview \e$B$7$^$9!#\e(B
+(cf. @ref{(tm-view-ja)mime/viewer-mode})
 
 @item @key{C-c C-x C-z}
 \e$BJT=8Cf$N\e(B message \e$B$rAw?.$9$k$3$H$J$/!"\e(Bmime/editor-mode \e$B$r=*N;$7$^$9!#\e(B
@@ -227,10 +231,10 @@ transfer level (@ref{transfer level}) \e$B$r\e(B 8bit (@ref{(tm-ja)8bit}) \e$B$K$7$
 \e$B$9!#\e(B
 
 @item @key{C-c C-x v}
-message \e$BA4BN$rEE;R=pL>$9$k$+$I$&$+$r7h$a$^$9!#\e(B(@ref{PGP})
+message \e$BA4BN$rEE;R=pL>$9$k$+$I$&$+$r7h$a$^$9!#\e(B(cf. @ref{PGP})
 
 @item @key{C-c C-x h}
-message \e$BA4BN$r0E9f2=$9$k$+$I$&$+$r7h$a$^$9!#\e(B(@ref{PGP})
+message \e$BA4BN$r0E9f2=$9$k$+$I$&$+$r7h$a$^$9!#\e(B(cf. @ref{PGP})
 
 @item @key{C-c C-x ?}
 help message \e$B$rI=<($7$^$9!#\e(B
@@ -239,7 +243,77 @@ help message \e$B$rI=<($7$^$9!#\e(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 \e$BA^F~$5$l$k\e(B file \e$B$KBP$9$k\e(B tag \e$B$N7hDj\e(B
+
+@kbd{C-c C-x C-i} (@code{mime-editor/insert-file}) \e$B$r<B9T$7$?;~!"A^F~$5\e(B
+\e$B$l$k\e(B file \e$B$KBP$9$k\e(B media-type \e$B$d\e(B encoding \e$B$J$I$N\e(B tag \e$B$N>pJs$OJQ?t\e(B 
+@code{mime-file-types} \e$B$K$h$C$F\e(B file \e$BL>$+$i?dB,$5$l$^$9!#\e(B@refill
+
+\e$BA0$K\e(B @kbd{C-u} \e$B$rIU$1$?;~!"$*$h$S!"E,Ev$JCM$,8+IU$+$i$J$+$C$?>l9g!"\e(Buser 
+\e$B$KBP$7$FCM$NF~NO$rB%$7$^$9!#!JA0$K\e(B @kbd{C-u} \e$B$rIU$1$?;~!"?dB,$5$l$?CM$,\e(B
+\e$B4{DjCM$H$7$FMQ$$$i$l$^$9!K\e(B@refill
+
+file \e$BL>$KBP$9$k4{DjCM$rJQ$($?$$>l9g$OJQ?t\e(B @code{mime-file-types}
+\e$B$r@_Dj$7$F2<$5$$!#\e(B
+
+@defvar mime-file-types
+
+\e$BA^F~$5$l$k\e(B file \e$B$N\e(B file \e$BL>$KBP$9$k\e(B tag \e$B$N4{DjCM$rM?$($k!#\e(B@refill
+
+\e$B$3$NJQ?t$O\e(B
+
+@lisp
+       (FILE_PAT TYPE SUBTYPE PARAMS ENCODING
+        DISPOSITION_TYPE DISPOSITION_PARAMS)
+@end lisp
+
+
+\e$B$H$$$&\e(B list \e$B$N\e(B list \e$B$G!"3FMWAG$O0J2<$NDL$j$G$"$k!'\e(B
+
+@table @samp
+@item FILE_PAT
+file \e$BL>$rI=$9@55,I=8=\e(B
+
+@item TYPE
+media type
+
+@item SUBTYPE
+media subtype
+
+@item PARAMS
+Content-Type field \e$B$N\e(B parameter
+
+@item ENCODING
+Content-Transfer-Encoding
+
+@item DISPOSITION_TYPE
+disposition-type
+
+@item DISPOSITION_PARAMS
+Content-Disposition field \e$B$N\e(B parameter
+
+@end table
+
+@noindent
+\e$B@_DjNc!'\e(B @file{*.rtf} \e$B$KBP$9$k\e(B media type \e$B$r\e(B application/rtf \e$B$K\e(B
+\e$B$9$k>l9g\e(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 \e$B$KA^F~$9$k\e(B data \e$B$O\e(B 7bit (@ref{(tm-ja)7bit}) \e$B$J$$$7\e(B 8bit

diff --git a/tm-edit.el b/tm-edit.el
index 03587b0..70268a2 100644 (file)
--- 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))
 
 \f
 ;;; @ Translate the tagged MIME messages into a MIME compliant message.