Extend imail-forward-all-headers to have value MIME-ONLY.

diff --git a/v7/src/imail/imail-top.scm b/v7/src/imail/imail-top.scm
index cda3a82a5b275ffbeaa70a9a218bde378af33c29..b1e93a3ece56d0f5f0eaf8c4a6fc19a48b83b7f2 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.183 2000/06/22 20:40:57 cph Exp $
+;;; $Id: imail-top.scm,v 1.184 2000/06/23 15:46:00 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2000 Massachusetts Institute of Technology
 ;;;
@@ -140,9 +140,11 @@ Otherwise, the text is left as is."
 
 (define-variable imail-forward-all-headers
   "If true, forwarded email messages will contain all header fields.
-Otherwise, only the header fields normally shown by IMAIL are sent."
+Otherwise, only the header fields normally shown by IMAIL are sent.
+If value is 'MIME-ONLY, full header fields are sent only when
+ imail-forward-using-mime is also true."
   #f
-  boolean?)
+  (lambda (x) (or (boolean? x) (eq? x 'MIME-ONLY))))
 \f
 (define-variable imail-forward-using-mime
   "If true, forwarded email messages are sent as MIME attachments.
@@ -986,7 +988,7 @@ see the documentation of `imail-resend'."
             (let ((mark (mark-left-inserting-copy (buffer-end mail-buffer))))
               (with-buffer-point-preserved mail-buffer
                 (lambda ()
-                  (insert-header-fields message raw? mark)
+                  (insert-header-fields message (eq? raw? #t) mark)
                   (insert-message-body message mark)))
               (mark-temporary! mark))))
        (if (window-has-no-neighbors? (current-window))