summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-05-21 12:04:55 +0200
committerBram Moolenaar <Bram@vim.org>2010-05-21 12:04:55 +0200
commitc6af8125c7593b3ca104bf1feac0d814fe76d92d (patch)
treeaee5f5129d4f8a45b6b5dba2b33fe792b594b07b /src/main.c
parent218116c1d0bacf1bceb93699258c23308617b43c (diff)
downloadvim-git-c6af8125c7593b3ca104bf1feac0d814fe76d92d.tar.gz
Other solution for GTK not changing the locale.
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main.c b/src/main.c
index 7e741def2..b9e92094e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -377,10 +377,6 @@ main
if (params.evim_mode)
mch_exit(1);
}
-# if defined(HAVE_LOCALE_H) || defined(X_LOCALE)
- /* Re-initialize locale, it may have been altered by gui_init_check() */
- init_locale();
-# endif
}
# endif
#endif
@@ -1400,6 +1396,10 @@ init_locale()
{
setlocale(LC_ALL, "");
+# ifdef FEAT_GUI_GTK
+ /* Tell Gtk not to change our locale settings. */
+ gtk_disable_setlocale();
+# endif
# if defined(FEAT_FLOAT) && defined(LC_NUMERIC)
/* Make sure strtod() uses a decimal point, not a comma. */
setlocale(LC_NUMERIC, "C");