From: Dave Love <fx@gnu.org>
Date: Thu, 23 Nov 2000 16:09:21 +0000 (+0000)
Subject: (rfc2047-encode-message-header): Don't encode if
X-Git-Tag: emacs-pretest-21.0.92~124
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1bde0b39f065ae76520f4fbcae8cb01828a76cd1;p=emacs.git

(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 12034d7ad93..e6b7407a9de 100644
--- 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)))