aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKatsumi Yamaoka2016-02-09 05:30:26 +0000
committerKatsumi Yamaoka2016-02-09 05:30:26 +0000
commit7c9206f82000e9fd6ea9d1a53fc054eff88e701c (patch)
tree67682f99d4b7a886d54483309084cdb28a121d65 /doc
parentb1079c0f86c218f016a6c2e84ea402f4e175fc53 (diff)
downloademacs-7c9206f82000e9fd6ea9d1a53fc054eff88e701c.tar.gz
emacs-7c9206f82000e9fd6ea9d1a53fc054eff88e701c.zip
Make mm-html-inhibit-images and mm-html-blocked-images default to nil
* lisp/gnus/mm-decode.el (mm-html-inhibit-images) (mm-html-blocked-images): Default to nil. * doc/misc/emacs-mime.texi (Display Customization): Mention that mm-html-inhibit-images and mm-html-blocked-images default to nil. * etc/NEWS (Gnus): Document mm-html-inhibit-images and mm-html-blocked-images.
Diffstat (limited to 'doc')
-rw-r--r--doc/misc/emacs-mime.texi4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index ae1e09105ba..b7c58d7ebeb 100644
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -420,7 +420,7 @@ article body. It is effective to images in @acronym{HTML} articles
420rendered when @code{mm-text-html-renderer} (@pxref{Display 420rendered when @code{mm-text-html-renderer} (@pxref{Display
421Customization}) is @code{shr} or @code{w3m}. In Gnus, this is 421Customization}) is @code{shr} or @code{w3m}. In Gnus, this is
422overridden by the value of @code{gnus-inhibit-images} (@pxref{Misc 422overridden by the value of @code{gnus-inhibit-images} (@pxref{Misc
423Article, ,Misc Article, gnus, Gnus manual}). 423Article, ,Misc Article, gnus, Gnus manual}). The default is @code{nil}.
424 424
425@item mm-html-blocked-images 425@item mm-html-blocked-images
426@vindex mm-html-blocked-images 426@vindex mm-html-blocked-images
@@ -436,7 +436,7 @@ It is effective when @code{mm-text-html-renderer} (@pxref{Display
436Customization}) is @code{shr}. In Gnus, this is overridden by the value 436Customization}) is @code{shr}. In Gnus, this is overridden by the value
437of @code{gnus-blocked-images} or the return value of the function that 437of @code{gnus-blocked-images} or the return value of the function that
438@code{gnus-blocked-images} is set to (@pxref{HTML, ,HTML, gnus, Gnus 438@code{gnus-blocked-images} is set to (@pxref{HTML, ,HTML, gnus, Gnus
439manual}). 439manual}). The default is @code{nil}.
440 440
441@item mm-w3m-safe-url-regexp 441@item mm-w3m-safe-url-regexp
442@vindex mm-w3m-safe-url-regexp 442@vindex mm-w3m-safe-url-regexp