aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2015-01-19 20:42:40 -0800
committerPaul Eggert2015-01-19 20:43:09 -0800
commitef5a526f1b51b76b0f753e0936c80743a7f4463d (patch)
tree239d6f086c42ff8ce42b85db6e8385059719f474 /src
parent97bf923892a781b71442562510c9ef8492eb1dfe (diff)
downloademacs-ef5a526f1b51b76b0f753e0936c80743a7f4463d.tar.gz
emacs-ef5a526f1b51b76b0f753e0936c80743a7f4463d.zip
Correct an old fix for GTK font selection
* gtkutil.c (xg_get_font): Fix off-by-2 typo. Fixes: bug#3228
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/gtkutil.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ad7780fbca7..b8528c27528 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
12015-01-20 Paul Eggert <eggert@cs.ucla.edu> 12015-01-20 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 Correct an old fix for GTK font selection
4 * gtkutil.c (xg_get_font): Fix off-by-2 typo.
5 Fixes: bug#3228
6
3 Fix minor bugs with printing null bytes 7 Fix minor bugs with printing null bytes
4 * minibuf.c (read_minibuf_noninteractive): 8 * minibuf.c (read_minibuf_noninteractive):
5 * xdisp.c (Ftrace_to_stderr) [GLYPH_DEBUG]: 9 * xdisp.c (Ftrace_to_stderr) [GLYPH_DEBUG]:
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 694278a2b4c..da05742b0c6 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -2093,7 +2093,7 @@ xg_get_font (struct frame *f, const char *default_name)
2093 args[8] = QCtype; 2093 args[8] = QCtype;
2094 args[9] = Qxft; 2094 args[9] = Qxft;
2095 2095
2096 font = Ffont_spec (8, args); 2096 font = Ffont_spec (10, args);
2097 2097
2098 pango_font_description_free (desc); 2098 pango_font_description_free (desc);
2099 dupstring (&x_last_font_name, name); 2099 dupstring (&x_last_font_name, name);