aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/xmenu.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c0e350e45f9..02d6ec1ae9e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12011-03-06 Paul Eggert <eggert@cs.ucla.edu> 12011-03-06 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * xmenu.c (menu_highlight_callback): Now static.
4
3 * xdisp.c (produce_glyphless_glyph): Initialize lower_xoff. 5 * xdisp.c (produce_glyphless_glyph): Initialize lower_xoff.
4 Add a FIXME comment, since the code still doesn't look right. 6 Add a FIXME comment, since the code still doesn't look right.
5 (Fcurrent_bidi_paragraph_direction): Simplify slightly; this 7 (Fcurrent_bidi_paragraph_direction): Simplify slightly; this
diff --git a/src/xmenu.c b/src/xmenu.c
index 934db0f0406..750dad6da17 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -723,7 +723,7 @@ show_help_event (FRAME_PTR f, xt_or_gtk_widget widget, Lisp_Object help)
723 unhighlighting. */ 723 unhighlighting. */
724 724
725#ifdef USE_GTK 725#ifdef USE_GTK
726void 726static void
727menu_highlight_callback (GtkWidget *widget, gpointer call_data) 727menu_highlight_callback (GtkWidget *widget, gpointer call_data)
728{ 728{
729 xg_menu_item_cb_data *cb_data; 729 xg_menu_item_cb_data *cb_data;
@@ -742,7 +742,7 @@ menu_highlight_callback (GtkWidget *widget, gpointer call_data)
742 show_help_event (cb_data->cl_data->f, widget, help); 742 show_help_event (cb_data->cl_data->f, widget, help);
743} 743}
744#else 744#else
745void 745static void
746menu_highlight_callback (Widget widget, LWLIB_ID id, void *call_data) 746menu_highlight_callback (Widget widget, LWLIB_ID id, void *call_data)
747{ 747{
748 struct frame *f; 748 struct frame *f;