(rfc2047-encode-message-header): Don't encode if

default-enable-multibyte-characters is nil.

diff --git a/lisp/gnus/rfc2047.el b/lisp/gnus/rfc2047.el
index 12034d7ad934afbe11c126e4d48bc6fad1a7a62c..e6b7407a9de98687297ab517dda359f84f789ff6 100644 (file)
--- a/lisp/gnus/rfc2047.el
+++ b/lisp/gnus/rfc2047.el
@@ -141,11 +141,15 @@ Should be called narrowed to the head of the message."
              (rfc2047-encode-region (point-min) (point-max)))
             ((eq method 'default)
              (if (and (featurep 'mule)
+                      (if (boundp 'default-enable-multibyte-characters)
+                          default-enable-multibyte-characters)
                       mail-parse-charset)
                  (mm-encode-coding-region (point-min) (point-max)
                                           mail-parse-charset)))
             ((mm-coding-system-p method)
-             (if (featurep 'mule)
+             (if (and (featurep 'mule)
+                      (if (boundp 'default-enable-multibyte-characters)
+                          default-enable-multibyte-characters))
                  (mm-encode-coding-region (point-min) (point-max) method)))
             ;; Hm.
             (t)))