summaryrefslogtreecommitdiff
path: root/src/xmenu.c
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2012-07-19 07:39:38 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2012-07-19 07:39:38 -0400
commit5db81e33629049da22e7d0ff6c28a5cae31edac9 (patch)
treea30274d3c351832f8ed0baacd2d178bd0e0fe93c /src/xmenu.c
parent5b835e1d6e0c6fafc7f27174889358bfde5f2449 (diff)
downloademacs-5db81e33629049da22e7d0ff6c28a5cae31edac9.tar.gz
* lisp/emacs-lisp/chart.el: Use lexical-binding.
(chart-emacs-storage): Don't hardcode the list of entries. * src/alloc.c (Fgarbage_collect): Tweak docstring.
Diffstat (limited to 'src/xmenu.c')
-rw-r--r--src/xmenu.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/xmenu.c b/src/xmenu.c
index 61e3e3632b0..c7ec3dc3171 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -679,19 +679,17 @@ popup_activate_callback (Widget widget, LWLIB_ID id, XtPointer client_data)
/* This callback is invoked when a dialog or menu is finished being
used and has been unposted. */
-#ifdef USE_GTK
static void
-popup_deactivate_callback (GtkWidget *widget, gpointer client_data)
-{
- popup_activated_flag = 0;
-}
+popup_deactivate_callback (
+#ifdef USE_GTK
+ GtkWidget *widget, gpointer client_data
#else
-static void
-popup_deactivate_callback (Widget widget, LWLIB_ID id, XtPointer client_data)
+ Widget widget, LWLIB_ID id, XtPointer client_data
+#endif
+ )
{
popup_activated_flag = 0;
}
-#endif
/* Function that finds the frame for WIDGET and shows the HELP text