[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/w32menu.c,v
From: |
Jason Rumney |
Subject: |
[Emacs-diffs] Changes to emacs/src/w32menu.c,v |
Date: |
Thu, 22 Feb 2007 22:49:41 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Jason Rumney <jasonr> 07/02/22 22:49:41
Index: w32menu.c
===================================================================
RCS file: /sources/emacs/emacs/src/w32menu.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- w32menu.c 14 Jan 2007 03:24:37 -0000 1.85
+++ w32menu.c 22 Feb 2007 22:49:41 -0000 1.86
@@ -129,7 +129,7 @@
#define FALSE 0
#endif /* no TRUE */
-static HMENU current_popup_menu;
+HMENU current_popup_menu;
void syms_of_w32menu ();
void globals_of_w32menu ();
@@ -1067,11 +1067,10 @@
buf.kind = MENU_BAR_EVENT;
buf.frame_or_window = frame;
buf.arg = entry;
- kbd_buffer_store_event (&buf);
-
/* Free memory used by owner-drawn and help-echo strings. */
w32_free_menu_strings (FRAME_W32_WINDOW (f));
- f->output_data.w32->menu_command_in_progress = 0;
+ kbd_buffer_store_event (&buf);
+
f->output_data.w32->menubar_active = 0;
return;
}
@@ -1080,7 +1079,6 @@
}
/* Free memory used by owner-drawn and help-echo strings. */
w32_free_menu_strings (FRAME_W32_WINDOW (f));
- f->output_data.w32->menu_command_in_progress = 0;
f->output_data.w32->menubar_active = 0;
}
- [Emacs-diffs] Changes to emacs/src/w32menu.c,v,
Jason Rumney <=