From: Gerd Moellmann <gerd@gnu.org>
Date: Fri, 21 Jul 2000 15:38:39 +0000 (+0000)
Subject: (note_mouse_highlight): If help-echo was found in an
X-Git-Tag: emacs-pretest-21.0.90~2690
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=743934dbc8ff5151ebca1725e5c6c1606f4f0505;p=emacs.git

(note_mouse_highlight): If help-echo was found in an
overlay, use that overlay as the object in which the help was
found.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 57f86bcf739..c174013452d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2000-07-21  Gerd Moellmann  <gerd@gnu.org>
 
+	* keyboard.c (show_help_echo, gen_help_event): Extend comments.
+
+	* xterm.c (note_mouse_highlight): If help-echo was found in an
+	overlay, use that overlay as the object in which the help was
+	found.
+
 	* window.c (foreach_window_1): Fix typo reversing an if-condition.
 	
 	* window.c (foreach_window): Instead of a fake variable argument
diff --git a/src/xterm.c b/src/xterm.c
index 966459952c5..309ed552b1e 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6626,18 +6626,21 @@ note_mouse_highlight (f, x, y)
 
 	/* Look for a `help-echo' property.  */
 	{
-	  Lisp_Object help, object, position;
+	  Lisp_Object help, overlay;
 
 	  /* Check overlays first.  */
 	  help = Qnil;
 	  for (i = 0; i < noverlays && NILP (help); ++i)
-	    help = Foverlay_get (overlay_vec[i], Qhelp_echo);
+	    {
+	      overlay = overlay_vec[i];
+	      help = Foverlay_get (overlay, Qhelp_echo);
+	    }
 
 	  if (!NILP (help))
 	    {
 	      help_echo = help;
 	      help_echo_window = window;
-	      help_echo_object = w->buffer;
+	      help_echo_object = overlay;
 	      help_echo_pos = pos;
 	    }
 	  else