Eliminate variable imail-receive-mime. User can toggle message to raw

form to get similar effect.

diff --git a/v7/src/imail/imail-top.scm b/v7/src/imail/imail-top.scm
index 4edeb62e8b211852d130e86a6c4dcf528985ab75..542399772a71110d8416b1e5581549b7c3b85799 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.146 2000/06/09 04:14:00 cph Exp $
+;;; $Id: imail-top.scm,v 1.147 2000/06/09 04:17:48 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2000 Massachusetts Institute of Technology
 ;;;
@@ -131,12 +131,6 @@ Set this variable to #F to disable updating."
   600
   (lambda (x) (or (not x) (and (exact-integer? x) (positive? x)))))
 
-(define-variable imail-receive-mime
-  "If true, MIME messages are decoded before being presented.
-Otherwise, all messages are presented as plain text."
-  #t
-  boolean?)
-
 (define-variable imail-auto-wrap
   "If true, messages will have their lines wrapped at the right margin.
 If set to 'FILL, the paragraphs are filled rather than wrapped.
@@ -451,7 +445,6 @@ variable's documentation (using \\[describe-variable]) for details:
     imail-mode-hook
     imail-pass-phrase-retention-time
     imail-primary-folder
-    imail-receive-mime
     imail-reply-with-re
     imail-update-interval
 
@@ -739,8 +732,7 @@ With prefix argument N moves backward N messages with these flags."
                      (if raw?
                          (insert-string (message-body message) mark)
                          (begin
-                           (if (and (ref-variable imail-receive-mime buffer)
-                                    (folder-supports-mime? folder))
+                           (if (folder-supports-mime? folder)
                                (insert-mime-message-body message mark)
                                (call-with-auto-wrapped-output-mark mark
                                  (lambda (port)

diff --git a/v7/src/imail/imail.pkg b/v7/src/imail/imail.pkg
index c07c9eac85b444642767c9b6963f7d150c186813..e7465f06bf37cddb04f4a7200c47de7f4bc39240 100644 (file)
--- a/v7/src/imail/imail.pkg
+++ b/v7/src/imail/imail.pkg
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: imail.pkg,v 1.52 2000/06/08 18:08:29 cph Exp $
+;;; $Id: imail.pkg,v 1.53 2000/06/09 04:17:52 cph Exp $
 ;;;
 ;;; Copyright (c) 2000 Massachusetts Institute of Technology
 ;;;
@@ -256,7 +256,6 @@
          edwin-variable$imail-mode-hook
          edwin-variable$imail-pass-phrase-retention-time
          edwin-variable$imail-primary-folder
-         edwin-variable$imail-receive-mime
          edwin-variable$imail-reply-with-re
          edwin-variable$imail-summary-highlight-message
          edwin-variable$imail-summary-mode-hook