From: Jan Djärv <jan.h.d@swipnet.se>
Date: Fri, 11 Jan 2013 01:22:49 +0000 (+0100)
Subject: * gtkutil.c (xg_initialize): Backport from trunk.
X-Git-Tag: emacs-24.2.93~59
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=38693137f66848fa3e3fee5d0af8436e9fe7414b;p=emacs.git

* gtkutil.c (xg_initialize): Backport from trunk.
Add ifdef HAVE_FREETYPE around x_last_font_name.

Fixes: debbugs:13403
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 0ba5b2ccab2..8c16df2803d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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).
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 0c7d0d18f0b..e76b0a733a0 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -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 */