Synch to No Gnus 200403010612.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5dd0c0c..c57437f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2004-03-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * lpath.el: Don't bind w3m-safe-url-regexp.
+
+       * gnus-art.el (gnus-article-wash-html-with-w3m): Don't make the
+       w3m-safe-url-regexp variable buffer-local.
+
+       * mm-view.el (mm-inline-text-html-render-with-w3m): Ditto.
+
 2004-02-27  Simon Josefsson  <jas@extundo.com>
 
        * gnus-sum.el (gnus-move-group-prefix-function): Add, default to

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 0c2c6c7..9b45e0b 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -2548,10 +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-force-redisplay)
+    (let ((w3m-safe-url-regexp mm-w3m-safe-url-regexp)
+         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 5219e75..920e1e3 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-safe-url-regexp))
+             w3m-minor-mode-map))
 
 (if (featurep 'xemacs)
     (progn

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index f0b4bf6..add8fab 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -222,7 +222,6 @@
 (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)))
@@ -237,7 +236,8 @@
        (when charset
          (delete-region (point-min) (point-max))
          (insert (mm-decode-string text charset)))
-       (let (w3m-force-redisplay)
+       (let ((w3m-safe-url-regexp mm-w3m-safe-url-regexp)
+             w3m-force-redisplay)
          (w3m-region (point-min) (point-max)))
        (when (and mm-inline-text-html-with-w3m-keymap
                   (boundp 'w3m-minor-mode-map)