* mm-decode.el (mm-inline-text-html-with-images): New user option.

	* mm-view.el (mm-inline-text-html-render-with-w3m): Bind the value
	of `w3m-display-inline-images' with the value of
	`mm-inline-text-html-with-images'.
	From: TSUCHIYA Masatoshi <tsuchiya@namazu.org>.

	* gnus-art.el (gnus-article-wash-html-with-w3m): Ditto.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 17bfef5..9f4db7f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,10 +1,21 @@
+2002-01-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mm-decode.el (mm-inline-text-html-with-images): New user option.
+
+       * mm-view.el (mm-inline-text-html-render-with-w3m): Bind the value
+       of `w3m-display-inline-images' with the value of
+       `mm-inline-text-html-with-images'.
+       From: TSUCHIYA Masatoshi <tsuchiya@namazu.org>.
+
+       * gnus-art.el (gnus-article-wash-html-with-w3m): Ditto.
+
 2002-01-27  Richard M. Stallman  <rms@gnu.org>
 
        * time-date.el: Add autoload cookies.  Many doc fixes.
        (time-add): New function.
        (time-subtract): Renamed from subtract-time.
        (subtract-time): New alias for time-subtract.
-       
+
 2002-01-28  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-article-wash-html-with-w3m): Replace w3m to

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 26991d4..72050e3 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -2089,7 +2089,8 @@ If READ-CHARSET, ask for a coding system."
 (defun gnus-article-wash-html-with-w3m ()
   "Wash the current buffer with emacs-w3m."
   (mm-setup-w3m)
-  (let ((w3m-safe-url-regexp "\\`cid:"))
+  (let ((w3m-safe-url-regexp "\\`cid:")
+       (w3m-display-inline-images mm-inline-text-html-with-images))
     (w3m-region (point) (point-max)))
   (setq mm-w3m-minor-mode t))
 

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 2181905..226fdb7 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -109,6 +109,14 @@ and `mm-inline-text-html-render-with-w3m', which uses emacs-w3m."
                (function))
   :group 'mime-display)
 
+(defcustom mm-inline-text-html-with-images nil
+  "If non-nil, Gnus will allow retrieving images in the HTML contents
+with <img> tags.  It has no effect on Emacs/w3.  For emacs-w3m, the
+value of the option `w3m-display-inline-images' will be bound with
+this value."
+  :type 'boolean
+  :group 'mime-display)
+
 (defcustom mm-inline-media-tests
   '(("image/jpeg"
      mm-inline-image

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index f22d064..9fc815f 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -192,7 +192,8 @@
        (when charset
          (delete-region (point-min) (point-max))
          (insert (mm-decode-string text charset)))
-       (let ((w3m-safe-url-regexp "\\`cid:"))
+       (let ((w3m-safe-url-regexp "\\`cid:")
+             (w3m-display-inline-images mm-inline-text-html-with-images))
          (w3m-region (point-min) (point-max)))
        (setq mm-w3m-minor-mode t))
       (mm-handle-set-undisplayer