diff options
| author | Richard M. Stallman <rms@gnu.org> | 1996-08-01 21:38:20 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1996-08-01 21:38:20 +0000 |
| commit | cd6dfed6c6b353a8ccf17fda63e6650cd039429a (patch) | |
| tree | b6e84152ed5d0b8da34d663447260419c321c69c /src/xdisp.c | |
| parent | 07e47d0b701f8dd07b6352c87ac1dee4da5b2d79 (diff) | |
| download | emacs-cd6dfed6c6b353a8ccf17fda63e6650cd039429a.tar.gz | |
(prepare_menu_bars): Conditionalize previous change.
Diffstat (limited to 'src/xdisp.c')
| -rw-r--r-- | src/xdisp.c | 7 |
1 files changed, 7 insertions, 0 deletions
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. |