procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix problems caused by fontconfig-2.13.0

Browse source 
* 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)
This commit is contained in:
Eli Zaretskii 2018-03-14 20:11:16 +02:00
parent 675edecf61
commit 36a1d52814
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/xterm.c
View file

@ -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. */ unrequest_sigio (); /* See comment in x_display_ok. */
gtk_init (&argc, &argv2); gtk_init (&argc, &argv2);
request_sigio (); request_sigio ();
fixup_locale ();
g_log_remove_handler ("GLib", id); g_log_remove_handler ("GLib", id);
xg_initialize (); 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 (); dpy = DEFAULT_GDK_DISPLAY ();
#if ! GTK_CHECK_VERSION (2, 90, 0) #if ! GTK_CHECK_VERSION (2, 90, 0)