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

* xterm.c (x_term_init): Call fixup_locale before and after calling

Browse source 
gtk_init.

Fixes: debbugs:12392
This commit is contained in:
Jan Djärv 2012-09-23 12:03:35 +02:00
parent 218374939e
commit a0942b9a36
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2012-09-23 Jan Djärv <jan.h.d@swipnet.se>
* xterm.c (x_term_init): Call fixup_locale before and after calling
gtk_init (Bug#12392).
2012-09-23 Chong Yidong <cyd@gnu.org>
* w32.c (w32_delayed_load): Remove LIBRARIES argument; always use

6
src/xterm.c
View file

@ -9957,11 +9957,13 @@ 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_init (&argc, &argv2);
fixup_locale ();
g_log_remove_handler ("GLib", id);
/* gtk_init does set_locale. We must fix locale after calling it. */
fixup_locale ();
xg_initialize ();
dpy = DEFAULT_GDK_DISPLAY ();