(w32_menu_display_help): Suppress tooltip when navigating menus with

the keyboard.

diff --git a/src/ChangeLog b/src/ChangeLog
index c5053161c83b29c62eaac36fd692a68ad9eb03fc..ec3ecb5666053336d2a33dbbdb55eabbc930be0a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-25  Jason Rumney  <jasonr@gnu.org>
+
+       * w32menu.c (w32_menu_display_help): Suppress tooltip when
+       navigating menus with the keyboard.
+
 2005-07-23  Richard M. Stallman  <rms@gnu.org>
 
        * insdel.c (syms_of_insdel): staticpro combine_after_change_buffer.

diff --git a/src/w32menu.c b/src/w32menu.c
index 065355f87550a55a30ef9faaa77cbc3b984fc0e7..0e4902b6ce4d7f12950ce0a1c4470eaf68d3afec 100644 (file)
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -2418,8 +2418,11 @@ w32_menu_display_help (HWND owner, HMENU menu, UINT item, UINT flags)
       struct frame *f = x_window_to_frame (&one_w32_display_info, owner);
       Lisp_Object frame, help;
 
-      /* No help echo on owner-draw menu items.  */
-      if (flags & MF_OWNERDRAW || flags & MF_POPUP)
+      /* No help echo on owner-draw menu items, or when the keyboard is used
+        to navigate the menus, since tooltips are distracting if they pop
+        up elsewhere.  */
+      if (flags & MF_OWNERDRAW || flags & MF_POPUP
+         || !(flags & MF_MOUSESELECT))
        help = Qnil;
       else
        {