[Emacs-diffs] /srv/bzr/emacs/trunk r105084: * xmenu.c (menu_highlight_callback): Only pass frame to show_help_event

[Jan D.]

------------------------------------------------------------
revno: 105084
fixes bug(s): http://debbugs.gnu.org/3642
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2011-07-10 18:55:22 +0200
message:
  * xmenu.c (menu_highlight_callback): Only pass frame to show_help_event
  for non-popups.
modified:
  src/ChangeLog
  src/xmenu.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-07-10 08:52:10 +0000
+++ b/src/ChangeLog     2011-07-10 16:55:22 +0000
@@ -1,3 +1,8 @@
+2011-07-10  Jan Djärv  <address@hidden>
+
+       * xmenu.c (menu_highlight_callback): Only pass frame to show_help_event
+       for non-popups (Bug#3642).
+
 2011-07-10  Andreas Schwab  <address@hidden>
 
        * alloc.c (reset_malloc_hooks): Protoize.

=== modified file 'src/xmenu.c'
--- a/src/xmenu.c       2011-06-24 21:25:22 +0000
+++ b/src/xmenu.c       2011-07-10 16:55:22 +0000
@@ -740,10 +740,13 @@
   help = call_data ? cb_data->help : Qnil;
 
   /* If popup_activated_flag is greater than 1 we are in a popup menu.
-     Don't show help for them, they won't appear before the
-     popup is popped down.  */
-  if (popup_activated_flag <= 1)
-    show_help_event (cb_data->cl_data->f, widget, help);
+     Don't pass the frame to show_help_event for those.
+     Passing frame creates an Emacs event.  As we are looping in
+     popup_widget_loop, it won't be handeled.  Passing NULL shows the tip
+     directly without using an Emacs event.  This is what the Lucid code
+     does below.  */
+  show_help_event (popup_activated_flag <= 1 ? cb_data->cl_data->f : NULL,
+                   widget, help);
 }
 #else
 static void