From: Chris Hanson <org/chris-hanson/cph>
Date: Fri, 2 Jun 2000 02:48:08 +0000 (+0000)
Subject: Show "text/plain" entities regardless of character set.  There are
X-Git-Tag: 20090517-FFI~3631
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=4a9e20a56b509e5cff77b56716baa67343daa9a9;p=mit-scheme.git

Show "text/plain" entities regardless of character set.  There are
some pretty broken mailers out there (e.g. Outlook Express) that claim
random character sets when they should be claiming "us-ascii".
---

diff --git a/v7/src/imail/imail-top.scm b/v7/src/imail/imail-top.scm
index 5f0d027a9..8e35d5a49 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.118 2000/06/02 02:25:36 cph Exp $
+;;; $Id: imail-top.scm,v 1.119 2000/06/02 02:48:08 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2000 Massachusetts Institute of Technology
 ;;;
@@ -781,13 +781,14 @@ With prefix argument N moves backward N messages with these flags."
 	 (if (null? selector)
 	     (message-body message)
 	     (message-mime-body-part message selector))))
-    (if (let ((charset
-	       (let ((entry (assq 'CHARSET (mime-body-parameters body))))
-		 (if entry
-		     (cdr entry)
-		     "us-ascii"))))
-	  (or (string-ci=? charset "us-ascii")
-	      (re-string-match "\\`iso-8859-[0-9]+\\'" charset #t)))
+    (if (or (eq? (mime-body-subtype body) 'PLAIN)
+	    (let ((charset
+		   (let ((entry (assq 'CHARSET (mime-body-parameters body))))
+		     (if entry
+			 (cdr entry)
+			 "us-ascii"))))
+	      (or (string-ci=? charset "us-ascii")
+		  (re-string-match "\\`iso-8859-[0-9]+\\'" charset #t))))
 	(begin
 	  (case (mime-body-one-part-encoding body)
 	    ((QUOTED-PRINTABLE)