[Emacs-diffs] /srv/bzr/emacs/trunk r111476: * gtkutil.c (xg_initialize): Add ifdef HAVE_FREETYPE around

[Jan D.]

------------------------------------------------------------
revno: 111476
fixes bug: http://debbugs.gnu.org/13403
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Thu 2013-01-10 18:45:08 +0100
message:
  * gtkutil.c (xg_initialize): Add ifdef HAVE_FREETYPE around
  x_last_font_name.
modified:
  src/ChangeLog
  src/gtkutil.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-01-10 10:30:16 +0000
+++ b/src/ChangeLog     2013-01-10 17:45:08 +0000
@@ -1,3 +1,8 @@
+2013-01-10  Rainer Orth <address@hidden> (tiny change)
+
+       * gtkutil.c (xg_initialize): Add ifdef HAVE_FREETYPE around
+       x_last_font_name (Bug#13403).
+
 2013-01-10  Dmitry Antipov  <address@hidden>
 
        Omit buffer_slot_type_mismatch and use generic predicates to enforce

=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c     2013-01-02 16:13:04 +0000
+++ b/src/gtkutil.c     2013-01-10 17:45:08 +0000
@@ -5041,7 +5041,9 @@
                                 "cancel", 0);
   update_theme_scrollbar_width ();
 
+#ifdef HAVE_FREETYPE
   x_last_font_name = NULL;
+#endif
 }
 
 #endif /* USE_GTK */