Merge from origin/emacs-25

[gnu-emacs] / lisp / gnus / mm-uu.el

diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el
index fec3b299407a1338d7d888aa07a0743d13598b07..049890e2e30a4a1b070be1acc9b5ff57e0cb5c91 100644 (file)
--- a/lisp/gnus/mm-uu.el
+++ b/lisp/gnus/mm-uu.el
@@ -290,8 +290,7 @@ If PROPERTIES is non-nil, PROPERTIES are applied to the buffer,
 see `set-text-properties'.  If PROPERTIES equals t, this means to
 apply the face `mm-uu-extract'."
   (let ((obuf (current-buffer))
-        (multi (and (boundp 'enable-multibyte-characters)
-                    enable-multibyte-characters))
+        (multi enable-multibyte-characters)
        (coding-system buffer-file-coding-system))
     (with-current-buffer (generate-new-buffer " *mm-uu*")
       (if multi (mm-enable-multibyte) (mm-disable-multibyte))