summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2015-01-20 22:05:31 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2015-01-20 22:05:58 -0800
commit4c09e3aef9a366ffebd314d01f666e04bd7798e2 (patch)
treec1b5043b6a7c060cc10e3de3ef0fb571ec493396
parent87309740ca4fd2b2bc61d2a4599765a2571e18f6 (diff)
downloademacs-4c09e3aef9a366ffebd314d01f666e04bd7798e2.tar.gz
Backport: correct old fix for GTK font selection
* gtkutil.c (xg_get_font): Fix off-by-2 typo. Fixes: bug#3228
-rw-r--r--src/ChangeLog6
-rw-r--r--src/gtkutil.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 709fd505af7..fcbc7dcc3a9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-21 Paul Eggert <eggert@cs.ucla.edu>
+
+ Backport: correct old fix for GTK font selection
+ * gtkutil.c (xg_get_font): Fix off-by-2 typo.
+ Fixes: bug#3228
+
2015-01-21 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (EV_TRAILER2): Set Vinhibit_quit to Qt (Bug#19531).
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 5c9ff9ca68d..b23d84c8b82 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -2103,7 +2103,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);