# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 838935500 0
# Node ID c5245429604228deede1210009114e9c7e80e49d
# Parent  63076f19cbc5bbd390c935e6dff0e70110148949
(prepare_menu_bars): Conditionalize previous change.

diff -r 63076f19cbc5 -r c52454296042 src/xdisp.c
--- 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.