diff options
| author | John Wiegley <johnw@newartisans.com> | 2016-02-15 14:07:46 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2016-02-15 14:07:46 -0800 |
| commit | 33bb679af9e323408c8089f0b5675a54776d60d5 (patch) | |
| tree | 597ee645c54d54e3d77bd3394a72d67b7293f262 /lisp/gnus/mm-decode.el | |
| parent | ab7583a2b00d13207ab1c325c25c520a33859eee (diff) | |
| parent | 10b8ed27ec91ff52f93eb0297dcc3abb214931aa (diff) | |
| download | emacs-33bb679af9e323408c8089f0b5675a54776d60d5.tar.gz emacs-33bb679af9e323408c8089f0b5675a54776d60d5.tar.bz2 emacs-33bb679af9e323408c8089f0b5675a54776d60d5.zip | |
Merge from origin/emacs-25
10b8ed2 Document EXIF image rotation
0f60049 Support integer image rotation and respect EXIF rotations
7dd45b6 Quote table names for postgres listings (sql-mode)
6bac035 * lisp/replace.el (replace-match-maybe-edit): Make arg
`backward' optional.
ee909aa * lisp/simple.el (next-line-or-history-element): Reset
temporary-goal-column.
0a289d3 Suppress ACL ops if configured with --disable-acl
1a9dbf5 Mention web bugs
fa55da2 Make mm-html-blocked-images default to "" again
Diffstat (limited to 'lisp/gnus/mm-decode.el')
| -rw-r--r-- | lisp/gnus/mm-decode.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index 89dc608cc88..f45337dc042 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -149,7 +149,7 @@ nil : use external viewer (default web browser)." :type 'boolean :group 'mime-display) -(defcustom mm-html-blocked-images nil +(defcustom mm-html-blocked-images "" "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" |