aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatsumi Yamaoka2016-02-09 22:24:25 +0000
committerKatsumi Yamaoka2016-02-09 22:24:25 +0000
commitfa55da20db11fd09a30c6e5c2205565929aee30e (patch)
tree4041d9d8347985771da73a5a8b3e70c4bb335a78
parent145a11e1a3417d0fef60148296f2e8f97e09d5e9 (diff)
downloademacs-fa55da20db11fd09a30c6e5c2205565929aee30e.tar.gz
emacs-fa55da20db11fd09a30c6e5c2205565929aee30e.zip
Make mm-html-blocked-images default to "" again
* lisp/gnus/mm-decode.el (mm-html-blocked-images): Default to "" that blocks all external images. * doc/misc/emacs-mime.texi (Display Customization): Mention that mm-html-blocked-images defaults to "".
-rw-r--r--doc/misc/emacs-mime.texi2
-rw-r--r--lisp/gnus/mm-decode.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index b7c58d7ebeb..9c4f10ec90c 100644
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -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}). The default is @code{nil}. 439manual}). The default is @code{""} that blocks all external images.
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
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index c45258e987c..f70877dc63a 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -151,7 +151,7 @@ nil : use external viewer (default web browser)."
151 :type 'boolean 151 :type 'boolean
152 :group 'mime-display) 152 :group 'mime-display)
153 153
154(defcustom mm-html-blocked-images nil 154(defcustom mm-html-blocked-images ""
155 "Regexp matching image URLs to be blocked, or nil meaning not to block. 155 "Regexp matching image URLs to be blocked, or nil meaning not to block.
156Note that cid images that are embedded in a message won't be blocked." 156Note that cid images that are embedded in a message won't be blocked."
157 :version "25.1" 157 :version "25.1"