From 861f307ac7484a4212bd80dd71299abf078ee6cb Mon Sep 17 00:00:00 2001 From: morioka Date: Mon, 9 Mar 1998 12:38:06 +0000 Subject: [PATCH] tm 7.39. --- Changes-7.39.en | 44 ++++++++++++++++++ Makefile | 6 +-- README.en | 49 +++++++++++++------- doc/tm-util=en.texi | 22 ++++++--- doc/tm-util=ja.texi | 22 ++++++--- doc/tm-view=en.texi | 62 +++++++++++++++++--------- doc/tm-view=ja.texi | 62 +++++++++++++++++--------- doc/tm_en.texi | 8 ++-- doc/tm_ja.texi | 4 +- gnus/ChangeLog-7.29-7.30.en | 16 +++++++ gnus/Makefile | 2 +- gnus/mk-tgnus | 6 ++- gnus/tm-sgnus.el | 103 +++++++------------------------------------ mh-e/mk-tmh | 4 ++ mk-tm | 4 +- signature.el | 28 ++++++++++-- tm-def.el | 4 +- tm-pgp.el | 8 ++-- tm-rmail.el | 100 ++++++++++++++++++++++++++++++++++------- tm-view.el | 9 ++-- 20 files changed, 367 insertions(+), 196 deletions(-) create mode 100644 Changes-7.39.en create mode 100644 gnus/ChangeLog-7.29-7.30.en diff --git a/Changes-7.39.en b/Changes-7.39.en new file mode 100644 index 0000000..5d6af59 --- /dev/null +++ b/Changes-7.39.en @@ -0,0 +1,44 @@ +Mon Dec 25 10:43:59 1995 Morioka Tomohiko + + * tm: Version 7.39 was released. + * tm/gnus: Version 7.30 was released. + + * README.en: Sample of hilit19 was changed. + +Mon Dec 25 09:08:50 1995 Morioka Tomohiko + + * tm-rmail.el: fixed to work in Emacs 18.*, but some problems are + rest. + + * tm-view.el (mime-viewer/redisplay): New variable: for redisplay + +Mon Dec 25 05:43:05 1995 Morioka Tomohiko + + * Makefile (19_29): `make gnus5' was commented out. + +Mon Dec 25 05:40:42 1995 Morioka Tomohiko + + * tm-rmail.el (tm-rmail/preview-message): New implementation + + * tm-rmail.el (rmail-summary-rmail-update): redefined + + * tm-rmail.el: `mime-viewer/show-summary-method' was set. + +Mon Dec 25 05:31:33 1995 Morioka Tomohiko + + * mk-tm (compile-tm): `(load "rmailsum")' was added. + +Mon Dec 25 03:20:41 1995 OKABE Yasuo + + * signature.el (signature-delete-blank-lines-at-eof): New variable + +Sat Dec 23 12:43:20 1995 Morioka Tomohiko + + * tm-def.el (tm:browse-url): argument was fixed. + + * README.en: fixed about PGP + +Sat Dec 23 09:32:27 1995 Tanaka Shinichiro + + * tm-pgp.el, README.en: + Typos were fixed. (cf. [tm-ja:1419], [tm-ja:1421]) diff --git a/Makefile b/Makefile index ab7ac2f..2d809f4 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 7.11 1995/12/21 11:06:40 morioka Exp morioka $ +# $Id: Makefile,v 7.12 1995/12/25 05:43:05 morioka Exp morioka $ # include config.tm @@ -38,7 +38,7 @@ TL_FILES = tl/README.en tl/Makefile tl/mk-tl tl/*.el tl/doc/*.texi \ FILES = $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(TL_FILES) -TARFILE = tm7.38.tar.gz +TARFILE = tm7.39.tar.gz 18: @@ -88,7 +88,7 @@ install-xemacs: xemacs cd ../mel; PWD=`pwd` $(MAKE) elc EMACS=$(EMACS19_29) $(EMACS19_29) -batch -l mk-tm -f compile-tm cd gnus; PWD=`pwd` $(MAKE) gnus EMACS=$(EMACS19_29) - cd gnus; PWD=`pwd` $(MAKE) gnus5 EMACS=$(EMACS19_29) +# cd gnus; PWD=`pwd` $(MAKE) gnus5 EMACS=$(EMACS19_29) cd gnus; PWD=`pwd` $(MAKE) sgnus EMACS=$(EMACS19_29) cd mh-e; PWD=`pwd` $(MAKE) elc EMACS=$(EMACS19_29) diff --git a/README.en b/README.en index 93da0a2..9a9569f 100644 --- a/README.en +++ b/README.en @@ -1,7 +1,7 @@ [README for tm (English Version)] by MORIOKA Tomohiko and KOBAYASHI Shuhei -$Id: README.en,v 7.7 1995/12/19 18:30:02 morioka Exp $ +$Id: README.en,v 7.11 1995/12/25 10:43:59 morioka Exp $ 1 What's tm? @@ -157,7 +157,7 @@ insert following to ~/.emacs. (setq tm-gnus/automatic-mime-preview nil) In addition, September Gnus has automatic MIME preview supporting -feature. Of course, tm-gnus provide this feature for other GNUS and +feature. Of course, tm-gnus provides this feature for other GNUS and Gnus, but it is unnatural. When automatic MIME preview mode, GNUS and Gnus do MIME processing @@ -214,8 +214,8 @@ RFC 1522 encoded-word. So it is not necessary to reset 6.2 PGP If you have PGP and Mailcrypt package, you can use PGP on -MIME. Currently, 2 drafts (draft-elkins-pem-pgp-01.txt and -draft-kazu-pgp-mime-00.txt) are proposed, so tm provide both way. +MIME. Currently, 2 drafts (draft-elkins-pem-pgp-02.txt and +draft-kazu-pgp-mime-00.txt) are proposed, so tm provides both way. For decoding, please insert following into ~/.emacs: @@ -228,11 +228,7 @@ draft-kazu-pgp-mime-00.txt) are proposed, so tm provide both way. ))) ====================================================================== -tm-pgp.el is a internal method modules to support PGP. It currently -supports application/pgp of draft-kazu-pgp-mime-00.txt and -application/pgp-signature of -draft-elkins-pem-pgp-01.txt. application/pgp-encrypted and -application/pgp-keys will be supported. +tm-pgp.el is a internal method modules to support PGP. For encoding, tm-edit provides 2 mechanism. One is for signing or encrypting for message as application/pgp. There are two command @@ -245,13 +241,20 @@ menu. If you use this mechanism, please specify 2 variables: `mime-editor/signing-type' and `mime-editor/encrypting-type'. They requires following values: - pgp-elkins processed as draft-elkins-pem-pgp-01.txt + pgp-elkins processed as draft-elkins-pem-pgp-02.txt pgp-kazu processed as draft-kazu-pgp-mime-00.txt nil not processed -Sorry, pgp-elkins is not supported yet. It will be supported. If you -use ``signed'' and ``encrypted'' as draft-kazu-pgp-mime-00.txt, please -insert following into ~/.emacs: +If you use ``signed'' and ``encrypted'' as draft-elkins-pem-pgp-02.txt, +please insert following into ~/.emacs: + +====================================================================== +(setq mime-editor/signing-type 'pgp-elkins) +(setq mime-editor/encrypting-type 'pgp-elkins) +====================================================================== + +If you use ``signed'' and ``encrypted'' as draft-kazu-pgp-mime-00.txt, +please insert following into ~/.emacs: ====================================================================== (setq mime-editor/signing-type 'pgp-kazu) @@ -263,7 +266,9 @@ insert following into ~/.emacs: ====================================================================== (cond (window-system - (let* ((header-patterns '(("^Subject:.*$" nil msg-subject) + (require 'hilit19) + (let* ((csubject-patterns '(("^\\[.+\\]$" nil msg-subject))) + (header-patterns '(("^Subject:.*$" nil msg-subject) ("^From:.*$" nil msg-from) ("^--text follows this line--$" nil msg-separator) @@ -271,7 +276,9 @@ insert following into ~/.emacs: )) (body-patterns '(("^\\(In article\\|[ \t]*\\w*[]<>}|]\\).*$" nil msg-quote))) - (message-patterns (append header-patterns body-patterns)) + (message-patterns (append ;;csubject-patterns + header-patterns + body-patterns)) ) (hilit-set-mode-patterns 'msg-header header-patterns) (hilit-set-mode-patterns 'msg-body body-patterns) @@ -280,9 +287,17 @@ insert following into ~/.emacs: 'hilit-rehighlight-message) ) (add-hook 'mime-viewer/content-header-filter-hook - (function hilit-rehighlight-buffer-quietly)) + (lambda () + (if (not (eq mime::preview/original-major-mode + 'gnus-original-article-mode)) + (hilit-rehighlight-buffer-quietly) + ))) (add-hook 'mime-viewer/plain-text-preview-hook - (function hilit-rehighlight-buffer-quietly)) + (lambda () + (if (not (eq mime::preview/original-major-mode + 'gnus-original-article-mode)) + (hilit-rehighlight-buffer-quietly) + ))) )) ====================================================================== diff --git a/doc/tm-util=en.texi b/doc/tm-util=en.texi index d3373d1..b1d787a 100644 --- a/doc/tm-util=en.texi +++ b/doc/tm-util=en.texi @@ -1,4 +1,4 @@ -@c $Id: tm-util=en.texi,v 2.0 1995/12/21 10:43:15 morioka Exp $ +@c $Id: tm-util=en.texi,v 3.0 1995/12/25 09:26:20 morioka Exp $ @node customize, Bug report, encoded-word, Top @comment node-name, next, previous, up @@ -103,7 +103,9 @@ example to add faces using hilit19. @lisp (cond (window-system - (let* ((header-patterns '(("^Subject:.*$" nil msg-subject) + (require 'hilit19) + (let* ((csubject-patterns '(("^\\[.+\\]$" nil msg-subject))) + (header-patterns '(("^Subject:.*$" nil msg-subject) ("^From:.*$" nil msg-from) ("^--text follows this line--$" nil msg-separator) @@ -111,7 +113,9 @@ example to add faces using hilit19. )) (body-patterns '(("^\\(In article\\|[ \t]*\\w*[]<>@}|]\\).*$" nil msg-quote))) - (message-patterns (append header-patterns body-patterns)) + (message-patterns (append ;;csubject-patterns + header-patterns + body-patterns)) ) (hilit-set-mode-patterns 'msg-header header-patterns) (hilit-set-mode-patterns 'msg-body body-patterns) @@ -120,9 +124,17 @@ example to add faces using hilit19. 'hilit-rehighlight-message) ) (add-hook 'mime-viewer/content-header-filter-hook - (function hilit-rehighlight-buffer-quietly)) + (lambda () + (if (not (eq mime::preview/original-major-mode + 'gnus-original-article-mode)) + (hilit-rehighlight-buffer-quietly) + ))) (add-hook 'mime-viewer/plain-text-preview-hook - (function hilit-rehighlight-buffer-quietly)) + (lambda () + (if (not (eq mime::preview/original-major-mode + 'gnus-original-article-mode)) + (hilit-rehighlight-buffer-quietly) + ))) )) @end lisp diff --git a/doc/tm-util=ja.texi b/doc/tm-util=ja.texi index 3119a19..b2da073 100644 --- a/doc/tm-util=ja.texi +++ b/doc/tm-util=ja.texi @@ -1,4 +1,4 @@ -@c $Id: tm-util=ja.texi,v 3.0 1995/12/17 22:56:52 morioka Exp $ +@c $Id: tm-util=ja.texi,v 4.0 1995/12/25 09:25:53 morioka Exp $ @node customize, Bug report, encoded-word, Top @comment node-name, next, previous, up @@ -109,7 +109,9 @@ hilit19 @lisp (cond (window-system - (let* ((header-patterns '(("^Subject:.*$" nil msg-subject) + (require 'hilit19) + (let* ((csubject-patterns '(("^\\[.+\\]$" nil msg-subject))) + (header-patterns '(("^Subject:.*$" nil msg-subject) ("^From:.*$" nil msg-from) ("^--text follows this line--$" nil msg-separator) @@ -117,7 +119,9 @@ hilit19 )) (body-patterns '(("^\\(In article\\|[ \t]*\\w*[]<>@}|]\\).*$" nil msg-quote))) - (message-patterns (append header-patterns body-patterns)) + (message-patterns (append ;;csubject-patterns + header-patterns + body-patterns)) ) (hilit-set-mode-patterns 'msg-header header-patterns) (hilit-set-mode-patterns 'msg-body body-patterns) @@ -126,9 +130,17 @@ hilit19 'hilit-rehighlight-message) ) (add-hook 'mime-viewer/content-header-filter-hook - (function hilit-rehighlight-buffer-quietly)) + (lambda () + (if (not (eq mime::preview/original-major-mode + 'gnus-original-article-mode)) + (hilit-rehighlight-buffer-quietly) + ))) (add-hook 'mime-viewer/plain-text-preview-hook - (function hilit-rehighlight-buffer-quietly)) + (lambda () + (if (not (eq mime::preview/original-major-mode + 'gnus-original-article-mode)) + (hilit-rehighlight-buffer-quietly) + ))) )) @end lisp diff --git a/doc/tm-view=en.texi b/doc/tm-view=en.texi index 50b7bc8..fdde8a2 100644 --- a/doc/tm-view=en.texi +++ b/doc/tm-view=en.texi @@ -1,4 +1,4 @@ -@c{$Id: tm-view=en.texi,v 7.6 1995/12/17 23:03:47 morioka Exp $} +@c{$Id: tm-view=en.texi,v 7.7 1995/12/25 10:00:44 morioka Exp $} @node tm-view, encoded-word, tm-MUA, Top @comment node-name, next, previous, up @@ -60,31 +60,51 @@ content-types. Example: @example -From: MORIOKA Tomohiko -Newsgroups: zxr.comp.emacs.tm-english -Subject: tm6.63.tar.gz -Date: Mon, 26 Jun 1995 17:39:50 JST -Organization: Chamonix, JAIST, Tatsunokuchi, Ishikawa, Japan -Reply-To: tm-eng@@chamonix.jaist.ac.jp -To: tm-eng@@chamonix.jaist.ac.jp -In-Reply-To: Your message of "Sun, 25 Jun 1995 23:20:49 MST" -X-Mua: mh-e 4.1 + tm 6.63 / Mule 2.2 (WAKAMURASAKI) PL02 -X-Mime-Composer: mime.el + tiny-mime 5.12 -X-Ml-Count: 32 +From: morioka@@jaist.ac.jp (MORIOKA Tomohiko) +Subject: Re: Question +Newsgroups: zxr.message.mime +Date: 22 Oct 93 11:02:44 +Mime-Version: 1.0 +Organization: Japan Advanced Institute of Science and Technology, + Ishikawa, Japan [1 (text/plain)] - I put tm6.63.tar.gz in ftp.jaist.ac.jp. + How to compose MIME message in MIME-Edit mode. + + Press `C-c C-x ?' then help message will be displayed: + +C-c C-x C-t insert a text message. +C-c C-x TAB insert a (binary) file. +C-c C-x C-e insert a reference to external body. +C-c C-x C-v insert a voice message. +C-c C-x C-y insert a mail or news message. +C-c C-x RET insert a mail message. +C-c C-x C-s insert a signature file at end. +C-c C-x t insert a new MIME tag. +C-c C-x a enclose as multipart/alternative. +C-c C-x p enclose as multipart/parallel. +C-c C-x m enclose as multipart/mixed. +C-c C-x d enclose as multipart/digest. +C-c C-x s enclose as PGP signed. +C-c C-x e enclose as PGP encrypted. +C-c C-x C-k insert PGP public key. +C-c C-x C-p preview editing MIME message. +... + +So press `C-c C-x C-i' and specify file name you want to include. + + MIME encoding for binary file is normally Base64. + +[2 (image/gif)] - In this version, tm-view uses new MIME encoding/decoding engine -``mel (MIME encoding library''. This library has internal/external -encoding/decoding engine. If data is smaller than a limit, tm-view -uses internal decoder, otherwise external decoder. +[3 (text/plain)] -[2 tm6.63.tar.gz ([anon-ftp] ftp.jaist.ac.jp:/pub/GNU/elisp/mime/alpha)] + In this way, it is finish a message attaching a picture. -[3 (text/plain)] ----- -MORIOKA, Tomohiko +======================== A cup of Russian tea ======================== +============ * not by jam, not by marmalade, by honey * ============ +============ MORIOKA Tomohiko ============ +=============== Internet E-mail: =============== @end example diff --git a/doc/tm-view=ja.texi b/doc/tm-view=ja.texi index 2a53dcd..2163552 100644 --- a/doc/tm-view=ja.texi +++ b/doc/tm-view=ja.texi @@ -1,4 +1,4 @@ -@c $Id: tm-view=ja.texi,v 7.9 1995/12/17 23:00:33 morioka Exp $ +@c $Id: tm-view=ja.texi,v 7.10 1995/12/25 10:00:27 morioka Exp $ @node tm-view, encoded-word, tm-MUA, Top @comment node-name, next, previous, up @@ -62,31 +62,51 @@ mime/viewer-mode @example -From: ¼é²¬ ÃÎɧ (MORIOKA Tomohiko) -Newsgroups: zxr.comp.emacs.tm-english -Subject: tm6.63.tar.gz -Date: Mon, 26 Jun 1995 17:39:50 JST -Organization: Chamonix, JAIST, Tatsunokuchi, Ishikawa, Japan -Reply-To: tm-eng@@chamonix.jaist.ac.jp -To: tm-eng@@chamonix.jaist.ac.jp -In-Reply-To: Your message of "Sun, 25 Jun 1995 23:20:49 MST" -X-Mua: mh-e 4.1 + tm 6.63 / Mule 2.2 ( ¼ã»ç ) PL02 -X-Mime-Composer: mime.el + tiny-mime 5.12 -X-Ml-Count: 32 +From: morioka@@jaist.ac.jp (¼é²¬ ÃÎɧ / MORIOKA Tomohiko) +Subject: Re: ¼ÁÌä¡© +Newsgroups: zxr.message.mime +Date: 22 Oct 93 11:02:44 +Mime-Version: 1.0 +Organization: Japan Advanced Institute of Science and Technology, + Ishikawa, Japan [1 (text/plain)] - I put tm6.63.tar.gz in ftp.jaist.ac.jp. + MIME-Edit mode ¤Ë¤ª¤±¤ë¡¢MIME message ¤Îºî¤êÊý¡£ + + C-c C-x ? ¤ò²¡¤¹¤È help ¤¬½Ð¤Æ¤¯¤ë¡£ + +C-c C-x C-t insert a text message. +C-c C-x TAB insert a (binary) file. +C-c C-x C-e insert a reference to external body. +C-c C-x C-v insert a voice message. +C-c C-x C-y insert a mail or news message. +C-c C-x RET insert a mail message. +C-c C-x C-s insert a signature file at end. +C-c C-x t insert a new MIME tag. +C-c C-x a enclose as multipart/alternative. +C-c C-x p enclose as multipart/parallel. +C-c C-x m enclose as multipart/mixed. +C-c C-x d enclose as multipart/digest. +C-c C-x s enclose as PGP signed. +C-c C-x e enclose as PGP encrypted. +C-c C-x C-k insert PGP public key. +C-c C-x C-p preview editing MIME message. +... + +¤Ã¤ÆÌõ¤Ç¡¢C-c C-x C-i ¤ò²¡¤·¤Æ¡¢ÁÞÆþ¤·¤¿¤¤ binary file ¤ò»ØÄꤷ¤Þ¤¹¡£ + + binary file ¤Î MIME encoding ¤Ë¤Ï¡¢ÉáÄÌ¡¢Base64 ¤ò»ØÄꤷ¤Þ¤¹¡£ + +[2 (image/gif)] - In this version, tm-view uses new MIME encoding/decoding engine -``mel (MIME encoding library''. This library has internal/external -encoding/decoding engine. If data is smaller than a limit, tm-view -uses internal decoder, otherwise external decoder. +[3 (text/plain)] -[2 tm6.63.tar.gz ([anon-ftp] ftp.jaist.ac.jp:/pub/GNU/elisp/mime/alpha)] + ¤³¤ó¤ÊÉ÷¤Ë¡¢³¨Æþ¤ê message ¤Î¤Ç¤­¾å¤¬¤ê¡£ -[3 (text/plain)] ----- -MORIOKA, Tomohiko +¢®¢®¢®¢®¢®¢®¢®¢®¢®¢®¢® ¥í¥·¥¢¥ó¡¦¥Æ¥£¡¼¤ò°ìÇÕ¡£ ¢®¢®¢®¢®¢®¢®¢®¢®¢®¢®¢® +¢®¢®¢®¢®¢® ¡ù ¥¸¥ã¥à¤Ç¤Ï¤Ê¤¯¥Þ¡¼¥Þ¥ì¡¼¥É¤Ç¤â¤Ê¤¯ËªÌª¤Ç ¡ù ¢®¢®¢®¢®¢® +¢®¢®¢®¢®¢® §®§°§²¤¤§°§¬§¡ §´§°§®§°§·§ª§¬§° ¢®¢®¢®¢®¢® +¢®¢®¢®¢®¢®¢®¢® Internet E-mail: ¢®¢®¢®¢®¢®¢®¢® @end example diff --git a/doc/tm_en.texi b/doc/tm_en.texi index 1e0a451..44cbc93 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 7.8 1995/12/21 10:42:14 morioka Exp morioka $} +@code{$Id: tm_en.texi,v 7.10 1995/12/23 10:22:09 morioka Exp morioka $} @end titlepage @@ -129,8 +129,8 @@ In future, we will support inline image. @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 using mime.el, while tm-setup is +provided to ease the setup. The mime-setup.el is used for the whole MIME +related setup including MIME encoding using tm-edit.el, while tm-setup is used to set up tm-MUA only. @menu @@ -230,7 +230,7 @@ When mime-setup.el sets up for signature.el, it sets variable signature automatically when it is sending a message. Reason of this setting is following: -GNUS inserts signature after mime.el composed as MIME +GNUS inserts signature after tm-edit.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. diff --git a/doc/tm_ja.texi b/doc/tm_ja.texi index 325b3e5..f21994e 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 7.4 1995/12/17 15:17:49 morioka Exp morioka $} +@code{$Id: tm_ja.texi,v 7.5 1995/12/23 09:41:52 morioka Exp morioka $} @end titlepage @@ -257,7 +257,7 @@ signature.el nil ¤ËÀßÄꤷ¤Þ¤¹¡£¤è¤Ã¤Æ¡¢Á÷¿®»þ¤Ë¼«Æ°Åª¤Ë signature ¤¬ÉÕ¤¯µ¡Ç½¤ÏÍÞÀ© ¤µ¤ì¤Þ¤¹¡£¤³¤Î¤è¤¦¤Ê¤³¤È¤ò¤·¤Æ¤¤¤ë¤Î¤Ï°Ê²¼¤ÎÍýͳ¤«¤é¤Ç¤¹¡£ -GNUS ¤¬ signature ¤òÉÕ¤±¤ë¤Î¤Ï mime.el ¤Ë¤è¤Ã¤Æ MIME message ¤¬ºîÀ®¤µ +GNUS ¤¬ signature ¤òÉÕ¤±¤ë¤Î¤Ï tm-edit.el ¤Ë¤è¤Ã¤Æ MIME message ¤¬ºîÀ®¤µ ¤ì¤¿¸å¤Ç¤¹¡£¤è¤Ã¤Æ¡¢GNUS ¤¬ÉÕ¤±¤¿ signature ¤Ï MIME message ¤È¤·¤ÆÀµ¤· ¤¯½èÍý¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£Î㤨¤Ð multipart message ¤Î¾ì¹ç¡¢MIME message ¤Î ³°¤ÎÈó MIME part ¤ËÉÕ¤­¤Þ¤¹¡£¤è¤Ã¤Æ¡¢MIME Âбþ MUA ¤Ç¸«¤¿¾ì¹ç¡¢ diff --git a/gnus/ChangeLog-7.29-7.30.en b/gnus/ChangeLog-7.29-7.30.en new file mode 100644 index 0000000..d87e6fc --- /dev/null +++ b/gnus/ChangeLog-7.29-7.30.en @@ -0,0 +1,16 @@ +Mon Dec 25 08:15:56 1995 Morioka Tomohiko + + * tm/gnus: Version 7.30 was released. + + * tm-sgnus.el (tm-gnus/summary-toggle-header): + use `mime-viewer/redisplay' + + * mk-tgnus: (install-tm-gnus): + `(setq command-line-args-left (cdr command-line-args-left))' + was added. + +Sat Dec 23 12:57:25 1995 Morioka Tomohiko + + * tm-sgnus.el (tm-gnus/summary-toggle-header): New implement + + * tm-sgnus.el: uses original `gnus-article-hide-headers-if-wanted' diff --git a/gnus/Makefile b/gnus/Makefile index 971de46..25ebfc7 100644 --- a/gnus/Makefile +++ b/gnus/Makefile @@ -27,7 +27,7 @@ TMDIR19_29 = $(DATADIR19_29)/$(EMACS_PREFIX)/site-lisp FILES = tm/gnus/*.el tm/doc/tm-gnus*.texi -TARFILE = tm-gnus7.28.tar +TARFILE = tm-gnus7.30.tar gnus: diff --git a/gnus/mk-tgnus b/gnus/mk-tgnus index 344ba60..567feb2 100644 --- a/gnus/mk-tgnus +++ b/gnus/mk-tgnus @@ -1,6 +1,6 @@ ;;; -*-Emacs-Lisp-*- ;;; -;;; $Id: mk-tgnus,v 1.1 1995/11/18 08:07:24 morioka Exp morioka $ +;;; $Id: mk-tgnus,v 2.0 1995/12/25 05:47:03 morioka Exp morioka $ ;;; (setq load-path @@ -107,4 +107,6 @@ ;;"tm-gnus.elc" "tm-sgnus.elc" "tm-gnus4.elc" "tm-gd5.elc") - )))) + )) + (setq command-line-args-left (cdr command-line-args-left)) + )) diff --git a/gnus/tm-sgnus.el b/gnus/tm-sgnus.el index ed7c0b6..8798eea 100644 --- a/gnus/tm-sgnus.el +++ b/gnus/tm-sgnus.el @@ -8,7 +8,7 @@ ;;; MURATA Masahiro ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1995/09/24 -;;; Version: $Revision: 7.28 $ +;;; Version: $Revision: 7.30 $ ;;; Keywords: news, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -43,7 +43,7 @@ ;;; (defconst tm-gnus/RCS-ID - "$Id: tm-sgnus.el,v 7.28 1995/12/22 07:50:17 morioka Exp $") + "$Id: tm-sgnus.el,v 7.30 1995/12/25 08:15:56 morioka Exp $") (defconst tm-gnus/version (concat (get-version-string tm-gnus/RCS-ID) " for September")) @@ -87,29 +87,21 @@ This variable is set to `gnus-show-mime'.") (defun tm-gnus/summary-toggle-header (&optional arg) (interactive "P") (if tm-gnus/automatic-mime-preview - (save-excursion - (set-buffer gnus-article-buffer) - (let* ((buffer-read-only nil) - (inhibit-point-motion-hooks t) - (hidden (text-property-any - (goto-char (point-min)) (search-forward "\n\n") - 'invisible t)) - e) - (goto-char (point-min)) - (when (search-forward "\n\n" nil t) - (delete-region (point-min) (1- (point)))) - (goto-char (point-min)) - (save-excursion - (set-buffer gnus-original-article-buffer) - (goto-char (point-min)) - (setq e (1- (or (search-forward "\n\n" nil t) (point-max))))) - (insert-buffer-substring gnus-original-article-buffer 1 e) - (if (or (not hidden) (and (numberp arg) (< arg 0))) - (tm-gnus/content-header-filter) - (mime/decode-message-header)) - (let ((gnus-inhibit-hiding t)) - (run-hooks 'gnus-article-display-hook)) - )) + (let* ((hidden + (save-excursion + (set-buffer gnus-article-buffer) + (text-property-any + (goto-char (point-min)) (search-forward "\n\n") + 'invisible t) + )) + (mime-viewer/ignored-field-regexp + (if hidden + "^:$" + mime-viewer/ignored-field-regexp)) + (mime-viewer/redisplay t) + ) + (gnus-summary-select-article hidden t) + ) (gnus-summary-toggle-header arg)) ) @@ -196,67 +188,6 @@ This variable is set to `gnus-show-mime'.") (setq gnus-decode-encoded-word-method (function tm-gnus/article-decode-encoded-word)) -(or (fboundp 'tm::gnus-article-hide-headers-if-wanted) - (fset 'tm::gnus-article-hide-headers-if-wanted - (symbol-function 'gnus-article-hide-headers-if-wanted)) - ) - -(defun gnus-article-hide-headers-if-wanted () - (or tm-gnus/automatic-mime-preview - (tm::gnus-article-hide-headers-if-wanted) - )) - -(defun tm-gnus/preview-cut-header () - (save-restriction - (let ((ignored mime-viewer/ignored-field-regexp) - (visible mime-viewer/visible-field-regexp) - want-list beg) - (goto-char (point-min)) - (narrow-to-region - (point) - (progn (search-forward "\n\n" nil t) (forward-line -1) (point))) - (goto-char (point-min)) - (while (re-search-forward "^[^ \t]*:" nil t) - (beginning-of-line) - ;; We add the headers we want to keep to a list and delete - ;; them from the buffer. - (if (or (and visible (looking-at visible)) - (and ignored (not (looking-at ignored)))) - (progn - (push (buffer-substring - (setq beg (point)) - (progn - (forward-line 1) - ;; Be sure to get multi-line headers... - (re-search-forward "^[^ \t]*:" nil t) - (beginning-of-line) - (point))) - want-list) - (delete-region beg (point))) - (forward-line 1))) - ;; Sort the headers that we want to display. - (setq want-list (sort want-list 'gnus-article-header-less)) - (goto-char (point-min)) - (while want-list - (insert (pop want-list))) - (add-text-properties - (point) (point-max) - (nconc (list 'gnus-type 'headers) gnus-hidden-properties)) - ))) - -(defun tm-gnus/content-header-filter () - (tm-gnus/preview-cut-header) - (mime/decode-message-header) - ) - - -;;; @ set up -;;; - -(set-alist 'mime-viewer/content-header-filter-alist - 'gnus-original-article-mode - (function tm-gnus/content-header-filter)) - ;;; @ for BBDB ;;; diff --git a/mh-e/mk-tmh b/mh-e/mk-tmh index 7720aff..f4308e4 100644 --- a/mh-e/mk-tmh +++ b/mh-e/mk-tmh @@ -1,4 +1,7 @@ ;;; -*-Emacs-Lisp-*- +;;; +;;; $Id: mk-tmh,v 2.0 1995/12/25 05:48:21 morioka Exp morioka $ +;;; (setq load-path (append (mapcar (function @@ -79,4 +82,5 @@ ) (apply (function install-el-files) path tm-mh-e-el-files) (apply (function install-elc-files) path tm-mh-e-elc-files) + (setq command-line-args-left (cdr command-line-args-left)) )) diff --git a/mk-tm b/mk-tm index 8fa3384..b9a4294 100644 --- a/mk-tm +++ b/mk-tm @@ -1,6 +1,6 @@ ;;; -*-Emacs-Lisp-*- ;;; -;;; $Id: mk-tm,v 7.4 1995/12/03 15:46:37 morioka Exp morioka $ +;;; $Id: mk-tm,v 7.6 1995/12/25 05:33:36 morioka Exp morioka $ ;;; (setq load-path (append @@ -114,6 +114,7 @@ (require 'tm-rich) (require 'mel-u) (require 'tm-edit) + (load "rmailsum") (mapcar (function (lambda (module) (let ((el-file (concat module ".el")) @@ -168,4 +169,5 @@ (append tm-el-files tm-uncompile-el-files) ) (apply (function install-elc-files) path tm-elc-files) + (setq command-line-args-left (cdr command-line-args-left)) )) diff --git a/signature.el b/signature.el index 937885b..324ace7 100644 --- a/signature.el +++ b/signature.el @@ -7,20 +7,40 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; OKABE Yasuo (1994/08/01) +;;; Created: 1994/7/11 ;;; Version: -;;; $Id: signature.el,v 7.1 1995/12/14 06:22:20 morioka Exp $ +;;; $Id: signature.el,v 7.3 1995/12/25 05:29:00 morioka Exp $ ;;; Keywords: mail, news, signature ;;; ;;; This file is part of tm (Tools for MIME). ;;; +;;; This program is free software; you can redistribute it and/or +;;; modify it under the terms of the GNU General Public License as +;;; published by the Free Software Foundation; either version 2, or +;;; (at your option) any later version. +;;; +;;; This program is distributed in the hope that it will be useful, +;;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;;; General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with This program. If not, write to the Free Software +;;; Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +;;; +;;; Code: (require 'tl-822) (defvar signature-insert-at-eof nil - "*Insert signature at the end of file if non-nil.") + "*Insert signature at the end of file if non-nil. [signature.el]") + +(defvar signature-delete-blank-lines-at-eof nil + "*Signature-insert-at-eof deletes blank lines at the end of file +if non-nil. [signature.el]") (defvar signature-file-name "~/.signature" - "*Name of file containing the user's signature.") + "*Name of file containing the user's signature. [signature.el]") (defvar signature-file-alist nil) @@ -103,7 +123,7 @@ (goto-char (point-max)) (if (not (bolp)) (insert "\n")) - ;;(delete-blank-lines) + (if signature-delete-blank-lines-at-eof (delete-blank-lines)) (insert-file-contents signature) (set-buffer-modified-p (buffer-modified-p)) ; force mode line update diff --git a/tm-def.el b/tm-def.el index d672cbe..6284cec 100644 --- a/tm-def.el +++ b/tm-def.el @@ -6,7 +6,7 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: tm-def.el,v 7.7 1995/12/21 18:17:03 morioka Exp $ +;;; $Id: tm-def.el,v 7.8 1995/12/23 12:43:20 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia, definition ;;; ;;; This file is part of tm (Tools for MIME). @@ -95,7 +95,7 @@ (defvar browse-url-browser-function nil) -(defun tm:browse-url () +(defun tm:browse-url (&optional url) (if (fboundp browse-url-browser-function) (call-interactively browse-url-browser-function) (if (fboundp tm:mother-button-dispatcher) diff --git a/tm-pgp.el b/tm-pgp.el index f59e852..0970200 100644 --- a/tm-pgp.el +++ b/tm-pgp.el @@ -8,7 +8,7 @@ ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1995/12/7 ;;; Version: -;;; $Id: tm-pgp.el,v 7.5 1995/12/21 18:45:26 morioka Exp $ +;;; $Id: tm-pgp.el,v 7.6 1995/12/23 10:16:40 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia, PGP, security ;;; ;;; This file is part of tm (Tools for MIME). @@ -112,7 +112,7 @@ ;;; @ Internal method for application/pgp-signature ;;; -;;; It is based on draft-elkins-pem-pgp-01.txt +;;; It is based on draft-elkins-pem-pgp-02.txt (defun mime-article/check-pgp-signature (beg end cal) (let* ((encoding (cdr (assq 'encoding cal))) @@ -200,7 +200,7 @@ ;;; @ Internal method for application/pgp-encrypted ;;; -;;; It is based on draft-elkins-pem-pgp-01.txt +;;; It is based on draft-elkins-pem-pgp-02.txt (defun mime-article/decrypt-pgp (beg end cal) (let* ((cnum (mime-article/point-content-number beg)) @@ -226,7 +226,7 @@ ;;; @ Internal method for application/pgp-keys ;;; -;;; It is based on draft-elkins-pem-pgp-01.txt +;;; It is based on draft-elkins-pem-pgp-02.txt (autoload 'mc-snarf-keys "mc-toplev") diff --git a/tm-rmail.el b/tm-rmail.el index 1099108..98b2415 100644 --- a/tm-rmail.el +++ b/tm-rmail.el @@ -6,7 +6,7 @@ ;;; modified by KOBAYASHI Shuhei ;;; Created: 1994/8/30 ;;; Version: -;;; $Revision: 7.20 $ +;;; $Revision: 7.22 $ ;;; Keywords: mail, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -40,7 +40,7 @@ ;;; (defconst tm-rmail/RCS-ID - "$Id: tm-rmail.el,v 7.20 1995/12/15 13:56:51 morioka Exp $") + "$Id: tm-rmail.el,v 7.22 1995/12/25 09:08:50 morioka Exp $") (defconst tm-rmail/version (get-version-string tm-rmail/RCS-ID)) (defvar tm-rmail/decode-all nil) @@ -74,13 +74,7 @@ (defun tm-rmail/preview-message () (interactive) (setq tm-rmail/decode-all t) - (let ((ret (rmail-widen-to-current-msgbeg - (function - (lambda () - (cons (mime/Content-Type) - (mime/Content-Transfer-Encoding "7bit") - ) - ))))) + (let ((ret (tm-rmail/get-Content-Type-and-Content-Transfer-Encoding))) (narrow-to-region (point-min) (save-excursion (goto-char (point-max)) @@ -89,11 +83,35 @@ (match-beginning 0) (point-max) ))) - (mime/viewer-mode nil (car ret)(cdr ret) nil - (format "*Preview-%s [%d/%d]*" - (buffer-name) - rmail-current-message rmail-total-messages)) - )) + (let ((abuf (current-buffer)) + (buf-name (format "*Preview-%s [%d/%d]*" + (buffer-name) + rmail-current-message rmail-total-messages)) + buf win) + (if (and mime::article/preview-buffer + (setq buf (get-buffer mime::article/preview-buffer)) + ) + (progn + (save-excursion + (set-buffer buf) + (rename-buffer buf-name) + ) + (if (setq win (get-buffer-window buf)) + (progn + (delete-window (get-buffer-window abuf)) + (set-window-buffer win abuf) + (set-buffer abuf) + )) + )) + (setq win (get-buffer-window abuf)) + (save-window-excursion + (mime/viewer-mode nil (car ret)(cdr ret) nil buf-name) + (or buf + (setq buf (current-buffer)) + ) + ) + (set-window-buffer win buf) + ))) (defun tm-rmail/preview-message-if-you-need () (if tm-rmail/decode-all @@ -102,13 +120,55 @@ (add-hook 'rmail-show-message-hook 'tm-rmail/preview-message-if-you-need) +(cond ((fboundp 'rmail-summary-rmail-update) + ;; for Emacs 19 or later + (or (fboundp 'tm:rmail-summary-rmail-update) + (fset 'tm:rmail-summary-rmail-update + (symbol-function 'rmail-summary-rmail-update)) + ) + + (defun rmail-summary-rmail-update () + (tm:rmail-summary-rmail-update) + (if tm-rmail/decode-all + (let ((win (get-buffer-window rmail-buffer))) + (if win + (delete-window win) + ))) + ) + + (defun tm-rmail/get-Content-Type-and-Content-Transfer-Encoding () + (rmail-widen-to-current-msgbeg + (function + (lambda () + (cons (mime/Content-Type) + (mime/Content-Transfer-Encoding "7bit") + ))))) + ) + (t + ;; for Emacs 18 + (defun tm-rmail/get-Content-Type-and-Content-Transfer-Encoding () + (save-restriction + (rmail-widen-to-current-msgbeg + (function + (lambda () + (goto-char (point-min)) + (narrow-to-region (or (and (re-search-forward "^.+:" nil t) + (match-beginning 0)) + (point-min)) + (point-max)) + ))) + (cons (mime/Content-Type) + (mime/Content-Transfer-Encoding "7bit") + ))) + )) + (define-key rmail-mode-map "v" (function tm-rmail/preview-message)) (defun tm-rmail/setup () (local-set-key "v" (function (lambda () (interactive) - (pop-to-buffer rmail-buffer) + (set-buffer rmail-buffer) (tm-rmail/preview-message) ))) ) @@ -151,6 +211,12 @@ ) ) +(defun tm-rmail/show-summary-method () + (save-excursion + (set-buffer mime::preview/article-buffer) + (rmail-summary) + )) + (call-after-loaded 'tm-view (function @@ -166,6 +232,10 @@ (set-alist 'mime-viewer/over-to-next-method-alist 'rmail-mode (function tm-rmail/over-to-next-method)) + + (set-alist 'mime-viewer/show-summary-method + 'rmail-mode + (function tm-rmail/show-summary-method)) ))) diff --git a/tm-view.el b/tm-view.el index f10508b..075446f 100644 --- a/tm-view.el +++ b/tm-view.el @@ -8,7 +8,7 @@ ;;; modified by Steven L. Baur ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1994/7/13 (1994/8/31 obsolete tm-body.el) -;;; Version: $Revision: 7.38 $ +;;; Version: $Revision: 7.39 $ ;;; Keywords: mail, news, MIME, multimedia ;;; ;;; This file is part of tm (Tools for MIME). @@ -44,7 +44,7 @@ ;;; (defconst mime-viewer/RCS-ID - "$Id: tm-view.el,v 7.38 1995/12/21 18:03:47 morioka Exp $") + "$Id: tm-view.el,v 7.39 1995/12/25 07:54:02 morioka Exp $") (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID)) (defconst mime/viewer-version mime-viewer/version) @@ -143,6 +143,7 @@ Each elements are regexp of field-name. [tm-view.el]") (apply (function regexp-or) mime-viewer/visible-field-list) ":")) +(defvar mime-viewer/redisplay nil) (defvar mime-viewer/announcement-for-message/partial (if (and (>= emacs-major-version 19) window-system) @@ -374,7 +375,9 @@ The compressed face will be piped to this command.") (get-buffer ibuf) (set-buffer ibuf) )) - (setq mime::article/content-info (mime/parse-message ctl encoding)) + (or mime-viewer/redisplay + (setq mime::article/content-info (mime/parse-message ctl encoding)) + ) (let ((ret (mime-viewer/make-preview-buffer obuf))) (setq mime::article/preview-buffer (car ret)) ret)) -- 1.7.10.4