From 70061cd3b20d164db66fed000c40db6fc6c2e34e Mon Sep 17 00:00:00 2001
From: morioka <morioka>
Date: Mon, 9 Mar 1998 15:51:55 +0000
Subject: [PATCH] tm 7.44.1.

---
 ChangeLog   |   12 ++++++++++++
 Makefile    |    2 +-
 tm-image.el |   19 ++++++++++++++++---
 tm-vm.el    |   17 ++++++++++++++---
 4 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 04c22ef..1901952 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Fri Feb 23 22:00:46 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
+
+	* tm-vm.el (tm-vm/preview-current-message): widen all headers
+ 	before call `mime/viewer-mode'.
+
+	* tm-image.el (mime-viewer/use-highlight-headers):
+	New variable for XEmacs.
+	(mime-preview/x-face-function-use-highlight-headers):
+	New function.
+	(mime-preview/x-face-function): Default value was changed.
+
+
 Sat Feb 23 17:55:12 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
 
 	* tl: Version 7.11.2 was released.
diff --git a/Makefile b/Makefile
index fcddd82..f09d7f1 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ TL_FILES = tl/README.en tl/Makefile tl/mk-tl tl/*.el tl/doc/*.texi \
 
 FILES	= $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(TL_FILES)
 
-TARFILE = tm7.44.tar.gz
+TARFILE = tm7.44.1.tar.gz
 
 
 18:
diff --git a/tm-image.el b/tm-image.el
index 4772248..5f50a18 100644
--- a/tm-image.el
+++ b/tm-image.el
@@ -8,7 +8,7 @@
 ;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Created: 1995/12/15
 ;;; Version:
-;;;	$Id: tm-image.el,v 4.6 1996/02/13 17:56:43 morioka Exp $
+;;;	$Id: tm-image.el,v 4.7 1996/02/23 21:58:10 morioka Exp $
 ;;;
 ;;; Keywords: mail, news, MIME, multimedia, image, picture
 ;;;
@@ -71,9 +71,18 @@
 		    ))
 	   (make-annotation gl (point) 'text)
 	   ))
-       
+
+       (defvar mime-viewer/use-highlight-headers t)
+
        (defvar mime-preview/x-face-function
-	 (function mime-preview/x-face-function-for-xemacs))
+	 (if (and mime-viewer/use-highlight-headers
+		  (progn
+		    (require 'highlight-headers)
+		    highlight-headers-hack-x-face-p
+		    ))
+	     (function mime-preview/x-face-function-use-highlight-headers)
+	   (function mime-preview/x-face-function-for-xemacs)
+	   ))
        )
       ((boundp 'MULE)
        (require 'bitmap)
@@ -102,6 +111,10 @@
 (add-hook 'mime-viewer/content-header-filter-hook
 	  mime-preview/x-face-function)
 
+(defun mime-preview/x-face-function-use-highlight-headers ()
+  (highlight-headers (point-min) (re-search-forward "^$" nil t) t)
+  )
+
 (defun mime-preview/x-face-function-for-xemacs ()
   (save-restriction
     (narrow-to-region (point-min) (re-search-forward "^$" nil t))
diff --git a/tm-vm.el b/tm-vm.el
index aaee439..e99e644 100644
--- a/tm-vm.el
+++ b/tm-vm.el
@@ -14,7 +14,7 @@
 ;;;         and ISHIHARA Akito <aki@bpel.tutics.tut.ac.jp>
 ;;; Maintainer: Shuhei KOBAYASHI <shuhei@cmpt01.phys.tohoku.ac.jp>
 ;;; Created: 1994/10/29
-;;; Version: $Revision: 7.43 $
+;;; Version: $Revision: 7.44 $
 ;;; Keywords: mail, MIME, multimedia, multilingual, encoded-word
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -41,7 +41,7 @@
 (require 'vm)
 
 (defconst tm-vm/RCS-ID
-  "$Id: tm-vm.el,v 7.43 1996/02/23 16:23:47 morioka Exp $")
+  "$Id: tm-vm.el,v 7.44 1996/02/23 22:00:46 morioka Exp $")
 (defconst tm-vm/version (get-version-string tm-vm/RCS-ID))
 
 (define-key vm-mode-map "Z" 'tm-vm/view-message)
@@ -219,7 +219,18 @@ tm-vm uses `vm-select-message-hook', use this hook instead.")
           (progn
             (set (make-local-variable 'tm-vm/system-state) 'previewing)
             (save-window-excursion
-              (mime/viewer-mode)
+	      (vm-widen-page)
+	      (goto-char (point-max))
+	      (widen)
+	      (narrow-to-region (point)
+				(save-excursion
+				  (goto-char
+				   (vm-start-of (car vm-message-pointer))
+				   )
+				  (forward-line)
+				  (point)
+				  ))
+	      (mime/viewer-mode)
               (goto-char (point-min))
 	      ;; 1996/2/16, fixed by
 	      ;;    Oscar Figueiredo <figueire@lspsun2.epfl.ch>
-- 
1.7.10.4