diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xmenu.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f07ad02272d..be2e89fedbf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2015-01-14 Martin Rudalics <rudalics@gmx.at> | ||
| 2 | |||
| 3 | * xmenu.c (update_frame_menubar): Remove garbaged code. | ||
| 4 | |||
| 1 | 2015-01-14 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2015-01-14 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | remove_slash_colon need not be inline | 7 | remove_slash_colon need not be inline |
diff --git a/src/xmenu.c b/src/xmenu.c index 77f0ce5c5c1..9063a8a2a52 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -641,7 +641,6 @@ update_frame_menubar (struct frame *f) | |||
| 641 | /* For reasons I don't know Lucid wants to add one pixel to the frame | 641 | /* For reasons I don't know Lucid wants to add one pixel to the frame |
| 642 | height when adding the menu bar. Compensate that here. */ | 642 | height when adding the menu bar. Compensate that here. */ |
| 643 | new_height = FRAME_TEXT_HEIGHT (f) - 1; | 643 | new_height = FRAME_TEXT_HEIGHT (f) - 1; |
| 644 | s); | ||
| 645 | #endif /* USE_LUCID */ | 644 | #endif /* USE_LUCID */ |
| 646 | adjust_frame_size (f, -1, new_height, 2, false, Qmenu_bar_lines); | 645 | adjust_frame_size (f, -1, new_height, 2, false, Qmenu_bar_lines); |
| 647 | unblock_input (); | 646 | unblock_input (); |