aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2015-01-14 15:47:19 +0100
committerMartin Rudalics2015-01-14 15:47:19 +0100
commit9602b62514df88ddf2e9dd1451c4e7f51756d65b (patch)
tree1d1367cd28234b3abb16fea63f540377c4cd1468
parent81882be7111e361ad072b9512bfefa3430b3e867 (diff)
downloademacs-9602b62514df88ddf2e9dd1451c4e7f51756d65b.tar.gz
emacs-9602b62514df88ddf2e9dd1451c4e7f51756d65b.zip
In update_frame_menubar remove garbaged code.
* xmenu.c (update_frame_menubar): Remove garbaged code.
-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 @@
12015-01-14 Martin Rudalics <rudalics@gmx.at>
2
3 * xmenu.c (update_frame_menubar): Remove garbaged code.
4
12015-01-14 Paul Eggert <eggert@cs.ucla.edu> 52015-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;
644s);
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 ();