From xemacs-m  Wed Sep 24 19:02:24 1997
Received: from altair.xemacs.org (steve@xemacs.miranova.com [206.190.83.19])
	by xemacs.org (8.8.5/8.8.5) with ESMTP id TAA10535
	for <xemacs-beta@xemacs.org>; Wed, 24 Sep 1997 19:02:23 -0500 (CDT)
Received: (from steve@localhost)
	by altair.xemacs.org (8.8.7/8.8.7) id RAA22092;
	Wed, 24 Sep 1997 17:08:28 -0700
Mail-Copies-To: never
To: xemacs-beta@xemacs.org
Subject: Re: Bronx on SunOS: success, but broken MIME and adjusted puresize
References: <9709241057.AA13441@salbuild.lehman.com>
X-Face: (:YAD@JS'&Kz'M}n7eX7gEvPR6U1mJ-kt;asEc2qAv;h{Yw7ckz<7+X_SYeTNAaPui:e~x$
 ,A=gkt*>UPL/}\a/#C~v2%ETiAY_sx;xve0yL??JWTtX_-NUzXyP38UdW#cmN1\4(X!c3m#%IbtB-3
 Z-!xpZi!`E.s{(;aP=b11"!3wQu]1j@^V|;n=B|{l<bZV1.AI`zWV%kPCnUhcgEe\(}/_kNd6,*3ZJ
 Q3o<YQ3^u;7jS=:p0--u3msQO
X-Attribution: sb
From: SL Baur <steve@xemacs.org>
In-Reply-To: Rick Campbell's message of "Wed, 24 Sep 1997 06:57:28 -0400"
Mime-Version: 1.0 (generated by tm-edit 7.108)
Content-Type: text/plain; charset=US-ASCII
Date: 24 Sep 1997 17:08:27 -0700
Message-ID: <m2lo0mjlvo.fsf@altair.xemacs.org>
Lines: 179
X-Mailer: Quassia Gnus v0.10/XEmacs 20.3(beta24) - "Ljubljana"

Rick Campbell <rickc@lehman.com> writes:

> Bronx looks good except:

Does this mean PGP works now?  Did you remove the superfluous files in 
lisp/tl?

>  - mime-viewer/extract-content is broken -- it always selects the
>    wrong content part.

Here are all the patches made to tm 19.15 to present.  You might try
reversing them to see which one is giving you problems.  I do not know 
what the patch to tm-mh-e.el pertains to.  If you don't use mh-e you
can ignore it.  The other changes added handling of inline PNG.

What mailer are you using?

Index: lisp/tm/tm-view.el
===================================================================
RCS file: /usr/local/xemacs/xemacs-19/lisp/tm/tm-view.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tm-view.el	1997/03/09 02:37:51	1.5
+++ tm-view.el	1997/08/21 06:24:14	1.6
@@ -77,6 +77,10 @@
      (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
      (mode "play" "print")
      )
