From 91d6a91a5a2f50b196ff69c5485295b621a278bb Mon Sep 17 00:00:00 2001 From: morioka Date: Mon, 9 Mar 1998 18:25:25 +0000 Subject: [PATCH] tm 7.62. --- ChangeLog | 20 +++++++++++++++ Makefile | 2 +- TM-CFG | 2 +- tm-edit.el | 17 +++++------- tm-view.el | 84 +++++++++++++++++++++++++++++++----------------------------- 5 files changed, 72 insertions(+), 53 deletions(-) diff --git a/ChangeLog b/ChangeLog index 88e4ac0..ede4b94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +Fri May 17 07:59:40 1996 MORIOKA Tomohiko + + * tl: Version 7.25 was released. + * MEL: Version 4.7 was released. + * tm: Version 7.62 was released. + + * tm-view.el (mime-preview/insert-content-subject): New + implementation. + + (mime-preview/default-content-separator): renamed from + `mime-viewer/default-content-separator'. + +Thu May 16 00:44:26 1996 MORIOKA Tomohiko + + * tm-edit.el: Unused variable `mime-signature-file' was abolished. + (mime-editor/translate-hook): DOC string was modified. + (mime/editor-mode): DOC string was modified. + (mime-editor/insert-signature): DOC string was modified. + + Wed May 15 19:31:39 1996 MORIOKA Tomohiko * tl: Version 7.24 was released. diff --git a/Makefile b/Makefile index be7eb99..5284757 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.61.tar.gz +TARFILE = tm7.62.tar.gz elc: $(EMACS) $(FLAGS) -l inst-tm -f compile-tm diff --git a/TM-CFG b/TM-CFG index 6fd8052..f464042 100644 --- a/TM-CFG +++ b/TM-CFG @@ -44,7 +44,7 @@ ;; 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 "/lab/local") ;; Please specify tm package prefix [optional] (setq TM_PACKAGE_PREFIX "") diff --git a/tm-edit.el b/tm-edit.el index fbd49a4..7237d52 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.60 $ +;;; Version: $Revision: 7.61 $ ;;; 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.60 1996/05/12 17:13:39 morioka Exp $") + "$Id: tm-edit.el,v 7.61 1996/05/16 00:44:26 morioka Exp $") (defconst mime-editor/version (get-version-string mime-editor/RCS-ID)) @@ -133,8 +133,8 @@ (defvar mime-prefix "\C-c\C-x" "*Keymap prefix for MIME commands.") -(defvar mime-signature-file "~/.signature.rtf" - "*Signature file to be included as a part of a multipart message.") +;; (defvar mime-signature-file "~/.signature.rtf" +;; "*Signature file to be included as a part of a multipart message.") (defvar mime-ignore-preceding-spaces nil "*Ignore preceding white spaces if non-nil.") @@ -158,8 +158,7 @@ If non-nil, the text tag is not inserted unless something different.") (defvar mime-editor/translate-hook nil "*Hook called before translating into a MIME compliant message. -To insert a signature file specified by mime-signature-file -(`.signature.rtf' by default) automatically, call the function +To insert a signature file automatically, call the function `mime-editor/insert-signature' from this hook.") (defvar mime-editor/exit-hook nil @@ -718,10 +717,6 @@ User customizable variables (not documented all of them): mime-prefix Specifies a key prefix for MIME minor mode commands. - mime-signature-file - Specifies a signature file to be included as part of a multipart - message. - mime-ignore-preceding-spaces Preceding white spaces in a message body are ignored if non-nil. @@ -953,7 +948,7 @@ Charset is automatically obtained from the `mime/lc-charset-alist'." ))) (defun mime-editor/insert-signature (&optional arg) - "Insert a signature file specified by mime-signature-file." + "Insert a signature file." (interactive "P") (let ((signature-insert-hook (function diff --git a/tm-view.el b/tm-view.el index 319ff98..c9b2d5e 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.61 $ +;;; Version: $Revision: 7.62 $ ;;; 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.61 1996/05/15 16:52:21 morioka Exp $") + "$Id: tm-view.el,v 7.62 1996/05/17 07:59:40 morioka Exp $") (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID)) (defconst mime/viewer-version mime-viewer/version) @@ -200,42 +200,46 @@ Each elements are regexp of field-name. [tm-view.el]") (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 - (lambda (num) - (format "%s" (1+ num)) - )) - (reverse rcnum) ".") - "0")) - )) - (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) - ) - ))) + (let ((access-type (assoc "access-type" params)) + (charset (assoc "charset" params)) + (num (or (assoc-value "x-part-number" params) + (if (consp rcnum) + (mapconcat (function + (lambda (num) + (format "%s" (1+ num)) + )) + (reverse rcnum) ".") + "0")) + )) + (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)) + ) + (insert (format "[%s %s ([%s] %s:%s)]\n" num subj + access-type site dir)) + ))) + ) + (t + (insert (concat "[" num " " subj)) + (let ((rest + (if (setq charset (cdr charset)) + (if encoding + (format " <%s; %s (%s)>]\n" + ctype charset encoding) + (format " <%s; %s>]\n" ctype charset) + ) + (format " <%s>]\n" ctype) + ))) + (if (>= (+ (current-column)(length rest))(window-width)) + (setq rest (concat "\n\t" rest)) + ) + (insert rest) + )))) (tm:add-button (point-min)(1- (point-max)) (function mime-viewer/play-content)) )) @@ -298,7 +302,7 @@ Each elements are regexp of field-name. [tm-view.el]") ;;; @@ content separator ;;; -(defun mime-viewer/default-content-separator (rcnum cinfo ctype params subj) +(defun mime-preview/default-content-separator (rcnum cinfo ctype params subj) (if (and (not (mime-viewer/header-visible-p rcnum cinfo ctype)) (not (mime-viewer/body-visible-p rcnum cinfo ctype)) ) @@ -498,7 +502,7 @@ The compressed face will be piped to this command.") (mime-preview/insert-content-subject rcnum cinfo ctype params subj encoding) )) - (mime-viewer/default-content-separator rcnum cinfo ctype params subj) + (mime-preview/default-content-separator rcnum cinfo ctype params subj) (prog1 (progn (setq ne (point-max)) -- 1.7.10.4