[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111172: * gtkutil.c (xg_initialize): Backport from trunk.

[Jan D.]

------------------------------------------------------------
revno: 111172
fixes bug: http://debbugs.gnu.org/13403
committer: Jan D. <address@hidden>
branch nick: emacs-24
timestamp: Fri 2013-01-11 02:22:49 +0100
message:
  * gtkutil.c (xg_initialize): Backport from trunk.
  Add ifdef HAVE_FREETYPE around x_last_font_name.
modified:
  src/ChangeLog
  src/gtkutil.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-01-11 07:51:25 +0000
+++ b/src/ChangeLog     2013-01-11 01:22:49 +0000
@@ -1,3 +1,8 @@
+2013-01-11  Jan Djärv  <address@hidden>
+
+       * gtkutil.c (xg_initialize): Backport from trunk.
+       Add ifdef HAVE_FREETYPE around x_last_font_name (Bug#13403).
+
 2013-01-11  Paul Eggert  <address@hidden>
 
        Backport typo fix from trunk, for AIX (Bug#13408).

=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c     2013-01-01 09:11:05 +0000
+++ b/src/gtkutil.c     2013-01-11 01:22:49 +0000
@@ -4994,7 +4994,9 @@
                                 "cancel", 0);
   update_theme_scrollbar_width ();
 
+#ifdef HAVE_FREETYPE
   x_last_font_name = NULL;
+#endif
 }
 
 #endif /* USE_GTK */