From: morioka Date: Mon, 9 Mar 1998 17:50:38 +0000 (+0000) Subject: tm 7.57. X-Git-Tag: tm7_57~1 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15cb3afb2b5a34521da0c387f61bda4a72998615;p=elisp%2Ftm.git tm 7.57. --- diff --git a/ChangeLog b/ChangeLog index bec5175..473eb14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,44 @@ +Wed May 8 12:48:42 1996 MORIOKA Tomohiko + + * tl: Version 7.22.2 was released. + * tm: Version 7.57 was released. + * tm/gnus: Version 7.55 was released. + +Tue May 7 06:28:36 1996 MORIOKA Tomohiko + + * tm-rich.el: Version dependent code was moved to emu.el. + +Sun May 5 16:40:31 1996 MORIOKA Tomohiko + + * tm-edit.el (mime-editor/normalize-body): call function + `enriched-encode' for text/enriched part. + + * tm-edit.el (mime-editor/process-multipart-1): didn't refer + variable `mime-editor/encrypting-type'. + + * tm-edit.el: Function `mime-editor/process-pgp-kazu' was + abolished. + (mime-editor/sign-pgp-kazu): New function. + (mime-editor/encrypt-pgp-kazu): New function. + (mime-editor/process-multipart-1): Use function + `mime-editor/sign-pgp-kazu' and `mime-editor/encrypt-pgp-kazu'. + +Sat May 4 09:08:49 1996 Hiroshi Ueno + + * TM-CFG (TM_GNUS_COMPILE, MAKE): New variable. + + * inst-tm (compile-tm): Use variable `TM_GNUS_COMPILE' and `MAKE'. + +Sat May 4 04:58:37 1996 MORIOKA Tomohiko + + * tm-ew-e.el (tm-eword::encode-string-1): fixed (cf.[tm-ja:1818]) + +Mon Apr 29 13:42:15 1996 Kevin Broadey + + * tm-view.el (mime-viewer/make-preview-buffer): fixed + (cf.[tm-en:480]) + + Mon Apr 29 02:29:21 1996 MORIOKA Tomohiko * tl: Version 7.22.1 was released. diff --git a/Makefile b/Makefile index 4a3a93b..a7a15e5 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,7 @@ TL_FILES = tl/README.en tl/Makefile tl/mk-tl tl/tl-els \ FILES = $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(TL_FILES) -TARFILE = tm7.56.tar.gz +TARFILE = tm7.57.tar.gz elc: $(EMACS) $(FLAGS) -l inst-tm -f compile-tm diff --git a/TM-CFG b/TM-CFG index 8b21eaa..50bc1f2 100644 --- a/TM-CFG +++ b/TM-CFG @@ -1,6 +1,6 @@ ;;; -*-Emacs-Lisp-*- ;;; -;;; $Id: TM-CFG,v 4.0 1996/04/21 18:10:08 morioka Exp morioka $ +;;; $Id: TM-CFG,v 5.0 1996/05/05 11:13:35 morioka Exp morioka $ ;;; (setq load-path (append @@ -43,8 +43,8 @@ ;; Please specify install path prefix. ;;(setq PREFIX "~/") ; install to you home directory -(setq PREFIX "/usr/local/") ; install to shared directory -;;(setq PREFIX "/lab/local/") +;;(setq PREFIX "/usr/local/") ; install to shared directory +(setq PREFIX "/lab/local/") ;; Please specify tm package prefix [optional] (setq TM_PACKAGE_PREFIX "") @@ -142,6 +142,8 @@ (setq TM_GNUS_INSTALL_FORMAT "cd gnus; PWD=`pwd` make install-19 EMACS=%s TMDIR19=%s") +(setq TM_GNUS_COMPILE ".gnus-compile") +(setq MAKE "make") (setq el-file-mode (+ (* 64 6)(* 8 4) 4)) diff --git a/doc/tm-edit-en.texi b/doc/tm-edit-en.texi new file mode 100644 index 0000000..7a369bd --- /dev/null +++ b/doc/tm-edit-en.texi @@ -0,0 +1,201 @@ +@c $Id: tm-edit-en.texi,v 3.0 1996/05/08 12:43:50 morioka Exp $ + +@node tm-edit, encoded-word, tm-view, Top +@comment node-name, next, previous, up +@chapter tm-edit +@cindex tm-edit + +tm-edit is a general MIME viewer for GNU Emacs. + +tm-edit is based on mime.el by UMEDA Masanobu +, who is famous as the author of GNUS. +tm-edit expands following points from mime.el: + +@itemize @bullet +@item based on RFC 1521/1522 +@item Content-Disposition field (RFC 1806) supports +@item multi-part in multi-part +@item PGP +@item strength automatic specification for parameter of file type +@end itemize + + +@menu +* mime/editor-mode:: +* single-part operations:: +* enclosure operation:: +* other operations of mime/editor-mode:: +@end menu + + +@node mime/editor-mode, single-part operations, tm-edit, tm-edit +@comment node-name, next, previous, up +@section mime/editor-mode +@cindex mime/editor-mode + +@emph{mime/editor-mode} is a minor mode to compose MIME message. +In this mode, @emph{tag} represents various kinds of data, you can +edit multi-part message. + +There are 2 kinds of @emph{tag}s: + +@itemize @bullet +@item single-part tag +@item multi-part tag +@end itemize + +single-part tag represents single part, this form is following: + +@example + --[[TYPE/SUBTYPE;PARAMETERS][ENCODING] + OPTIONAL-FIELDS] +@end example + +TYPE/SUBTYPE and PARAMETERS indicates type/subtype and parameters of +Content-Type field. TYPE/SUBTYPE is required, PARAMETERS is optional. + +ENCODING indicates Content-Transfer-Encoding field. It is optional too. + +OPTIONAL-FIELDS is to represent another fields except Content-Type +field and Content-Transfer-Encoding field. + +multi-part tags represent multi part. They consist of a pair of +@emph{multi-part beginning tag} and @emph{multi-part ending tag}. + +@emph{multi-part beginning tag}'s form is following: + +@example + --<>-@{ +@end example + +@emph{multi-part ending tag}'s form is following: + +@example + --@}-<> +@end example + +A region from multi-part beginning tag to multi-part ending tag is +called as @emph{enclosure}. + + +@node single-part operations, enclosure operation, mime/editor-mode, tm-edit +@comment node-name, next, previous, up +@section single-part operations +@cindex single-part + +Operations to make single-part are following: + +@table @kbd +@item @key{C-c C-x C-t} +Insert single-part tag indicates text part. + +@item @key{C-c C-x C-i} +Insert file as a MIME attachment. + +@item @key{C-c C-x C-e} +Insert external part. + +@item @key{C-c C-x C-v} +Record audio input until @key{C-g} is pressed, and insert as a audio +part. (It requires /dev/audio in default.) + +@item @key{C-c C-x C-y} +Insert current (mail or news) message. (It is MUA depended.) + +@item @key{C-c C-x C-m} +Insert mail message. (It is MUA depended.) + +@item @key{C-c C-x C-w, C-c C-x C-s} +Insert signature. + +@item @key{C-c C-x C-k} +Insert PGP public key. (It requires Mailcrypt package.) + +@item @key{C-c C-x t} +Insert any single-part tag. +@end table + + +@node enclosure operation, other operations of mime/editor-mode, single-part operations, tm-edit +@comment node-name, next, previous, up +@section enclosure operations +@cindex multi-part +@cindex enclosure + +Operations to make enclosure are following: + +@table @kbd +@item @key{C-c C-x a} +Enclose specified region as multipart/alternative. + +@item @key{C-c C-x p} +Enclose specified region as multipart/parallel. + +@item @key{C-c C-x m} +Enclose specified region as multipart/mixed. + +@item @key{C-c C-x d} +Enclose specified region as multipart/digest. + +@item @key{C-c C-x s} +Digital-sign to specified region. (*1) + +@item @key{C-c C-x e} +Encrypt to specified region. (*1) +@end table + +@b{[Notice]} +@enumerate +@item +It requires Mailcrypt package and pgp package. In addition, please set +symbol @code{pgp-elkins} or @code{pgp-kazu} to +variable @code{mime-editor/signing-type} and +@code{mime-editor/encrypting-type}. + +@code{pgp-elkins} indicates draft-elkins-pem-pgp-02.txt, +@code{pgp-kazu} indicates draft-kazu-pgp-mime-00.txt. +@end enumerate + + +@node other operations of mime/editor-mode, , enclosure operation, tm-edit +@comment node-name, next, previous, up +@section Another operation in mime/editor-mode. + +There are another operations in mime/editor-mode. + +@table @kbd +@item @key{C-c C-c} +Send current editing message. + +@item @key{C-c C-x C-p} +Preview current editing message. + +@item @key{C-c C-x C-z} +Exit mime/editor-mode. (@key{M-x mime/edit-again} is available to +reedit.) + +@item @key{C-c C-x ?} +Display help message. + +@item @key{M-x mime-editor/set-split} +Set current editing message to enable automatic splitting or not. +Form of automatic split messages is message/partial. + +@item @key{M-x mime-editor/set-sign} +Set current editing message to digital-sign or not. (*1) + +@item @key{M-x mime-editor/set-encrypt} +Set current editing message to encrypt or not. (*1) +@end table + +@b{[Notice]} +@enumerate +@item +It requires Mailcrypt package and pgp package. In addition, please set +symbol @code{pgp-elkins} or @code{pgp-kazu} to +variable @code{mime-editor/signing-type} and +@code{mime-editor/encrypting-type}. + +@code{pgp-elkins} indicates draft-elkins-pem-pgp-02.txt, +@code{pgp-kazu} indicates draft-kazu-pgp-mime-00.txt. +@end enumerate diff --git a/doc/tm_en.texi b/doc/tm_en.texi index 375a930..a03933a 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.14 1996/04/24 12:57:47 morioka Exp $} +@code{$Id: tm_en.texi,v 7.15 1996/05/08 12:42:01 morioka Exp $} @end titlepage @@ -333,7 +333,7 @@ automatically in default setting. @include tm-view=en.texi -@include tm-edit=en.texi +@include tm-edit-en.texi @include tm-ew=en.texi diff --git a/doc/tm_ja.texi b/doc/tm_ja.texi index 3ad48d7..3c2f124 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.8 1996/04/24 12:56:59 morioka Exp $} +@code{$Id: tm_ja.texi,v 7.11 1996/05/08 12:30:47 morioka Exp morioka $} @end titlepage @@ -23,7 +23,6 @@ GNU Emacs @menu * Introduction:: ¤Ï¤¸¤á¤Ë -* Emacs-Versions:: Emacs ¤Î¼ïÎàÊ̤ε¡Ç½¤ª¤è¤ÓÀ©¸Â * Setting:: ÀßÄê * tm-MUA:: mh-e, GNUS, RMAIL, VM ¤Ê¤É³Æ¼ï MUA ¤Î³ÈÄ¥ @@ -45,7 +44,7 @@ GNU Emacs @end menu -@node Introduction, Emacs-Versions, Top, Top +@node Introduction, Setting, Top, Top @comment node-name, next, previous, up @chapter tm ¤È¤Ï @cindex tm ¤È¤Ï @@ -78,69 +77,8 @@ tm @item @strong{mime-setup:} MIME ´Ø·¸Á´È̤ÎÀßÄê module @end itemize -@menu -* tm-view:: -* tm-mh-e:(tm-mh-e_ja.info). -* tm-gnus:(tm-gnus_ja.info). -* tm-rmail:(tm-rmail_ja.info). -* tm-vm:(tm-vm_ja.info). -* chain-mail:(tm-cmail_ja.info). -@end menu - - -@node Emacs-Versions, Setting, Introduction, Top -@comment node-name, next, previous, up -@chapter Emacs ¤Î¼ïÎàÊ̤ε¡Ç½¤ª¤è¤ÓÀ©¸Â -@cindex emacs variants -@cindex charset - -@section original GNU Emacs 18 and Epoch -@cindex Original Emacs 18 -@cindex Epoch - -Æ°ºî¤ÏÊݾڤ·¤Þ¤»¤ó¡£¤·¤«¤·¤Ê¤¬¤é¡¢US-ASCII ¤ÎÈϰϤǤÏÆ°ºî¤¹¤ë¤È»×¤ï¤ì -¤Þ¤¹¡£ - - -@section NEmacs, NEpoch -@cindex Emacs 18 -@cindex NEmacs -@cindex NEpoch - -ISO-2022-JP, US-ASCII ¤¬»È¤¨¤Þ¤¹¡£ - - -@section original GNU Emacs 19 -@cindex Original Emacs 19 - -US-ASCII ¤ª¤è¤Ó ISO-8859-1 ¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£ - -¤Þ¤¿¡¢X window ¾å¤ÎÆÈΩ¤·¤¿ window ¤È¤·¤ÆÆ°ºî¤µ¤»¤ë¾ì¹ç¡¢tm-rich ¤Ë¤è -¤ë multi face ɽ¼¨¤¬¹Ô¤Ê¤¨¤Þ¤¹¡£ - - -@section Mule -@cindex Mule -@cindex Emacs 18 -@cindex Emacs 19 - -ISO-2022-JP, US-ASCII, ISO-8859-1..9, ISO-2022-CN, ISO-2022-KR, EUC-KR -¤Ê¤É¤Î¿¤¯¤Î charset ¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£¤Þ¤¿¡¢´Ø¿ô -mime/set-charset-and-encoding ¤ÇÄɲá¦Êѹ¹¤¬¤Ç¤­¤Þ¤¹¡£ - -¤Þ¤¿¡¢Mule 2.* ¤ò X window ¾å¤ÎÆÈΩ¤·¤¿ window ¤È¤·¤ÆÆ°ºî¤µ¤»¤ë¾ì¹ç¡¢ -tm-rich ¤Ë¤è¤ë multi face ɽ¼¨¤¬¹Ô¤Ê¤¨¤Þ¤¹¡£ - - -@section XEmacs -@cindex XEmacs - -US-ASCII ¤ª¤è¤Ó ISO-8859-1 ¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£ - -¾­ÍèŪ¤Ë¤Ï¡¢inline image ¤Îɽ¼¨¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤ëͽÄê¤Ç¤¹¡£ - -@node Setting, tm-MUA, Emacs-Versions, Top +@node Setting, tm-MUA, Introduction, Top @comment node-name, next, previous, up @chapter ÀßÄê @cindex ÀßÄê @@ -151,14 +89,14 @@ US-ASCII MIME message ¤Î±ÜÍ÷¤ÎÀßÄê¤Î¤ß¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£ @menu -* mime-setup.el:: ÉáÄ̤ÎÀßÄê -* tm-setup.el:: tm-edit ¤ò»È¤¤¤¿¤¯¤Ê¤¤¾ì¹ç +* mime-setup:: ÉáÄ̤ÎÀßÄê +* tm-setup:: tm-edit ¤ò»È¤¤¤¿¤¯¤Ê¤¤¾ì¹ç * setting for VM:: VM ¤ÎÀßÄê * manual setting:: ÀßÄê file ¤ò»È¤ï¤Ê¤¤¾ì¹ç @end menu -@node mime-setup.el, tm-setup.el, Setting, Setting +@node mime-setup, tm-setup, Setting, Setting @comment node-name, next, previous, up @section mime-setup.el @cindex mime-setup.el @@ -276,7 +214,7 @@ signature ¤Ë¤è¤Ã¤Æ GNUS ¤Îɸ½à¤ËÌ᤹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ -@node tm-setup.el, setting for VM, mime-setup.el, Setting +@node tm-setup, setting for VM, mime-setup, Setting @comment node-name, next, previous, up @section tm-setup.el @cindex tm-setup.el @@ -299,7 +237,7 @@ Memo: mime-setup.el ¤ê¤Þ¤»¤ó¡£ -@node setting for VM, manual setting, tm-setup.el, Setting +@node setting for VM, manual setting, tm-setup, Setting @comment node-name, next, previous, up @section vm diff --git a/gnus/ChangeLog b/gnus/ChangeLog index dc1c38c..e6655ca 100644 --- a/gnus/ChangeLog +++ b/gnus/ChangeLog @@ -1,3 +1,15 @@ +Wed May 8 12:47:38 1996 MORIOKA Tomohiko + + * tm/gnus: Version 7.55 was released. + +Tue May 7 18:19:39 1996 MORIOKA Tomohiko + + * tm-sgnus.el: Mule support part was divided between Mule and + XEmacs 20.0 with Mule. + + * mk-tgnus (install-tm-gnus): version condition was modified. + + Mon Apr 29 01:55:32 1996 MORIOKA Tomohiko * tm/gnus: Version 7.54 was released. diff --git a/gnus/mk-tgnus b/gnus/mk-tgnus index 6955794..9a8cac7 100644 --- a/gnus/mk-tgnus +++ b/gnus/mk-tgnus @@ -1,6 +1,6 @@ ;;; -*-Emacs-Lisp-*- ;;; -;;; $Id: mk-tgnus,v 2.1 1996/02/08 01:30:10 morioka Exp morioka $ +;;; $Id: mk-tgnus,v 3.0 1996/05/07 17:38:25 morioka Exp $ ;;; (setq load-path @@ -78,7 +78,7 @@ (if (not (file-exists-p path)) (make-directory path t) ) - (cond ((< (string-to-int emacs-version) 19) + (cond (running-emacs-18 (install-el-files path "tm-gnus.el" "tm-gnus3.el" "tm-gnus4.el" @@ -87,7 +87,11 @@ ;;"tm-gnus.elc" "tm-gnus3.elc" "tm-gnus4.elc") ) - ((<= emacs-minor-version 29) + ((or (and running-emacs-19 + (<= emacs-minor-version 29)) + (and running-xemacs-19 + (<= emacs-minor-version 13)) + ) (install-el-files path "tm-gnus.el" "tm-sgnus.el" "tm-gnus4.el" diff --git a/gnus/tm-sgnus.el b/gnus/tm-sgnus.el index 6b9f47d..3ef3497 100644 --- a/gnus/tm-sgnus.el +++ b/gnus/tm-sgnus.el @@ -7,7 +7,7 @@ ;;; Author: MORIOKA Tomohiko ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1995/09/24 -;;; Version: $Revision: 7.54 $ +;;; Version: $Revision: 7.55 $ ;;; Keywords: news, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -41,7 +41,7 @@ ;;; (defconst tm-gnus/RCS-ID - "$Id: tm-sgnus.el,v 7.54 1996/04/29 01:55:32 morioka Exp $") + "$Id: tm-sgnus.el,v 7.55 1996/05/07 18:19:39 morioka Exp $") (defconst tm-gnus/version (concat (get-version-string tm-gnus/RCS-ID) " for September")) @@ -212,49 +212,6 @@ This variable is set to `gnus-show-mime'.") (setq gnus-decode-encoded-word-method (function tm-gnus/article-decode-encoded-word)) -;; (if (boundp 'MULE) -;; (progn -;; (define-service-coding-system gnus-nntp-service nil *noconv*) -;; (if (and (boundp 'nntp-server-process) -;; (processp nntp-server-process) -;; ) -;; (set-process-coding-system nntp-server-process *noconv* *noconv*) -;; ) -;; -;; (or (fboundp 'tm-gnus/original-request-article) -;; (fset 'tm-gnus/original-request-article -;; (symbol-function 'gnus-request-article)) -;; ) -;; -;; (defun gnus-request-article (article group &optional buffer) -;; (let ((file-coding-system-for-read *noconv*)) -;; (tm-gnus/original-request-article article group buffer) -;; )) -;; -;; (defun tm-gnus/nnheader-find-file-noselect (&rest args) -;; (let ((file-coding-system-for-read *noconv*)) -;; (apply (function find-file-noselect) args) -;; )) -;; (eval-after-load -;; "nnheader" -;; '(fset 'nnheader-find-file-noselect -;; 'tm-gnus/nnheader-find-file-noselect) -;; ) -;; -;; (defun tm-gnus/nnmail-get-new-mail (&rest args) -;; (let ((file-coding-system-for-read *noconv*)) -;; (apply (function tm-gnus/original-nnmail-get-new-mail) args) -;; )) -;; (eval-after-load -;; "nnmail" -;; '(progn (or (fboundp 'tm-gnus/original-nnmail-get-new-mail) -;; (fset 'tm-gnus/original-nnmail-get-new-mail -;; (symbol-function 'nnmail-get-new-mail)) -;; ) -;; (fset 'nnmail-get-new-mail 'tm-gnus/nnmail-get-new-mail) -;; )) -;; )) - ;;; @ for MULE ;;; @@ -268,8 +225,10 @@ This variable is set to `gnus-show-mime'.") cs)) (cond - ((boundp 'MULE) - (define-service-coding-system gnus-nntp-service nil *noconv*) + ((featurep 'mule) + (if (boundp 'MULE) + (define-service-coding-system gnus-nntp-service nil *noconv*) + ) (if (and (boundp 'nntp-server-process) (processp nntp-server-process) ) @@ -279,12 +238,12 @@ This variable is set to `gnus-show-mime'.") 'nnheader (lambda () (defun nnheader-find-file-noselect (filename &optional nowarn rawfile) - (let ((file-coding-system-for-read '*noconv*)) + (let ((file-coding-system-for-read *noconv*)) (find-file-noselect filename nowarn rawfile) )) (defun nnheader-insert-raw-file-contents (filename &optional visit beg end replace) - (let ((file-coding-system-for-read '*noconv*)) + (let ((file-coding-system-for-read *noconv*)) (insert-file-contents filename visit beg end replace) )) ;;(fset 'nnheader-raw-write-region 'si:write-region) @@ -294,21 +253,11 @@ This variable is set to `gnus-show-mime'.") ) (add-hook 'nnmail-prepare-save-mail-hook 'tm-gnus/prepare-save-mail-function) - ;; (add-hook 'nnmbox-prepare-save-mail-hook - ;; 'tm-gnus/prepare-save-mail-function) - ;; (add-hook 'nnbabyl-prepare-save-mail-hook - ;; 'tm-gnus/prepare-save-mail-function) - ;; (add-hook 'nnml-prepare-save-mail-hook - ;; 'tm-gnus/prepare-save-mail-function) - ;; (add-hook 'nnmh-prepare-save-mail-hook - ;; 'tm-gnus/prepare-save-mail-function) - ;; (add-hook 'nnfolder-prepare-save-mail-hook - ;; 'tm-gnus/prepare-save-mail-function) - (gnus-set-newsgroup-default-coding-system "alt.chinese.text" '*hz*) - (gnus-set-newsgroup-default-coding-system "alt.chinese.text.big5" '*big5*) - (gnus-set-newsgroup-default-coding-system "han" '*euc-kr*) - (gnus-set-newsgroup-default-coding-system "relcom" '*koi8*) + (gnus-set-newsgroup-default-coding-system "alt.chinese.text" *hz*) + (gnus-set-newsgroup-default-coding-system "alt.chinese.text.big5" *big5*) + (gnus-set-newsgroup-default-coding-system "han" *euc-kr*) + (gnus-set-newsgroup-default-coding-system "relcom" *koi8*) )) diff --git a/inst-tm b/inst-tm index d8763e5..027305e 100644 --- a/inst-tm +++ b/inst-tm @@ -1,6 +1,6 @@ ;;; -*-Emacs-Lisp-*- ;;; -;;; $Id: inst-tm,v 5.0 1996/04/21 19:43:46 morioka Exp morioka $ +;;; $Id: inst-tm,v 6.0 1996/05/05 11:14:38 morioka Exp $ ;;; (load-file "TM-CFG") @@ -80,24 +80,29 @@ (compile-el-files "mh-e/" tm-mh-e-modules) (compile-el-files "./" '("mime-setup")) (save-excursion - (set-buffer (get-buffer-create ".gnus-compile")) + (set-buffer (get-buffer-create TM_GNUS_COMPILE)) (let ((emacs (car command-line-args))) - (insert (format "cd gnus\nmake gnus EMACS=%s PWD=`pwd`\n" emacs)) + (insert (format "cd gnus\n%s gnus EMACS=%s PWD=`pwd`\n" MAKE emacs)) (cond ((string-match "XEmacs" emacs-version) - (insert (format "make sgnus EMACS=%s PWD=`pwd`\n" emacs)) + (insert (format "%s sgnus EMACS=%s PWD=`pwd`\n" MAKE emacs)) ) (t (cond ((<= emacs-major-version 18) - (insert (format "make gnus3 EMACS=%s PWD=`pwd`\n" emacs)) - (insert (format "make gnus4 EMACS=%s PWD=`pwd`\n" emacs)) + (insert (format "%s gnus3 EMACS=%s PWD=`pwd`\n" + MAKE emacs)) + (insert (format "%s gnus4 EMACS=%s PWD=`pwd`\n" + MAKE emacs)) ) ((< emacs-minor-version 30) - (insert (format "make gnus4 EMACS=%s PWD=`pwd`\n" emacs)) - (insert (format "make gnus5 EMACS=%s PWD=`pwd`\n" emacs)) + (insert (format "%s gnus4 EMACS=%s PWD=`pwd`\n" + MAKE emacs)) + (insert (format "%s gnus5 EMACS=%s PWD=`pwd`\n" + MAKE emacs)) ) (t - (insert (format "make sgnus EMACS=%s PWD=`pwd`\n" emacs)) + (insert (format "%s sgnus EMACS=%s PWD=`pwd`\n" + MAKE emacs)) ))))) - (write-file ".gnus-compile") + (write-file TM_GNUS_COMPILE) ) ) diff --git a/tm-edit.el b/tm-edit.el index 0b85027..df0383f 100644 --- a/tm-edit.el +++ b/tm-edit.el @@ -8,7 +8,7 @@ ;;; MORIOKA Tomohiko ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1994/08/21 renamed from mime.el -;;; Version: $Revision: 7.53 $ +;;; Version: $Revision: 7.56 $ ;;; Keywords: mail, news, MIME, multimedia, multilingual ;;; ;;; This file is part of tm (Tools for MIME). @@ -122,7 +122,7 @@ ;;; (defconst mime-editor/RCS-ID - "$Id: tm-edit.el,v 7.53 1996/04/29 01:52:53 morioka Exp $") + "$Id: tm-edit.el,v 7.56 1996/05/05 16:40:31 morioka Exp $") (defconst mime-editor/version (get-version-string mime-editor/RCS-ID)) @@ -1482,17 +1482,15 @@ while if FLAG is `\\^M' (control-M) the text is hidden." (mime-editor/sign-pgp-elkins bb eb boundary) ) ((eq mime-editor/signing-type 'pgp-kazu) - (mime-editor/process-pgp-kazu 'mc-sign - bb eb boundary) + (mime-editor/sign-pgp-kazu bb eb boundary) ) )) ((string= type "encrypted") - (cond ((eq mime-editor/signing-type 'pgp-elkins) + (cond ((eq mime-editor/encrypting-type 'pgp-elkins) (mime-editor/encrypt-pgp-elkins bb eb boundary) ) - ((eq mime-editor/signing-type 'pgp-kazu) - (mime-editor/process-pgp-kazu 'mc-encrypt - bb eb boundary) + ((eq mime-editor/encrypting-type 'pgp-kazu) + (mime-editor/encrypt-pgp-kazu bb eb boundary) ))) (t (setq boundary @@ -1506,14 +1504,17 @@ while if FLAG is `\\^M' (control-M) the text is hidden." )) boundary)))) + +(autoload 'mc-pgp-lookup-key "mc-pgp") +(autoload 'mc-pgp-sign-region "mc-pgp") +(autoload 'mc-pgp-encrypt-region "mc-pgp") + (defun tm:mc-pgp-generic-parser (result) (let ((ret (mc-pgp-generic-parser result))) (if (consp ret) (vector (car ret)(cdr ret)) ))) -(autoload 'mc-pgp-lookup-key "mc-pgp") - (defun tm:mc-process-region (beg end passwd program args parser &optional buffer boundary) (let ((obuf (current-buffer)) @@ -1650,8 +1651,6 @@ Content-Transfer-Encoding: 7bit ) )))) -(autoload 'mc-pgp-encrypt-region "mc-pgp") - (defun mime-editor/encrypt-pgp-elkins (beg end boundary) (save-excursion (save-restriction @@ -1715,7 +1714,7 @@ Content-Transfer-Encoding: 7bit (insert (format "\n--%s--\n" pgp-boundary)) ))))) -(defun mime-editor/process-pgp-kazu (type beg end boundary) +(defun mime-editor/sign-pgp-kazu (beg end boundary) (save-excursion (save-restriction (narrow-to-region beg end) @@ -1731,26 +1730,76 @@ Content-Transfer-Encoding: 7bit (insert (format "Content-Transfer-Encoding: %s\n" encoding)) ) (insert "\n") - (if (null - (progn - (goto-char beg) - (insert "=\n") - (prog1 - (let ((mail-header-separator "=")) - (call-interactively type) - ) - (goto-char beg) - (and (search-forward "=\n") - (replace-match "")) - ))) + (or (let ((program-coding-system-alist + (cons (cons (cons nil ".*pgp.*") + (cons *noconv* *noconv*)) + program-coding-system-alist)) + ) + (mc-pgp-sign-region beg (point-max)) + ) (throw 'mime-editor/error 'pgp-error) - ) + ) (goto-char beg) (insert "--[[application/pgp; format=mime][7bit]]\n") )) )) +(defun mime-editor/encrypt-pgp-kazu (beg end boundary) + (save-excursion + (let ((from (rfc822/get-field-body "From")) + (to (rfc822/get-field-body "To")) + (cc (rfc822/get-field-body "cc")) + recipients) + (save-restriction + (narrow-to-region beg end) + (let* ((ret + (mime-editor/translate-region beg end boundary)) + (ctype (car ret)) + (encoding (nth 1 ret)) + (parts (nth 3 ret)) + ) + (goto-char beg) + (if (and (stringp from) + (not (string-equal from ""))) + (insert (format "From: %s\n" from)) + ) + (if (and (stringp to) + (not (string-equal to ""))) + (progn + (insert (format "To: %s\n" to)) + (setq recipients to) + )) + (if (and (stringp cc) + (not (string-equal cc ""))) + (progn + (insert (format "cc: %s\n" cc)) + (if recipients + (setq recipients (concat recipients "," cc)) + (setq recipients cc) + ))) + (insert (format "Content-Type: %s\n" ctype)) + (if encoding + (insert (format "Content-Transfer-Encoding: %s\n" encoding)) + ) + (insert "\n") + (or (let ((program-coding-system-alist + (cons (cons (cons nil ".*pgp.*") + (cons *noconv* *noconv*)) + program-coding-system-alist)) + ) + (mc-pgp-encrypt-region + (mc-split "\\([ \t\n]*,[ \t\n]*\\)+" recipients) + beg (point-max)) + ) + (throw 'mime-editor/error 'pgp-error) + ) + (goto-char beg) + (insert + "--[[application/pgp; format=mime][7bit]]\n") + )) + ))) + (defun mime-editor/translate-body () "Encode the tagged MIME body in current buffer in MIME compliant message." (interactive) @@ -1911,13 +1960,26 @@ Content-Transfer-Encoding: 7bit ;; Define charset for text if necessary. (setq charset (or charset (mime-editor/choose-charset))) (mime-editor/define-charset charset) - (if (string-equal contype "text/x-rot13-47") - (save-excursion - (forward-line) - (set-mark (point)) - (goto-char (mime-editor/content-end)) - (tm:caesar-region) - )) + (cond ((string-equal contype "text/x-rot13-47") + (save-excursion + (forward-line) + (set-mark (point)) + (goto-char (mime-editor/content-end)) + (tm:caesar-region) + )) + ((string-equal contype "text/enriched") + (save-excursion + (let ((beg (progn + (forward-line) + (point))) + (end (mime-editor/content-end)) + ) + (enriched-encode beg end) + (goto-char beg) + (if (search-forward "\n\n") + (delete-region beg (match-end 0)) + ) + )))) ;; Point is now on current tag. ;; Define encoding and encode text if necessary. (if (null encoding) ;Encoding is not specified. diff --git a/tm-ew-e.el b/tm-ew-e.el index 4fceecd..a01fb90 100644 --- a/tm-ew-e.el +++ b/tm-ew-e.el @@ -6,7 +6,7 @@ ;;; Copyright (C) 1993 .. 1996 MORIOKA Tomohiko ;;; ;;; Author: MORIOKA Tomohiko -;;; Version: $Revision: 7.16 $ +;;; Version: $Revision: 7.17 $ ;;; Keywords: mail, news, MIME, RFC 1522, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -36,7 +36,7 @@ ;;; (defconst tm-ew-e/RCS-ID - "$Id: tm-ew-e.el,v 7.16 1996/04/24 11:30:54 morioka Exp $") + "$Id: tm-ew-e.el,v 7.17 1996/05/04 04:58:37 morioka Exp $") (defconst mime-eword/encoder-version (get-version-string tm-ew-e/RCS-ID)) @@ -288,12 +288,12 @@ (t (setq string (car rword)) (let* ((sl (length string)) - (p 0) + (p 0) np (str "") nstr) (while (and (< p len) (progn - (setq p (+ p (char-bytes (sref string p)))) - (setq nstr (substring string 0 p)) + (setq np (+ p (char-bytes (sref string p)))) + (setq nstr (substring string 0 np)) (setq ret (tm-eword::encoded-word-length (cons nstr (cdr rword)) )) @@ -301,7 +301,8 @@ (setq len (+ (car ret) column)) (<= len 76) )) - (setq str nstr)) + (setq str nstr + p np)) (if (string-equal str "") (setq string "\n " len 1) diff --git a/tm-rich.el b/tm-rich.el index e7c4857..447f61b 100644 --- a/tm-rich.el +++ b/tm-rich.el @@ -7,7 +7,7 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: tm-rich.el,v 7.4 1996/04/26 05:31:57 morioka Exp $ +;;; $Id: tm-rich.el,v 7.5 1996/05/07 06:28:36 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia, richtext, enriched ;;; ;;; This file is part of tm (Tools for MIME). @@ -30,15 +30,6 @@ (require 'tm-view) -(defvar tm-rich/richtext-module - (if (or running-emacs-19_29-or-later - running-xemacs-20 - (and running-xemacs (>= emacs-minor-version 14))) - 'richtext - 'tinyrich)) - -(require tm-rich/richtext-module) - ;;; @ content filters for tm-view ;;; diff --git a/tm-view.el b/tm-view.el index 2d7fb1c..d51fdec 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.56 $ +;;; Version: $Revision: 7.57 $ ;;; 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.56 1996/04/29 02:29:21 morioka Exp $") + "$Id: tm-view.el,v 7.57 1996/05/04 07:42:27 morioka Exp $") (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID)) (defconst mime/viewer-version mime-viewer/version) @@ -414,6 +414,8 @@ The compressed face will be piped to this command.") (or obuf (setq obuf (concat "*Preview-" (buffer-name the-buf) "*"))) (set-buffer (get-buffer-create obuf)) + (setq buffer-read-only nil) + (widen) (erase-buffer) (setq mime::preview/article-buffer the-buf) (setq mime::preview/original-major-mode mode)