From 76b1558d97fd5dd6754f9cb349fdcf06e389aa8c Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Thu, 24 Aug 2000 23:36:46 +0000
Subject: [PATCH] Synch with Gnus.

---
 lisp/ChangeLog   |    5 +++++
 lisp/gnus-art.el |   39 ++++++++++++++++++++++++---------------
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ff0d359..4682643 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-24  Dave Love  <fx@gnu.org>
+
+	* gnus-art.el (gnus-insert-mime-button): Fix help-echo for Emacs
+	21.
+
 2000-08-23  Dave Love  <fx@gnu.org>
 
 	* dgnushack.el: Remove `member-if' compiler macro.
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 4055dd3..f8e8f77 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -3538,21 +3538,30 @@ In no internal viewer is available, use an external viewer."
 		 article-type annotation
 		 gnus-data ,handle))
     (setq e (point))
-    (widget-convert-button 'link b e
-			   :mime-handle handle
-			   :action 'gnus-widget-press-button
-			   :button-keymap gnus-mime-button-map
-			   :help-echo
-			   (lambda (widget)
-			     ;; Needed to properly clear the message
-			     ;; due to a bug in wid-edit
-			     (setq help-echo-owns-message t)
-			     (format
-			      "Click to %s the MIME part; %s for more options"
-			      (if (mm-handle-displayed-p
-				   (widget-get widget :mime-handle))
-				  "hide" "show")
-			      (if gnus-xemacs "button3" "mouse-3"))))))
+    (widget-convert-button
+     'link b e
+     :mime-handle handle
+     :action 'gnus-widget-press-button
+     :button-keymap gnus-mime-button-map
+     :help-echo
+     (lambda (widget/window &optional overlay pos)
+       ;; Needed to properly clear the message due to a bug in
+       ;; wid-edit (XEmacs only).
+       (if (boundp 'help-echo-owns-message)
+	   (setq help-echo-owns-message t))
+       (format
+	"%S: %s the MIME part; %S: more options"
+	(aref gnus-mouse-2 0)
+	;; XEmacs will get a single widget arg; Emacs 21 will get
+	;; window, overlay, position.
+	(if (mm-handle-displayed-p
+	     (if overlay
+		 (with-current-buffer (overlay-buffer overlay)
+		   (widget-get (widget-at (overlay-start overlay))
+			       :mime-handle))
+	       (widget-get widget/window :mime-handle)))
+	    "hide" "show")
+	(aref gnus-down-mouse-3 0))))))
 
 (defun gnus-widget-press-button (elems el)
   (goto-char (widget-get elems :from))
-- 
1.7.10.4