procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Jason Rumney 2009-04-06 14:54:36 +00:00
parent 2bf4ad49e4
commit 472c36097b
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2009-04-06 Jason Rumney <jasonr@gnu.org>
* frame.c (x_set_font): Avoid C99 mid-block variable declaration.
2009-04-06 Kenichi Handa <handa@m17n.org>
* ftxfont.c (ftxfont_draw_backgrond): Fix args to XFillRectangle.

5
src/frame.c
View file

@ -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);