Implement variable imail-inline-mime-text-subtypes.

diff --git a/v7/src/imail/imail-top.scm b/v7/src/imail/imail-top.scm
index 34fb3bc281b3d9cd6dd8af67d2e6c5fdb64fdaf1..875fc175298c5ae92e6de4b1aca9f443a1c4f80a 100644 (file)
--- 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.159 2000/06/15 15:40:21 cph Exp $
+;;; $Id: imail-top.scm,v 1.160 2000/06/15 16:19:53 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2000 Massachusetts Institute of Technology
 ;;;
@@ -143,7 +143,7 @@ Otherwise, the text is left as is."
 Otherwise, only the header fields normally shown by IMAIL are sent."
   #f
   boolean?)
-
+\f
 (define-variable imail-forward-using-mime
   "If true, forwarded email messages are sent as MIME attachments.
 Otherwise, they are inserted into the message body."
@@ -156,6 +156,16 @@ Text messages using these character sets are displayed inline;
  when other character sets are used, the text is treated as an attachment."
   (list "us-ascii" "iso-8859-[0-9]+" "windows-[0-9]+")
   list-of-strings?)
+
+(define-variable imail-inline-mime-text-subtypes
+  "List of MIME text subtypes that should be shown inline.
+The value of this variable is a list of symbols.
+A text entity that appears at the top level of a message
+ is always shown inline, regardless of its subtype.
+Likewise, a text/plain entity is always shown inline.
+Note that this variable does not affect subparts of multipart/alternative."
+  '(HTML ENRICHED)
+  list-of-strings?)
 \f
 (define-command imail
   "Read and edit incoming mail.
@@ -1186,7 +1196,9 @@ With prefix argument N moves backward N messages with these flags."
                encoding
                (mime-body-one-part-encoding body)))))
     (if (and (or (not enclosure)
-                (eq? (mime-body-subtype body) 'PLAIN))
+                (let ((subtype (mime-body-subtype body)))
+                  (or (eq? subtype 'PLAIN)
+                      (memq subtype imail-inline-mime-text-subtypes))))
             (known-mime-encoding? encoding)
             (re-string-match
              (string-append "\\`"

diff --git a/v7/src/imail/imail.pkg b/v7/src/imail/imail.pkg
index d6abdffd047cbac41d779bef0c94ba9ce2a20afc..82e142aa5186c74baa2623df7f1efce411d03c9d 100644 (file)
--- a/v7/src/imail/imail.pkg
+++ b/v7/src/imail/imail.pkg
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: imail.pkg,v 1.61 2000/06/15 15:40:37 cph Exp $
+;;; $Id: imail.pkg,v 1.62 2000/06/15 16:20:02 cph Exp $
 ;;;
 ;;; Copyright (c) 2000 Massachusetts Institute of Technology
 ;;;
@@ -262,6 +262,7 @@
          edwin-variable$imail-forward-all-headers
          edwin-variable$imail-forward-using-mime
          edwin-variable$imail-ignored-headers
+         edwin-variable$imail-inline-mime-text-subtypes
          edwin-variable$imail-kept-headers
          edwin-variable$imail-known-mime-charsets
          edwin-variable$imail-message-filter

diff --git a/v7/src/imail/todo.txt b/v7/src/imail/todo.txt
index 0ea483c3cd70e4894656c8d71e27d238a2a49d4e..4b4f172e66cc88429128953456389f547ed799ae 100644 (file)
--- a/v7/src/imail/todo.txt
+++ b/v7/src/imail/todo.txt
@@ -1,5 +1,5 @@
 IMAIL To-Do List
-$Id: todo.txt,v 1.83 2000/06/15 15:40:03 cph Exp $
+$Id: todo.txt,v 1.84 2000/06/15 16:20:25 cph Exp $
 
 Bug fixes
 ---------
@@ -38,9 +38,6 @@ New features
 
 * Command to save an attachment should work on inline entities too.
 
-* Add variable saying what type/subtype combinations should be
-  inlined.  Can this be combined with the known-charsets variable?
-
 * Support the "flagged" message flag by highlighting messages with
   this flag in the summary buffer.