diff options
| author | Katsumi Yamaoka <yamaoka@jpl.org> | 2016-02-09 05:30:26 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2016-02-09 05:30:26 +0000 |
| commit | 7c9206f82000e9fd6ea9d1a53fc054eff88e701c (patch) | |
| tree | 67682f99d4b7a886d54483309084cdb28a121d65 | |
| parent | b1079c0f86c218f016a6c2e84ea402f4e175fc53 (diff) | |
| download | emacs-7c9206f82000e9fd6ea9d1a53fc054eff88e701c.tar.gz | |
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.
| -rw-r--r-- | doc/misc/emacs-mime.texi | 4 | ||||
| -rw-r--r-- | etc/NEWS | 14 | ||||
| -rw-r--r-- | lisp/gnus/mm-decode.el | 7 |
3 files changed, 18 insertions, 7 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 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 @@ -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 --- diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index c6cb6520255..c45258e987c 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -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" |