Mercurial > emacs
changeset 102866:deb361b63021
(x_set_font): Avoid C99 mid-block variable declaration.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Mon, 06 Apr 2009 14:54:36 +0000 |
| parents | cfdc747670fb |
| children | 8a809181875d |
| files | src/ChangeLog src/frame.c |
| diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Apr 06 14:37:23 2009 +0000 +++ b/src/ChangeLog Mon Apr 06 14:54:36 2009 +0000 @@ -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.
--- a/src/frame.c Mon Apr 06 14:37:23 2009 +0000 +++ b/src/frame.c Mon Apr 06 14:54:36 2009 +0000 @@ -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);