summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xmenu.c1
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 @@
+2015-01-14 Martin Rudalics <rudalics@gmx.at>
+
+ * xmenu.c (update_frame_menubar): Remove garbaged code.
+
2015-01-14 Paul Eggert <eggert@cs.ucla.edu>
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)
/* For reasons I don't know Lucid wants to add one pixel to the frame
height when adding the menu bar. Compensate that here. */
new_height = FRAME_TEXT_HEIGHT (f) - 1;
-s);
#endif /* USE_LUCID */
adjust_frame_size (f, -1, new_height, 2, false, Qmenu_bar_lines);
unblock_input ();