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 12316f0d985f3add844def90020dc116e087b77e..2b935870dae73c8e156ae2f42f1efb9e65d048ae 100644 (file)
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -420,12 +420,12 @@ 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
 External images that have @acronym{URL}s that match this regexp won't
-be fetched and displayed.  For instance, do block all @acronym{URL}s
+be fetched and displayed.  For instance, to block all @acronym{URL}s
 that have the string ``ads'' in them, do the following:
 
 @lisp
@@ -438,6 +438,11 @@ 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{""} (which is the default).
+
 @item mm-w3m-safe-url-regexp
 @vindex mm-w3m-safe-url-regexp
 A regular expression that matches safe URL names, i.e., URLs that are
@@ -1549,7 +1554,7 @@ Here's a bunch of time/date/second/day examples:
 (time-less-p '(13818 19266) '(13818 19145))
 @result{} nil
 
-(subtract-time '(13818 19266) '(13818 19145))
+(time-subtract '(13818 19266) '(13818 19145))
 @result{} (0 121)
 
 (days-between "Sat Sep 12 12:21:54 1998 +0200"
@@ -1627,14 +1632,14 @@ return a ``zero'' time.
 
 @item time-less-p
 Take two times and say whether the first time is less (i.e., earlier)
-than the second time.
+than the second time.  (This is a built-in function.)
 
 @item time-since
 Take a time and return a time saying how long it was since that time.
 
-@item subtract-time
+@item time-subtract
 Take two times and subtract the second from the first.  I.e., return
-the time between the two times.
+the time between the two times.  (This is a built-in function.)
 
 @item days-between
 Take two days and return the number of days between those two days.
@@ -1821,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: