Merge from origin/emacs-25

[gnu-emacs] / doc / misc / emacs-mime.texi

diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index 0147db34fffed2fd171d605a83078afdccef4268..2b3bba39ad985698644d8c623a14446b8a1f2983 100644 (file)
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -4,6 +4,7 @@
 
 @setfilename ../../info/emacs-mime.info
 @settitle Emacs MIME Manual
+@include docstyle.texi
 @synindex fn cp
 @synindex vr cp
 @synindex pg cp
@@ -11,7 +12,7 @@
 @copying
 This file documents the Emacs MIME interface functionality.
 
-Copyright @copyright{} 1998--2015 Free Software Foundation, Inc.
+Copyright @copyright{} 1998--2016 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -27,7 +28,6 @@ modify this GNU manual.''
 @end copying
 
 @c Node ``Interface Functions'' uses non-ASCII characters
-@documentencoding UTF-8
 
 @dircategory Emacs lisp libraries
 @direntry
@@ -412,17 +412,36 @@ information about emacs-w3m}, @code{links}, @code{lynx},
 external viewer.  You can also specify a function, which will be
 called with a @acronym{MIME} handle as the argument.
 
-@item mm-inline-text-html-with-images
+@item mm-html-inhibit-images
+@vindex mm-html-inhibit-images
 @vindex mm-inline-text-html-with-images
+If this is non-@code{nil}, inhibit displaying of images inline in the
+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}).  The default is @code{nil}.
+
+@item mm-html-blocked-images
+@vindex mm-html-blocked-images
+External images that have @acronym{URL}s that match this regexp won't
+be fetched and displayed.  For instance, to block all @acronym{URL}s
+that have the string ``ads'' in them, do the following:
+
+@lisp
+(setq mm-html-blocked-images "ads")
+@end lisp
+
+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}).
+
 Some @acronym{HTML} mails might have the trick of spammers using
 @samp{<img>} tags.  It is likely to be intended to verify whether you
 have read the mail.  You can prevent your personal information from
-leaking by setting this option to @code{nil} (which is the default).
-For emacs-w3m, you may use the command @kbd{t} on the image anchor to
-show an image even if it is @code{nil}.@footnote{The command @kbd{T}
-will load all images.  If you have set the option
-@code{w3m-key-binding} to @code{info}, use @kbd{i} or @kbd{I}
-instead.}
+leaking by setting this option to @code{""} (which is the default).
 
 @item mm-w3m-safe-url-regexp
 @vindex mm-w3m-safe-url-regexp
@@ -1807,6 +1826,11 @@ matching types.
 @vindex mailcap-mime-data
 This variable is an alist of alists containing backup viewing rules.
 
+@item mailcap-user-mime-data
+@vindex mailcap-user-mime-data
+A customizable list of viewers that take preference over
+@code{mailcap-mime-data}.
+
 @end table
 
 Interface functions: