From 769476d363d9780208eac36abd53939cff8819d6 Mon Sep 17 00:00:00 2001 From: morioka Date: Mon, 9 Mar 1998 07:57:05 +0000 Subject: [PATCH] tm 6.88. --- Changes-6.84-6.88.en | 217 ++++++++++++++++++++++++++++++++++++++++++++++++++ Changes-6.84-6.88.ja | 217 ++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 2 +- gnus/Makefile | 2 +- gnus/tm-gnus.el | 14 +++- mh-e/Makefile | 2 +- mh-e/tm-mh-e.el | 34 ++++++-- mk-tm | 6 +- tm-def.el | 67 +++++++++------- tm-rich.el | 41 ++++++++-- tm-view.el | 89 +++++++++++---------- 11 files changed, 600 insertions(+), 91 deletions(-) create mode 100644 Changes-6.84-6.88.en create mode 100644 Changes-6.84-6.88.ja diff --git a/Changes-6.84-6.88.en b/Changes-6.84-6.88.en new file mode 100644 index 0000000..dc82163 --- /dev/null +++ b/Changes-6.84-6.88.en @@ -0,0 +1,217 @@ +* tl + + Attached version 6.6.6. + + - emu is changed. + +tl/emu-18.el +---------------------------- +revision 6.0 +date: 1995/09/21 00:06:48; author: morioka; state: Exp; lines: +3 -1 +comment was modified. +---------------------------- +revision 5.0 +date: 1995/09/20 23:29:11; author: morioka; state: Exp; lines: +10 -2 +Variable `mouse-button-2' was created. +---------------------------- + +tl/emu-19.el +---------------------------- +revision 2.0 +date: 1995/09/21 00:10:55; author: morioka; state: Exp; lines: +3 -1 +comment was modified. +---------------------------- +revision 1.1 +date: 1995/09/20 23:31:30; author: morioka; state: Exp; +It was created as emu module for Emacs 19.*. +---------------------------- + +tl/emu-mule.el +---------------------------- +revision 6.3 +date: 1995/09/21 00:08:02; author: morioka; state: Exp; lines: +3 -1 +comment was modified. +---------------------------- +revision 6.2 +date: 1995/09/20 23:42:12; author: morioka; state: Exp; lines: +16 -3 +Function `tl:make-overlay', `tl:overlay-put', `tl:add-text-properties' +were defined. +---------------------------- + +tl/emu-nemacs.el +---------------------------- +revision 6.1 +date: 1995/09/21 00:07:24; author: morioka; state: Exp; lines: +3 -1 +comment was modified. +---------------------------- +revision 6.0 +date: 1995/09/20 23:38:29; author: morioka; state: Exp; lines: +30 -2 +Function `tl:make-overlay', + `tl:overlay-put', + `tl:add-text-properties', +and variable `mouse-button-2' and `tl:available-face-attribute-alist' +were defined. +---------------------------- + +tl/emu-orig.el +---------------------------- +revision 4.0 +date: 1995/09/21 00:09:37; author: morioka; state: Exp; lines: +3 -1 +comment was modified. +---------------------------- +revision 3.0 +date: 1995/09/20 23:45:23; author: morioka; state: Exp; lines: +18 -2 +(require 'emu-xemacs) for XEmacs, (require 'emu-19) for FSF original +Emacs 19. +---------------------------- + +tl/emu-xemacs.el +---------------------------- +revision 5.0 +date: 1995/09/21 00:08:50; author: morioka; state: Exp; lines: +4 -2 +comment was modified. +---------------------------- +revision 4.0 +date: 1995/09/20 23:35:02; author: morioka; state: Exp; lines: +35 -21 +Function `tl:set-text-properties', + `tl:add-text-properties', + `tl:make-overlay', + `tl:overlay-put', + `tl:overlay-buffer', + `tl:move-overlay', +and variable `mouse-button-2' were defined. +---------------------------- + +tl/emu.el +---------------------------- +revision 4.0 +date: 1995/09/21 00:05:57; author: morioka; state: Exp; lines: +10 -2 +comment was modified. +---------------------------- +revision 3.0 +date: 1995/09/20 23:46:38; author: morioka; state: Exp; lines: +1 -5 +(require 'emu-xemacs) was moved to emu-orig.el. +---------------------------- + + +* tm + +tm/tm-def.el +---------------------------- +revision 6.3 +date: 1995/09/21 00:12:52; author: morioka; state: Exp; lines: +2 -2 +comment was modified. +---------------------------- +revision 6.2 +date: 1995/09/20 23:53:54; author: morioka; state: Exp; lines: +39 -28 +Function `tm:set-face-region', + `tm:add-button', + `tm:button-dispatcher', +and variable `tm:button-face', `tm:mouse-face' were defined. +---------------------------- + +tm/tm-rich.el +---------------------------- +revision 6.14 +date: 1995/09/21 00:18:32; author: morioka; state: Exp; lines: +3 -3 +Function `mime-viewer/filter-text/enriched' was fixed to use function +`mime-viewer/default-code-convert-region'. +---------------------------- +revision 6.13 +date: 1995/09/21 00:14:07; author: morioka; state: Exp; lines: +2 -2 +comment was modified. +---------------------------- +revision 6.12 +date: 1995/09/20 19:48:26; author: morioka; state: Exp; lines: +19 -2 +comment was modified. +---------------------------- +revision 6.11 +date: 1995/09/20 19:34:15; author: morioka; state: Exp; lines: +15 -3 +Eric Ding said： +====================================================================== +if text/enriched mail is encoded with quoted-printable, tm-view +doesn't seem to be decoding it properly. +====================================================================== +I applied this patch. +---------------------------- + +tm/tm-view.el +---------------------------- +revision 6.88 +date: 1995/09/21 02:33:28; author: morioka; state: Exp; lines: +2 -2 +In function `mime-viewer/insert-content-subject', button does not +include new line. +---------------------------- +revision 6.87 +date: 1995/09/21 02:12:25; author: morioka; state: Exp; lines: +3 -1 +tm:add-button was set for announcement of message/partial. +---------------------------- +revision 6.86 +date: 1995/09/21 00:13:26; author: morioka; state: Exp; lines: +2 -2 +comment was modified. +---------------------------- +revision 6.85 +date: 1995/09/21 00:00:42; author: morioka; state: Exp; lines: +35 -34 +(1) In function `mime-viewer/insert-content-subject', button setting + was added. +(2) Setting of mouse-button-2 is modified to use variable + `mouse-button-2' and function `tm:button-dispatcher'. +---------------------------- +revision 6.84 +date: 1995/09/20 20:01:21; author: morioka; state: Exp; lines: +13 -7 +Setting for message/news was added. +---------------------------- + + +* tm/gnus + + Attached version 6.22.1. + +tm/gnus/tm-gnus.el +---------------------------- +revision 6.3 +date: 1995/09/21 02:59:55; author: morioka; state: Exp; lines: +10 -4 +September Gnus was supported. +---------------------------- + + +* tm/mh-e + + Attached version 6.32. + +tm/mh-e/tm-mh-e.el +---------------------------- +revision 6.32 +date: 1995/09/21 00:20:10; author: morioka; state: Exp; lines: +3 -3 +comment was modified. +---------------------------- +revision 6.31 +date: 1995/09/20 20:17:13; author: morioka; state: Exp; lines: +13 -4 +comment was modified. +---------------------------- +revision 6.30 +date: 1995/09/20 20:11:48; author: morioka; state: Exp; lines: +7 -2 +ARIURA 's mhl supporting patch was applied. +---------------------------- +revision 6.29 +date: 1995/09/20 19:25:17; author: morioka; state: Exp; lines: +7 -4 +In function `tm-mh-e/cite', + + (if (not (eq nil mime::article/preview-buffer)) + mime::article/preview-buffer + (current-buffer)) + +was rewrote to + + (or mime::article/preview-buffer (current-buffer)) +---------------------------- +revision 6.28 +date: 1995/09/20 19:14:48; author: morioka; state: Exp; lines: +6 -3 +Eric Ding said: +====================================================================== +in tm-mh-e/cite 6.25, there is an assumption that mh-reply is being +called from within mh-e, which is not always true (for instance, if +it's being used from within gnus). Here's the patch. +====================================================================== +I applied this patch. +---------------------------- diff --git a/Changes-6.84-6.88.ja b/Changes-6.84-6.88.ja new file mode 100644 index 0000000..d50e745 --- /dev/null +++ b/Changes-6.84-6.88.ja @@ -0,0 +1,217 @@ +* tl + + Version 6.6.6 を添付した。 + + - emu の構成を変更した。 + +tl/emu-18.el +---------------------------- +revision 6.0 +date: 1995/09/21 00:06:48; author: morioka; state: Exp; lines: +3 -1 +comment を修正した。 +---------------------------- +revision 5.0 +date: 1995/09/20 23:29:11; author: morioka; state: Exp; lines: +10 -2 +変数 mouse-button-2 を追加した。 +---------------------------- + +tl/emu-19.el +---------------------------- +revision 2.0 +date: 1995/09/21 00:10:55; author: morioka; state: Exp; lines: +3 -1 +comment を修正した。 +---------------------------- +revision 1.1 +date: 1995/09/20 23:31:30; author: morioka; state: Exp; +Emacs 19 系用の module として新設した。 +---------------------------- + +tl/emu-mule.el +---------------------------- +revision 6.3 +date: 1995/09/21 00:08:02; author: morioka; state: Exp; lines: +3 -1 +comment を修正した。 +---------------------------- +revision 6.2 +date: 1995/09/20 23:42:12; author: morioka; state: Exp; lines: +16 -3 +関数 tl:make-overlay, tl:overlay-put, tl:add-text-properties を定義し +た。 +---------------------------- + +tl/emu-nemacs.el +---------------------------- +revision 6.1 +date: 1995/09/21 00:07:24; author: morioka; state: Exp; lines: +3 -1 +comment を修正した。 +---------------------------- +revision 6.0 +date: 1995/09/20 23:38:29; author: morioka; state: Exp; lines: +30 -2 +関数 tl:make-overlay, + tl:overlay-put, + tl:add-text-properties, +および、変数 mouse-button-2, tl:available-face-attribute-alist を定義 +した。 +---------------------------- + +tl/emu-orig.el +---------------------------- +revision 4.0 +date: 1995/09/21 00:09:37; author: morioka; state: Exp; lines: +3 -1 +comment を修正した。 +---------------------------- +revision 3.0 +date: 1995/09/20 23:45:23; author: morioka; state: Exp; lines: +18 -2 +XEmacs の場合は emu-xemacs, FSF original Emacs 19 の場合は emu-19 を +require するようにした。 +---------------------------- + +tl/emu-xemacs.el +---------------------------- +revision 5.0 +date: 1995/09/21 00:08:50; author: morioka; state: Exp; lines: +4 -2 +comment を修正した。 +---------------------------- +revision 4.0 +date: 1995/09/20 23:35:02; author: morioka; state: Exp; lines: +35 -21 +関数 tl:set-text-properties, + tl:add-text-properties, + tl:make-overlay, + tl:overlay-put, + tl:overlay-buffer, + tl:move-overlay, +および、変数 mouse-button-2 を定義した。 +---------------------------- + +tl/emu.el +---------------------------- +revision 4.0 +date: 1995/09/21 00:05:57; author: morioka; state: Exp; lines: +10 -2 +comment を修正した。 +---------------------------- +revision 3.0 +date: 1995/09/20 23:46:38; author: morioka; state: Exp; lines: +1 -5 +emu-xemacs を require する部分を emu-orig.el に移した。 +---------------------------- + + +* tm + +tm/tm-def.el +---------------------------- +revision 6.3 +date: 1995/09/21 00:12:52; author: morioka; state: Exp; lines: +2 -2 +comment を修正した。 +---------------------------- +revision 6.2 +date: 1995/09/20 23:53:54; author: morioka; state: Exp; lines: +39 -28 +関数 tm:set-face-region, tm:add-button, tm:button-dispatcher, +および、変数 tm:button-face, tm:mouse-face を追加した。 +---------------------------- + +tm/tm-rich.el +---------------------------- +revision 6.14 +date: 1995/09/21 00:18:32; author: morioka; state: Exp; lines: +3 -3 +関数 mime-viewer/default-code-convert-region を使うように、関数 +mime-viewer/filter-text/enriched を修正した。 +---------------------------- +revision 6.13 +date: 1995/09/21 00:14:07; author: morioka; state: Exp; lines: +2 -2 +comment を修正した。 +---------------------------- +revision 6.12 +date: 1995/09/20 19:48:26; author: morioka; state: Exp; lines: +19 -2 +comment を修正した。 +---------------------------- +revision 6.11 +date: 1995/09/20 19:34:15; author: morioka; state: Exp; lines: +15 -3 +Eric Ding さん曰く： +====================================================================== +if text/enriched mail is encoded with quoted-printable, tm-view +doesn't seem to be decoding it properly. +====================================================================== +この patch を当てた。 +---------------------------- + +tm/tm-view.el +---------------------------- +revision 6.88 +date: 1995/09/21 02:33:28; author: morioka; state: Exp; lines: +2 -2 +関数 mime-viewer/insert-content-subject における button の範囲に改行が +含まれないようにした。 +---------------------------- +revision 6.87 +date: 1995/09/21 02:12:25; author: morioka; state: Exp; lines: +3 -1 +message/partial の announcement に対して tm:add-button の設定を行なっ +た。 +---------------------------- +revision 6.86 +date: 1995/09/21 00:13:26; author: morioka; state: Exp; lines: +2 -2 +comment を修正した。 +---------------------------- +revision 6.85 +date: 1995/09/21 00:00:42; author: morioka; state: Exp; lines: +35 -34 +(1) 関数 mime-viewer/insert-content-subject で button の設定を行なった。 +(2) mouse-button-2 の設定を変数 mouse-button-2 と関数 + tm:button-dispatcher を使うように修正した。 +---------------------------- +revision 6.84 +date: 1995/09/20 20:01:21; author: morioka; state: Exp; lines: +13 -7 +message/news 用の設定を行なった。 +---------------------------- + + +* tm/gnus + + Version 6.22.1 を添付した。 + +tm/gnus/tm-gnus.el +---------------------------- +revision 6.3 +date: 1995/09/21 02:59:55; author: morioka; state: Exp; lines: +10 -4 +September Gnus に対応した。 +---------------------------- + + +* tm/mh-e + + Version 6.32 を添付した。 + +tm/mh-e/tm-mh-e.el +---------------------------- +revision 6.32 +date: 1995/09/21 00:20:10; author: morioka; state: Exp; lines: +3 -3 +comment を修正した。 +---------------------------- +revision 6.31 +date: 1995/09/20 20:17:13; author: morioka; state: Exp; lines: +13 -4 +comment を修正した。 +---------------------------- +revision 6.30 +date: 1995/09/20 20:11:48; author: morioka; state: Exp; lines: +7 -2 +有浦 俊一郎 さんの mhl 対応 patch を当てた。 +---------------------------- +revision 6.29 +date: 1995/09/20 19:25:17; author: morioka; state: Exp; lines: +7 -4 +関数 tm-mh-e/cite において、 + + (if (not (eq nil mime::article/preview-buffer)) + mime::article/preview-buffer + (current-buffer)) + +を + + (or mime::article/preview-buffer (current-buffer)) + +に書き換えた。 +---------------------------- +revision 6.28 +date: 1995/09/20 19:14:48; author: morioka; state: Exp; lines: +6 -3 +Eric Ding さん曰く： +====================================================================== +in tm-mh-e/cite 6.25, there is an assumption that mh-reply is being +called from within mh-e, which is not always true (for instance, if +it's being used from within gnus). Here's the patch. +====================================================================== +この patch を当てた。 +---------------------------- diff --git a/Makefile b/Makefile index f546d4d..77bde7a 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,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 = tm6.83.tar +TARFILE = tm6.88.tar nemacs: diff --git a/gnus/Makefile b/gnus/Makefile index c3b86b5..8d576e7 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-gnus6.22.tar +TARFILE = tm-gnus6.22.1.tar gnus3: diff --git a/gnus/tm-gnus.el b/gnus/tm-gnus.el index d0836fc..59782c5 100644 --- a/gnus/tm-gnus.el +++ b/gnus/tm-gnus.el @@ -1,9 +1,15 @@ ;;; -;;; A MIME extension for GNUS +;;; tm-gnus.el --- MIME extension for GNUS ;;; -;;; by Morioka Tomohiko, 1993/11/20 +;;; Copyright (C) 1995 Free Software Foundation, Inc. +;;; Copyright (C) 1993,1994,1995 MORIOKA Tomohiko ;;; -;;; $Id: tm-gnus.el,v 6.2 1995/08/31 20:21:22 morioka Exp $ +;;; Author: Morioka Tomohiko +;;; Version: +;;; $Id: tm-gnus.el,v 6.3 1995/09/21 02:59:55 morioka Exp $ +;;; Keywords: news, MIME, multimedia, encoded-word, multilingual +;;; +;;; This file is part of tm (Tools for MIME). ;;; (require 'gnus) @@ -27,7 +33,7 @@ ((string-match "(ding)" gnus-version) (require 'tm-dgnus) ) - ((string-match "^Gnus v5" gnus-version) + ((string-match "^Gnus v5\\|^September Gnus" gnus-version) (require 'tm-gnus5) )) diff --git a/mh-e/Makefile b/mh-e/Makefile index 9dcdc23..843dacd 100644 --- a/mh-e/Makefile +++ b/mh-e/Makefile @@ -23,7 +23,7 @@ TMDIR19 = $(HOME)/lib/emacs19/lisp FILES = tm/mh-e/*.el tm/mh-e/Makefile tm/mh-e/mk-tmh tm/mh-e/*.ol -TARFILE = tm-mh-e6.27.tar +TARFILE = tm-mh-e6.32.tar elc: diff --git a/mh-e/tm-mh-e.el b/mh-e/tm-mh-e.el index feb5c23..287b5b0 100644 --- a/mh-e/tm-mh-e.el +++ b/mh-e/tm-mh-e.el @@ -1,9 +1,14 @@ ;;; -;;; A MIME extender for mh-e +;;; tm-mh-e.el --- MIME extender for mh-e ;;; -;;; by Morioka Tomohiko, 1993/11/21 +;;; Copyright (C) 1995 Free Software Foundation, Inc. +;;; Copyright (C) 1993,1994,1995 MORIOKA Tomohiko +;;; +;;; Author: MORIOKA Tomohiko +;;; Keywords: mail, MH, MIME, multimedia, encoded-word, multilingual +;;; +;;; This file is part of tm (Tools for MIME). ;;; - ;;; @ require modules ;;; @@ -21,7 +26,7 @@ ;;; (defconst tm-mh-e/RCS-ID - "$Id: tm-mh-e.el,v 6.27 1995/09/20 12:34:39 morioka Exp $") + "$Id: tm-mh-e.el,v 6.32 1995/09/21 00:20:10 morioka Exp $") (defconst tm-mh-e/version (get-version-string tm-mh-e/RCS-ID)) @@ -78,7 +83,16 @@ (invisible-headers mh-invisible-headers) (visible-headers mh-visible-headers) ) - (insert-file-contents msg-filename) + ;; 1995/9/21 + ;; modified by ARIURA + ;; to support mhl. + (if mhl-formfile + (mh-exec-lib-cmd-output "mhl" "-nobell" "-noclear" + (if (stringp mhl-formfile) + (list "-form" mhl-formfile)) + msg-filename) + (insert-file-contents msg-filename)) + ;; end (goto-char (point-min)) (cond (clean-message-header (mh-clean-msg-header (point-min) @@ -165,8 +179,14 @@ With arg, turn MIME processing on if arg is positive." (save-restriction (insert-buffer (save-window-excursion - (switch-to-buffer (concat "show-" mh-sent-from-folder)) - mime::article/preview-buffer)) + ;; 1995/9/21, + ;; modified by Eric Ding + ;; (c.f. tm-eng:104) + (set-buffer mh-sent-from-folder) + (set-buffer mh-show-buffer) + (or mime::article/preview-buffer (current-buffer)) + ;; end + )) (if (looking-at "^\\[.+\\(\n[ \t].+\\)*\\]\n") (replace-match "")) (narrow-to-region (point)(point-max)) diff --git a/mk-tm b/mk-tm index fbe0ff8..e5b08ed 100644 --- a/mk-tm +++ b/mk-tm @@ -30,7 +30,7 @@ )) '("signature" "tiny-mime" "tm-def" "tm-view" - "tm-latex" + "tm-latex" "tm-w3" "tm-rmail" "tm-comp" "tm-setup" "mime-setup" )) @@ -43,7 +43,7 @@ ) )) -(setq tm-uncompile-el-files '("tm-partial.el" "tm-w3.el")) +(setq tm-uncompile-el-files '("tm-partial.el")) (if (catch 'tag (let ((paths load-path) path) @@ -86,7 +86,7 @@ tm-modules)) (defun compile-tm () - (mapcar (function byte-compile-file) tm-el-files) + (mapcar (function byte-compile-file file) tm-el-files) ) (defconst el-file-mode (+ (* 64 6)(* 8 4) 4)) diff --git a/tm-def.el b/tm-def.el index 8a5e8d1..db57699 100644 --- a/tm-def.el +++ b/tm-def.el @@ -1,5 +1,15 @@ ;;; -;;; $Id: tm-def.el,v 6.1 1995/09/20 14:44:49 morioka Exp $ +;;; tm-def.el --- definition module for tm +;;; +;;; Copyright (C) 1995 Free Software Foundation, Inc. +;;; Copyright (C) 1995 MORIOKA Tomohiko +;;; +;;; Author: MORIOKA Tomohiko +;;; Version: +;;; $Id: tm-def.el,v 6.3 1995/09/21 00:12:52 morioka Exp $ +;;; Keywords: mail, news, MIME, multimedia, definition +;;; +;;; This file is part of tm (Tools for MIME). ;;; (require 'emu) @@ -28,33 +38,34 @@ (t (require 'tm-orig)) ) -(cond ((string-match "XEmacs\\|Lucid" emacs-version) - (defun tm:set-face-region (b e face) - (let ((overlay (make-extent b e))) - (set-extent-property overlay 'face face) - )) - ) - ((and (>= emacs-major-version 19) window-system) - (defun tm:set-face-region (b e face) - (let ((overlay (make-overlay b e))) - (overlay-put overlay 'face face) - )) - ) - ((and (boundp 'NEMACS) NEMACS) - (setq tm:available-face-attribute-alist - '((bold . inversed-region) - (italic . underlined-region) - (underline . underlined-region) - )) - (defun tm:set-face-region (beg end face) - (attribute-add-narrow-attribute - (cdr (assq face mime/available-face-attribute-alist)) - beg end)) - ) - (t - (defun tm:set-face-region (beg end sym) - ) - )) +(defun tm:set-face-region (b e face) + (let ((overlay (tl:make-overlay b e))) + (tl:overlay-put overlay 'face face) + )) + +(setq tm:button-face 'bold) +(setq tm:mouse-face 'highlight) + +(defun tm:add-button (from to func &optional data) + "Create a button between FROM and TO with callback FUNC and data DATA." + (and tm:button-face + (tl:overlay-put (tl:make-overlay from to) 'face tm:button-face)) + (tl:add-text-properties from to + (append (and tm:mouse-face + (list 'mouse-face tm:mouse-face)) + (list 'tm-callback func) + (and data (list 'tm-data data)) + )) + ) + +(defun tm:button-dispatcher (event) + "Select the button under point." + (interactive "e") + (mouse-set-point event) + (let ((func (get-text-property (point) 'tm-callback))) + (if func + (call-interactively func) + ))) ;;; @ definitions about MIME diff --git a/tm-rich.el b/tm-rich.el index 7827746..6968a31 100644 --- a/tm-rich.el +++ b/tm-rich.el @@ -1,7 +1,16 @@ ;;; -;;; $Id: tm-rich.el,v 6.10 1995/08/05 00:55:37 morioka Exp $ +;;; tm-rich.el --- text/enriched and text/richtext style +;;; richtext filter for tm-view ;;; -;;; by MORIOKA Tomohiko +;;; Copyright (C) 1995 Free Software Foundation, Inc. +;;; Copyright (C) 1994,1995 MORIOKA Tomohiko +;;; +;;; Author: MORIOKA Tomohiko +;;; Version: +;;; $Id: tm-rich.el,v 6.14 1995/09/21 00:18:32 morioka Exp $ +;;; Keywords: mail, news, MIME, multimedia, richtext, enriched +;;; +;;; This file is part of tm (Tools for MIME). ;;; (require 'tm-view) @@ -23,8 +32,18 @@ (let* ((mode mime::preview/original-major-mode) (m (assq mode mime-viewer/code-converter-alist)) (charset (assoc "charset" params)) - (beg (point-min)) + ;; 1995/9/21 + ;; modified by Eric Ding + ;; (c.f. tm-eng:105) + (beg (point-min)) (end (point-max)) ) + (cond ((string= encoding "quoted-printable") + (quoted-printable-decode-region beg end) + ) + ((string= encoding "base64") + (base64-decode-region beg end) + )) + ;; end (if (and m (fboundp (setq m (cdr m)))) (funcall m beg (point-max) charset encoding) (mime-viewer/default-code-convert-region beg (point-max) @@ -37,12 +56,22 @@ (let* ((mode mime::preview/original-major-mode) (m (assq mode mime-viewer/code-converter-alist)) (charset (assoc "charset" params)) - (beg (point-min)) + ;; 1995/9/21 + ;; modified by Eric Ding + ;; (c.f. tm-eng:105) + (beg (point-min)) (end (point-max)) ) + (cond ((string= encoding "quoted-printable") + (quoted-printable-decode-region beg end) + ) + ((string= encoding "base64") + (base64-decode-region beg end) + )) + ;; end (if (and m (fboundp (setq m (cdr m)))) (funcall m beg (point-max) charset encoding) - (mime/code-convert-region-to-emacs beg (point-max) - charset encoding) + (mime-viewer/default-code-convert-region beg (point-max) + charset encoding) ) (enriched-decode beg (point-max)) )) diff --git a/tm-view.el b/tm-view.el index 2678325..730e261 100644 --- a/tm-view.el +++ b/tm-view.el @@ -1,8 +1,14 @@ ;;; -;;; A MIME viewer for GNU Emacs +;;; tm-view.el --- interactive MIME viewer for GNU Emacs +;;; +;;; Copyright (C) 1995 Free Software Foundation, Inc. +;;; Copyright (C) 1994,1995 MORIOKA Tomohiko +;;; +;;; Author: MORIOKA Tomohiko +;;; Keywords: mail, news, MIME, multimedia +;;; +;;; This file is part of tm (Tools for MIME). ;;; -;;; by Morioka Tomohiko, 1994/07/13 -;;; ;;; @ require modules ;;; @@ -21,7 +27,7 @@ ;;; (defconst mime-viewer/RCS-ID - "$Id: tm-view.el,v 6.83 1995/09/20 14:19:42 morioka Exp $") + "$Id: tm-view.el,v 6.88 1995/09/21 02:33:28 morioka Exp $") (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID)) (defconst mime/viewer-version mime-viewer/version) @@ -73,14 +79,14 @@ ;; 'file '"access-type" '"name" '"site" '"directory")) ((type . "message/partial") (method . mime/decode-message/partial-region)) - ((type . "message/rfc822") - (method "tm-file" nil 'file 'type 'encoding 'mode 'name)) ((method "metamail" t "-m" "tm" "-x" "-d" "-z" "-e" 'file)(mode . "play")) + ((method "tm-file" nil 'file 'type 'encoding 'mode 'name) + (mode . "extract")) )) (defvar mime-viewer/childrens-header-showing-Content-Type-list - '("message/rfc822")) + '("message/rfc822" "message/news")) (defvar mime-viewer/default-showing-Content-Type-list '("text/plain" "text/richtext" "text/enriched" @@ -163,31 +169,36 @@ (defun mime-viewer/insert-content-subject (cnum cinfo ctype params subj) - (insert - (let ((access-type (assoc "access-type" params)) - (num (or (assoc-value "x-part-number" params) - (if (listp cnum) - (mapconcat (function - (lambda (num) - (format "%s" (+ num 1)) - )) - cnum ".") - "0")) - )) - (if access-type - (let ((server (assoc "server" params))) - (setq access-type (cdr access-type)) - (if server - (format "[%s %s ([%s] %s)]\n" num subj - access-type (cdr server)) - (let ((site (assoc-value "site" params)) - (dir (assoc-value "directory" params)) - ) - (format "[%s %s ([%s] %s:%s)]\n" num subj - access-type site dir) - ))) - (format "[%s %s (%s)]\n" num subj ctype) - )))) + (save-restriction + (narrow-to-region (point)(point)) + (insert + (let ((access-type (assoc "access-type" params)) + (num (or (assoc-value "x-part-number" params) + (if (listp cnum) + (mapconcat (function + (lambda (num) + (format "%s" (+ num 1)) + )) + cnum ".") + "0")) + )) + (if access-type + (let ((server (assoc "server" params))) + (setq access-type (cdr access-type)) + (if server + (format "[%s %s ([%s] %s)]\n" num subj + access-type (cdr server)) + (let ((site (assoc-value "site" params)) + (dir (assoc-value "directory" params)) + ) + (format "[%s %s ([%s] %s:%s)]\n" num subj + access-type site dir) + ))) + (format "[%s %s (%s)]\n" num subj ctype) + ))) + (tm:add-button (point-min)(1- (point-max)) + (function mime-viewer/play-content)) + )) (defun mime-viewer/default-content-subject-function (cnum cinfo ctype params subj) @@ -643,6 +654,8 @@ it is regarded as current-buffer. [tm-view]" (narrow-to-region be be) (insert mime-viewer/announcement-for-message/partial) + (tm:add-button (point-min)(point-max) + (function mime-viewer/play-content)) (setq ne (point-max)) ) (switch-to-buffer the-buf) @@ -994,14 +1007,10 @@ it is regarded as current-buffer. [tm-view]" "q" (function mime-viewer/quit)) (define-key mime/viewer-mode-map "\C-c\C-x" (function mime-viewer/kill-buffer)) - (cond ((string-match "XEmacs\\|Lucid" emacs-version) - (define-key mime/viewer-mode-map - 'button2 (function mime-viewer/play-content-mouse)) - ) - ((>= emacs-major-version 19) - (define-key mime/viewer-mode-map - [mouse-2] (function mime-viewer/play-content-mouse)) - )) + (if mouse-button-2 + (define-key mime/viewer-mode-map + mouse-button-2 (function tm:button-dispatcher)) + ) )) (defun mime/viewer-mode (&optional mother ctl encoding) -- 1.7.10.4