diff options
-rw-r--r-- | src/ChangeLog | 5 | ||||
-rw-r--r-- | src/w32menu.c | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c5053161c8..ec3ecb5666 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-07-25 Jason Rumney <[email protected]> + + * w32menu.c (w32_menu_display_help): Suppress tooltip when + navigating menus with the keyboard. + 2005-07-23 Richard M. Stallman <[email protected]> * insdel.c (syms_of_insdel): staticpro combine_after_change_buffer. diff --git a/src/w32menu.c b/src/w32menu.c index 065355f875..0e4902b6ce 100644 --- 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 { |