From 380de3eb6491aeb8d2e1f43131f17ead10507205 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 16 Oct 2003 03:45:54 +0000 Subject: [PATCH] Synch to Gnus 200310160344. --- lisp/ChangeLog | 5 +++++ lisp/mm-decode.el | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1229811..e555fb6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2003-10-16 Katsumi Yamaoka + + * mm-decode.el (mm-inline-text-html-with-images): Doc fix. + (mm-w3m-safe-url-regexp): Doc fix. + 2003-10-12 Jesper Harder * gnus-sum.el (gnus-summary-respool-query): Don't narrow to head, diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el index fe7eed1..ef05220 100644 --- a/lisp/mm-decode.el +++ b/lisp/mm-decode.el @@ -127,9 +127,9 @@ nil : using external viewer." It is suggested to customize `mm-text-html-renderer' instead.") (defcustom mm-inline-text-html-with-images nil - "If non-nil, Gnus will allow retrieving images in the HTML contents -with tags. It has no effect on Emacs/w3. See also -the documentation for the option `mm-w3m-safe-url-regexp'." + "If non-nil, Gnus will allow retrieving images in HTML contents with +the tags. It has no effect on Emacs/w3. See also the +documentation for the `mm-w3m-safe-url-regexp' variable." :type 'boolean :group 'mime-display) @@ -141,10 +141,10 @@ It is most likely intended to check whether the ominous spam mail has reached your eyes or not, in which case the spammer knows for sure that your email address is valid. It is done by embedding an identifier string into a URL that you might automatically retrieve -when displaying the image. By default, the -`mm-inline-text-html-with-images' variable is nil and Gnus will never -connect to the spammer's site arbitrarily. You may set this value to -nil if you consider all urls to be safe." +when displaying the image. The default value is \"\\\\`cid:\" which only +matches parts embedded to the Multipart/Related type MIME contents and +Gnus will never connect to the spammer's site arbitrarily. You may +set this variable to nil if you consider all urls to be safe." :type '(choice (regexp :tag "Regexp") (const :tag "All URLs are safe" nil)) :group 'mime-display) -- 1.7.10.4