From: Chong Yidong <cyd@stupidchicken.com>
Date: Mon, 6 Nov 2006 16:46:53 +0000 (+0000)
Subject: * macmenu.c (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.
X-Git-Tag: emacs-pretest-22.0.91~249
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e8407323ab788fa2d20ab58b451991f728d61339;p=emacs.git

* macmenu.c (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.

* w32menu.c (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.
Return nil if building without menus.

* xmenu.c (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.
Return nil if building without menus.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index e2b11bf2025..b2db09204c4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2006-11-06  Martin Rudalics  <rudalics@gmx.at>
+
+	* macmenu.c (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.
+
+	* w32menu.c (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.
+	Return nil if building without menus.
+
+	* xmenu.c (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.
+	Return nil if building without menus.
+
 2006-11-05  Mark Davies  <mark@mcs.vuw.ac.nz>  (tiny change)
 
 	* s/netbsd.h (POSIX_SIGNALS): Defined.