From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 12 Jun 2011 03:53:12 +0000 (-0700)
Subject: * xmenu.c (x_menu_set_in_use): Fix incorrect assumption.
X-Git-Tag: emacs-pretest-24.0.90~104^2~578^2~1
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=73dba34265faf12a46cef1edabe066af3159122a;p=emacs.git

* xmenu.c (x_menu_set_in_use): Fix incorrect assumption.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index a1e5f3a2200..db1f1c82f35 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -21,8 +21,6 @@
 	(compare_window_configurations): Remove unused locals.
 	* xfns.c (x_set_scroll_bar_default_width): Remove unused locals.
 	* xmenu.c (x_menu_set_in_use): Define only if USE_GTK || USE_MOTIF.
-	Omit no-longer-needed #ifdef USE_X_TOOLKIT, since USE_X_TOOLKIT is
-	implied by USE_GTK || USE_MOTIF.
 	(dialog_selection_callback) [!USE_GTK]: Prefer intptr_t for integers
 	the same widths as pointers.  This follows up on the 2011-05-06 patch.
 	* xterm.c (x_alloc_lighter_color_for_widget): Define only if USE_LUCID.
diff --git a/src/xmenu.c b/src/xmenu.c
index db1d8823a7e..1cb71187c0c 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -356,8 +356,10 @@ x_menu_set_in_use (int in_use)
 {
   menu_items_inuse = in_use ? Qt : Qnil;
   popup_activated_flag = in_use;
+#ifdef USE_X_TOOLKIT
   if (popup_activated_flag)
     x_activate_timeout_atimer ();
+#endif
 }
 
 #endif