From cd6dfed6c6b353a8ccf17fda63e6650cd039429a Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 1 Aug 1996 21:38:20 +0000 Subject: [PATCH] (prepare_menu_bars): Conditionalize previous change. --- src/xdisp.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/xdisp.c b/src/xdisp.c index 5b1b9e24a7a..d01775f5e22 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -39,6 +39,7 @@ Boston, MA 02111-1307, USA. */ #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 @@ prepare_menu_bars () } 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. -- 2.39.5