(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 57f86bcf739faf130a6e93240d4a8900fa10a0e0..c174013452d019ad042e1d8b5bfb27f33aeca477 100644 (file)
--- 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 966459952c56ef21d6e8372f9365f9dfcdfcff0b..309ed552b1e0ced58237fb22c5b5333f350656ea 100644 (file)
--- 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