Commit 472c3609 authored by Jason Rumney's avatar Jason Rumney
Browse files

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

parent 2bf4ad49
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.
......@@ -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)
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);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment