From 20d8199d314548d935020ae3ea90d7031e9c007c Mon Sep 17 00:00:00 2001 From: morioka Date: Mon, 9 Mar 1998 10:53:08 +0000 Subject: [PATCH] tm 7.10. --- Changes-7.09-7.10.en | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++ Changes-7.09-7.10.ja | 133 +++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 2 +- README.eng | 87 ++++++++++++++++++++++---------- doc/tm-eword_ja.texi | 10 ++-- doc/tm_en.texi | 122 +++++++++++++++++++++++++++++++++++++++------ doc/tm_ja.texi | 130 ++++++++++++++++++++++++++++++++++++++++++------ gnus/Makefile | 2 +- gnus/tm-gnus5.el | 71 +++++++++++++++++++------- gnus/tm-sgnus.el | 29 +++++------ mime-setup.el | 30 ++++++++--- signature.el | 32 +++++++++--- tm-def.el | 6 +-- tm-ew-d.el | 7 +-- tm-eword.el | 92 ++++++++++++++++------------------ tm-parse.el | 14 +++--- tm-rich.el | 16 +++--- tm-rmail.el | 13 +++-- tm-view.el | 14 +++--- 19 files changed, 753 insertions(+), 192 deletions(-) create mode 100644 Changes-7.09-7.10.en create mode 100644 Changes-7.09-7.10.ja diff --git a/Changes-7.09-7.10.en b/Changes-7.09-7.10.en new file mode 100644 index 0000000..122e8f4 --- /dev/null +++ b/Changes-7.09-7.10.en @@ -0,0 +1,135 @@ +* tl + + Attached version 7.00. + +tl/tl-822.el +---------------------------- +revision 4.0 +date: 1995/10/05 13:22:22; author: morioka; state: Exp; lines: +21 -4 +Constant `rfc822/linear-white-space-regexp', +`rfc822/quoted-pair-regexp', `rfc822/qtext-regexp', +`rfc822/quoted-string-regexp' was added. +---------------------------- +revision 3.0 +date: 1995/10/05 12:09:52; author: morioka; state: Exp; lines: +5 -3 +Constant `rfc822/field-top-regexp' was added. +---------------------------- +revision 2.0 +date: 1995/10/05 11:26:43; author: morioka; state: Exp; lines: +83 -1 +Constant `rfc822/field-name-regexp', +function `rfc822/field-end', `rfc822/get-field-body', +function `rfc822/strip-quoted-pair', `rfc822/strip-quoted-string', +function `rfc822/unfolding-string' was added. +---------------------------- + +tl/tl-str.el +---------------------------- +revision 7.0 +date: 1995/10/05 13:21:07; author: morioka; state: Exp; lines: +11 -10 +Fixed problem of function `get-version-string'. +---------------------------- + +* tm + +tm/mime-setup.el +---------------------------- +revision 7.2 +date: 1995/10/05 10:34:43; author: morioka; state: Exp; lines: +11 -3 +In setting to variable `mh-letter-mode-hook', mail-header-separator is +regularized. +---------------------------- +revision 7.1 +date: 1995/10/04 13:41:01; author: morioka; state: Exp; lines: +12 -6 +Variable `mime-setup-default-signature-key' and +`mime-setup-signature-key-alist' is added. Variable +`mime-setup-signature-key' was deleted. +---------------------------- + +tm/signature.el +---------------------------- +revision 2.0 +date: 1995/10/05 11:24:45; author: morioka; state: Exp; lines: +24 -8 +Use tl-822 instead of tl-header. +---------------------------- + +tm/tm-def.el +---------------------------- +revision 7.0 +date: 1995/10/05 13:27:34; author: morioka; state: Exp; lines: +3 -3 +Use tl-822 instead of tl-header. +---------------------------- + +tm/tm-ew-d.el +---------------------------- +revision 7.2 +date: 1995/10/05 12:20:36; author: morioka; state: Exp; lines: +4 -3 +Use tl-822 instead of tl-header. +---------------------------- + +tm/tm-eword.el +---------------------------- +revision 7.2 +date: 1995/10/05 12:22:42; author: morioka; state: Exp; lines: +2 -4 +Function `mime/encode-field' was modified to use constant +`rfc822/field-top-regexp'. +---------------------------- +revision 7.1 +date: 1995/10/05 11:27:38; author: morioka; state: Exp; lines: +46 -48 +Use tl-822 instead of tl-header. +---------------------------- + +tm/tm-parse.el +---------------------------- +revision 3.0 +date: 1995/10/05 11:28:40; author: morioka; state: Exp; lines: +7 -7 +Use tl-822 instead of tl-header. +---------------------------- + +tm/tm-rich.el +---------------------------- +revision 7.0 +date: 1995/10/04 05:27:50; author: morioka; state: Exp; lines: +8 -6 +comment was modified. +---------------------------- +revision 6.15 +date: 1995/10/04 05:23:29; author: morioka; state: Exp; lines: +3 -1 +Eric Ding 's patch was applied. +---------------------------- + +tm/tm-rmail.el +---------------------------- +revision 7.1 +date: 1995/10/05 13:04:10; author: morioka; state: Exp; lines: +5 -2 +(require 'tl-header) was deleted. +---------------------------- + +tm/tm-view.el +---------------------------- +revision 7.10 +date: 1995/10/05 10:35:19; author: morioka; state: Exp; lines: +7 -7 +Use tl-822 instead of tl-header. +---------------------------- + + +* tm/gnus + + Attached version 7.02. + +tm/gnus/tm-gnus5.el +---------------------------- +revision 7.2 +date: 1995/10/05 12:57:53; author: morioka; state: Exp; lines: +5 -5 +Use tl-822 instead of tl-header. +---------------------------- +revision 7.1 +date: 1995/10/03 15:02:14; author: morioka; state: Exp; lines: +50 -13 +Function `gnus-mail-forward-using-mhe-mime' by OKABE Yasuo + was added. +---------------------------- + +tm/gnus/tm-sgnus.el +---------------------------- +revision 7.1 +date: 1995/10/05 13:01:17; author: morioka; state: Exp; lines: +12 -17 +modified a little. +---------------------------- diff --git a/Changes-7.09-7.10.ja b/Changes-7.09-7.10.ja new file mode 100644 index 0000000..8308109 --- /dev/null +++ b/Changes-7.09-7.10.ja @@ -0,0 +1,133 @@ +* tl + + Version 7.00 $B$rE:IU$7$?!#(B + +tl/tl-822.el +---------------------------- +revision 4.0 +date: 1995/10/05 13:22:22; author: morioka; state: Exp; lines: +21 -4 +$BDj?t(B rfc822/linear-white-space-regexp, rfc822/quoted-pair-regexp, +rfc822/qtext-regexp, rfc822/quoted-string-regexp $B$rDI2C$7$?!#(B +---------------------------- +revision 3.0 +date: 1995/10/05 12:09:52; author: morioka; state: Exp; lines: +5 -3 +$BDj?t(B rfc822/field-top-regexp $B$rDI2C$7$?!#(B +---------------------------- +revision 2.0 +date: 1995/10/05 11:26:43; author: morioka; state: Exp; lines: +83 -1 +$BDj?t(B rfc822/field-name-regexp, +$B4X?t(B rfc822/field-end, rfc822/get-field-body, +$B4X?t(B rfc822/strip-quoted-pair, rfc822/strip-quoted-string, +$B4X?t(B rfc822/unfolding-string $B$rDI2C$7$?!#(B +---------------------------- + +tl/tl-str.el +---------------------------- +revision 7.0 +date: 1995/10/05 13:21:07; author: morioka; state: Exp; lines: +11 -10 +$B4X?t(B get-version-string $B$NIT6q9g$r=$@5$7$?!#(B +---------------------------- + +* tm + +tm/mime-setup.el +---------------------------- +revision 7.2 +date: 1995/10/05 10:34:43; author: morioka; state: Exp; lines: +11 -3 +$BJQ?t(B mh-letter-mode-hook $B$K$*$$$F!"(Bmail-header-separator $B$r@55,2=$9$k(B +$B$h$&$K$7$?!#(B +---------------------------- +revision 7.1 +date: 1995/10/04 13:41:01; author: morioka; state: Exp; lines: +12 -6 +$BJQ?t(B mime-setup-default-signature-key $B$HJQ?t(B +mime-setup-signature-key-alist $B$r@_$1$?!#JQ?t(B mime-setup-signature-key +$B$OGQ;_$7$?!#(B +---------------------------- + +tm/signature.el +---------------------------- +revision 2.0 +date: 1995/10/05 11:24:45; author: morioka; state: Exp; lines: +24 -8 +tl-header $B$r;H$&$N$r$d$a$F(B tl-822 $B$r;H$&$h$&$K$7$?!#(B +---------------------------- + +tm/tm-def.el +---------------------------- +revision 7.0 +date: 1995/10/05 13:27:34; author: morioka; state: Exp; lines: +3 -3 +tl-header $B$r;H$&$N$r$d$a$F(B tl-822 $B$r;H$&$h$&$K$7$?!#(B +---------------------------- + +tm/tm-ew-d.el +---------------------------- +revision 7.2 +date: 1995/10/05 12:20:36; author: morioka; state: Exp; lines: +4 -3 +tl-header $B$r;H$&$N$r$d$a!"(Btl-822 $B$r;H$&$h$&$K$7$?!#(B +---------------------------- + +tm/tm-eword.el +---------------------------- +revision 7.2 +date: 1995/10/05 12:22:42; author: morioka; state: Exp; lines: +2 -4 +$B4X?t(B mime/encode-field $B$GDj?t(B rfc822/field-top-regexp $B$r;H$&$h$&$K$7$?!#(B +---------------------------- +revision 7.1 +date: 1995/10/05 11:27:38; author: morioka; state: Exp; lines: +46 -48 +tl-header $B$r;H$&$N$r$d$a$F(B tl-822 $B$r;H$&$h$&$K$7$?!#(B +---------------------------- + +tm/tm-parse.el +---------------------------- +revision 3.0 +date: 1995/10/05 11:28:40; author: morioka; state: Exp; lines: +7 -7 +tl-header $B$r;H$&$N$r$d$a$F(B tl-822 $B$r;H$&$h$&$K$7$?!#(B +---------------------------- + +tm/tm-rich.el +---------------------------- +revision 7.0 +date: 1995/10/04 05:27:50; author: morioka; state: Exp; lines: +8 -6 +comment $B$r=$@5$7$?!#(B +---------------------------- +revision 6.15 +date: 1995/10/04 05:23:29; author: morioka; state: Exp; lines: +3 -1 +Eric Ding $B$5$s$N(B patch $B$rEv$F$?!#(B +---------------------------- + +tm/tm-rmail.el +---------------------------- +revision 7.1 +date: 1995/10/05 13:04:10; author: morioka; state: Exp; lines: +5 -2 +(require 'tl-header) $B$r=|5n$7$?!#(B +---------------------------- + +tm/tm-view.el +---------------------------- +revision 7.10 +date: 1995/10/05 10:35:19; author: morioka; state: Exp; lines: +7 -7 +tl-header $B$r;H$&$N$r$d$a$F(B tl-822 $B$r;H$&$h$&$K$7$?!#(B +---------------------------- + + +* tm/gnus + + Version 7.02 $B$rE:IU$7$?!#(B + +tm/gnus/tm-gnus5.el +---------------------------- +revision 7.2 +date: 1995/10/05 12:57:53; author: morioka; state: Exp; lines: +5 -5 +tl-header $B$r;H$&$N$r$d$a$F(B tl-822 $B$r;H$&$h$&$K$7$?!#(B +---------------------------- +revision 7.1 +date: 1995/10/03 15:02:14; author: morioka; state: Exp; lines: +50 -13 +$B2,It(B $B $B$5$s$,:n$C$?4X?t(B +gnus-mail-forward-using-mhe-mime $B$rF~$l$?!#(B +---------------------------- + +tm/gnus/tm-sgnus.el +---------------------------- +revision 7.1 +date: 1995/10/05 13:01:17; author: morioka; state: Exp; lines: +12 -17 +$B$A$g$C$H=q$-49$($?$@$1!#(B +---------------------------- diff --git a/Makefile b/Makefile index de5db71..a3b9b15 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ TL_FILES = tl/README.eng tl/Makefile tl/mk-tl tl/*.el tl/doc/*.texi FILES = $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(TL_FILES) -TARFILE = tm7.09.tar +TARFILE = tm7.10.tar nemacs: diff --git a/README.eng b/README.eng index a2bcdd4..efda134 100644 --- a/README.eng +++ b/README.eng @@ -1,6 +1,6 @@ [README for tm (English Version)] by MORIOKA Tomohiko -$Id: README.eng,v 6.11 1995/09/20 17:16:09 morioka Exp $ +$Id: README.eng,v 7.0 1995/10/05 06:57:02 morioka Exp $ 1 What's tm? @@ -19,42 +19,66 @@ This package includes following documents. - doc/tm_en.texi : tm Reference Manual (TeXinfo) - doc/tm-view_en.texi : tm-view Reference Manual (TeXinfo) -- doc/tiny-mime-eng.ol : tiny-mime.el Reference Manual (Emacs Outline) -- doc/tiny-mime-eng.tex : tiny-mime.el Reference Manual (LaTeX) -- rel-6eng.ol : notice about major changes of tm 6.* (Emacs Outline) +- doc/tm-gnus_en.texi : tm-gnus Reference Manual (TeXinfo) (2) Japanese edition - doc/tm_ja.tex : tm Reference Manual (TeXinfo) -- doc/tm-view_ja.tex : tm-view Reference Manual (TeXinfo) -- doc/tm-eword_ja.texi : tiny-mime.el Reference Manual (TeXinfo) +- doc/tm-view_ja.texi : tm-view Reference Manual (TeXinfo) +- doc/tm-eword_ja.texi : tm-eword.el Reference Manual (TeXinfo) +- doc/tm-gnus_ja.texi : tm-gnus Reference Manual (TeXinfo) - doc/signature-jp.ol : signature.el Reference Manual (Emacs Outline) - doc/signature-jp.tex : signature.el Reference Manual (LaTeX) -- rel-6jp.ol : notice about major changes of tm 6.* (Emacs Outline) 3 Modules Tm has following modules: - - tiny-mime : MIME header encoder/decoder - tm-view : MIME viewer + - tm-parse.el : MIME message parser + - tm-play.el : MIME content player + - tm-eword : MIME encoded-word encoder/decoder + - tm-ew-d.el : MIME encoded-word decoder + - tm-ew-e.el : MIME encoded-word encoder - tm-def : definition module for tm + - tm-nemacs.el : NEmacs depended part of tm + - tm-orig.el : FSF original Emacs and XEmacs + depended part of tm + - tm-mule.el : Mule depended part of tm - tm-MUAs : MIME extender for MUAs - tm-mh-e : tm-MUA for mh-e - tm-gnus : tm-MUA for GNUS - tm-rmail : tm-MUA for RMAIL - tm-vm : tm-MUA for vm - - extender for tm-view + - preview filter for tm-view + - tm-rich : for text/enriched and text/richtext + - internal methods for tm-view - tm-partial : automatic assembler for message/partial - tm-ftp : for anonymous ftp - - tm-rich : for text/enriched and text/richtext + - tm-w3 : for text/html (using w3) + - tm-tar : for tar content - tm-comp : extender for mime.el (big message automatic - splitter, previewer using tm-view, uuencode - supporter) + splitter, previewer using tm-view, uuencode supporter) - tm-setup: set up module for tm-MUAs - mime-setup: set up module for MIME + +---------+-----------------+------------------+ + | tm-MUAs | preview filters | internal methods | + +---------+-----------------+------------------+ + | tm-view | + +-----------------------+-------+-----+--------+ + | tm-word | | | | + +-----------------------+ | | | + | tm-def | | | + +-------------------------------+ MEL |external| + | tl | | | + +-------------------------------+ |methods | + | emu | | | + +-------------------------------+-----+ | + | Emacs variants | | + +-------------------------------------+--------+ + 4 Install @@ -96,15 +120,17 @@ environment. 5.1 tm-gnus -(1) Please edit gnus/Makefile. +(1) Please edit tm/gnus/Makefile. - If you use GNUS 3.*, please edit gnus/g3-path. + If you use GNUS 3.*, please edit tm/gnus/g3-path. - If you use GNUS 4.*, please edit gnus/g4-path. + If you use GNUS 4.*, please edit tm/gnus/g4-path. - If you use (ding) GNUS, please edit gnus/d-path. + If you use (ding) Gnus, please edit tm/gnus/d-path. - If you use GNUS 5.*, please edit gnus/g5-path. + If you use Gnus 5.0.*, please edit tm/gnus/g5-path. + + If you use September Gnus, please edit tm/gnus/s-path. (2) make @@ -114,7 +140,9 @@ environment. Run `make dgnus', if you use (ding) GNUS. - Run `make gnus5', if you use GNUS 5.*. + Run `make gnus5', if you use Gnus 5.0.*. + + Run `make sgnus', if you use September Gnus. (3) install @@ -123,12 +151,20 @@ environment. Run `make install-19', if you use Emacs 19.*. -5.1.1 Gnus 5.* +5.1.1 Gnus 5.0.6 If you want to use automatic MIME preview support, please apply a -patch to Gnus 5.*. This patch is called `with tm patch'. It is -available from ftp.jaist.ac.jp:/pub/GNU/elisp/dgnus/. Current version -is gnus-5.0.4-tm.diff. +patch to Gnus 5.*. This patch is called `with September patch'. It +provides September Gnus like article buffer feature. + + It is available from ftp.jaist.ac.jp:/pub/GNU/elisp/dgnus/. Current +version is gnus-5.0.6-September.diff. + + +5.1.2 September Gnus + + For current September Gnus, automatic MIME preview feature is +available without any patches. 5.2 tm-mh-e @@ -257,10 +293,9 @@ body in human-recognizable language (^_^). 9 TODO -- better XEmacs support (i.e. richtext filter or inline image) -- multi frame support -- improvement of tiny-mime -- better uuencode support +- automatic MIME preview support for another MUA +- better XEmacs support (e.g. inline image) - development of internal method for message/external-body based on tm-ftp - development good MIME composer +- etc. diff --git a/doc/tm-eword_ja.texi b/doc/tm-eword_ja.texi index 1430a2c..a25a9df 100644 --- a/doc/tm-eword_ja.texi +++ b/doc/tm-eword_ja.texi @@ -1,16 +1,16 @@ \input texinfo.tex -@c{-*-tiny-mime manual-*-} +@c{-*-tm-eword manual-*-} @setfilename tm-eword_ja.info -@settitle{tiny-mime manual} +@settitle{tm-eword manual} @titlepage -@title{tiny-mime Manual¡ÊÆüËܸìÈÇ¡Ë} +@title{tm-eword Manual¡ÊÆüËܸìÈÇ¡Ë} @author{¼é²¬ ÃÎɧ Ãø} -@code{$Id: tm-eword_ja.texi,v 4.0 1995/09/05 17:50:57 morioka Exp $} +@code{$Id: tm-eword_ja.texi,v 4.0 1995/09/05 17:50:57 morioka Exp morioka $} @end titlepage -@node Top, Abstract, (tm_ja.info)Abstract, (tm_ja.info)Abstract +@node Top, Abstract, (tm_ja.info)Introduction, (tm_ja.info)Introduction @comment node-name, next, previous, up @ifinfo @top tiny-mime 6.6 Reference manual diff --git a/doc/tm_en.texi b/doc/tm_en.texi index 883dd8f..77da73b 100644 --- a/doc/tm_en.texi +++ b/doc/tm_en.texi @@ -6,7 +6,7 @@ @titlepage @title tm Manual (English Version) @author by MORIOKA Tomohiko -@code{$Id: tm_en.texi,v 6.4 1995/09/06 03:51:39 morioka Exp $} +@code{$Id: tm_en.texi,v 7.0 1995/10/04 15:16:13 morioka Exp $} @end titlepage @@ -189,12 +189,23 @@ Or copy *.el to your emacs lisp directory. @chapter Setting @cindex Setting -In the tm package, two files, mime-setup.el and tm-setup.el, are provided -to ease the setup. A mime-setup.el is used for the whole MIME related -setup including MIME encoding, while tm-setup is used to set up tm-MUA -only. +In the tm package, two files, mime-setup.el and tm-setup.el, are +provided to ease the setup. A mime-setup.el is used for the whole MIME +related setup including MIME encoding using mime.el, while tm-setup is +used to set up tm-MUA only. + +@menu +* mime-setup:: +* tm-setup:: +* tm-vm:: +* manual setting:: +@end menu -@section mime-setup + +@node mime-setup, tm-setup, Setting, Setting +@comment node-name, next, previous, up +@section mime-setup.el +@cindex mime-setup.el @lisp (load "mime-setup") @@ -203,11 +214,36 @@ only. will perform various settings of MIME. As mime-setup loads tm-setup, you do not need to load tm-setup when you use mime-setup. -You can also set up the "automatic signature selection tool" using -mime-setup. If you want to automatically select the signature file +mime-setup.el requires mime.el. mime.el is included in +emacs-mime-tools.shar. It is available lots of anonymous-ftp sites, +for example: + +@example + ftp://ftp.kyutech.ac.jp/pub/MultiMedia/mime + ftp://ftp.jaist.ac.jp/pub/GNU/elisp/mime +@end example + + +@subsection SuperCite +@cindex SuperCite + +@defvar mime-setup-use-sc + +If it is not nil, mime-setup.el sets up SuperCite using sc-setup.el. +Its default value is nil. + +If you set up SuperCite, you need the SuperCite package. +@end defvar + + +@subsection signature +@cindex signature + +You can set up the "automatic signature selection tool" using +mime-setup. If you want to automatically select the signature file depending on how the message headers show, add lines like shown below -to your .emacs (Refer to the reference manual of signature.el for -more details). +to your .emacs (Refer to the reference manual of signature.el for more +details). @lisp (setq signature-file-alist @@ -219,10 +255,64 @@ more details). )) @end lisp -mime-setup requires mime.el. if you set up SuperCite via mime-setup, -you need the SuperCite package also. +@defvar mime-setup-use-signature + +If it is not nil, mime-setup.el sets up for signature.el. Its default +value is t. +@end defvar + + +@defvar mime-setup-signature-key-alist + +It defines key to bind signature inserting command for each +major-mode. Its default value is following: + +@lisp + ((mail-mode . "\C-c\C-w")) +@end lisp +If you want to change, please rewrite it. For example: + +@lisp +(set-alist 'mime-setup-signature-key-alist 'news-reply-mode "\C-c\C-w") +@end lisp + +@end defvar + + +@defvar mime-setup-default-signature-key + +If key to bind signature inserting command for a major-mode is not +found from mime-setup-signature-key-alist, its value is used as key. +Its default value is ``\C-c\C-s''. +@end defvar + + +@subsection Notices for GNUS +@cindex GNUS + +When mime-setup.el sets up for signature.el, it sets variable +@code{gnus-signature-file} to nil. Therefore GNUS does not insert +signature automatically when it is sending a message. Reason of this +setting is following: + +GNUS inserts signature after mime.el composed as MIME +message. Therefore signature inserted by GNUS is not processed as a +valid MIME part. In particular, for multipart message, signature +places in outside of MIME part. So MIME MUA might not display it. + +Other notice is key bind. In historical reason, key bind to insert +signature is @key{C-c C-s} (like mh-e) instead of @key{C-c C-w}. If +you change to GNUS's default, please set following: + +@lisp +(set-alist 'mime-setup-signature-key-alist 'news-reply-mode "\C-c\C-w") +@end lisp + + +@node tm-setup, tm-vm, mime-setup, Setting +@comment node-name, next, previous, up @section tm-setup tm-setup only sets up tm-MUAs. You do not need to explicitly load @@ -234,16 +324,20 @@ when you do not want to use mime-setup but want to set up tm-MUAs. @end lisp +@node tm-vm, manual setting, tm-setup, Setting +@comment node-name, next, previous, up @section vm -If you use vm, please insert following in .vm or .emacs. +If you use vm, please insert following in .vm: @lisp (load "tm-vm") @end lisp -@section setting up without loading provided setup files +@node manual setting, , tm-vm, Setting +@comment node-name, next, previous, up +@section Setting up without loading provided setup files You may find the valuable hints in tm-setup.el if you want to set up MIME environment without loading the tm-provided setup files. diff --git a/doc/tm_ja.texi b/doc/tm_ja.texi index 2db6588..764cf9e 100644 --- a/doc/tm_ja.texi +++ b/doc/tm_ja.texi @@ -6,7 +6,7 @@ @titlepage @title{tm Manual¡ÊÆüËܸìÈÇ¡Ë} @author{¼é²¬ ÃÎɧ Ãø} -@code{$Id: tm_ja.texi,v 5.0 1995/09/06 04:10:18 morioka Exp $} +@code{$Id: tm_ja.texi,v 6.0 1995/10/04 14:42:13 morioka Exp morioka $} @end titlepage @@ -218,24 +218,59 @@ Mule 2.* @cindex ÀßÄê ¤³¤Î package ¤Ë¤Ï mime-setup.el ¤È tm-setup.el ¤È¤¤¤¦´Ê°×ÀßÄê file ¤¬ -Éí°¤·¤Æ¤¤¤Þ¤¹¡£mime-setup.el ¤Ç¤Ï encoding ¤â´Þ¤á¤¿ MIME Á´È̤ÎÀßÄê¤ò -¹Ô¤Ê¤¤¡¢tm-setup ¤Ç¤Ï tm-MUA ¤Ë´Ø¤¹¤ëÀßÄê¤Î¤ß¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£ +Éí°¤·¤Æ¤¤¤Þ¤¹¡£mime-setup.el ¤Ç¤Ï mime.el ¤ò»È¤Ã¤¿ encoding ¤â´Þ¤á¤¿ +MIME Á´È̤ÎÀßÄê¤ò¹Ô¤Ê¤¤¡¢tm-setup ¤Ç¤Ï tm-MUA ¤Ë´Ø¤¹¤ëÀßÄê¤Î¤ß¤ò¹Ô¤Ê¤¤ +¤Þ¤¹¡£ + +@menu +* mime-setup:: mime.el ¤ò»È¤¦¾ì¹ç +* tm-setup:: mime.el °Ê³°¤Î MIME composer ¤ò»È¤¦¾ì¹ç +* tm-vm:: VM ¤Î¾ì¹ç¤ÎÀßÄê +* manual setting:: ÀßÄê file ¤ò»È¤ï¤Ê¤¤¾ì¹ç +@end menu -@section mime-setup -@cindex mime-setup +@node mime-setup, tm-setup, Setting, Setting +@comment node-name, next, previous, up +@section mime-setup.el +@cindex mime-setup.el @lisp (load "mime-setup") @end lisp -¤È¤¹¤ë¤È MIME ¤Ë´Ø¤¹¤ë³Æ¼ïÀßÄê¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£mime-setup ¤Ï tm-setup ¤ò -Æɤó¤Ç¤¤¤ë¤Î¤Ç¡¢mime-setup ¤ò»È¤¦¾ì¹ç¡¢tm-setup ¤ò load ¤¹¤ëɬÍפϤ¢¤ê -¤Þ¤»¤ó¡£ -mime-setup ¤Ç¤Ï signature ¤Î¼«Æ°ÀÚÂؤ¨ tool ¤âÉí°¤·¤Æ¤¤¤Þ¤¹¡£ -message header ¤Î field ¤Ë¹ç¤ï¤»¤Æ signature ¤Î¼«Æ°ÀÚÂؤò¹Ô¤Ê¤¤¤¿¤¤¾ì -¹ç¤Ï .emacs ¤Ë°Ê²¼¤Î¤è¤¦¤Ê¤â¤Î¤òÆþ¤ì¤Æ²¼¤µ¤¤¡£¡Ê¾Ü¤·¤¯¤Ï signature.el -¤ÎÀâÌÀ½ñ¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡Ë +¤È¤¹¤ë¤È mime.el ¤È tm ¤ò»È¤Ã¤¿ MIME ¤Ë´Ø¤¹¤ë³Æ¼ïÀßÄê¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£ +mime-setup.el ¤Ï tm-setup.el ¤ò¸Æ¤ó¤Ç¤¤¤ë¤Î¤Ç¡¢mime-setup.el ¤ò»È¤¦¾ì +¹ç¡¢tm-setup.el ¤ò load ¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£ + +mime-setup.el ¤ò»È¤¦¾ì¹ç¤Ï mime.el ¤¬É¬ÍפǤ¹¡£mime.el ¤Ï +emacs-mime-tools.shar ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¤Ê¤ª¡¢emacs-mime-tools.shar ¤Ï +°Ê²¼¤Î¾ì½ê¤Ê¤É¤«¤éÆþ¼ê¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ + +@example + ftp://ftp.kyutech.ac.jp/pub/MultiMedia/mime + ftp://ftp.jaist.ac.jp/pub/GNU/elisp/mime +@end example + + +@subsection SuperCite +@cindex SuperCite + +@defvar mime-setup-use-sc + +¤³¤ÎÊÑ¿ô¤¬ nil °Ê³°¤Î»þ¡¢sc-setup.el ¤ò»È¤Ã¤Æ SuperCite ¤ÎÀßÄê¤ò¹Ô¤Ê¤¤ +¤Þ¤¹¡£´ûÄêÃÍ¤Ï nil ¤Ç¤¹¡£¤Ê¤ª¡¢SuperCite ¤ò»È¤¦¾ì¹ç¤Ï¡¢SuperCite ¤âɬ +ÍפǤ¹¡£ +@end defvar + + +@subsection signature +@cindex signature + +tm ¤Ë¤Ï signature ¤Î¼«Æ°ÀÚÂؤ¨ tool ¤¬Éí°¤·¤Æ¤ª¤ê¡¢mime-setup.el ¤Ï¤³ +¤ÎÀßÄê¤â¹Ô¤Ê¤¤¤Þ¤¹¡£message header ¤Î field ¤Ë¹ç¤ï¤»¤Æ signature ¤Î¼« +Æ°ÀÚÂؤò¹Ô¤Ê¤¤¤¿¤¤¾ì¹ç¤Ï .emacs ¤Ë°Ê²¼¤Î¤è¤¦¤Ê¤â¤Î¤òÆþ¤ì¤Æ²¼¤µ¤¤¡£¡Ê¾Ü +¤·¤¯¤Ï signature.el ¤ÎÀâÌÀ½ñ¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡Ë @lisp (setq signature-file-alist @@ -247,10 +282,67 @@ message header )) @end lisp -mime-setup ¤ò»È¤¦¾ì¹ç¤Ï¡¢mime.el ¤¬É¬ÍפǤ¹¡£¤Þ¤¿¡¢SuperCite ¤ò»È¤¦¾ì -¹ç¤Ï¡¢SuperCite ¤âɬÍפǤ¹¡£ +@defvar mime-setup-use-signature + +¤³¤ÎÊÑ¿ô¤¬ nil °Ê³°¤Î»þ¡¢signature.el ¤ò»È¤¤¤Þ¤¹¡£´ûÄêÃÍ¤Ï t ¤Ç¤¹¡£ +@end defvar + + +@defvar mime-setup-signature-key-alist + +³Æ major-mode ¤Ë¤ª¤¤¤Æ signature ÁÞÆþÌ¿Îá¤òÀßÄꤹ¤Ù¤­ key ¤ò»ØÄꤷ¤Þ¤¹¡£ +´ûÄêÃÍ¤Ï + +@lisp + ((mail-mode . "\C-c\C-w")) +@end lisp + +¤Ç¤¹¡£ + +¤³¤ì¤òÊѹ¹¤·¤¿¤¤¾ì¹ç¤Ï¡¢´Ø¿ô set-alist ¤Ê¤É¤ò»È¤Ã¤Æ¤³¤ÎÊÑ¿ô¤ò½ñ¤­´¹¤¨ +¤Æ²¼¤µ¤¤¡£ + +@lisp +(set-alist 'mime-setup-signature-key-alist 'news-reply-mode "\C-c\C-w") +@end lisp + +@end defvar + + +@defvar mime-setup-default-signature-key + +¤¢¤ë major-mode ¤Ë¤ª¤¤¤Æ signature ÁÞÆþÌ¿Îá¤òÀßÄꤹ¤Ù¤­ key ¤¬¸«¤Ä¤«¤é +¤Ê¤¤¾ì¹ç¡¢¤³¤ÎÊÑ¿ô¤ËÀßÄꤵ¤ì¤¿ key ¤¬ÍѤ¤¤é¤ì¤Þ¤¹¡£´ûÄêÃͤϡ¢ +``\C-c\C-s'' ¤Ç¤¹¡£ +@end defvar + + +@subsection GNUS ¤Î¾ì¹ç¤ÎÃí°Õ +@cindex GNUS + +signature.el ¤ò»È¤¦¾ì¹ç¡¢mime-setup.el ¤ÏÊÑ¿ô gnus-signature-file ¤ò +nil ¤ËÀßÄꤷ¤Þ¤¹¡£¤è¤Ã¤Æ¡¢Á÷¿®»þ¤Ë¼«Æ°Åª¤Ë signature ¤¬ÉÕ¤¯µ¡Ç½¤ÏÍÞÀ© +¤µ¤ì¤Þ¤¹¡£¤³¤Î¤è¤¦¤Ê¤³¤È¤ò¤·¤Æ¤¤¤ë¤Î¤Ï°Ê²¼¤ÎÍýͳ¤«¤é¤Ç¤¹¡£ + +GNUS ¤¬ signature ¤òÉÕ¤±¤ë¤Î¤Ï mime.el ¤Ë¤è¤Ã¤Æ MIME message ¤¬ºîÀ®¤µ +¤ì¤¿¸å¤Ç¤¹¡£¤è¤Ã¤Æ¡¢GNUS ¤¬ÉÕ¤±¤¿ signature ¤Ï MIME message ¤È¤·¤ÆÀµ¤· +¤¯½èÍý¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£Î㤨¤Ð multipart message ¤Î¾ì¹ç¡¢MIME message ¤Î +³°¤ÎÈó MIME part ¤ËÉÕ¤­¤Þ¤¹¡£¤è¤Ã¤Æ¡¢MIME Âбþ MUA ¤Ç¸«¤¿¾ì¹ç¡¢ +signature ¤Ïɽ¼¨¤µ¤ì¤Ê¤¤¤«¤âÃΤì¤Þ¤»¤ó¡£ +¤â¤¦°ì¤Ä¤ÎÃí°Õ¤Ïɸ½àÀßÄê¤Ç¤Ï signature ¤òÁÞÆþ¤¹¤ë key ¤Ï C-c C-w ¤Ç¤Ï +¤Ê¤¯ mh-e ¤ÈƱ¤¸ C-c C-s ¤Ë³ä¤êÅö¤Æ¤é¤ì¤Æ¤¤¤ë¤³¤È¤Ç¤¹¡£¤³¤ì¤Ï + +@lisp +(set-alist 'mime-setup-signature-key-alist 'news-reply-mode "\C-c\C-w") +@end lisp + +¤Ë¤è¤Ã¤Æ GNUS ¤Îɸ½à¤ËÌ᤹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ + + +@node tm-setup, tm-vm, mime-setup, Setting +@comment node-name, next, previous, up @section tm-setup @cindex tm-setup @@ -263,15 +355,21 @@ tm-setup @end lisp +@node tm-vm, manual setting, tm-setup, Setting +@comment node-name, next, previous, up @section vm -vm ¤ò»È¤¦¾ì¹ç¤Ï .vm ¤« .emacs ¤Ë +vm ¤ò»È¤¦¾ì¹ç¤Ï .vm ¤Ë + @lisp (load "tm-vm") @end lisp + ¤òÆþ¤ì¤Æ²¼¤µ¤¤¡£ +@node manual setting, , tm-vm, Setting +@comment node-name, next, previous, up @section ÀßÄê file ¤ò»È¤ï¤Ê¤¤¾ì¹ç tm-setup.el ¤ò»²¹Í¤Ë¤·¤Æ²¼¤µ¤¤¡£ @@ -320,7 +418,7 @@ tm-MUA * tm-rmail: (tm-rmail_ja.info). * tm-vm: (tm-vm_ja.info). * tm-cmail: (tm-cmail_ja.info). -* mime/viewer-mode: (tm-view_ja.info)how-to-use. +* mime/viewer-mode: (tm-view_ja.info)Commands. @end menu diff --git a/gnus/Makefile b/gnus/Makefile index af9da58..63a4ba5 100644 --- a/gnus/Makefile +++ b/gnus/Makefile @@ -17,7 +17,7 @@ TMDIR19 = $(HOME)/lib/emacs19/lisp FILES = tm/gnus/*.el tm/doc/tm-gnus*.texi -TARFILE = tm-gnus7.00.tar +TARFILE = tm-gnus7.02.tar gnus3: diff --git a/gnus/tm-gnus5.el b/gnus/tm-gnus5.el index d6e17fa..91f070d 100644 --- a/gnus/tm-gnus5.el +++ b/gnus/tm-gnus5.el @@ -13,6 +13,7 @@ (require 'tl-str) (require 'tl-list) (require 'tl-misc) +(require 'tl-822) (require 'gnus) (autoload 'mime/viewer-mode "tm-view" "View MIME message." t) @@ -26,7 +27,7 @@ ;;; (defconst tm-gnus/RCS-ID - "$Id: tm-gnus5.el,v 7.0 1995/10/03 05:07:54 morioka Exp $") + "$Id: tm-gnus5.el,v 7.2 1995/10/05 12:57:53 morioka Exp $") (defconst tm-gnus/version (concat (get-version-string tm-gnus/RCS-ID) " for GNUS 5")) @@ -98,12 +99,11 @@ article is automatic MIME decoded.") (call-after-loaded 'tm-view - (function - (lambda () - (set-alist 'mime-viewer/quitting-method-alist - 'gnus-article-mode - (function mime-viewer/quitting-method-for-gnus5)) - ))) + (lambda () + (set-alist 'mime-viewer/quitting-method-alist + 'gnus-article-mode + (function mime-viewer/quitting-method-for-gnus5)) + )) ;;; @ summary filter @@ -148,10 +148,9 @@ article is automatic MIME decoded.") (if (save-window-excursion (switch-to-buffer tm-gnus/preview-buffer) (some-element - (function - (lambda (field) - (message/get-field-body field) - )) + (lambda (field) + (rfc822/get-field-body field) + ) mime-viewer/ignored-field-list)) mime-viewer/ignored-field-list))) (gnus-summary-select-article t t) @@ -199,12 +198,11 @@ With arg, turn MIME processing on if arg is positive." (tm-gnus/set-mime-method tm-gnus/decode-all) (add-hook 'gnus-exit-gnus-hook - (function - (lambda () - (let ((buf (get-buffer tm-gnus/preview-buffer))) - (if buf - (kill-buffer buf) - ))))) + (lambda () + (let ((buf (get-buffer tm-gnus/preview-buffer))) + (if buf + (kill-buffer buf) + )))) ) (setq gnus-article-display-hook tm-gnus/original-article-display-hook) (setq gnus-show-mime t) @@ -224,6 +222,45 @@ With arg, turn MIME processing on if arg is positive." ))) +;;; @ for mime.el +;;; + +;;; by OKABE Yasuo +;;; +;;; Please use following setting: +;;; (setq gnus-mail-forward-method +;;; (function gnus-mail-forward-using-mhe-mime)) + +(defun gnus-mail-forward-using-mhe-mime (&optional buffer) + "Forward the current message to another user using mh-e with mime-mode." + ;; First of all, prepare mhe mail buffer. + (let* ((to (read-string "To: ")) + (cc (read-string "Cc: ")) + (buffer (or buffer gnus-clean-article-buffer)) + (config (current-window-configuration));; need to add this - erik + (subject (gnus-forward-make-subject buffer))) + (setq mh-show-buffer buffer) + (mh-find-path) + (mh-send-sub to (or cc "") (or subject "(None)") config);; Erik Selberg 1/23/94 + (let ((draft (current-buffer)) + (gnus-mail-buffer (current-buffer)) + mail-buf) + (gnus-configure-windows 'reply-yank) + (setq mail-buf (eval (cdr (assq 'mail gnus-window-to-buffer)))) + (pop-to-buffer mail-buf);; always in the display, so won't have window probs + (switch-to-buffer draft) + ) + (save-excursion + (goto-char (point-max)) + (insert (concat (mime-make-tag "message" "rfc822" nil "7bit") "\n")) + (insert-buffer buffer) + (setq mh-sent-from-folder buffer) + (setq mh-sent-from-msg 1) + (setq mh-previous-window-config config) + (run-hooks 'gnus-mail-hook) + ))) + + ;;; @ end ;;; diff --git a/gnus/tm-sgnus.el b/gnus/tm-sgnus.el index 90ebb52..655b2c0 100644 --- a/gnus/tm-sgnus.el +++ b/gnus/tm-sgnus.el @@ -15,27 +15,23 @@ (require 'tl-misc) (require 'gnus) +(autoload 'mime/viewer-mode "tm-view" "View MIME message." t) +(autoload 'mime/decode-message-header + "tm-ew-d" "Decode MIME encoded-words in message header." t) +(autoload 'mime/decode-encoded-words-string + "tm-ew-d" "Decode MIME encoded-words in string." t) + ;;; @ version ;;; (defconst tm-gnus/RCS-ID - "$Id: tm-sgnus.el,v 7.0 1995/10/03 05:09:53 morioka Exp $") + "$Id: tm-sgnus.el,v 7.1 1995/10/05 13:01:17 morioka Exp $") (defconst tm-gnus/version (concat (get-version-string tm-gnus/RCS-ID) " for September")) -;;; @ autoload -;;; - -(autoload 'mime/viewer-mode "tm-view" "View MIME message." t) -(autoload 'mime/decode-message-header - "tm-ew-d" "Decode MIME encoded-words in message header." t) -(autoload 'mime/decode-encoded-words-string - "tm-ew-d" "Decode MIME encoded-words in string." t) - - ;;; @ variables ;;; @@ -86,12 +82,11 @@ article is automatic MIME decoded.") (call-after-loaded 'tm-view - (function - (lambda () - (set-alist 'mime-viewer/quitting-method-alist - 'gnus-original-article-mode - (function mime-viewer/quitting-method-for-sgnus)) - ))) + (lambda () + (set-alist 'mime-viewer/quitting-method-alist + 'gnus-original-article-mode + (function mime-viewer/quitting-method-for-sgnus)) + )) ;;; @ summary filter diff --git a/mime-setup.el b/mime-setup.el index 5829653..01a9bc9 100644 --- a/mime-setup.el +++ b/mime-setup.el @@ -6,7 +6,7 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: mime-setup.el,v 7.0 1995/10/03 04:27:39 morioka Exp $ +;;; $Id: mime-setup.el,v 7.2 1995/10/05 10:34:43 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -20,7 +20,9 @@ (defvar mime-setup-use-sc nil) (defvar mime-setup-use-signature t) -(defvar mime-setup-signature-key "\C-c\C-s") +(defvar mime-setup-default-signature-key "\C-c\C-s") +(defvar mime-setup-signature-key-alist + '((mail-mode . "\C-c\C-w"))) ;;; @ for Edit MIME mode @@ -107,10 +109,14 @@ (add-hook 'mime-mode-hook (function (lambda () - (define-key (current-local-map) - mime-setup-signature-key - (function insert-signature)) - ))) + (let ((key (or (cdr + (assq major-mode + mime-setup-signature-key-alist) + ) + mime-setup-default-signature-key))) + (define-key (current-local-map) + key (function insert-signature)) + )))) (setq gnus-signature-file nil) )) @@ -200,8 +206,16 @@ (mime/decode-message-header) (mime-mode) (make-local-variable 'mail-header-separator) - (setq mail-header-separator "--------")) - )) + (setq mail-header-separator "--------") + (save-excursion + (goto-char (point-min)) + (if (re-search-forward "^-*$" nil t) + (progn + (replace-match mail-header-separator) + (set-buffer-modified-p (buffer-modified-p)) + )) + ) + ))) ;;; @ for GNUS diff --git a/signature.el b/signature.el index c1362d2..080468a 100644 --- a/signature.el +++ b/signature.el @@ -1,11 +1,20 @@ ;;; -;;; $Id: signature.el,v 1.6 1994/08/03 04:42:40 morioka Exp $ -;;; Modified by Yasuo OKABE 1994/08/01 -;;; - -(provide 'signature) +;;; signature.el --- signature utility for GNU Emacs +;;; +;;; Copyright (C) 1995 Free Software Foundation, Inc. +;;; Copyright (C) 1994,1995 MORIOKA Tomohiko +;;; Copyright (C) 1994 OKABE Yasuo +;;; +;;; Author: MORIOKA Tomohiko +;;; OKABE Yasuo (1994/08/01) +;;; Version: +;;; $Id: signature.el,v 2.0 1995/10/05 11:24:45 morioka Exp $ +;;; Keywords: mail, news, signature +;;; +;;; This file is part of tm (Tools for MIME). +;;; -(require 'tl-header) +(require 'tl-822) (defvar signature-insert-at-eof nil "*Insert signature at the end of file if non-nil.") @@ -32,7 +41,7 @@ (while r (setq cell (car r)) (setq b (car cell)) - (if (setq f (message/get-field-body (car b))) + (if (setq f (rfc822/get-field-body (car b))) (cond ((listp (cdr b)) (let ((r (cdr b))) (while r @@ -84,7 +93,8 @@ (insert "\n")) (delete-blank-lines) (insert-file-contents signature) - (set-buffer-modified-p (buffer-modified-p)) ; force mode line update + (set-buffer-modified-p (buffer-modified-p)) + ; force mode line update ))))) (defun insert-signature (&optional arg) @@ -96,3 +106,9 @@ named -DISTRIBUTION interactively." (if signature-insert-at-eof (call-interactively 'signature/insert-signature-at-eof) (call-interactively 'signature/insert-signature-at-point))) + + +;;; @ end +;;; + +(provide 'signature) diff --git a/tm-def.el b/tm-def.el index f8d3f76..b7b7f39 100644 --- a/tm-def.el +++ b/tm-def.el @@ -6,14 +6,14 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: tm-def.el,v 6.9 1995/10/03 04:30:57 morioka Exp $ +;;; $Id: tm-def.el,v 7.0 1995/10/05 13:27:34 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia, definition ;;; ;;; This file is part of tm (Tools for MIME). ;;; (require 'emu) -(require 'tl-header) +(require 'tl-822) ;;; @ variables @@ -115,7 +115,7 @@ (concat mime/token-regexp "/" mime/token-regexp)) (defconst mime/content-parameter-value-regexp (concat "\\(" - message/quoted-string-regexp + rfc822/quoted-string-regexp "\\|[^; \t\n]*\\)")) diff --git a/tm-ew-d.el b/tm-ew-d.el index d14dead..615810c 100644 --- a/tm-ew-d.el +++ b/tm-ew-d.el @@ -9,11 +9,12 @@ ;;; Author: ENAMI Tsugutomo ;;; MORIOKA Tomohiko ;;; Version: -;;; $Id: tm-ew-d.el,v 7.1 1995/10/03 04:34:26 morioka Exp $ +;;; $Id: tm-ew-d.el,v 7.2 1995/10/05 12:20:36 morioka Exp $ ;;; Keywords: mail, news, MIME, RFC 1522, multilingual, encoded-word ;;; (require 'emu) +(require 'tl-822) (require 'mel) (require 'tm-def) @@ -104,9 +105,9 @@ (defun mime/unfolding () (goto-char (point-min)) (let (field beg end) - (while (re-search-forward message/field-name-regexp nil t) + (while (re-search-forward rfc822/field-top-regexp nil t) (setq beg (match-beginning 0)) - (setq end (message/field-end)) + (setq end (rfc822/field-end)) (setq field (buffer-substring beg end)) (if (string-match mime/encoded-word-regexp field) (save-restriction diff --git a/tm-eword.el b/tm-eword.el index cd01794..2079375 100644 --- a/tm-eword.el +++ b/tm-eword.el @@ -9,7 +9,7 @@ ;;; Keywords: mail, news, MIME, RFC 1522, multilingual, encoded-word ;;; -(require 'tl-header) +(require 'tl-822) (require 'tl-str) (require 'tm-def) @@ -24,7 +24,7 @@ ;;; (defconst tm-eword/RCS-ID - "$Id: tm-eword.el,v 7.0 1995/10/03 04:40:06 morioka Exp $") + "$Id: tm-eword.el,v 7.2 1995/10/05 12:22:42 morioka Exp $") (defconst tm-eword/version (get-version-string tm-eword/RCS-ID)) @@ -44,47 +44,44 @@ ;;; (defun mime/encode-field (str) - (setq str (message/unfolding-string str)) - (let ((ret (message/divide-field str)) - field-name field-body) - (setq field-name (car ret)) - (setq field-body (nth 1 ret)) - (concat field-name " " - (cond ((string= field-body "") "") - ((or (string-match "^Reply-To:$" field-name) - (string-match "^From:$" field-name) - (string-match "^Sender:$" field-name) - (string-match "^Resent-Reply-To:$" field-name) - (string-match "^Resent-From:$" field-name) - (string-match "^Resent-Sender:$" field-name) - (string-match "^To:$" field-name) - (string-match "^Resent-To:$" field-name) - (string-match "^cc:$" field-name) - (string-match "^Resent-cc:$" field-name) - (string-match "^bcc:$" field-name) - (string-match "^Resent-bcc:$" field-name) - ) - (car (tm-eword::encode-address-list - (+ (length field-name) 1) field-body)) - ) - (t - (catch 'tag - (let ((r mime/no-encoding-header-fields) fn) - (while r - (setq fn (car r)) - (if (string-match (concat "^" fn ":$") field-name) - (throw 'tag field-body) - ) - (setq r (cdr r)) - )) - (car (tm-eword::encode-string - (+ (length field-name) 1) field-body)) - )) - )) - )) + (setq str (rfc822/unfolding-string str)) + (let ((ret (string-match rfc822/field-top-regexp str))) + (if ret + (let ((field-name (substring str 0 (match-end 1))) + (field-body (eliminate-top-spaces + (substring str (match-end 0)))) + fname) + (concat field-name ": " + (cond ((string= field-body "") "") + ((member (setq fname (downcase field-name)) + '("reply-to" "from" "sender" + "resent-reply-to" "resent-from" + "resent-sender" "to" "resent-to" + "cc" "resent-cc" + "bcc" "resent-bcc" "dcc") + ) + (car (tm-eword::encode-address-list + (+ (length field-name) 1) field-body)) + ) + (t + (catch 'tag + (let ((r mime/no-encoding-header-fields) fn) + (while r + (setq fn (car r)) + (if (string= (downcase fn) fname) + (throw 'tag field-body) + ) + (setq r (cdr r)) + )) + (car (tm-eword::encode-string + (+ (length field-name) 1) field-body)) + )) + )) + ) + str))) (defun mime/exist-encoded-word-in-subject () - (let ((str (message/get-field-body "Subject"))) + (let ((str (rfc822/get-field-body "Subject"))) (if (and str (string-match mime/encoded-word-regexp str)) str))) @@ -105,12 +102,11 @@ (while (re-search-forward "^.+:.*\\(\n\\s +.*\\)*" nil t) (setq beg (match-beginning 0)) (setq end (match-end 0)) - (setq field (buffer-substring beg end)) - (insert (mime/encode-field - (prog1 - (buffer-substring beg end) - (delete-region beg end) - ))) + (if (setq field (mime/encode-field (buffer-substring beg end))) + (progn + (delete-region beg end) + (insert field) + )) )) (if mime/use-X-Nsubject (let ((str (mime/exist-encoded-word-in-subject))) @@ -119,7 +115,7 @@ (concat "\nX-Nsubject: " (mime/decode-encoded-words-string - (message/unfolding-string str)) + (rfc822/unfolding-string str)) ))))) ))) diff --git a/tm-parse.el b/tm-parse.el index 3a4d810..e1d2c30 100644 --- a/tm-parse.el +++ b/tm-parse.el @@ -6,13 +6,13 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: tm-parse.el,v 2.4 1995/09/26 13:19:32 morioka Exp $ +;;; $Id: tm-parse.el,v 3.0 1995/10/05 11:28:40 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia ;;; ;;; This file is part of tm (Tools for MIME). ;;; -(require 'tl-header) +(require 'tl-822) (require 'tl-misc) (require 'tm-def) @@ -29,7 +29,7 @@ (let ((e (match-end 2))) (cons (cons (downcase (substring str (match-beginning 1) (match-end 1))) - (message/strip-quoted-string + (rfc822/strip-quoted-string (substring str (match-beginning 2) e)) ) (substring str e) @@ -40,7 +40,7 @@ (defun mime/parse-Content-Type (str) "Parse STR as field-body of Content-Type field. [tm-parse.el]" - (setq str (message/unfolding-string str)) + (setq str (rfc822/unfolding-string str)) (if (string-match mime::ctype-regexp str) (let* ((e (match-end 0)) (ctype (downcase (substring str 0 e))) @@ -60,7 +60,7 @@ (defun mime/Content-Type () "Read field-body of Content-Type field from current-buffer, and return parsed it. [tm-parse.el]" - (let ((str (message/get-field-body "Content-Type"))) + (let ((str (rfc822/get-field-body "Content-Type"))) (if str (mime/parse-Content-Type str) ))) @@ -69,7 +69,7 @@ and return parsed it. [tm-parse.el]" "Read field-body of Content-Transfer-Encoding field from current-buffer, and return it. If is is not found, return DEFAULT-ENCODING. [tm-parse.el]" - (let ((str (message/get-field-body "Content-Transfer-Encoding"))) + (let ((str (rfc822/get-field-body "Content-Transfer-Encoding"))) (if str (downcase str) default-encoding) @@ -132,7 +132,7 @@ If is is not found, return DEFAULT-ENCODING. [tm-parse.el]" ) (let ((boundary (assoc "boundary" params))) (cond (boundary - (setq boundary (message/strip-quoted-string (cdr boundary))) + (setq boundary (rfc822/strip-quoted-string (cdr boundary))) (mime/parse-multipart boundary ctype params encoding) ) ((string= ctype "message/rfc822") diff --git a/tm-rich.el b/tm-rich.el index 6968a31..48c8ee1 100644 --- a/tm-rich.el +++ b/tm-rich.el @@ -7,7 +7,7 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: tm-rich.el,v 6.14 1995/09/21 00:18:32 morioka Exp $ +;;; $Id: tm-rich.el,v 7.0 1995/10/04 05:27:50 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia, richtext, enriched ;;; ;;; This file is part of tm (Tools for MIME). @@ -15,6 +15,7 @@ (require 'tm-view) + (defvar tm-rich/richtext-module (if (or (< emacs-major-version 19) (and (= emacs-major-version 19) @@ -32,11 +33,11 @@ (let* ((mode mime::preview/original-major-mode) (m (assq mode mime-viewer/code-converter-alist)) (charset (assoc "charset" params)) - ;; 1995/9/21 + ;; 1995/9/21 (c.f. tm-eng:105), 1995/10/3 (c.f. tm-eng:121) ;; modified by Eric Ding - ;; (c.f. tm-eng:105) (beg (point-min)) (end (point-max)) ) + (remove-text-properties beg end '(face nil)) (cond ((string= encoding "quoted-printable") (quoted-printable-decode-region beg end) ) @@ -56,11 +57,11 @@ (let* ((mode mime::preview/original-major-mode) (m (assq mode mime-viewer/code-converter-alist)) (charset (assoc "charset" params)) - ;; 1995/9/21 + ;; 1995/9/21 (c.f. tm-eng:105), 1995/10/3 (c.f. tm-eng:121) ;; modified by Eric Ding - ;; (c.f. tm-eng:105) (beg (point-min)) (end (point-max)) ) + (remove-text-properties beg end '(face nil)) (cond ((string= encoding "quoted-printable") (quoted-printable-decode-region beg end) ) @@ -87,6 +88,9 @@ "text/enriched" (function mime-viewer/filter-text/enriched)) -(run-hooks 'tm-rich-load-hook) +;;; @ end +;;; (provide 'tm-rich) + +(run-hooks 'tm-rich-load-hook) diff --git a/tm-rmail.el b/tm-rmail.el index 222c898..24428b3 100644 --- a/tm-rmail.el +++ b/tm-rmail.el @@ -1,22 +1,21 @@ ;;; -;;; $Id: tm-rmail.el,v 6.7 1995/09/28 06:05:20 morioka Exp $ -;;; ;;; Copyright (C) 1995 Free Software Foundation, Inc. ;;; Copyright (C) 1994,1995 MORIOKA Tomohiko ;;; ;;; Author: MORIOKA Tomohiko -;;; Keywords: mail, news, MIME, multimedia +;;; Version: +;;; $Id: tm-rmail.el,v 7.1 1995/10/05 13:04:10 morioka Exp $ +;;; Keywords: mail, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). ;;; -(require 'tl-header) (require 'tl-list) (require 'tl-misc) (autoload 'mime/viewer-mode "tm-view" "View MIME message." t) (autoload 'mime/Content-Type "tm-view" "parse Content-Type field.") -(autoload 'mime/decode-message-header "tiny-mime" "Decode MIME header." t) +(autoload 'mime/decode-message-header "tm-ew-d" "Decode MIME encoded-word." t) (setq rmail-message-filter (function @@ -85,6 +84,10 @@ (function tm-rmail/quitting-method)) ))) + +;;; @ end +;;; + (provide 'tm-rmail) (run-hooks 'tm-rmail-load-hook) diff --git a/tm-view.el b/tm-view.el index 0d40908..cc21670 100644 --- a/tm-view.el +++ b/tm-view.el @@ -14,7 +14,7 @@ (require 'tl-list) (require 'tl-atype) (require 'tl-misc) -(require 'tl-header) +(require 'tl-822) (require 'mel) (require 'tm-ew-d) (require 'tm-def) @@ -25,7 +25,7 @@ ;;; (defconst mime-viewer/RCS-ID - "$Id: tm-view.el,v 7.9 1995/10/03 04:56:10 morioka Exp $") + "$Id: tm-view.el,v 7.10 1995/10/05 10:35:19 morioka Exp $") (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID)) (defconst mime/viewer-version mime-viewer/version) @@ -281,7 +281,7 @@ The compressed face will be piped to this command.") (goto-char (point-min)) (if (re-search-forward "^X-Face:[ \t]*" nil t) (let ((beg (match-end 0)) - (end (message/field-end)) + (end (rfc822/field-end)) ) (call-process-region beg end "sh" nil 0 nil "-c" mime-viewer/x-face-command) @@ -466,10 +466,10 @@ The compressed face will be piped to this command.") "")) (let (ret) (or (and (setq ret (assoc "name" param)) - (message/strip-quoted-string (cdr ret)) + (rfc822/strip-quoted-string (cdr ret)) ) (and (setq ret (assoc "x-name" param)) - (message/strip-quoted-string (cdr ret)) + (rfc822/strip-quoted-string (cdr ret)) ) (save-excursion @@ -481,8 +481,8 @@ The compressed face will be piped to this command.") ) (point-max))) (or - (message/get-field-body "Content-Description") - (message/get-field-body "Subject") + (rfc822/get-field-body "Content-Description") + (rfc822/get-field-body "Subject") ))) "")) )) -- 1.7.10.4