From 3be71ce28d832553a1350b15d9323c30014382c0 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 23 Jan 2013 16:00:11 +0100 Subject: updated for version 7.3.777 Problem: When building with Gnome locale gets reset. Solution: Set locale after gnome_program_init(). (Christian Brabandt) --- src/gui_gtk_x11.c | 8 ++++++++ src/version.c | 2 ++ 2 files changed, 10 insertions(+) diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index d70f41860..a8cad32e1 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -3130,8 +3130,16 @@ gui_mch_init(void) * exits on failure, but that's a non-issue because we already called * gtk_init_check() in gui_mch_init_check(). */ if (using_gnome) + { gnome_program_init(VIMPACKAGE, VIM_VERSION_SHORT, LIBGNOMEUI_MODULE, gui_argc, gui_argv, NULL); +# if defined(FEAT_FLOAT) && defined(LC_NUMERIC) + /* Make sure strtod() uses a decimal point, not a comma. Gnome init + * may change it. */ + if (setlocale(LC_NUMERIC, NULL) != (char *) "C") + setlocale(LC_NUMERIC, "C"); +# endif + } #endif vim_free(gui_argv); gui_argv = NULL; diff --git a/src/version.c b/src/version.c index 03a483314..3e7d4639e 100644 --- a/src/version.c +++ b/src/version.c @@ -725,6 +725,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 777, /**/ 776, /**/ -- cgit v1.2.3