* mail/rmail.el (rmail-enable-mime-composing): New. A lightweight

	version of rmail-enable-mime.
	(rmail-forward): Use it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 45572c4bf52185ce04b6932dc74987ba0b72152c..aa84ac967f694dceaa03a48a3510e0f562bffb1f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-07  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * mail/rmail.el (rmail-enable-mime-composing): New. A lightweight
+       version of rmail-enable-mime.
+       (rmail-forward): Use it.
+
 2002-02-06  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
 
        * textmodes/sgml-mode.el (sgml-start-tag-regex)

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 2b3c1ee84ab0c4ba2c8d119de2f0bd3d70352af1..e1b12317db14a97ee870e0ee7ea29d72434c88f4 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -420,6 +420,9 @@ until a user explicitly requires it."
                 (other :tag "when asked" ask))
   :group 'rmail)
 
+(defvar rmail-enable-mime-composing nil
+  "*If non-nil, RMAIL uses `rmail-insert-mime-forwarded-message-function' to forward.")
+
 ;;;###autoload
 (defvar rmail-show-mime-function nil
   "Function to show MIME decoded message of RMAIL file.
@@ -429,7 +432,8 @@ It is called with no argument.")
 ;;;###autoload
 (defvar rmail-insert-mime-forwarded-message-function nil
   "Function to insert a message in MIME format so it can be forwarded.
-This function is called if `rmail-enable-mime' is non-nil.
+This function is called if `rmail-enable-mime' or 
+`rmail-enable-mime-composing' is non-nil.
 It is called with one argument FORWARD-BUFFER, which is a
 buffer containing the message to forward.  The current buffer
 is the outgoing mail buffer.")
@@ -3263,7 +3267,7 @@ see the documentation of `rmail-resend'."
          (save-excursion
            ;; Insert after header separator--before signature if any.
            (goto-char (mail-text-start))
-           (if rmail-enable-mime
+           (if (or rmail-enable-mime rmail-enable-mime-composing)
                (funcall rmail-insert-mime-forwarded-message-function
                         forward-buffer)
              (insert "------- Start of forwarded message -------\n")