diff options
| author | Martin Rudalics | 2014-09-25 09:01:35 +0200 |
|---|---|---|
| committer | Martin Rudalics | 2014-09-25 09:01:35 +0200 |
| commit | 340e4cce7aaa1de72d384e4889f0f8aa65025874 (patch) | |
| tree | e7d176a1736129a32d195a2f763661e32dece05e /src/xmenu.c | |
| parent | 2494447b719e8d50eee6fc04b83b44b957b67957 (diff) | |
| download | emacs-340e4cce7aaa1de72d384e4889f0f8aa65025874.tar.gz emacs-340e4cce7aaa1de72d384e4889f0f8aa65025874.zip | |
Remove code left dead after 2014-07-27 changes.
* frame.c (frame_inhibit_resize):
* widget.c (EmacsFrameResize):
* window.c (resize_frame_windows, Fset_window_configuration):
* xdisp.c (expose_frame):
* xfns.c (x_change_tool_bar_height):
* xmenu.c (update_frame_menubar):
* xterm.c (handle_one_xevent, x_new_font, x_set_window_size_1):
Remove code left dead after 2014-07-27 changes.
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index 8bb8d17369c..e3f1a17fbce 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -627,7 +627,6 @@ update_frame_menubar (struct frame *f) | |||
| 627 | xg_update_frame_menubar (f); | 627 | xg_update_frame_menubar (f); |
| 628 | #else | 628 | #else |
| 629 | struct x_output *x; | 629 | struct x_output *x; |
| 630 | /** int columns, rows; **/ | ||
| 631 | 630 | ||
| 632 | eassert (FRAME_X_P (f)); | 631 | eassert (FRAME_X_P (f)); |
| 633 | 632 | ||
| @@ -637,10 +636,6 @@ update_frame_menubar (struct frame *f) | |||
| 637 | return; | 636 | return; |
| 638 | 637 | ||
| 639 | block_input (); | 638 | block_input (); |
| 640 | /* Save the size of the frame because the pane widget doesn't accept | ||
| 641 | to resize itself. So force it. */ | ||
| 642 | /** columns = FRAME_COLS (f); **/ | ||
| 643 | /** rows = FRAME_LINES (f); **/ | ||
| 644 | 639 | ||
| 645 | /* Do the voodoo which means "I'm changing lots of things, don't try | 640 | /* Do the voodoo which means "I'm changing lots of things, don't try |
| 646 | to refigure sizes until I'm done." */ | 641 | to refigure sizes until I'm done." */ |
| @@ -661,8 +656,7 @@ update_frame_menubar (struct frame *f) | |||
| 661 | XtManageChild (x->edit_widget); | 656 | XtManageChild (x->edit_widget); |
| 662 | lw_refigure_widget (x->column_widget, True); | 657 | lw_refigure_widget (x->column_widget, True); |
| 663 | 658 | ||
| 664 | /* Force the pane widget to resize itself with the right values. */ | 659 | /* Force the pane widget to resize itself. */ |
| 665 | /** EmacsFrameSetCharSize (x->edit_widget, columns, rows); **/ | ||
| 666 | adjust_frame_size (f, FRAME_TEXT_WIDTH (f), FRAME_TEXT_HEIGHT (f), 2, 0); | 660 | adjust_frame_size (f, FRAME_TEXT_WIDTH (f), FRAME_TEXT_HEIGHT (f), 2, 0); |
| 667 | unblock_input (); | 661 | unblock_input (); |
| 668 | #endif | 662 | #endif |