diff options
| author | Jan Djärv | 2013-01-10 18:45:08 +0100 |
|---|---|---|
| committer | Jan Djärv | 2013-01-10 18:45:08 +0100 |
| commit | 48660ca5db63d6245c56dd373adfcdb1879eb352 (patch) | |
| tree | 6952651beec875353a15110e086803f10e3a700e | |
| parent | 72781fefa6c91b51e44e7faed4b8792fbd65f345 (diff) | |
| download | emacs-48660ca5db63d6245c56dd373adfcdb1879eb352.tar.gz emacs-48660ca5db63d6245c56dd373adfcdb1879eb352.zip | |
* gtkutil.c (xg_initialize): Add ifdef HAVE_FREETYPE around
x_last_font_name.
Fixes: debbugs:13403
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/gtkutil.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 55a233adcd7..dd22c5388b0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-01-10 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> (tiny change) | ||
| 2 | |||
| 3 | * gtkutil.c (xg_initialize): Add ifdef HAVE_FREETYPE around | ||
| 4 | x_last_font_name (Bug#13403). | ||
| 5 | |||
| 1 | 2013-01-10 Dmitry Antipov <dmantipov@yandex.ru> | 6 | 2013-01-10 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 7 | ||
| 3 | Omit buffer_slot_type_mismatch and use generic predicates to enforce | 8 | Omit buffer_slot_type_mismatch and use generic predicates to enforce |
diff --git a/src/gtkutil.c b/src/gtkutil.c index 95ac04b8ff0..6daf189f74c 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c | |||
| @@ -5041,7 +5041,9 @@ xg_initialize (void) | |||
| 5041 | "cancel", 0); | 5041 | "cancel", 0); |
| 5042 | update_theme_scrollbar_width (); | 5042 | update_theme_scrollbar_width (); |
| 5043 | 5043 | ||
| 5044 | #ifdef HAVE_FREETYPE | ||
| 5044 | x_last_font_name = NULL; | 5045 | x_last_font_name = NULL; |
| 5046 | #endif | ||
| 5045 | } | 5047 | } |
| 5046 | 5048 | ||
| 5047 | #endif /* USE_GTK */ | 5049 | #endif /* USE_GTK */ |