From xemacs-m  Mon Jul 21 01:38:55 1997
Received: from altair.xemacs.org (steve@xemacs.miranova.com [206.190.83.19])
	by xemacs.org (8.8.5/8.8.5) with ESMTP id BAA25235
	for <xemacs-beta@xemacs.org>; Mon, 21 Jul 1997 01:38:54 -0500 (CDT)
Received: (from steve@localhost)
	by altair.xemacs.org (8.8.6/8.8.6) id XAA02679;
	Sun, 20 Jul 1997 23:42:24 -0700
Mail-Copies-To: never
To: xemacs-beta@xemacs.org
Subject: Re: failure - 20.3b14 - linux
References: <199707210403.AAA09168@news.smart.net>
X-Face: `'%\i;ySOu]g?NlziJSk_$&@]KP`}~PEQPjZ5;nxSaDW_o$4+4%Ab]%Ifw3ZR;7TIT3,O,'
 @2{L;]ox6kc;$_5kU'n**9vFg-]eV~GbxSVCx|(s%uR[],*:^WKmC`B}(;|k9/m]gwt?&`t;^rfCJg
 khHH>pP1W\)xM0U@!FNDD72{3fDP$PkBhx^7Z?-WxH6DbFN:QOnT`llzW}VGdYv;n9lzljQvKTIBhQ
 YuV
X-Attribution: sb
From: SL Baur <steve@xemacs.org>
In-Reply-To: Jeff Miller's message of "Mon, 21 Jul 1997 00:03:47 -0400"
Mime-Version: 1.0 (generated by tm-edit 7.108)
Content-Type: text/plain; charset=US-ASCII
Date: 20 Jul 1997 23:42:22 -0700
Message-ID: <m2204s9a9d.fsf@altair.xemacs.org>
Lines: 40
X-Mailer: Gnus v5.4.64/XEmacs 20.3(beta15) - "Berlin"

Jeff Miller <jmiller@smart.net> writes:

> Tested building a stripped down version.  
 ...
> repeatably with just ./configure --with-menubars=none

> didn't this menubar accelerator stuff just get added?  

Yes.  It all needs a HAVE_MENUBAR guard.

1997-07-20  SL Baur  <steve@altair.xemacs.org>

	* event-stream.c (menu_move_up): Guard menubar accelerator code
	with HAVE_MENUBARS.

Index: src/event-stream.c
===================================================================
RCS file: /usr/local/xemacs/xemacs-20.0/src/event-stream.c,v
retrieving revision 1.16
diff -u -r1.16 event-stream.c
--- event-stream.c	1997/07/19 22:12:08	1.16
+++ event-stream.c	1997/07/21 06:40:30
@@ -3021,7 +3021,7 @@
   return event_binding (event0, 1);
 }
 
-#ifdef HAVE_X_WINDOWS
+#if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBARS)
 static void
 menu_move_up (void)
 {
@@ -3516,7 +3516,7 @@
   if (!NILP (con->defining_kbd_macro) && NILP (Vexecuting_macro))
     con->kbd_macro_ptr = con->kbd_macro_end;
 }
-#endif /* HAVE_X_WINDOWS */
+#endif /* HAVE_X_WINDOWS && HAVE_MENUBARS */
 
 /* See if we can do function-key-map or key-translation-map translation
    on the current events in the command builder.  If so, do this, and

