diff options
| author | Paul Eggert | 2011-03-06 14:34:54 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-03-06 14:34:54 -0800 |
| commit | 032f16205d3fc06ecafa26382745b49985dd124b (patch) | |
| tree | 8b08c9618952283c03cad2f4b42bd0b79b717161 /src | |
| parent | 44a3a108430ef79370ad2957a5d71d4cd040962b (diff) | |
| download | emacs-032f16205d3fc06ecafa26382745b49985dd124b.tar.gz emacs-032f16205d3fc06ecafa26382745b49985dd124b.zip | |
* xmenu.c (menu_highlight_callback): Now static.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xmenu.c | 4 |
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 @@ | |||
| 1 | 2011-03-06 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-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 |
| 726 | void | 726 | static void |
| 727 | menu_highlight_callback (GtkWidget *widget, gpointer call_data) | 727 | menu_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 |
| 745 | void | 745 | static void |
| 746 | menu_highlight_callback (Widget widget, LWLIB_ID id, void *call_data) | 746 | menu_highlight_callback (Widget widget, LWLIB_ID id, void *call_data) |
| 747 | { | 747 | { |
| 748 | struct frame *f; | 748 | struct frame *f; |