Mercurial > emacs
changeset 106177:cb523092ddfd
* xterm.c (x_new_font):
* print.c (print_object):
* cmds.c (Fself_insert_command): Move declarations before statements.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Sat, 21 Nov 2009 02:33:45 +0000 |
| parents | 64f03bed7d67 |
| children | 3f65383da746 |
| files | src/ChangeLog src/cmds.c src/print.c src/xterm.c |
| diffstat | 4 files changed, 15 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Nov 20 21:49:46 2009 +0000 +++ b/src/ChangeLog Sat Nov 21 02:33:45 2009 +0000 @@ -1,3 +1,9 @@ +2009-11-21 Dan Nicolaescu <dann@ics.uci.edu> + + * xterm.c (x_new_font): + * print.c (print_object): + * cmds.c (Fself_insert_command): Move declarations before statements. + 2009-11-20 Ken Brown <kbrown@cornell.edu> (tiny change) * s/cygwin.h: Remove unneeded linker flags.
--- a/src/cmds.c Fri Nov 20 21:49:46 2009 +0000 +++ b/src/cmds.c Sat Nov 21 02:33:45 2009 +0000 @@ -330,8 +330,8 @@ (n) Lisp_Object n; { + int remove_boundary = 1; CHECK_NUMBER (n); - int remove_boundary = 1; if (!EQ (Vthis_command, current_kboard->Vlast_command)) nonundocount = 0;
--- a/src/print.c Fri Nov 20 21:49:46 2009 +0000 +++ b/src/print.c Sat Nov 21 02:33:45 2009 +0000 @@ -2034,6 +2034,7 @@ else if (HASH_TABLE_P (obj)) { struct Lisp_Hash_Table *h = XHASH_TABLE (obj); + int i, real_size, size; #if 0 strout ("#<hash-table", -1, -1, printcharfun, 0); if (SYMBOLP (h->test)) @@ -2086,10 +2087,8 @@ strout (" data ", -1, -1, printcharfun, 0); /* Print the data here as a plist. */ - int i; - - int real_size = HASH_TABLE_SIZE (h); - int size = real_size; + real_size = HASH_TABLE_SIZE (h); + size = real_size; /* Don't print more elements than the specified maximum. */ if (NATNUMP (Vprint_length)
--- a/src/xterm.c Fri Nov 20 21:49:46 2009 +0000 +++ b/src/xterm.c Sat Nov 21 02:33:45 2009 +0000 @@ -8054,7 +8054,9 @@ 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 @@ 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));