mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-22 07:09:54 +00:00
Code Issues Releases Activity

Make mm-html-inhibit-images and mm-html-blocked-images default to nil

Browse Source 
* 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.
This commit is contained in:
Katsumi Yamaoka 2016-02-09 05:30:26 +00:00
parent b1079c0f86
commit 7c9206f820
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/misc/emacs-mime.texi
View File

@ -420,7 +420,7 @@ article body. It is effective to images in @acronym{HTML} articles
rendered when @code{mm-text-html-renderer} (@pxref{Display
Customization}) is @code{shr} or @code{w3m}. In Gnus, this is
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
@vindex mm-html-blocked-images
@ -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
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
manual}).
manual}). The default is @code{nil}.
@item mm-w3m-safe-url-regexp
@vindex mm-w3m-safe-url-regexp

14
etc/NEWS
View File

@ -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,
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
---

7
lisp/gnus/mm-decode.el
View File

@ -145,16 +145,13 @@ nil : use external viewer (default web browser)."
(function))
:group 'mime-display)
(defcustom mm-html-inhibit-images
(if (boundp 'mm-inline-text-html-with-images)
(not (symbol-value 'mm-inline-text-html-with-images))
t)
(defcustom mm-html-inhibit-images nil
"Non-nil means inhibit displaying of images inline in the article body."
:version "25.1"
:type 'boolean
: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.
Note that cid images that are embedded in a message won't be blocked."
:version "25.1"