[Emacs-diffs] emacs/src ChangeLog cmds.c print.c xterm.c

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   09/11/21 02:33:48

Modified files:
        src            : ChangeLog cmds.c print.c xterm.c 

Log message:
        * xterm.c (x_new_font):
        * print.c (print_object):
        * cmds.c (Fself_insert_command): Move declarations before statements.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7886&r2=1.7887
http://cvs.savannah.gnu.org/viewcvs/emacs/src/cmds.c?cvsroot=emacs&r1=1.113&r2=1.114
http://cvs.savannah.gnu.org/viewcvs/emacs/src/print.c?cvsroot=emacs&r1=1.263&r2=1.264
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xterm.c?cvsroot=emacs&r1=1.1053&r2=1.1054

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7886
retrieving revision 1.7887
diff -u -b -r1.7886 -r1.7887
--- ChangeLog   20 Nov 2009 21:44:58 -0000      1.7886
+++ ChangeLog   21 Nov 2009 02:33:45 -0000      1.7887
@@ -1,3 +1,9 @@
+2009-11-21  Dan Nicolaescu  <address@hidden>
+
+       * xterm.c (x_new_font):
+       * print.c (print_object):
+       * cmds.c (Fself_insert_command): Move declarations before statements.
+
 2009-11-20  Ken Brown  <address@hidden>  (tiny change)
 
        * s/cygwin.h: Remove unneeded linker flags.

Index: cmds.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/cmds.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- cmds.c      6 Nov 2009 06:50:54 -0000       1.113
+++ cmds.c      21 Nov 2009 02:33:47 -0000      1.114
@@ -330,8 +330,8 @@
      (n)
      Lisp_Object n;
 {
-  CHECK_NUMBER (n);
   int remove_boundary = 1;
+  CHECK_NUMBER (n);
 
   if (!EQ (Vthis_command, current_kboard->Vlast_command))
     nonundocount = 0;

Index: print.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/print.c,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -b -r1.263 -r1.264
--- print.c     6 Nov 2009 18:47:51 -0000       1.263
+++ print.c     21 Nov 2009 02:33:47 -0000      1.264
@@ -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)

Index: xterm.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xterm.c,v
retrieving revision 1.1053
retrieving revision 1.1054
diff -u -b -r1.1053 -r1.1054
--- xterm.c     17 Nov 2009 08:21:36 -0000      1.1053
+++ xterm.c     21 Nov 2009 02:33:47 -0000      1.1054
@@ -8054,6 +8054,8 @@
         problems because the tip frame has no widget.  */
       if (NILP (tip_frame) || XFRAME (tip_frame) != f)
         {
+         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
@@ -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));