From: morioka Date: Mon, 9 Mar 1998 18:23:28 +0000 (+0000) Subject: tm 7.61. X-Git-Tag: tm7_61~1 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5ecf144fab194dcdc3c2e339bf7d992ddb0d380;p=elisp%2Ftm.git tm 7.61. --- diff --git a/ChangeLog b/ChangeLog index 71a3c40..88e4ac0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,39 @@ +Wed May 15 19:31:39 1996 MORIOKA Tomohiko + + * tl: Version 7.24 was released. + * tm: Version 7.61 was released. + * tm/mh-e: Version 7.61.1 was released. + + * doc/tm_ja.texi, doc/tm_en.texi: Address of the tm ML + administration was changed. + + * README.en: Address of the tm ML administration was changed. + +Wed May 15 16:52:21 1996 MORIOKA Tomohiko + + * tm-view.el (mime-preview/insert-content-subject): renamed from + `mime-viewer/insert-content-subject'; new argument `encoding'. + + (mime-preview/default-content-subject-function): renamed from + `mime-viewer/default-content-subject-function'; new argument + `encoding'. + + (mime-preview/content-subject-function): renamed from + `mime-viewer/content-subject-function'; new argument `encoding'. + + (mime-preview/display-message/partial): renamed from + `mime-viewer/display-message/partial'; abolish argument `obuf'; + initial buffer was changed to preview-buffer. + + (mime-preview/display-content): Variable + `mime-viewer/content-subject-function' was renamed to + `mime-preview/content-subject-function' and arguments was changed. + Function `mime-viewer/insert-content-subject' was renamed to + `mime-preview/insert-content-subject' and arguments was changed. + Function `mime-viewer/display-message/partial' was renamed to + `mime-preview/display-message/partial' and arguments was changed. + + Tue May 14 02:11:54 1996 MORIOKA Tomohiko * tl: Version 7.22.5 was released. diff --git a/Makefile b/Makefile index 0838a62..be7eb99 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.60.tar.gz +TARFILE = tm7.61.tar.gz elc: $(EMACS) $(FLAGS) -l inst-tm -f compile-tm diff --git a/README.en b/README.en index cd440e5..73597ee 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.19 1996/05/08 15:25:04 morioka Exp $ +$Id: README.en,v 7.20 1996/05/15 19:28:24 morioka Exp $ 1 What's tm? @@ -327,8 +327,8 @@ Via tm ML, You can report bugs of tm, obtain the latest release of tm package, and discuss the future enhancements to tm. To join tm ML, send a mail to - tm-admin@chamonix.jaist.ac.jp (Japanese or English) - tm-eng-admin@chamonix.jaist.ac.jp (English) + tm-ja-admin@chamonix.jaist.ac.jp (Japanese) + tm-en-admin@chamonix.jaist.ac.jp (English) Since the user registration is manually done, please write the mail body in human-recognizable language (^_^). diff --git a/doc/tm_en.texi b/doc/tm_en.texi index a03933a..2bea890 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.15 1996/05/08 12:42:01 morioka Exp $} +@code{$Id: tm_en.texi,v 7.17 1996/05/15 19:31:39 morioka Exp morioka $} @end titlepage @@ -77,14 +77,6 @@ The tm package includes the modules listed below. @item @strong{mime-setup:} MIME setup module @end itemize -@menu -* tm-view:: -* tm-mh-e:(tm-mh-e_en.info). -* tm-gnus:(tm-gnus_en.info). -* tm-rmail:(tm-rmail_en.info). -* tm-vm:(tm-vm_en.info). -@end menu - @node Emacs Versions, Setting, Introduction, Top @comment node-name, next, previous, up @@ -363,13 +355,13 @@ package, and discuss the future enhancements to tm. To join tm ML, send a mail to @itemize @bullet -@item Japanese or English +@item Japanese - + @item English - + @end itemize Since the user registration is manually done, please write diff --git a/doc/tm_ja.texi b/doc/tm_ja.texi index 3c2f124..7628604 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.11 1996/05/08 12:30:47 morioka Exp morioka $} +@code{$Id: tm_ja.texi,v 7.12 1996/05/15 19:30:13 morioka Exp morioka $} @end titlepage @@ -355,13 +355,13 @@ tm ML ¹Ô¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£tm ML ¤Ë»²²Ã¤·¤¿¤¤Êý¤Ï @itemize @bullet -@item Japanese or English +@item ÆüËܸì - + -@item English +@item ±Ñ¸ì - + @end itemize ¤Þ¤Ç mail ¤òÁ÷¤Ã¤Æ²¼¤µ¤¤¡£ÅÐÏ¿¤Ï¼êÆ°¤Ç¤¹¤Î¤Ç¡¢¤Ç¤­¤ì¤Ð¡¢¼«Á³¸À¸ì¤Ç½ñ¤¤ diff --git a/mh-e/ChangeLog b/mh-e/ChangeLog index 9972222..e5c3b27 100644 --- a/mh-e/ChangeLog +++ b/mh-e/ChangeLog @@ -1,3 +1,15 @@ +Wed May 15 15:39:54 1996 MORIOKA Tomohiko + + * tm/mh-e: Version 7.61.1 was released. + + * tmh-comp.el (tm-mh-e/forward): use function + `mime-eword/decode-string' for `orig-from' and `orig-subject'. + + * tmh-comp.el (tm-mh-e/forward): remove `(require 'tm-edit)'. + + * tmh-comp.el (tm-mh-e/forward): remove `(require 'mh-comp)'. + + Sat May 11 16:24:52 1996 MORIOKA Tomohiko * tm/mh-e: Version 7.61 was released. diff --git a/mh-e/Makefile b/mh-e/Makefile index e52de8d..c3ddc5a 100644 --- a/mh-e/Makefile +++ b/mh-e/Makefile @@ -24,7 +24,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-e7.61.tar +TARFILE = tm-mh-e7.61.1.tar elc: diff --git a/mh-e/tmh-comp.el b/mh-e/tmh-comp.el index 4e4d446..4309a14 100644 --- a/mh-e/tmh-comp.el +++ b/mh-e/tmh-comp.el @@ -10,7 +10,7 @@ ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1996/2/29 (separated from tm-mh-e.el) ;;; Version: -;;; $Id: tmh-comp.el,v 4.0 1996/04/25 15:38:16 morioka Exp $ +;;; $Id: tmh-comp.el,v 7.0 1996/05/15 15:39:54 morioka Exp $ ;;; Keywords: mail, MH, MIME, multimedia, encoded-word, multilingual ;;; ;;; This file is part of tm (Tools for MIME). @@ -298,14 +298,12 @@ gives the headers to clean out of the original message." Defaults to displayed message. If optional prefix argument provided, then prompt for the message sequence. See also documentation for `\\[mh-send]' function." - (interactive (progn - (require 'mh-comp) - (list (mh-read-address "To: ") - (mh-read-address "Cc: ") - (if current-prefix-arg - (mh-read-seq-default "Forward" t) - (mh-get-msg-num t) - )))) + (interactive (list (mh-read-address "To: ") + (mh-read-address "Cc: ") + (if current-prefix-arg + (mh-read-seq-default "Forward" t) + (mh-get-msg-num t) + ))) (or msg-or-seq (setq msg-or-seq (mh-get-msg-num t))) (let* ((folder mh-current-folder) @@ -325,7 +323,6 @@ then prompt for the message sequence. See also documentation for (set-buffer-modified-p nil))) (t (mh-read-draft "" draft-name nil))))) - (require 'tm-edit) (let ((msubtype "digest") orig-from orig-subject multipart-flag (tag-regexp @@ -374,8 +371,11 @@ then prompt for the message sequence. See also documentation for (forward-line 1) (save-restriction (narrow-to-region (point) (point-max)) - (setq orig-from (mh-get-header-field "From:")) - (setq orig-subject (mh-get-header-field "Subject:"))) + (setq orig-from (mime-eword/decode-string + (mh-get-header-field "From:"))) + (setq orig-subject (mime-eword/decode-string + (mh-get-header-field "Subject:"))) + ) (let ((forw-subject (mh-forwarded-letter-subject orig-from orig-subject))) (mh-insert-fields "Subject:" forw-subject) diff --git a/tm-view.el b/tm-view.el index 84f75d8..319ff98 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.60 $ +;;; Version: $Revision: 7.61 $ ;;; Keywords: mail, news, MIME, multimedia ;;; ;;; This file is part of tm (Tools for MIME). @@ -45,7 +45,7 @@ ;;; (defconst mime-viewer/RCS-ID - "$Id: tm-view.el,v 7.60 1996/05/14 02:11:54 morioka Exp $") + "$Id: tm-view.el,v 7.61 1996/05/15 16:52:21 morioka Exp $") (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID)) (defconst mime/viewer-version mime-viewer/version) @@ -196,12 +196,13 @@ Each elements are regexp of field-name. [tm-view.el]") ;;; @@ content subject ;;; -(defun mime-viewer/insert-content-subject - (rcnum cinfo ctype params subj) +(defun mime-preview/insert-content-subject + (rcnum cinfo ctype params subj encoding) (save-restriction (narrow-to-region (point)(point)) (insert (let ((access-type (assoc "access-type" params)) + (charset (assoc "charset" params)) (num (or (assoc-value "x-part-number" params) (if (consp rcnum) (mapconcat (function @@ -211,36 +212,46 @@ Each elements are regexp of field-name. [tm-view.el]") (reverse rcnum) ".") "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) - ))) + (cond (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) + ))) + ) + ((setq charset (cdr charset)) + (if encoding + (format "[%s %s (%s; %s <%s>)]\n" + num subj ctype charset encoding) + (format "[%s %s (%s; %s)]\n" num subj ctype charset) + ) + ) + (t + (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 - (rcnum cinfo ctype params subj) +(defun mime-preview/default-content-subject-function + (rcnum cinfo ctype params subj encoding) (if (and (consp rcnum) (not (member ctype mime-viewer/content-subject-omitting-Content-Type-list))) - (mime-viewer/insert-content-subject - rcnum cinfo ctype params subj) + (mime-preview/insert-content-subject + rcnum cinfo ctype params subj encoding) )) -(defvar mime-viewer/content-subject-function - (function mime-viewer/default-content-subject-function)) +(defvar mime-preview/content-subject-function + (function mime-preview/default-content-subject-function)) ;;; @@ content header filter @@ -460,8 +471,8 @@ The compressed face will be piped to this command.") (set-buffer obuf) (setq nb (point)) (narrow-to-region nb nb) - (funcall mime-viewer/content-subject-function - rcnum cinfo ctype params subj) + (funcall mime-preview/content-subject-function + rcnum cinfo ctype params subj encoding) (if (mime-viewer/header-visible-p rcnum cinfo ctype) (mime-preview/display-header beg he) ) @@ -470,21 +481,22 @@ The compressed face will be piped to this command.") ctype mime-viewer/content-subject-showing-Content-Type-list)) (save-excursion (goto-char (point-max)) - (mime-viewer/insert-content-subject rcnum cinfo ctype params subj) + (mime-preview/insert-content-subject + rcnum cinfo ctype params subj encoding) )) (cond ((mime-viewer/body-visible-p rcnum cinfo ctype) (mime-preview/display-body he end rcnum cinfo ctype params subj encoding) ) ((equal ctype "message/partial") - (set-buffer ibuf) - (mime-viewer/display-message/partial obuf) + (mime-preview/display-message/partial) ) ((and (null rcnum) (null (mime::content-info/children cinfo)) ) (goto-char (point-max)) - (mime-viewer/insert-content-subject rcnum cinfo ctype params subj) + (mime-preview/insert-content-subject + rcnum cinfo ctype params subj encoding) )) (mime-viewer/default-content-separator rcnum cinfo ctype params subj) (prog1 @@ -521,8 +533,7 @@ The compressed face will be piped to this command.") ) ))) -(defun mime-viewer/display-message/partial (obuf) - (set-buffer obuf) +(defun mime-preview/display-message/partial () (save-restriction (goto-char (point-max)) (if (not (search-backward "\n\n" nil t))