Synch to No Gnus 200402271148.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bad3364..dc29bf6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,13 @@
 2004-02-27  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+       * lpath.el: Bind w3m-safe-url-regexp.
+
+       * gnus-art.el (gnus-article-wash-html-with-w3m): Make the
+       w3m-safe-url-regexp variable buffer-local and set it as the value
+       of mm-w3m-safe-url-regexp.
+
+       * mm-view.el (mm-inline-text-html-render-with-w3m): Ditto.
+
        * gnus-msg.el (gnus-setup-message): Ignore an article copy while
        parsing gnus-posting-styles when the message is not for replying.
 

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index a90a14c..0c2c6c7 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -2548,12 +2548,10 @@ If READ-CHARSET, ask for a coding system."
 (defun gnus-article-wash-html-with-w3m ()
   "Wash the current buffer with emacs-w3m."
   (mm-setup-w3m)
+  (set (make-local-variable 'w3m-safe-url-regexp) mm-w3m-safe-url-regexp)
   (save-restriction
     (narrow-to-region (point) (point-max))
-    (let ((w3m-safe-url-regexp (if mm-inline-text-html-with-images
-                                  nil
-                                "\\`cid:"))
-         w3m-force-redisplay)
+    (let (w3m-force-redisplay)
       (w3m-region (point-min) (point-max)))
     (when (and mm-inline-text-html-with-w3m-keymap
               (boundp 'w3m-minor-mode-map)

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 920e1e3..5219e75 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -29,7 +29,7 @@
              w3-meta-content-type-charset-regexp
              w3m-cid-retrieve-function-alist w3m-current-buffer
              w3m-display-inline-images w3m-meta-content-type-charset-regexp
-             w3m-minor-mode-map))
+             w3m-minor-mode-map w3m-safe-url-regexp))
 
 (if (featurep 'xemacs)
     (progn

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index add8fab..f0b4bf6 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -222,6 +222,7 @@
 (defun mm-inline-text-html-render-with-w3m (handle)
   "Render a text/html part using emacs-w3m."
   (mm-setup-w3m)
+  (set (make-local-variable 'w3m-safe-url-regexp) mm-w3m-safe-url-regexp)
   (let ((text (mm-get-part handle))
        (b (point))
        (charset (mail-content-type-get (mm-handle-type handle) 'charset)))
@@ -236,8 +237,7 @@
        (when charset
          (delete-region (point-min) (point-max))
          (insert (mm-decode-string text charset)))
-       (let ((w3m-safe-url-regexp mm-w3m-safe-url-regexp)
-             w3m-force-redisplay)
+       (let (w3m-force-redisplay)
          (w3m-region (point-min) (point-max)))
        (when (and mm-inline-text-html-with-w3m-keymap
                   (boundp 'w3m-minor-mode-map)