Merge from origin/emacs-25

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

diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 51fcd8bcd5bbdd8b0acc48054e3193a6fc668ec6..f45337dc04222c60b0ae41766e252e773ace3c5c 100644 (file)
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -149,7 +149,7 @@ nil    : use external viewer (default web browser)."
   :type 'boolean
   :group 'mime-display)
 
-(defcustom mm-html-blocked-images nil
+(defcustom mm-html-blocked-images ""
   "Regexp matching image URLs to be blocked, or nil meaning not to block.
 Note that cid images that are embedded in a message won't be blocked."
   :version "25.1"
@@ -1806,7 +1806,7 @@ If RECURSIVE, search recursively."
                                                                 nil t))
                              (not (eq charset 'ascii)))
                         (decode-coding-string (buffer-string) charset)
-                      (mm-string-as-multibyte (buffer-string)))
+                      (string-as-multibyte (buffer-string)))
                   (erase-buffer)
                   (mm-enable-multibyte)))
         (goto-char (point-min))