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

Use gtk_disable_setlocale

Browse source 
* src/pgtkterm.c (pgtk_term_init):
* src/xterm.c (x_term_init):
Use gtk_disable_setlocale rather than fixup_locale.
This commit is contained in:
Paul Eggert 2025-01-26 22:15:49 -08:00
parent a1e4f6a35c
commit 06fd3f4e98
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/pgtkterm.c
View file

@ -7070,13 +7070,10 @@ pgtk_term_init (Lisp_Object display_name, char *resource_name)
id = g_log_set_handler ("GLib", G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL
| G_LOG_FLAG_RECURSION, my_log_handler, NULL);
/* gtk_init does set_locale. Fix locale before and after. */
fixup_locale ();
gtk_disable_setlocale ();
unrequest_sigio (); /* See comment in x_display_ok. */
gtk_init (&argc, &argv2);
request_sigio ();
fixup_locale ();
g_log_remove_handler ("GLib", id);

6
src/xterm.c
View file

@ -30651,8 +30651,7 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
Call before gtk_init so Gtk+ event filters comes after our. */
gdk_window_add_filter (NULL, event_handler_gdk, NULL);
/* gtk_init does set_locale. Fix locale before and after. */
fixup_locale ();
gtk_disable_setlocale ();
unrequest_sigio (); /* See comment in x_display_ok. */
gtk_init (&argc, &argv2);
request_sigio ();
@ -30661,8 +30660,7 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
xg_initialize ();
/* Do this after the call to xg_initialize, because when
Fontconfig is used, xg_initialize calls its initialization
/* When Fontconfig is used, xg_initialize calls its initialization
function which in some versions of Fontconfig calls setlocale. */
fixup_locale ();