diff options
| author | Michael Albinus | 2019-11-19 08:19:00 +0100 |
|---|---|---|
| committer | Michael Albinus | 2019-11-19 08:19:00 +0100 |
| commit | a15431ffe23838025e7b20131c16bbeb80ce4090 (patch) | |
| tree | 809a8c9d42fb326358e3db03002fe03dcbadc23d /src | |
| parent | 3cc06d1abb6587e0922a5ddc7a7febd3dd71d55a (diff) | |
| parent | 5bc97ebceb54e0eb2804bef4c1bc32a40d8a2371 (diff) | |
| download | emacs-a15431ffe23838025e7b20131c16bbeb80ce4090.tar.gz emacs-a15431ffe23838025e7b20131c16bbeb80ce4090.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src')
| -rw-r--r-- | src/gtkutil.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c index c4d2ef9d80b..25ef5dd248d 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c | |||
| @@ -2228,7 +2228,7 @@ xg_get_file_name (struct frame *f, | |||
| 2228 | 2228 | ||
| 2229 | static char *x_last_font_name; | 2229 | static char *x_last_font_name; |
| 2230 | 2230 | ||
| 2231 | #if GTK_CHECK_VERSION (3, 2, 0) | 2231 | #ifdef HAVE_GTK3 |
| 2232 | static gboolean | 2232 | static gboolean |
| 2233 | xg_font_filter (const PangoFontFamily *family, | 2233 | xg_font_filter (const PangoFontFamily *family, |
| 2234 | const PangoFontFace *face, | 2234 | const PangoFontFace *face, |
| @@ -2262,7 +2262,7 @@ xg_get_font (struct frame *f, const char *default_name) | |||
| 2262 | w = gtk_font_chooser_dialog_new | 2262 | w = gtk_font_chooser_dialog_new |
| 2263 | ("Pick a font", GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f))); | 2263 | ("Pick a font", GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f))); |
| 2264 | 2264 | ||
| 2265 | #if GTK_CHECK_VERSION (3, 2, 0) | 2265 | #ifdef HAVE_GTK3 |
| 2266 | gtk_font_chooser_set_filter_func (GTK_FONT_CHOOSER (w), xg_font_filter, NULL, NULL); | 2266 | gtk_font_chooser_set_filter_func (GTK_FONT_CHOOSER (w), xg_font_filter, NULL, NULL); |
| 2267 | #endif | 2267 | #endif |
| 2268 | if (default_name) | 2268 | if (default_name) |