updated for version 7.4.270
Problem: Comparing pointers instead of the string they point to.
Solution: Use strcmp(). (Ken Takata)
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 1cb47b4..3e1616c 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -3142,10 +3142,14 @@
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");
+ {
+ char *p = setlocale(LC_NUMERIC, NULL);
+
+ /* Make sure strtod() uses a decimal point, not a comma. Gnome
+ * init may change it. */
+ if (p == NULL || strcmp(p, "C") != 0)
+ setlocale(LC_NUMERIC, "C");
+ }
# endif
}
#endif
diff --git a/src/version.c b/src/version.c
index f13edda..b41ffc2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 270,
+/**/
269,
/**/
268,
