Blame SOURCES/7.4.270

22c937
To: vim_dev@googlegroups.com
22c937
Subject: Patch 7.4.270
22c937
Fcc: outbox
22c937
From: Bram Moolenaar <Bram@moolenaar.net>
22c937
Mime-Version: 1.0
22c937
Content-Type: text/plain; charset=UTF-8
22c937
Content-Transfer-Encoding: 8bit
22c937
------------
22c937
22c937
Patch 7.4.270
22c937
Problem:    Comparing pointers instead of the string they point to.
22c937
Solution:   Use strcmp(). (Ken Takata)
22c937
Files:	    src/gui_gtk_x11.c
22c937
22c937
22c937
*** ../vim-7.4.269/src/gui_gtk_x11.c	2014-04-06 21:08:41.311360470 +0200
22c937
--- src/gui_gtk_x11.c	2014-04-29 15:02:35.931856814 +0200
22c937
***************
22c937
*** 3142,3151 ****
22c937
  	gnome_program_init(VIMPACKAGE, VIM_VERSION_SHORT,
22c937
  			   LIBGNOMEUI_MODULE, gui_argc, gui_argv, NULL);
22c937
  # if defined(FEAT_FLOAT) && defined(LC_NUMERIC)
22c937
! 	/* Make sure strtod() uses a decimal point, not a comma. Gnome init
22c937
! 	 * may change it. */
22c937
! 	if (setlocale(LC_NUMERIC, NULL) != (char *) "C")
22c937
! 	   setlocale(LC_NUMERIC, "C");
22c937
  # endif
22c937
      }
22c937
  #endif
22c937
--- 3142,3155 ----
22c937
  	gnome_program_init(VIMPACKAGE, VIM_VERSION_SHORT,
22c937
  			   LIBGNOMEUI_MODULE, gui_argc, gui_argv, NULL);
22c937
  # if defined(FEAT_FLOAT) && defined(LC_NUMERIC)
22c937
! 	{
22c937
! 	    char *p = setlocale(LC_NUMERIC, NULL);
22c937
! 
22c937
! 	    /* Make sure strtod() uses a decimal point, not a comma. Gnome
22c937
! 	     * init may change it. */
22c937
! 	    if (p == NULL || strcmp(p, "C") != 0)
22c937
! 	       setlocale(LC_NUMERIC, "C");
22c937
! 	}
22c937
  # endif
22c937
      }
22c937
  #endif
22c937
*** ../vim-7.4.269/src/version.c	2014-04-29 14:44:31.519875819 +0200
22c937
--- src/version.c	2014-04-29 14:59:21.799860216 +0200
22c937
***************
22c937
*** 736,737 ****
22c937
--- 736,739 ----
22c937
  {   /* Add new patch number below this line */
22c937
+ /**/
22c937
+     270,
22c937
  /**/
22c937
22c937
-- 
22c937
From "know your smileys":
22c937
 :-| :-|   Deja' vu!
22c937
22c937
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
22c937
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
22c937
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
22c937
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///