Avoid erratic behavior of menu-bar tooltips on w32 (Bug#19925)

 src/w32fns.c (Fw32__menu_bar_in_use): New internal function.

 lisp/frame.el (blink-cursor-timer-function): Don't increment
 blink-cursor-blinks-done counter when a menu is active on a w32
 frame.

2 files changed, 15 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8bffdadf66c..a2ac5389f20 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-23  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32fns.c (Fw32__menu_bar_in_use): New internal function.
+        (Bug#19925)
+
 2015-02-20  Glenn Morris  <rgm@gnu.org>
 
         * fileio.c (Fmake_temp_name): Doc tweaks.  (Bug#19858)
diff --git a/src/w32fns.c b/src/w32fns.c
index 5af36b9a0c8..ed110317d17 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -8063,6 +8063,15 @@ w32_sys_ring_bell (struct frame *f)
     MessageBeep (sound_type);
 }
 
+DEFUN ("w32--menu-bar-in-use", Fw32__menu_bar_in_use, Sw32__menu_bar_in_use,
+       0, 0, 0,
+       doc: /* Return non-nil when a menu-bar menu is being used.
+Internal use only.  */)
+  (void)
+{
+  return menubar_in_use ? Qt : Qnil;
+}
+
 
 /***********************************************************************
                             Initialization
@@ -8439,6 +8448,7 @@ only be necessary if the default setting causes problems.  */);
   defsubr (&Sw32_window_exists_p);
   defsubr (&Sw32_frame_rect);
   defsubr (&Sw32_battery_status);
+  defsubr (&Sw32__menu_bar_in_use);
 
 #ifdef WINDOWSNT
   defsubr (&Sfile_system_info);