[Emacs-diffs] emacs/src ChangeLog frame.c

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   09/04/06 14:54:41

Modified files:
        src            : ChangeLog frame.c 

Log message:
        (x_set_font): Avoid C99 mid-block variable declaration.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7471&r2=1.7472
http://cvs.savannah.gnu.org/viewcvs/emacs/src/frame.c?cvsroot=emacs&r1=1.414&r2=1.415

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7471
retrieving revision 1.7472
diff -u -b -r1.7471 -r1.7472
--- ChangeLog   6 Apr 2009 11:11:36 -0000       1.7471
+++ ChangeLog   6 Apr 2009 14:54:36 -0000       1.7472
@@ -1,3 +1,7 @@
+2009-04-06  Jason Rumney  <address@hidden>
+
+       * frame.c (x_set_font): Avoid C99 mid-block variable declaration.
+
 2009-04-06  Kenichi Handa  <address@hidden>
 
        * ftxfont.c (ftxfont_draw_backgrond): Fix args to XFillRectangle.

Index: frame.c
===================================================================
RCS file: /sources/emacs/emacs/src/frame.c,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -b -r1.414 -r1.415
--- frame.c     28 Mar 2009 04:52:12 -0000      1.414
+++ frame.c     6 Apr 2009 14:54:40 -0000       1.415
@@ -3367,9 +3367,8 @@
      struct frame *f;
      Lisp_Object arg, oldval;
 {
-  Lisp_Object frame;
+  Lisp_Object frame, font_object, lval;
   int fontset = -1;
-  Lisp_Object font_object;
 
   /* Set the frame parameter back to the old value because we may
      fail to use ARG as the new parameter value.  */
@@ -3427,7 +3426,7 @@
     return;
 
   
-  Lisp_Object lval = Fassq (Qfullscreen, f->param_alist);
+  lval = Fassq (Qfullscreen, f->param_alist);
   if (CONSP (lval)) lval = CDR (lval);
 
   x_new_font (f, font_object, fontset);