lkundrak / rpms / vim

Forked from rpms/vim 4 years ago
Clone
adf6b40
To: vim_dev@googlegroups.com
adf6b40
Subject: Patch 7.4.174
adf6b40
Fcc: outbox
adf6b40
From: Bram Moolenaar <Bram@moolenaar.net>
adf6b40
Mime-Version: 1.0
adf6b40
Content-Type: text/plain; charset=UTF-8
adf6b40
Content-Transfer-Encoding: 8bit
adf6b40
------------
adf6b40
adf6b40
Patch 7.4.174
adf6b40
Problem:    Compiler warnings for Python interface. (Tony Mechelynck)
adf6b40
Solution:   Add type casts, initialize variable.
adf6b40
Files:	    src/if_py_both.h
adf6b40
adf6b40
adf6b40
*** ../vim-7.4.173/src/if_py_both.h	2014-01-31 14:53:59.715533645 +0100
adf6b40
--- src/if_py_both.h	2014-02-11 15:57:30.678154932 +0100
adf6b40
***************
adf6b40
*** 2368,2374 ****
adf6b40
      PyInt	numreplaced = 0;
adf6b40
      PyInt	numadded = 0;
adf6b40
      PyInt	size;
adf6b40
!     listitem_T	**lis;
adf6b40
  
adf6b40
      size = ListLength(self);
adf6b40
  
adf6b40
--- 2368,2374 ----
adf6b40
      PyInt	numreplaced = 0;
adf6b40
      PyInt	numadded = 0;
adf6b40
      PyInt	size;
adf6b40
!     listitem_T	**lis = NULL;
adf6b40
  
adf6b40
      size = ListLength(self);
adf6b40
  
adf6b40
***************
adf6b40
*** 2503,2510 ****
adf6b40
  	{
adf6b40
  	    Py_DECREF(iterator);
adf6b40
  	    PyErr_FORMAT(PyExc_ValueError,
adf6b40
! 		    N_("attempt to assign sequence of size greater then %d "
adf6b40
! 			"to extended slice"), slicelen);
adf6b40
  	    list_restore(numadded, numreplaced, slicelen, l, lis, lastaddedli);
adf6b40
  	    PyMem_Free(lis);
adf6b40
  	    return -1;
adf6b40
--- 2503,2510 ----
adf6b40
  	{
adf6b40
  	    Py_DECREF(iterator);
adf6b40
  	    PyErr_FORMAT(PyExc_ValueError,
adf6b40
! 		    N_("attempt to assign sequence of size greater then %ld "
adf6b40
! 			"to extended slice"), (long)slicelen);
adf6b40
  	    list_restore(numadded, numreplaced, slicelen, l, lis, lastaddedli);
adf6b40
  	    PyMem_Free(lis);
adf6b40
  	    return -1;
adf6b40
***************
adf6b40
*** 2516,2523 ****
adf6b40
      if (step != 1 && i != slicelen)
adf6b40
      {
adf6b40
  	PyErr_FORMAT2(PyExc_ValueError,
adf6b40
! 		N_("attempt to assign sequence of size %d to extended slice "
adf6b40
! 		    "of size %d"), i, slicelen);
adf6b40
  	list_restore(numadded, numreplaced, slicelen, l, lis, lastaddedli);
adf6b40
  	PyMem_Free(lis);
adf6b40
  	return -1;
adf6b40
--- 2516,2523 ----
adf6b40
      if (step != 1 && i != slicelen)
adf6b40
      {
adf6b40
  	PyErr_FORMAT2(PyExc_ValueError,
adf6b40
! 		N_("attempt to assign sequence of size %ld to extended slice "
adf6b40
! 		    "of size %ld"), (long)i, (long)slicelen);
adf6b40
  	list_restore(numadded, numreplaced, slicelen, l, lis, lastaddedli);
adf6b40
  	PyMem_Free(lis);
adf6b40
  	return -1;
adf6b40
*** ../vim-7.4.173/src/version.c	2014-02-11 15:47:41.382145902 +0100
adf6b40
--- src/version.c	2014-02-11 15:59:04.646156372 +0100
adf6b40
***************
adf6b40
*** 740,741 ****
adf6b40
--- 740,743 ----
adf6b40
  {   /* Add new patch number below this line */
adf6b40
+ /**/
adf6b40
+     174,
adf6b40
  /**/
adf6b40
adf6b40
-- 
adf6b40
DINGO:   You must spank her well and after you have spanked her you
adf6b40
         may deal with her as you like and then ... spank me.
adf6b40
AMAZING: And spank me!
adf6b40
STUNNER: And me.
adf6b40
LOVELY:  And me.
adf6b40
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
adf6b40
adf6b40
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
adf6b40
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
adf6b40
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
adf6b40
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///