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