From: Chris Hanson <org/chris-hanson/cph>
Date: Fri, 30 Jun 2000 19:12:15 +0000 (+0000)
Subject: Don't inline text/plain entities that have disposition ATTACHMENT.
X-Git-Tag: 20090517-FFI~3408
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=2b2e95a3932714dbd4e816be5a306067e8f55cef;p=mit-scheme.git

Don't inline text/plain entities that have disposition ATTACHMENT.
---

diff --git a/v7/src/imail/imail-top.scm b/v7/src/imail/imail-top.scm
index a3f8537f7..5a54c134c 100644
--- a/v7/src/imail/imail-top.scm
+++ b/v7/src/imail/imail-top.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: imail-top.scm,v 1.204 2000/06/30 19:11:46 cph Exp $
+;;; $Id: imail-top.scm,v 1.205 2000/06/30 19:12:15 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2000 Massachusetts Institute of Technology
 ;;;
@@ -2143,10 +2143,10 @@ Negative argument means search in reverse."
 
 (define-method insert-mime-message-part
     (message (body <mime-body-text>) selector context mark)
-  (if (and (or (not (insert-mime-context-enclosure context))
-	       (let ((disposition (mime-body-disposition body)))
-		 (if disposition
-		     (eq? (car disposition) 'INLINE)
+  (if (and (let ((disposition (mime-body-disposition body)))
+	     (if disposition
+		 (eq? (car disposition) 'INLINE)
+		 (or (not (insert-mime-context-enclosure context))
 		     (let ((subtype (mime-body-subtype body)))
 		       (or (eq? subtype 'PLAIN)
 			   (memq subtype