tm 7.60.

diff --git a/ChangeLog b/ChangeLog
index d794159..71a3c40 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+Tue May 14 02:11:54 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * tl: Version 7.22.5 was released.
+       * MEL: Version 4.6 was released.
+       * tm: Version 7.60 was released.
+
+       * tm-view.el (mime-preview/display-body): renamed from
+       `mime-viewer/display-body'; abolish argument `obuf'; initial
+       buffer was changed to preview-buffer.
+
+       (mime-preview/display-content): Function
+       `mime-viewer/display-body' was renamed to
+       `mime-preview/display-body'.
+
+Sun May 12 17:13:39 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-edit.el (mime-editor::edit-again): fixed to use function
+       `character-decode-region' instead of `decode-coding-region'.
+
+\f
 Sat May 11 16:23:16 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * tl: Version 7.22.4 was released.

diff --git a/Makefile b/Makefile
index 189cdc8..0838a62 100644 (file)
--- 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.59.tar.gz
+TARFILE = tm7.60.tar.gz
 
 elc:
        $(EMACS) $(FLAGS) -l inst-tm -f compile-tm

diff --git a/tm-edit.el b/tm-edit.el
index be28d3e..fbd49a4 100644 (file)
--- a/tm-edit.el
+++ b/tm-edit.el
@@ -8,7 +8,7 @@
 ;;;         MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Created: 1994/08/21 renamed from mime.el
-;;; Version: $Revision: 7.59 $
+;;; Version: $Revision: 7.60 $
 ;;; 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.59 1996/05/09 18:40:11 morioka Exp $")
+  "$Id: tm-edit.el,v 7.60 1996/05/12 17:13:39 morioka Exp $")
 
 (defconst mime-editor/version (get-version-string mime-editor/RCS-ID))
 
@@ -2671,8 +2671,8 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
                    ))
                ))))
        (if code-conversion
-           (decode-coding-region (point-min) (point-max)
-                                 mime/default-coding-system)
+           (character-decode-region (point-min) (point-max)
+                                    mime/default-coding-system)
          )
        ))))
 

diff --git a/tm-view.el b/tm-view.el
index 9c88f3a..84f75d8 100644 (file)
--- a/tm-view.el
+++ b/tm-view.el
@@ -8,7 +8,7 @@
 ;;; modified by Steven L. Baur <steve@miranova.com>
 ;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Created: 1994/7/13 (1994/8/31 obsolete tm-body.el)
-;;; Version: $Revision: 7.59 $
+;;; Version: $Revision: 7.60 $
 ;;; 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.59 1996/05/11 16:23:16 morioka Exp $")
+  "$Id: tm-view.el,v 7.60 1996/05/14 02:11:54 morioka Exp $")
 
 (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID))
 (defconst mime/viewer-version mime-viewer/version)
@@ -465,31 +465,27 @@ The compressed face will be piped to this command.")
     (if (mime-viewer/header-visible-p rcnum cinfo ctype)
        (mime-preview/display-header beg he)
       )
-    (set-buffer ibuf)
     (if (and (null rcnum)
             (member
              ctype mime-viewer/content-subject-showing-Content-Type-list))
        (save-excursion
-         (set-buffer obuf)
          (goto-char (point-max))
          (mime-viewer/insert-content-subject rcnum cinfo ctype params subj)
          ))
     (cond ((mime-viewer/body-visible-p rcnum cinfo ctype)
-          (mime-viewer/display-body he end obuf
-                                    rcnum cinfo ctype params subj encoding)
+          (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)
           )
          ((and (null rcnum)
                (null (mime::content-info/children cinfo))
                )
-          (set-buffer obuf)
           (goto-char (point-max))
           (mime-viewer/insert-content-subject rcnum cinfo ctype params subj)
-          )
-         (t (set-buffer obuf))
-         )
+          ))
     (mime-viewer/default-content-separator rcnum cinfo ctype params subj)
     (prog1
        (progn
@@ -513,20 +509,17 @@ The compressed face will be piped to this command.")
     (run-hooks 'mime-viewer/content-header-filter-hook)
     ))
 
-(defun mime-viewer/display-body (beg end obuf
-                                    rcnum cinfo ctype params subj encoding)
-  (let ((str (buffer-substring beg end))
-       be)
-    (set-buffer obuf)
-    (save-restriction
-      (setq be (point-max))
-      (narrow-to-region be be)
-      (insert str)
-      (let ((f (cdr (or (assoc ctype mime-viewer/content-filter-alist)
-                       (assq t mime-viewer/content-filter-alist)))))
-       (and (functionp f)
-            (funcall f ctype params encoding)
-            )))))
+(defun mime-preview/display-body (beg end
+                                     rcnum cinfo ctype params subj encoding)
+  (save-restriction
+    (narrow-to-region (point-max)(point-max))
+    (insert-buffer-substring mime::preview/article-buffer beg end)
+    (let ((f (cdr (or (assoc ctype mime-viewer/content-filter-alist)
+                     (assq t mime-viewer/content-filter-alist)))))
+      (and (functionp f)
+          (funcall f ctype params encoding)
+          )
+      )))
 
 (defun mime-viewer/display-message/partial (obuf)
   (set-buffer obuf)