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

* gtkutil.c (xg_initialize): Backport from trunk.

Browse source 
Add ifdef HAVE_FREETYPE around x_last_font_name.

Fixes: debbugs:13403
This commit is contained in:
Jan Djärv 2013-01-11 02:22:49 +01:00
parent 45b7bfdd54
commit 38693137f6
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2013-01-11 Jan Djärv <jan.h.d@swipnet.se>
* gtkutil.c (xg_initialize): Backport from trunk.
Add ifdef HAVE_FREETYPE around x_last_font_name (Bug#13403).
2013-01-11 Paul Eggert <eggert@cs.ucla.edu>
Backport typo fix from trunk, for AIX (Bug#13408).

2
src/gtkutil.c
View file

@ -4994,7 +4994,9 @@ xg_initialize (void)
"cancel", 0);
update_theme_scrollbar_width ();
#ifdef HAVE_FREETYPE
x_last_font_name = NULL;
#endif
}
#endif /* USE_GTK */