aboutsummaryrefslogtreecommitdiffstats
path: root/src/w32fns.c
diff options
context:
space:
mode:
authorEli Zaretskii2015-02-23 19:46:44 +0200
committerEli Zaretskii2015-02-23 19:46:44 +0200
commit18178922a8074627fe4e4e2fd0c9d21839f172c4 (patch)
treee0eb66fb6397e5265f12016d15c2a17a74d5a76a /src/w32fns.c
parent02609324ce7341c05f4c5c141942c45d730291b1 (diff)
downloademacs-18178922a8074627fe4e4e2fd0c9d21839f172c4.tar.gz
emacs-18178922a8074627fe4e4e2fd0c9d21839f172c4.zip
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.
Diffstat (limited to 'src/w32fns.c')
-rw-r--r--src/w32fns.c10
1 files changed, 10 insertions, 0 deletions
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)
8063 MessageBeep (sound_type); 8063 MessageBeep (sound_type);
8064} 8064}
8065 8065
8066DEFUN ("w32--menu-bar-in-use", Fw32__menu_bar_in_use, Sw32__menu_bar_in_use,
8067 0, 0, 0,
8068 doc: /* Return non-nil when a menu-bar menu is being used.
8069Internal use only. */)
8070 (void)
8071{
8072 return menubar_in_use ? Qt : Qnil;
8073}
8074
8066 8075
8067/*********************************************************************** 8076/***********************************************************************
8068 Initialization 8077 Initialization
@@ -8439,6 +8448,7 @@ only be necessary if the default setting causes problems. */);
8439 defsubr (&Sw32_window_exists_p); 8448 defsubr (&Sw32_window_exists_p);
8440 defsubr (&Sw32_frame_rect); 8449 defsubr (&Sw32_frame_rect);
8441 defsubr (&Sw32_battery_status); 8450 defsubr (&Sw32_battery_status);
8451 defsubr (&Sw32__menu_bar_in_use);
8442 8452
8443#ifdef WINDOWSNT 8453#ifdef WINDOWSNT
8444 defsubr (&Sfile_system_info); 8454 defsubr (&Sfile_system_info);