diff options
| author | Paul Eggert | 2015-01-20 22:05:31 -0800 |
|---|---|---|
| committer | Paul Eggert | 2015-01-20 22:05:58 -0800 |
| commit | 4c09e3aef9a366ffebd314d01f666e04bd7798e2 (patch) | |
| tree | c1b5043b6a7c060cc10e3de3ef0fb571ec493396 | |
| parent | 87309740ca4fd2b2bc61d2a4599765a2571e18f6 (diff) | |
| download | emacs-4c09e3aef9a366ffebd314d01f666e04bd7798e2.tar.gz emacs-4c09e3aef9a366ffebd314d01f666e04bd7798e2.zip | |
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/ChangeLog | 6 | ||||
| -rw-r--r-- | src/gtkutil.c | 2 |
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 @@ | |||
| 1 | 2015-01-21 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Backport: correct old fix for GTK font selection | ||
| 4 | * gtkutil.c (xg_get_font): Fix off-by-2 typo. | ||
| 5 | Fixes: bug#3228 | ||
| 6 | |||
| 1 | 2015-01-21 Jan Djärv <jan.h.d@swipnet.se> | 7 | 2015-01-21 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 8 | ||
| 3 | * nsterm.m (EV_TRAILER2): Set Vinhibit_quit to Qt (Bug#19531). | 9 | * 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) | |||
| 2103 | args[8] = QCtype; | 2103 | args[8] = QCtype; |
| 2104 | args[9] = Qxft; | 2104 | args[9] = Qxft; |
| 2105 | 2105 | ||
| 2106 | font = Ffont_spec (8, args); | 2106 | font = Ffont_spec (10, args); |
| 2107 | 2107 | ||
| 2108 | pango_font_description_free (desc); | 2108 | pango_font_description_free (desc); |
| 2109 | dupstring (&x_last_font_name, name); | 2109 | dupstring (&x_last_font_name, name); |