From 472c36097b3a6f598ded7f455279af32c05a0ae3 Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Mon, 6 Apr 2009 14:54:36 +0000 Subject: [PATCH] (x_set_font): Avoid C99 mid-block variable declaration. --- src/ChangeLog | 4 ++++ src/frame.c | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 7d0f307e4a3..a76c86f1195 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2009-04-06 Jason Rumney + + * frame.c (x_set_font): Avoid C99 mid-block variable declaration. + 2009-04-06 Kenichi Handa * ftxfont.c (ftxfont_draw_backgrond): Fix args to XFillRectangle. diff --git a/src/frame.c b/src/frame.c index 1a110219e6a..80a691e35fd 100644 --- a/src/frame.c +++ b/src/frame.c @@ -3367,9 +3367,8 @@ x_set_font (f, arg, oldval) 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 @@ x_set_font (f, arg, oldval) 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); -- 2.39.5