diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2009-11-21 02:33:45 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2009-11-21 02:33:45 +0000 |
| commit | b0ca0f33f7a256b1d7791ff2598ed2272b34abb1 (patch) | |
| tree | 098d5d5fdd9284170dde866e859f4d7612fa0830 /src/xterm.c | |
| parent | e572025ff11352705a5145cf77cdf6227f36d4b4 (diff) | |
| download | emacs-b0ca0f33f7a256b1d7791ff2598ed2272b34abb1.tar.gz | |
* xterm.c (x_new_font):
* print.c (print_object):
* cmds.c (Fself_insert_command): Move declarations before statements.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/xterm.c b/src/xterm.c index 3349dc05b95..c4cf3de12fc 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -8054,7 +8054,9 @@ x_new_font (f, font_object, fontset) problems because the tip frame has no widget. */ if (NILP (tip_frame) || XFRAME (tip_frame) != f) { - /* When the frame is maximized/fullscreen or running under for + int rows, cols; + + /* When the frame is maximized/fullscreen or running under for example Xmonad, x_set_window_size will be a no-op. In that case, the right thing to do is extend rows/cols to the current frame size. We do that first if x_set_window_size @@ -8067,8 +8069,8 @@ x_new_font (f, font_object, fontset) is however. */ pixelh -= FRAME_MENUBAR_HEIGHT (f); #endif - int rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, pixelh); - int cols = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, FRAME_PIXEL_WIDTH (f)); + rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, pixelh); + cols = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, FRAME_PIXEL_WIDTH (f)); change_frame_size (f, rows, cols, 0, 1, 0); x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f)); |