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

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

1 files changed, 10 insertions, 6 deletions

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 1fae5060dbe..d1b9deb21e0 100644
--- 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)