Mercurial > emacs
changeset 15813:c52454296042
(prepare_menu_bars): Conditionalize previous change.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Thu, 01 Aug 1996 21:38:20 +0000 |
| parents | 63076f19cbc5 |
| children | ab40944b1b6e |
| files | src/xdisp.c |
| diffstat | 1 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xdisp.c Thu Aug 01 04:54:51 1996 +0000 +++ b/src/xdisp.c Thu Aug 01 21:38:20 1996 +0000 @@ -39,6 +39,7 @@ #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) extern void set_frame_menubar (); +extern int pending_menu_activation; #endif extern int interrupt_input; @@ -777,6 +778,12 @@ } else update_menu_bar (selected_frame, 1); + + /* Motif needs this. See comment in xmenu.c. + Turn it off when pending_menu_activation is not defined. */ +#ifdef USE_X_TOOLKIT + pending_menu_activation = 0; +#endif } /* Do a frame update, taking possible shortcuts into account.