Mercurial > emacs

changeset 13511:a0fd601c9d5b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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.
author Richard M. Stallman <rms@gnu.org>
date Sat, 11 Nov 1995 15:55:13 +0000
parents f4212b188d42
children 738750464578
files src/xdisp.c
diffstat 1 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/xdisp.c	Sat Nov 11 14:35:47 1995 +0000
+++ b/src/xdisp.c	Sat Nov 11 15:55:13 1995 +0000
@@ -1286,7 +1286,7 @@
 
   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 @@
   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 @@
   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);