bug#3228: 23.0.93; GTK font selection: asked for Courier, got Nimbus

[Paul Eggert <eggert@cs.ucla.edu>]

[-- Attachment #1: Type: text/plain, Size: 169 bytes --]

There was a typo in Chong Yidong's fix (installed 2012-08-17) and I installed 
the attached patch to fix it, as master commit 
ef5a526f1b51b76b0f753e0936c80743a7f4463d.

[-- Attachment #2: 0001-Correct-an-old-fix-for-GTK-font-selection.patch --]
[-- Type: text/x-patch, Size: 1189 bytes --]

From c80ef1c052314b4ba7386e612bc1bb02550d383d Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 19 Jan 2015 20:42:40 -0800
Subject: [PATCH] Correct an old fix for GTK font selection

* gtkutil.c (xg_get_font): Fix off-by-2 typo.
Fixes: bug#3228
---
 src/ChangeLog | 4 ++++
 src/gtkutil.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index ad7780f..b8528c2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2015-01-20  Paul Eggert  <eggert@cs.ucla.edu>
 
+	Correct an old fix for GTK font selection
+	* gtkutil.c (xg_get_font): Fix off-by-2 typo.
+	Fixes: bug#3228
+
 	Fix minor bugs with printing null bytes
 	* minibuf.c (read_minibuf_noninteractive):
 	* xdisp.c (Ftrace_to_stderr) [GLYPH_DEBUG]:
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 694278a..da05742 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -2093,7 +2093,7 @@ xg_get_font (struct frame *f, const char *default_name)
 	  args[8] = QCtype;
 	  args[9] = Qxft;
 
-	  font = Ffont_spec (8, args);
+	  font = Ffont_spec (10, args);
 
 	  pango_font_description_free (desc);
 	  dupstring (&x_last_font_name, name);
-- 
2.1.0