Commit 7c9206f8 authored by Katsumi Yamaoka's avatar Katsumi Yamaoka

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.
parent b1079c0f
...@@ -420,7 +420,7 @@ article body. It is effective to images in @acronym{HTML} articles ...@@ -420,7 +420,7 @@ article body. It is effective to images in @acronym{HTML} articles
rendered when @code{mm-text-html-renderer} (@pxref{Display rendered when @code{mm-text-html-renderer} (@pxref{Display
Customization}) is @code{shr} or @code{w3m}. In Gnus, this is Customization}) is @code{shr} or @code{w3m}. In Gnus, this is
overridden by the value of @code{gnus-inhibit-images} (@pxref{Misc overridden by the value of @code{gnus-inhibit-images} (@pxref{Misc
Article, ,Misc Article, gnus, Gnus manual}). Article, ,Misc Article, gnus, Gnus manual}). The default is @code{nil}.
@item mm-html-blocked-images @item mm-html-blocked-images
@vindex mm-html-blocked-images @vindex mm-html-blocked-images
...@@ -436,7 +436,7 @@ It is effective when @code{mm-text-html-renderer} (@pxref{Display ...@@ -436,7 +436,7 @@ It is effective when @code{mm-text-html-renderer} (@pxref{Display
Customization}) is @code{shr}. In Gnus, this is overridden by the value Customization}) is @code{shr}. In Gnus, this is overridden by the value
of @code{gnus-blocked-images} or the return value of the function that of @code{gnus-blocked-images} or the return value of the function that
@code{gnus-blocked-images} is set to (@pxref{HTML, ,HTML, gnus, Gnus @code{gnus-blocked-images} is set to (@pxref{HTML, ,HTML, gnus, Gnus
manual}). manual}). The default is @code{nil}.
@item mm-w3m-safe-url-regexp @item mm-w3m-safe-url-regexp
@vindex mm-w3m-safe-url-regexp @vindex mm-w3m-safe-url-regexp
......
...@@ -353,6 +353,20 @@ to version 206, you can do this with C-u C-u M-x desktop-save. ...@@ -353,6 +353,20 @@ to version 206, you can do this with C-u C-u M-x desktop-save.
It raises an error if a bookmark of that name already exists, It raises an error if a bookmark of that name already exists,
unlike `bookmark-set' which silently updates an existing bookmark. unlike `bookmark-set' which silently updates an existing bookmark.
** Gnus
+++
*** New user options `mm-html-inhibit-images' and `mm-html-blocked-images'
now control how mm-* functions fetch and display images in an HTML
message. Gnus still uses `gnus-inhibit-images' and `gnus-blocked-images'
for that purpose, i.e., binds mm-html- variables with those gnus-
variables, but other packages do not have to bind gnus- variables now.
---
*** `mm-inline-text-html-with-images' has been removed.
Use `mm-html-inhibit-images' instead. Note that the value is opposite
in meaning.
** IMAP ** IMAP
--- ---
......
...@@ -145,16 +145,13 @@ nil : use external viewer (default web browser)." ...@@ -145,16 +145,13 @@ nil : use external viewer (default web browser)."
(function)) (function))
:group 'mime-display) :group 'mime-display)
(defcustom mm-html-inhibit-images (defcustom mm-html-inhibit-images nil
(if (boundp 'mm-inline-text-html-with-images)
(not (symbol-value 'mm-inline-text-html-with-images))
t)
"Non-nil means inhibit displaying of images inline in the article body." "Non-nil means inhibit displaying of images inline in the article body."
:version "25.1" :version "25.1"
:type 'boolean :type 'boolean
:group 'mime-display) :group 'mime-display)
(defcustom mm-html-blocked-images "" (defcustom mm-html-blocked-images nil
"Regexp matching image URLs to be blocked, or nil meaning not to block. "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." Note that cid images that are embedded in a message won't be blocked."
:version "25.1" :version "25.1"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment