diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2018-03-14 20:11:16 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2018-03-14 20:11:16 +0200 |
| commit | 36a1d52814562bb589f03226c31ca823f0518fd2 (patch) | |
| tree | 92d2ce7725ac85d88da4a52ebf37ba4968489006 | |
| parent | 675edecf6102a20b3482544315c654fde4b6236e (diff) | |
| download | emacs-36a1d52814562bb589f03226c31ca823f0518fd2.tar.gz emacs-36a1d52814562bb589f03226c31ca823f0518fd2.tar.bz2 emacs-36a1d52814562bb589f03226c31ca823f0518fd2.zip | |
Fix problems caused by fontconfig-2.13.0
* src/xterm.c (x_term_init): Call fixup_locale after
xg_initialize, to countermand the call to setlocale in some
versions of fontconfig. (Bug#30788)
| -rw-r--r-- | src/xterm.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/xterm.c b/src/xterm.c index c5163aa990a..7b445e5f46c 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -12411,12 +12411,16 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) unrequest_sigio (); /* See comment in x_display_ok. */ gtk_init (&argc, &argv2); request_sigio (); - fixup_locale (); g_log_remove_handler ("GLib", id); xg_initialize (); + /* Do this after the call to xg_initialize, because when + Fontconfig is used, xg_initialize calls its initialization + function which in some versions of Fontconfig calls setlocale. */ + fixup_locale (); + dpy = DEFAULT_GDK_DISPLAY (); #if ! GTK_CHECK_VERSION (2, 90, 0) |