lkundrak / rpms / vim

Forked from rpms/vim 4 years ago
Clone
cd41238
To: vim_dev@googlegroups.com
cd41238
Subject: Patch 7.4.179
cd41238
Fcc: outbox
cd41238
From: Bram Moolenaar <Bram@moolenaar.net>
cd41238
Mime-Version: 1.0
cd41238
Content-Type: text/plain; charset=UTF-8
cd41238
Content-Transfer-Encoding: 8bit
cd41238
------------
cd41238
cd41238
Patch 7.4.179
cd41238
Problem:    Warning for type-punned pointer. (Tony Mechelynck)
cd41238
Solution:   Use intermediate variable.
cd41238
Files:	    src/if_py_both.h
cd41238
cd41238
cd41238
*** ../vim-7.4.178/src/if_py_both.h	2014-02-11 18:47:18.678311042 +0100
cd41238
--- src/if_py_both.h	2014-02-11 18:41:12.774305435 +0100
cd41238
***************
cd41238
*** 1617,1624 ****
cd41238
      }
cd41238
      else if (flags & DICT_FLAG_RETURN_BOOL)
cd41238
      {
cd41238
! 	Py_INCREF(Py_True);
cd41238
! 	return Py_True;
cd41238
      }
cd41238
  
cd41238
      di = dict_lookup(hi);
cd41238
--- 1617,1625 ----
cd41238
      }
cd41238
      else if (flags & DICT_FLAG_RETURN_BOOL)
cd41238
      {
cd41238
! 	ret = Py_True;
cd41238
! 	Py_INCREF(ret);
cd41238
! 	return ret;
cd41238
      }
cd41238
  
cd41238
      di = dict_lookup(hi);
cd41238
*** ../vim-7.4.178/src/version.c	2014-02-11 19:33:03.358353098 +0100
cd41238
--- src/version.c	2014-02-12 22:08:16.795819706 +0100
cd41238
***************
cd41238
*** 740,741 ****
cd41238
--- 740,743 ----
cd41238
  {   /* Add new patch number below this line */
cd41238
+ /**/
cd41238
+     179,
cd41238
  /**/
cd41238
cd41238
-- 
cd41238
Luxury. We used to have to get out of the lake at three o'clock in the 
cd41238
morning, clean the lake, eat a handful of hot gravel, go to work at the 
cd41238
mill every day for tuppence a month, come home, and Dad would beat us 
cd41238
around the head and neck with a broken bottle, if we were LUCKY!
cd41238
cd41238
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
cd41238
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
cd41238
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
cd41238
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///