diff options
| author | Paul Eggert | 2011-03-06 14:36:06 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-03-06 14:36:06 -0800 |
| commit | 9d66f88eb9f67c5484abb4000e2d5e6acf34a795 (patch) | |
| tree | 81853acc3cdba30d90fb685fbbbddbf767d70d4c /src | |
| parent | 032f16205d3fc06ecafa26382745b49985dd124b (diff) | |
| download | emacs-9d66f88eb9f67c5484abb4000e2d5e6acf34a795.tar.gz emacs-9d66f88eb9f67c5484abb4000e2d5e6acf34a795.zip | |
* xmenu.c (set_frame_menubar): Remove unused local.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/xmenu.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 02d6ec1ae9e..1ca428fa685 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,6 +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. | 3 | * xmenu.c (menu_highlight_callback): Now static. |
| 4 | (set_frame_menubar): Remove unused local. | ||
| 4 | 5 | ||
| 5 | * xdisp.c (produce_glyphless_glyph): Initialize lower_xoff. | 6 | * xdisp.c (produce_glyphless_glyph): Initialize lower_xoff. |
| 6 | Add a FIXME comment, since the code still doesn't look right. | 7 | Add a FIXME comment, since the code still doesn't look right. |
diff --git a/src/xmenu.c b/src/xmenu.c index 750dad6da17..c79db086df3 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -1175,8 +1175,6 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p) | |||
| 1175 | } | 1175 | } |
| 1176 | else | 1176 | else |
| 1177 | { | 1177 | { |
| 1178 | GtkWidget *wvbox = f->output_data.x->vbox_widget; | ||
| 1179 | |||
| 1180 | menubar_widget | 1178 | menubar_widget |
| 1181 | = xg_create_widget ("menubar", "menubar", f, first_wv, | 1179 | = xg_create_widget ("menubar", "menubar", f, first_wv, |
| 1182 | G_CALLBACK (menubar_selection_callback), | 1180 | G_CALLBACK (menubar_selection_callback), |