[Emacs-diffs] /srv/bzr/emacs/trunk r109642: * gtkutil.c (xg_get_font): Demand an Xft font.

[Chong Yidong]

------------------------------------------------------------
revno: 109642
fixes bug: http://debbugs.gnu.org/3228
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Thu 2012-08-16 14:57:48 +0800
message:
  * gtkutil.c (xg_get_font): Demand an Xft font.
modified:
  src/ChangeLog
  src/gtkutil.c
  src/xftfont.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-16 06:35:13 +0000
+++ b/src/ChangeLog     2012-08-16 06:57:48 +0000
@@ -1,5 +1,7 @@
 2012-08-16  Chong Yidong  <address@hidden>
 
+       * gtkutil.c (xg_get_font): Demand an Xft font (Bug#3228).
+
        * xfont.c (xfont_open):
        * xftfont.c (xftfont_open): Set the font's max_width field.
 

=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c     2012-08-15 18:34:46 +0000
+++ b/src/gtkutil.c     2012-08-16 06:57:48 +0000
@@ -2016,7 +2016,7 @@
 
 #if USE_NEW_GTK_FONT_CHOOSER
 
-extern Lisp_Object Qnormal;
+extern Lisp_Object Qxft, Qnormal;
 extern Lisp_Object Qextra_light, Qlight, Qsemi_light, Qsemi_bold;
 extern Lisp_Object Qbold, Qextra_bold, Qultra_bold;
 extern Lisp_Object Qoblique, Qitalic;
@@ -2099,7 +2099,7 @@
 
       if (desc)
        {
-         Lisp_Object args[8];
+         Lisp_Object args[10];
          const char *name   = pango_font_description_get_family (desc);
          gint        size   = pango_font_description_get_size (desc);
          PangoWeight weight = pango_font_description_get_weight (desc);
@@ -2117,6 +2117,9 @@
          args[6] = QCslant;
          args[7] = XG_STYLE_TO_SYMBOL (style);
 
+         args[8] = QCtype;
+         args[9] = Qxft;
+
          font = Ffont_spec (8, args);
 
          pango_font_description_free (desc);

=== modified file 'src/xftfont.c'
--- a/src/xftfont.c     2012-08-16 06:35:13 +0000
+++ b/src/xftfont.c     2012-08-16 06:57:48 +0000
@@ -39,7 +39,7 @@
 
 /* Xft font driver.  */
 
-static Lisp_Object Qxft;
+Lisp_Object Qxft;
 static Lisp_Object QChinting, QCautohint, QChintstyle, QCrgba, QCembolden,
   QClcdfilter;