diff options
| author | Richard M. Stallman <rms@gnu.org> | 1995-11-11 15:55:13 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1995-11-11 15:55:13 +0000 |
| commit | 9d5883ed44174388366f8e333dd8e8314ceba3d4 (patch) | |
| tree | 6ab8f9cee562837be0e982ddb454c3809cff4760 /src/xdisp.c | |
| parent | eef14caf763cf2fecf653f85f09aa8779a6ce5fe (diff) | |
| download | emacs-9d5883ed44174388366f8e333dd8e8314ceba3d4.tar.gz | |
(display_menu_bar): Fix backwards conditional.
(update_menu_bar, redisplay_window): Don't use FRAME_EXTERNAL_MENU_BAR
in #ifdef, since it is always defined.
Diffstat (limited to 'src/xdisp.c')
| -rw-r--r-- | src/xdisp.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 645c6844340..2d1b7d4c840 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -1286,7 +1286,7 @@ update_menu_bar (f, save_match_data) if (FRAME_X_P (f) ? -#ifdef FRAME_EXTERNAL_MENU_BAR +#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) FRAME_EXTERNAL_MENU_BAR (f) #else FRAME_MENU_BAR_LINES (f) > 0 @@ -1745,7 +1745,7 @@ done: if (update_mode_line && (FRAME_X_P (f) ? -#ifdef FRAME_EXTERNAL_MENU_BAR +#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) FRAME_EXTERNAL_MENU_BAR (f) #else FRAME_MENU_BAR_LINES (f) > 0 @@ -3169,10 +3169,14 @@ display_menu_bar (w) int hpos = 0; int i; -#if !defined (USE_X_TOOLKIT) && !defined (HAVE_NTGUI) +#ifdef HAVE_NTGUI + return; +#endif + +#ifdef USE_X_TOOLKIT if (FRAME_X_P (f)) return; -#endif /* not USE_X_TOOLKIT and not HAVE_NTGUI */ +#endif /* USE_X_TOOLKIT */ get_display_line (f, vpos, 0); |