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)

diff --git a/src/xterm.c b/src/xterm.c
index db5ea4ac55ecef90fa7a5ecd3fae6ef490cd092d..0fcd7ef7e2b2a9578424d037cbbe16e421732e8c 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -12422,12 +12422,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)