(gnus-structured-field-decoder): Pay attention

to enable-multibyte-characters.
(gnus-unstructured-field-decoder): Likewise.

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 1fae5060dbe496c59dc006982f4b35b41771c887..d1b9deb21e0e0522d4c57d02581abaad2769a29c 100644 (file)
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -621,21 +621,25 @@ is not run if `gnus-visual' is nil."
 
 ;; 1997/5/4 by MORIOKA Tomohiko <morioka@jaist.ac.jp>
 (defcustom gnus-structured-field-decoder
-  (if (featurep 'mule)
+  (if (and (featurep 'mule)
+          (boundp 'enable-multibyte-characters))
       (lambda (string)
-       (if gnus-mule-coding-system
+       (if (and enable-multibyte-characters gnus-mule-coding-system)
            (decode-coding-string string gnus-mule-coding-system)
-         )))
+         string))
+    'identity)
   "Function to decode non-ASCII characters in structured field for summary."
   :group 'gnus-various
   :type 'function)
 
 (defcustom gnus-unstructured-field-decoder
-  (if (featurep 'mule)
+  (if (and (featurep 'mule)
+          (boundp 'enable-multibyte-characters))
       (lambda (string)
-       (if gnus-mule-coding-system 
+       (if (and enable-multibyte-characters gnus-mule-coding-system)
            (decode-coding-string string gnus-mule-coding-system)
-         )))
+         string))
+    'identity)
   "Function to decode non-ASCII characters in unstructured field for summary."
   :group 'gnus-various
   :type 'function)