Publicize cl--generic-all-functions

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

diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index a3d6e74fbcbeceafbef45db058e60c5592d08ee3..8e1e3e782cf7e0e7c89009094489fe89a3f16dd1 100644 (file)
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -1,6 +1,6 @@
 ;;; mm-view.el --- functions for viewing MIME objects
 
-;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2016 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
@@ -141,7 +141,7 @@
       (push (cons 'gnus-article-mode 'mm-w3m-cid-retrieve)
            w3m-cid-retrieve-function-alist))
     (setq mm-w3m-setup t))
-  (setq w3m-display-inline-images mm-inline-text-html-with-images))
+  (setq w3m-display-inline-images (not mm-html-inhibit-images)))
 
 (defun mm-w3m-cid-retrieve-1 (url handle)
   (dolist (elem handle)
@@ -629,6 +629,8 @@ If MODE is not set, try to find mode automatically."
     (replace-match "\n"))
   t)
 
+(autoload 'epg-decrypt-string "epg")
+
 (defun mm-view-pkcs7-decrypt (handle &optional from)
   (insert-buffer-substring (mm-handle-buffer handle))
   (goto-char (point-min))