From: yamaoka <yamaoka>
Date: Tue, 6 Jan 2004 11:46:33 +0000 (+0000)
Subject: Synch to No Gnus 200401061143.
X-Git-Tag: t-gnus-6_17_4-quimby-~1162
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c35e59910bcc6201f6e8ca509e1ab0a459dafb0;p=elisp%2Fgnus.git-

Synch to No Gnus 200401061143.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce9259e..23a449d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2004-01-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-art.el (gnus-article-wash-html-with-w3m): Don't use
+	mm-w3m-local-map-property.
+
+	* mm-view.el (mm-w3m-mode-map): Remove.
+	(mm-w3m-local-map-property): Remove.
+	(mm-inline-text-html-render-with-w3m): Don't use
+	mm-w3m-local-map-property.
+
 2004-01-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* run-at-time.el: New file.
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 253adb3..b90f400 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -2546,11 +2546,14 @@ If READ-CHARSET, ask for a coding system."
 				 "\\`cid:"))
 	  w3m-force-redisplay)
       (w3m-region (point-min) (point-max)))
-    (when mm-inline-text-html-with-w3m-keymap
+    (when (and mm-inline-text-html-with-w3m-keymap
+	       (boundp 'w3m-minor-mode-map)
+	       w3m-minor-mode-map)
       (add-text-properties
        (point-min) (point-max)
-       (nconc (mm-w3m-local-map-property)
-	      '(mm-inline-text-html-with-w3m t))))))
+       (list 'keymap w3m-minor-mode-map
+	     ;; Put the mark meaning this part was rendered by emacs-w3m.
+	     'mm-inline-text-html-with-w3m t)))))
 
 (defun article-hide-list-identifiers ()
   "Remove list identifies from the Subject header.
diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 4328ce7..d3eb051 100644
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -216,27 +216,6 @@
 	      (mm-w3m-cid-retrieve-1 url handle))
 	  (mm-w3m-cid-retrieve-1 url handles))))))
 
-(eval-and-compile
-  (unless (or (featurep 'xemacs)
-	      (>= emacs-major-version 21))
-    (defvar mm-w3m-mode-map nil
-      "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)
-    (if (or (featurep 'xemacs)
-	    (>= emacs-major-version 21))
-	(list 'keymap w3m-minor-mode-map)
-      (list 'local-map
-	    (or mm-w3m-mode-map
-		(progn
-		  (setq mm-w3m-mode-map (copy-keymap w3m-minor-mode-map))
-		  (set-keymap-parent mm-w3m-mode-map gnus-article-mode-map)
-		  mm-w3m-mode-map))))))
-
 (defun mm-inline-text-html-render-with-w3m (handle)
   "Render a text/html part using emacs-w3m."
   (mm-setup-w3m)
@@ -257,12 +236,14 @@ this keymap, add them to `w3m-minor-mode-map' instead of this keymap.")))
 	(let ((w3m-safe-url-regexp mm-w3m-safe-url-regexp)
 	      w3m-force-redisplay)
 	  (w3m-region (point-min) (point-max)))
-	(when mm-inline-text-html-with-w3m-keymap
+	(when (and mm-inline-text-html-with-w3m-keymap
+		   (boundp 'w3m-minor-mode-map)
+		   w3m-minor-mode-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)))))
+	   (list 'keymap w3m-minor-mode-map
+		 ;; Put the mark meaning this part was rendered by emacs-w3m.
+		 'mm-inline-text-html-with-w3m t))))
       (mm-handle-set-undisplayer
        handle
        `(lambda ()