+    ((type . "image/png")
+     (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
+     (mode "play" "print")
+     )
     ((type . "image/tiff")
      (method "tm-image" nil 'file 'type 'encoding 'mode 'name)
      (mode "play" "print")

Index: lisp/tm/tm-mh-e.el
===================================================================
RCS file: /usr/local/xemacs/xemacs-19/lisp/tm/tm-mh-e.el,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tm-mh-e.el	1996/12/22 00:29:40	1.2
+++ tm-mh-e.el	1997/08/21 06:24:13	1.3
@@ -73,20 +73,26 @@
   ;; Display message NUMBER of FOLDER.
   ;; Sets the current buffer to the show buffer.
   (set-buffer folder)
-  (or show-buffer
-      (setq show-buffer mh-show-buffer))
   ;; Bind variables in folder buffer in case they are local
-  (let ((msg-filename (mh-msg-filename msg-num)))
+  (let ((formfile mhl-formfile)
+	(clean-message-header mh-clean-message-header)
+	(invisible-headers mh-invisible-headers)
+	(visible-headers mh-visible-headers)
+	(msg-filename (mh-msg-filename msg-num))
+	(show-buffer mh-show-buffer)
+	)
     (if (not (file-exists-p msg-filename))
 	(error "Message %d does not exist" msg-num))
     (set-buffer show-buffer)
     (cond ((not (equal msg-filename buffer-file-name))
 	   ;; Buffer does not yet contain message.
-	   (clear-visited-file-modtime)
-	   (unlock-buffer)
-	   (setq buffer-file-name nil)	; no locking during setup
+	   (mh-unvisit-file)
 	   (setq buffer-read-only nil)
 	   (erase-buffer)
+	   ;; Changing contents, so this hook needs to be reinitialized.
+	   ;; pgp.el uses this.
+	   (if (boundp 'write-contents-hooks) ;Emacs 19
+	       (setq write-contents-hooks nil))
 	   (if mode
 	       (let* ((aname (concat "article-" folder))
 		      (abuf (get-buffer aname))
@@ -114,18 +120,21 @@
 		 (mime/viewer-mode nil nil nil
 				   aname (concat "show-" folder))
 		 (goto-char (point-min))
+		 (let ( (buffer-read-only nil) )
+		   (cond (clean-message-header
+			  (mh-clean-msg-header (point-min)
+					       invisible-headers
+					     visible-headers)
+			  (goto-char (point-min)))
+			 (t
+			  (mh-start-of-uncleaned-message))))
+		 (goto-char (point-min))
 		 )
-	     (let ((clean-message-header mh-clean-message-header)
-		   (invisible-headers mh-invisible-headers)
-		   (visible-headers mh-visible-headers)
-		   )
-	       ;; 1995/9/21
-	       ;;   modified by ARIURA <ariura@cc.tuat.ac.jp>
-	       ;;   to support mhl.
-	       (if mhl-formfile
+	     (progn
+	       (if formfile
 		   (mh-exec-lib-cmd-output "mhl" "-nobell" "-noclear"
-					   (if (stringp mhl-formfile)
-					       (list "-form" mhl-formfile))
+					   (if (stringp formfile)
+					       (list "-form" formfile))
 					   msg-filename)
 		 (insert-file-contents msg-filename))
 	       ;; end
@@ -145,11 +154,14 @@
 	       (setq buffer-file-name msg-filename)
 	       (mh-show-mode)
 	       ))
+	   (set-buffer-modified-p nil)
 	   (or (eq buffer-undo-list t)	;don't save undo info for prev msgs
 	       (setq buffer-undo-list nil))
-;;; Added by itokon (02/19/96)
+	   (set-buffer-auto-saved)
+	   ;; the parts of set-visited-file-name we want to do (no locking)
 	   (setq buffer-file-name msg-filename)
-;;;
+	   (setq buffer-backed-up nil)
+	   (auto-save-mode 1)
 	   (set-mark nil)
 	   (setq mode-line-buffer-identification
 		 (list (format mh-show-buffer-mode-line-buffer-id

Index: lisp/tm/tm-image.el
===================================================================
RCS file: /usr/local/xemacs/xemacs-19/lisp/tm/tm-image.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tm-image.el	1997/03/16 05:55:42	1.6
+++ tm-image.el	1997/08/21 06:24:12	1.7
@@ -132,6 +132,7 @@
 	  ("image/x-xpixmap"		. xpm)
 	  ("image/x-pic"		. pic)
 	  ("image/x-mag"		. mag)
+	  ("image/png"			. png)
 	  ))
 
 (defvar mime-viewer/ps-to-gif-command "pstogif")


Index: lisp/tm/tm-edit.el
===================================================================
RCS file: /usr/local/xemacs/xemacs-19/lisp/tm/tm-edit.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tm-edit.el	1997/03/22 05:29:22	1.7
+++ tm-edit.el	1997/08/21 06:24:11	1.8
@@ -210,6 +210,7 @@
     ("image"
      ("gif")
      ("jpeg")
+     ("png")
      ("tiff")
      ("x-pic")
      ("x-mag")
@@ -242,6 +243,11 @@
      )
     ("\\.gif$"
      "image"	"gif"		nil
+     "base64"
+     "inline"		(("filename" . file))
+     )
+    ("\\.png$"
+     "image"	"png"		nil
      "base64"
      "inline"		(("filename" . file))
      )

>  - pure size had to be adjusted

As long as it was only done once, it's normal and you can safely
ignore it.

