# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1526221806 -7200
# Node ID eb264a7750719b365b735e42fe401360b8933fcf
# Parent  31e8a593e29d1234f89bf7318a27beb64be44747
patch 8.0.1833: X11: ":echo 3.14" gives E806

commit https://github.com/vim/vim/commit/889fe2c2b9ba5c92b7e862a4aafbd863585fd633
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun May 13 16:23:40 2018 +0200

    patch 8.0.1833: X11: ":echo 3.14" gives E806

    Problem:    X11: ":echo 3.14" gives E806.
    Solution:   set LC_NUMERIC to "C". (Dominique Pelle, closes https://github.com/vim/vim/issues/2368)

diff --git a/src/gui_x11.c b/src/gui_x11.c
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -1282,6 +1282,17 @@ gui_mch_init_check(void)
 		cmdline_options, XtNumber(cmdline_options),
 		CARDINAL &gui_argc, gui_argv);
 
+# if defined(FEAT_FLOAT) && defined(LC_NUMERIC)
+    {
+	/* The call to XtOpenDisplay() may have set the locale from the
+	 * environment. Set LC_NUMERIC to "C" to make sure that strtod() uses a
+	 * decimal point, not a comma. */
+	char *p = setlocale(LC_NUMERIC, NULL);
+
+	if (p == NULL || strcmp(p, "C") != 0)
+	   setlocale(LC_NUMERIC, "C");
+    }
+# endif
     if (app_context == NULL || gui.dpy == NULL)
     {
 	gui.dying = TRUE;
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1833,
+/**/
     1832,
 /**/
     1831,