jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone

Blame SOURCES/7.4.270

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