From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 11 Nov 1995 15:55:13 +0000 (+0000)
Subject: (display_menu_bar): Fix backwards conditional.
X-Git-Tag: emacs-19.34~2349
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dc937613b0cbe6ff8cc4c4819e7b93cf05334b6f;p=emacs.git

(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.
---

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);