jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone
3ef2ca
To: vim_dev@googlegroups.com
3ef2ca
Subject: Patch 7.4.174
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.174
3ef2ca
Problem:    Compiler warnings for Python interface. (Tony Mechelynck)
3ef2ca
Solution:   Add type casts, initialize variable.
3ef2ca
Files:	    src/if_py_both.h
3ef2ca
3ef2ca
3ef2ca
*** ../vim-7.4.173/src/if_py_both.h	2014-01-31 14:53:59.715533645 +0100
3ef2ca
--- src/if_py_both.h	2014-02-11 15:57:30.678154932 +0100
3ef2ca
***************
3ef2ca
*** 2368,2374 ****
3ef2ca
      PyInt	numreplaced = 0;
3ef2ca
      PyInt	numadded = 0;
3ef2ca
      PyInt	size;
3ef2ca
!     listitem_T	**lis;
3ef2ca
  
3ef2ca
      size = ListLength(self);
3ef2ca
  
3ef2ca
--- 2368,2374 ----
3ef2ca
      PyInt	numreplaced = 0;
3ef2ca
      PyInt	numadded = 0;
3ef2ca
      PyInt	size;
3ef2ca
!     listitem_T	**lis = NULL;
3ef2ca
  
3ef2ca
      size = ListLength(self);
3ef2ca
  
3ef2ca
***************
3ef2ca
*** 2503,2510 ****
3ef2ca
  	{
3ef2ca
  	    Py_DECREF(iterator);
3ef2ca
  	    PyErr_FORMAT(PyExc_ValueError,
3ef2ca
! 		    N_("attempt to assign sequence of size greater then %d "
3ef2ca
! 			"to extended slice"), slicelen);
3ef2ca
  	    list_restore(numadded, numreplaced, slicelen, l, lis, lastaddedli);
3ef2ca
  	    PyMem_Free(lis);
3ef2ca
  	    return -1;
3ef2ca
--- 2503,2510 ----
3ef2ca
  	{
3ef2ca
  	    Py_DECREF(iterator);
3ef2ca
  	    PyErr_FORMAT(PyExc_ValueError,
3ef2ca
! 		    N_("attempt to assign sequence of size greater then %ld "
3ef2ca
! 			"to extended slice"), (long)slicelen);
3ef2ca
  	    list_restore(numadded, numreplaced, slicelen, l, lis, lastaddedli);
3ef2ca
  	    PyMem_Free(lis);
3ef2ca
  	    return -1;
3ef2ca
***************
3ef2ca
*** 2516,2523 ****
3ef2ca
      if (step != 1 && i != slicelen)
3ef2ca
      {
3ef2ca
  	PyErr_FORMAT2(PyExc_ValueError,
3ef2ca
! 		N_("attempt to assign sequence of size %d to extended slice "
3ef2ca
! 		    "of size %d"), i, slicelen);
3ef2ca
  	list_restore(numadded, numreplaced, slicelen, l, lis, lastaddedli);
3ef2ca
  	PyMem_Free(lis);
3ef2ca
  	return -1;
3ef2ca
--- 2516,2523 ----
3ef2ca
      if (step != 1 && i != slicelen)
3ef2ca
      {
3ef2ca
  	PyErr_FORMAT2(PyExc_ValueError,
3ef2ca
! 		N_("attempt to assign sequence of size %ld to extended slice "
3ef2ca
! 		    "of size %ld"), (long)i, (long)slicelen);
3ef2ca
  	list_restore(numadded, numreplaced, slicelen, l, lis, lastaddedli);
3ef2ca
  	PyMem_Free(lis);
3ef2ca
  	return -1;
3ef2ca
*** ../vim-7.4.173/src/version.c	2014-02-11 15:47:41.382145902 +0100
3ef2ca
--- src/version.c	2014-02-11 15:59:04.646156372 +0100
3ef2ca
***************
3ef2ca
*** 740,741 ****
3ef2ca
--- 740,743 ----
3ef2ca
  {   /* Add new patch number below this line */
3ef2ca
+ /**/
3ef2ca
+     174,
3ef2ca
  /**/
3ef2ca
3ef2ca
-- 
3ef2ca
DINGO:   You must spank her well and after you have spanked her you
3ef2ca
         may deal with her as you like and then ... spank me.
3ef2ca
AMAZING: And spank me!
3ef2ca
STUNNER: And me.
3ef2ca
LOVELY:  And me.
3ef2ca
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
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    ///