Synch to Gnus 200310100840.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 858ccea..2db82d9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mm-decode.el (mm-w3m-safe-url-regexp): Doc fix.
+
+       * mm-view.el (mm-w3m-mode-map): Doc fix.
+       (mm-inline-text-html-render-with-w3m): Add a comment.
+
 2003-10-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-group.el: Remove superfluous eval-when-compiles.

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 02dcf95..04b352a 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -134,14 +134,17 @@ the documentation for the option `mm-w3m-safe-url-regexp'."
   :group 'mime-display)
 
 (defcustom mm-w3m-safe-url-regexp "\\`cid:"
-  "Regexp that matches safe url names.
-Some HTML mails might have a trick of spammers using <img> tags.
-It is likely to be intended to verify whether you have read the
-mail.  You can prevent your personal informations from leaking by
-setting this to the regexp which matches the safe url names.  The
-value of the variable `w3m-safe-url-regexp' will be bound with
-this value.  You may set this value to nil if you consider all
-urls to be safe."
+  "Regexp matching URLs which are considered to be safe.
+Some HTML mails might contain a nasty trick used by spammers, using
+the <img> tag which is far more evil than the [Click Here!] button.
+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."
   :type '(choice (regexp :tag "Regexp")
                 (const :tag "All URLs are safe" nil))
   :group 'mime-display)

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 5a57a92..ec59348 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -213,11 +213,10 @@
   (unless (or (featurep 'xemacs)
              (>= emacs-major-version 21))
     (defvar mm-w3m-mode-map nil
-      "Keymap for text/html part rendered by `mm-w3m-preview-text/html'.
-This map is overwritten by `mm-w3m-local-map-property' based on the
-value of `w3m-minor-mode-map'.  Therefore, in order to add some
-commands to this map, add them to `w3m-minor-mode-map' instead of this
-map.")))
+      "Keymap for text/html parts rendered by emacs-w3m.
+This keymap will be bound only when Emacs 20 is running and overwritten
+by the value of `w3m-minor-mode-map'.  In order to add some commands to
+this keymap, add them to `w3m-minor-mode-map' instead of this keymap.")))
 
 (defun mm-w3m-local-map-property ()
   (when (and (boundp 'w3m-minor-mode-map) w3m-minor-mode-map)
@@ -255,6 +254,7 @@ map.")))
          (add-text-properties
           (point-min) (point-max)
           (nconc (mm-w3m-local-map-property)
+                 ;; Put the mark meaning this part was rendered by emacs-w3m.
                  '(mm-inline-text-html-with-w3m t)))))
       (mm-handle-set-undisplayer
        handle