diff options
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xterm.c | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d03e208354d..0448dab3cab 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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 diff --git a/src/xterm.c b/src/xterm.c index 5b34cc39815..15a78147d24 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -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 (); |