From c0dd99f6d6c0859b053415e185dbc322a54a7839 Mon Sep 17 00:00:00 2001 From: morioka Date: Tue, 10 Mar 1998 17:55:30 +0000 Subject: [PATCH] tm 7.106. --- ChangeLog | 21 +++++++++++++++++++++ Makefile | 5 +++-- tm-edit.el | 25 +++++++++++++------------ tm-file.el | 16 +++------------- tm-play.el | 15 +++++++-------- 5 files changed, 47 insertions(+), 35 deletions(-) diff --git a/ChangeLog b/ChangeLog index e4325b3..2a6a4af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +1997-03-22 MORIOKA Tomohiko + + * emu: Version 7.40.1 was released. + * MU: Version 0.40.2 was released. + * MEL: Version 6.3 was released. + * tm: Version 7.106 was released. + * tm-mh-e: Version 7.73.3 was released. + * tm-vm: Version 8.10 was released. + +Thu Mar 20 07:20:15 1997 MORIOKA Tomohiko + + * tm-edit.el (mime-editor/translate-single-part-tag): modified. + +Wed Mar 12 14:26:55 1997 MORIOKA Tomohiko + + * tm-play.el: modified for XEmacs 20.1 b6. + + * tm-file.el (mime-article/extract-file): Use macro + `as-binary-output-file'. + + 1997-03-10 MORIOKA Tomohiko * emu: Version 7.40 was released. diff --git a/Makefile b/Makefile index 0ae3576..2026df4 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # $Id: Makefile,v 7.45 1997/01/10 15:42:29 morioka Exp morioka $ # -VERSION = 7.105.2 +VERSION = 7.106 SHELL = /bin/sh MAKE = make @@ -61,7 +61,8 @@ TM_VM_FILES = tm-vm/TM-VM-ELS tm-vm/*.el tm-vm/*.texi tm-vm/*.info \ TM_MUA_FILES = $(TM_MH_E_FILES) $(GNUS_MIME_FILES) $(TM_GNUS_FILES) \ $(TM_MAIL_FILES) $(TM_VM_FILES) -MEL_FILES = mel/*.el mel/Makefile mel/mk-mel mel/MEL-ELS mel/ChangeLog +MEL_FILES = mel/Makefile mel/MEL-MK mel/MEL-CFG mel/MEL-ELS \ + mel/*.el mel/ChangeLog MU_FILES = mu/MU-ELS mu/*.el mu/ChangeLog diff --git a/tm-edit.el b/tm-edit.el index 3ac3aff..fc4ceb7 100644 --- a/tm-edit.el +++ b/tm-edit.el @@ -6,7 +6,7 @@ ;; MORIOKA Tomohiko ;; Maintainer: MORIOKA Tomohiko ;; Created: 1994/08/21 renamed from mime.el -;; Version: $Revision: 7.105 $ +;; Version: $Revision: 7.106 $ ;; Keywords: mail, news, MIME, multimedia, multilingual ;; This file is part of tm (Tools for MIME). @@ -120,7 +120,7 @@ ;;; (defconst mime-editor/RCS-ID - "$Id: tm-edit.el,v 7.105 1997/02/13 14:29:14 morioka Exp $") + "$Id: tm-edit.el,v 7.106 1997/03/20 07:20:15 morioka Exp $") (defconst mime-editor/version (get-version-string mime-editor/RCS-ID)) @@ -1760,16 +1760,17 @@ Content-Transfer-Encoding: 7bit (tag (buffer-substring beg end)) ) (delete-region beg end) - (setq contype (mime-editor/get-contype tag)) - (setq encoding (mime-editor/get-encoding tag)) - (insert (concat prefix "--" boundary "\n")) - (save-restriction - (narrow-to-region (point)(point)) - (insert "Content-Type: " contype "\n") - (if encoding - (insert "Content-Transfer-Encoding: " encoding "\n")) - (mime/encode-message-header) - ) + (let ((contype (mime-editor/get-contype tag)) + (encoding (mime-editor/get-encoding tag)) + ) + (insert (concat prefix "--" boundary "\n")) + (save-restriction + (narrow-to-region (point)(point)) + (insert "Content-Type: " contype "\n") + (if encoding + (insert "Content-Transfer-Encoding: " encoding "\n")) + (mime/encode-message-header) + )) t))) (defun mime-editor/translate-region (beg end &optional boundary multipart) diff --git a/tm-file.el b/tm-file.el index 7801ca7..17de358 100644 --- a/tm-file.el +++ b/tm-file.el @@ -1,10 +1,10 @@ ;;; tm-file.el --- tm-view internal method for file extraction -;; Copyright (C) 1995,1996 Free Software Foundation, Inc. +;; Copyright (C) 1995,1996,1997 Free Software Foundation, Inc. ;; Author: MORIOKA Tomohiko ;; modified by Shuhei KOBAYASHI -;; Version: $Id: tm-file.el,v 7.8 1996/09/23 13:16:56 morioka Exp $ +;; Version: $Id: tm-file.el,v 7.10 1997/03/12 14:21:10 morioka Exp $ ;; Keywords: mail, news, MIME, multimedia, file, extract ;; This file is part of tm (Tools for MIME). @@ -60,17 +60,7 @@ (save-excursion (set-buffer tmp-buf) (mime-decode-region (point-min)(point-max) encoding) - (let ((coding-system-for-write 'no-conversion) - (mc-flag nil) ; for Mule - (file-coding-system - (if (featurep 'mule) *noconv*)) - kanji-flag ; for NEmacs - (emx-binary-mode t) ; for OS/2 - jka-compr-compression-info-list ; for jka-compr - jam-zcat-filename-list ; for jam-zcat - require-final-newline) - (write-file filename) - ) + (as-binary-output-file (write-file filename)) (kill-buffer tmp-buf) ))) diff --git a/tm-play.el b/tm-play.el index 4dd054e..a1366d7 100644 --- a/tm-play.el +++ b/tm-play.el @@ -4,7 +4,7 @@ ;; Author: MORIOKA Tomohiko ;; Created: 1995/9/26 (separated from tm-view.el) -;; Version: $Id: tm-play.el,v 7.42 1997/02/06 17:31:09 morioka Exp $ +;; Version: $Id: tm-play.el,v 7.43 1997/03/12 14:26:55 morioka Exp $ ;; Keywords: mail, news, MIME, multimedia ;; This file is part of tm (Tools for MIME). @@ -273,9 +273,9 @@ (cons t (mime-charset-to-coding-system default-mime-charset)) )) -(cond (running-mule-merged-emacs +(cond ((boundp 'MULE) ; for MULE 2.3 or older (defun mime-article::write-region (start end file) - (let ((coding-system-for-write + (let ((file-coding-system (cdr (or (assq major-mode mime-article/coding-system-alist) (assq t mime-article/coding-system-alist) @@ -283,10 +283,9 @@ (write-region start end file) )) ) - ((or (boundp 'MULE) - running-xemacs-with-mule) + ((featurep 'mule) ; for Emacs/mule and XEmacs/mule (defun mime-article::write-region (start end file) - (let ((file-coding-system + (let ((coding-system-for-write (cdr (or (assq major-mode mime-article/coding-system-alist) (assq t mime-article/coding-system-alist) @@ -294,7 +293,7 @@ (write-region start end file) )) ) - ((boundp 'NEMACS) + ((boundp 'NEMACS) ; for NEmacs (defun mime-article::write-region (start end file) (let ((kanji-fileio-code (cdr @@ -304,7 +303,7 @@ (write-region start end file) )) ) - (t + (t ; for Emacs 19 or older and XEmacs without mule (defalias 'mime-article::write-region 'write-region) )) -- 1.7.10.4