* xterm.c (x_new_font):

* print.c (print_object):
* cmds.c (Fself_insert_command): Move declarations before statements.

diff --git a/src/ChangeLog b/src/ChangeLog
index acfffd39d7a0e47b57f0a6e9c6e0c6deff131645..452cee484f256896dc912a8fa21e100c19c4928c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.

diff --git a/src/cmds.c b/src/cmds.c
index 69b967aa7e2c13acd26dd6b1644830b31e30bd7a..008fd6b82c232e05b94a152ce5462a0ae32cbed2 100644 (file)
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -330,8 +330,8 @@ After insertion, the value of `auto-fill-function' is called if the
      (n)
      Lisp_Object n;
 {
-  CHECK_NUMBER (n);
   int remove_boundary = 1;
+  CHECK_NUMBER (n);
 
   if (!EQ (Vthis_command, current_kboard->Vlast_command))
     nonundocount = 0;

diff --git a/src/print.c b/src/print.c
index 24d497ed36592dfbec86982090bdf9ddea8d2bd1..613660b582c623a8ca1dae477c834663e2f209c3 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -2034,6 +2034,7 @@ print_object (obj, printcharfun, escapeflag)
       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 @@ print_object (obj, printcharfun, escapeflag)
          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)

diff --git a/src/xterm.c b/src/xterm.c
index 3349dc05b95bb0de52bc5a37c776bbf8d78dcab2..c4cf3de12fcb80657392496b8810f4676568c3d7 100644 (file)
--- 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));