(note_mouse_highlight): If help-echo was found in an

overlay, use that overlay as the object in which the help was
found.

1 files changed, 6 insertions, 3 deletions

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