From: Dave Love <fx@gnu.org>
Date: Wed, 19 Jul 2000 15:56:50 +0000 (+0000)
Subject: (ediff-region-help-echo): Partially fix for Emacs implementation.
X-Git-Tag: emacs-pretest-21.0.90~2724
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=50575ec215fab586efac2f675c34b7d5410122fc;p=emacs.git

(ediff-region-help-echo): Partially fix for Emacs implementation.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 59312a4f82f..7a35106dcdc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2000-07-19  Dave Love  <fx@gnu.org>
+
+	* ediff-init.el (ediff-region-help-echo): Partially fix for Emacs
+	implementation.
+
+	* mouse.el (popup-menu): Allow a list of keymaps for menu arg.
+	(mouse-popup-menubar, mouse-popup-menubar-stuff): New functions.
+	(global-map): Bind c-down-mouse-3 to mouse-popup-menubar-stuff.
+
 2000-07-19  Gerd Moellmann  <gerd@gnu.org>
 
 	* textmodes/refer.el: Correct maintainer's email address.
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el
index ed8cfa29e1e..852ba19207c 100644
--- a/lisp/ediff-init.el
+++ b/lisp/ediff-init.el
@@ -811,23 +811,33 @@ appropriate symbol: `rcs', `pcl-cvs', or `generic-sc' if you so desire."
   (ediff-overlay-put extent 'face face)
   (ediff-overlay-put extent 'help-echo 'ediff-region-help-echo))
  
-;; This does nothing in Emacs, since overlays there have no help-echo property
-(defun ediff-region-help-echo (extent)
-  (let ((is-current (ediff-overlay-get extent 'ediff))
-	(face (ediff-overlay-get extent 'face))
-	(diff-num (ediff-overlay-get extent 'ediff-diff-num))
-	face-help)
+(defun ediff-region-help-echo (extent-or-window &optional buffer point)
+  (let (is-current face diff-num face-help)
+    (if buffer
+	;; Emacs 21 calling sequence.
+	(progn
+	  (setq is-current (get-char-property point 'ediff buffer))
+	  (setq face (get-char-property point 'face buffer))
+	  (if (stringp face)
+	      (setq face (intern face)))
+	  (setq diff-num (get-char-property point 'ediff-diff-num buffer)))
+      ;; XEmacs calling sequence.
+      (setq is-current (ediff-overlay-get extent-or-window 'ediff))
+      (setq face (ediff-overlay-get extent-or-window 'face))
+      (setq diff-num (ediff-overlay-get extent-or-window 'ediff-diff-num)))
 
     ;; This happens only for refinement overlays
     (setq face-help (and face (get face 'ediff-help-echo)))
 
-    (cond ((and is-current diff-num) ; current diff region
+    (cond ((and is-current diff-num)	; current diff region
 	   (format "Difference region %S -- current" (1+ diff-num)))
-	  (face-help) ; refinement of current diff region
-	  (diff-num ; non-current
+;; This doesn't DTRT because we may have got it from the wrong goverlay.
+;; Fixme.
+;;;	  (face-help)			; refinement of current diff region
+	  (diff-num			; non-current
 	   (format "Difference region %S -- non-current" (1+ diff-num)))
-	  (t ""))   ; none
-    ))
+	  (t ""))			; none
+    )))
 
 
 (defun ediff-set-face-pixmap (face pixmap)