From f93f0520808e1137f0f40c13116f6d8e45fa49cc Mon Sep 17 00:00:00 2001
From: morioka <morioka>
Date: Mon, 2 Mar 1998 13:45:25 +0000
Subject: [PATCH] tm 5.5.

---
 Makefile    |    2 +-
 tm-gnus3.el |    6 +++++-
 tm-view.el  |   44 +++++++++++++++++++++++++++++---------------
 3 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 37431e0..87ddbbc 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ GOMI	= *.aux *.toc *.log $(TEXFILES) $(DVIFILES) *.ps $(UTILS)
 FILES	= README.eng *.ol *.pln \
 	  Makefile *.el *.c methods tm-jp.tex $(TEXFILES)
 
-TARFILE = tm5.1.tar
+TARFILE = tm5.5.tar
 
 .SUFFIXES:	.ol .tex .dvi .ps
 
diff --git a/tm-gnus3.el b/tm-gnus3.el
index 582bd5c..b537689 100644
--- a/tm-gnus3.el
+++ b/tm-gnus3.el
@@ -1,5 +1,5 @@
 ;;;
-;;; $Id: tm-gnus3.el,v 5.0 1994/09/25 21:27:38 morioka Exp $
+;;; $Id: tm-gnus3.el,v 5.1 1994/10/03 03:45:44 morioka Exp $
 ;;;
 
 (provide 'tm-gnus3)
@@ -34,10 +34,14 @@
 		 (if (string-match (regexp-quote "3.14.4") gnus-version)
 		     (function
 		      (lambda ()
+			(mime/exit-view-mode)
+			(delete-other-windows)
 			(gnus-Article-show-summary)
 			))
 		   (function
 		    (lambda ()
+		      (mime/exit-view-mode)
+		      (delete-other-windows)
 		      (gnus-Article-show-subjects)
 		      )))
 		 mime/go-to-top-node-method-alist))
diff --git a/tm-view.el b/tm-view.el
index 4541cbb..702b576 100644
--- a/tm-view.el
+++ b/tm-view.el
@@ -10,7 +10,7 @@
 ;;;
 
 (defconst mime/viewer-RCS-ID
-  "$Id: tm-view.el,v 5.1 1994/09/25 21:23:07 morioka Exp $")
+  "$Id: tm-view.el,v 5.5 1994/10/02 17:54:17 morioka Exp $")
 
 (defconst mime/viewer-version
   (and (string-match "[0-9][0-9.]*" mime/viewer-RCS-ID)
@@ -99,21 +99,21 @@
      )))
 
 (defvar mime/make-content-header-filter
+;;(setq mime/make-content-header-filter
   (function
    (lambda (cid)
      (if (listp cid)
 	 (delete-region (goto-char (point-min))
-			    (or (and (search-forward "\n\n" nil t)
-				     (match-beginning 0))
-				(point-max))
-			    )
+			(or (and (re-search-forward "^$" nil t)
+				 (match-end 0))
+			    (point-max))
+			)
        )
      )))
 
 (defvar mime/default-showing-Content-Type-list
 ;;(setq mime/default-showing-Content-Type-list
-  '("text/plain" "text/richtext" "text/enriched"
-    "text/x-latex" "message/rfc822" nil))
+  '("text/plain" "text/richtext" "text/enriched" "text/x-latex" nil))
 
 (defvar mime/go-to-top-node-method-alist
 ;;(setq mime/go-to-top-node-method-alist
@@ -296,8 +296,16 @@
 	    (and (setq ret (assoc "x-name" param))
 		 (message/strip-quoted-string (cdr ret))
 		 )
-	    (message/get-field-body "Content-Description")
-	    (message/get-field-body "Subject")
+	    (progn
+	      (narrow-to-region (point-min)
+				(progn
+				  (search-forward "\n\n" nil t)
+				  (match-beginning 0)
+				  ))
+	      (or
+	       (message/get-field-body "Content-Description")
+	       (message/get-field-body "Subject")
+	       ))
 	    ""))
       )))
 
@@ -345,8 +353,12 @@
 			(search-forward "\n\n" nil t)
 			(match-end 0)
 			)
-		    end))
+		    (+ end 1)
+		    ))
 	    ))
+	(if (> e (point-max))
+	    (setq e (point-max))
+	  )
 	(setq str (buffer-substring beg e))
 	(switch-to-buffer obuf)
 	(setq nb (point))
@@ -370,6 +382,7 @@
 	(setq r (cdr r))
 	)
       (set-buffer-modified-p nil)
+      (setq buffer-read-only t)
       (switch-to-buffer the-buf)
       (list obuf dest)
       )))
@@ -767,11 +780,12 @@
     (switch-to-buffer (nth 2 pc))
     (setq cn (mime/get-point-content-number (nth 3 pc)))
     (if (eq cn t)
-	(and (setq r (assoc major-mode mime/go-to-top-node-method-alist))
-	     (switch-to-buffer the-buf)
-	     (funcall (cdr r))
-	     )
-      (setq r (mime/get-content-region (cdr cn)))
+	(if (setq r (assoc major-mode mime/go-to-top-node-method-alist))
+	    (progn
+	      (switch-to-buffer the-buf)
+	      (funcall (cdr r))
+	      ))
+      (setq r (mime/get-content-region (butlast cn)))
       (switch-to-buffer the-buf)
       (catch 'tag
 	(let ((rfcl mime/preview-flat-content-list) cell)
-- 
1.7.10.4