mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-06 20:00:46 -08:00
Code Issues Projects Releases Wiki Activity

(menubar_active): Remove menu_command_in_progress.

Browse source
This commit is contained in:
Jason Rumney 2007-02-22 22:51:31 +00:00
parent 5d22ded9ff
commit 904700a0f4
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/ChangeLog
View file

@ -1,3 +1,16 @@
2007-02-22 Jason Rumney <jasonr@gnu.org>
* w32menu.c (current_popup_menu): Make available globally.
(menubar_selection_callback): Free menu strings before pushing the
menu event into the keyboard buffer. Remove
menu_command_in_progress.
* w32fns.c (current_popup_menu): Use from w32menu.c.
(w32_wnd_proc): Use menubar_active and current_popup_menu to
determine whether a menubar menu has been cancelled.
* w32term.h (w32_output): Remove menu_command_in_progress.
2007-02-22 Kim F. Storm <storm@cua.dk>
* dispnew.c (update_frame, update_single_window): Set force_p here if

3
src/w32term.h
View file

@ -378,9 +378,6 @@ struct w32_output
/* Nonzero means menubar is currently active. */
char menubar_active;
/* Nonzero means a menu command is being processed. */
char menu_command_in_progress;
/* Nonzero means menubar is about to become active, but should be
brought up to date first. */
volatile char pending_menu_activation;