From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 29 Apr 2014 13:11:43 +0000 (+0200)
Subject: updated for version 7.4.270
X-Git-Tag: v7.4.270
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ff32c5c2cec3597a5695ca79825ab53441dbf06;p=vim

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 1cb47b44b..3e1616c85 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -3142,10 +3142,14 @@ gui_mch_init(void)
 	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 f13edda83..b41ffc297 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    270,
 /**/
     269,
 /**/