lkundrak / rpms / vim

Forked from rpms/vim 4 years ago
Clone
4d07bf5
To: vim_dev@googlegroups.com
4d07bf5
Subject: Patch 7.3.300
4d07bf5
Fcc: outbox
4d07bf5
From: Bram Moolenaar <Bram@moolenaar.net>
4d07bf5
Mime-Version: 1.0
4d07bf5
Content-Type: text/plain; charset=UTF-8
4d07bf5
Content-Transfer-Encoding: 8bit
4d07bf5
------------
4d07bf5
4d07bf5
Patch 7.3.300
4d07bf5
Problem:    Python doesn't parse multi-byte argument correctly.
4d07bf5
Solution:   Use "t" instead of "s". (lilydjwg)
4d07bf5
Files:	    src/if_py_both.h
4d07bf5
4d07bf5
4d07bf5
*** ../vim-7.3.299/src/if_py_both.h	2011-07-07 15:08:53.000000000 +0200
4d07bf5
--- src/if_py_both.h	2011-09-07 19:25:12.000000000 +0200
4d07bf5
***************
4d07bf5
*** 74,80 ****
4d07bf5
      char *str = NULL;
4d07bf5
      int error = ((OutputObject *)(self))->error;
4d07bf5
  
4d07bf5
!     if (!PyArg_ParseTuple(args, "es#", ENC_OPT, &str, &len))
4d07bf5
  	return NULL;
4d07bf5
  
4d07bf5
      Py_BEGIN_ALLOW_THREADS
4d07bf5
--- 74,80 ----
4d07bf5
      char *str = NULL;
4d07bf5
      int error = ((OutputObject *)(self))->error;
4d07bf5
  
4d07bf5
!     if (!PyArg_ParseTuple(args, "et#", ENC_OPT, &str, &len))
4d07bf5
  	return NULL;
4d07bf5
  
4d07bf5
      Py_BEGIN_ALLOW_THREADS
4d07bf5
***************
4d07bf5
*** 114,120 ****
4d07bf5
  	char *str = NULL;
4d07bf5
  	PyInt len;
4d07bf5
  
4d07bf5
! 	if (!PyArg_Parse(line, "es#", ENC_OPT, &str, &len)) {
4d07bf5
  	    PyErr_SetString(PyExc_TypeError, _("writelines() requires list of strings"));
4d07bf5
  	    Py_DECREF(list);
4d07bf5
  	    return NULL;
4d07bf5
--- 114,120 ----
4d07bf5
  	char *str = NULL;
4d07bf5
  	PyInt len;
4d07bf5
  
4d07bf5
! 	if (!PyArg_Parse(line, "et#", ENC_OPT, &str, &len)) {
4d07bf5
  	    PyErr_SetString(PyExc_TypeError, _("writelines() requires list of strings"));
4d07bf5
  	    Py_DECREF(list);
4d07bf5
  	    return NULL;
4d07bf5
*** ../vim-7.3.299/src/version.c	2011-09-07 19:08:57.000000000 +0200
4d07bf5
--- src/version.c	2011-09-07 19:26:05.000000000 +0200
4d07bf5
***************
4d07bf5
*** 711,712 ****
4d07bf5
--- 711,714 ----
4d07bf5
  {   /* Add new patch number below this line */
4d07bf5
+ /**/
4d07bf5
+     300,
4d07bf5
  /**/
4d07bf5
4d07bf5
-- 
4d07bf5
A salesperson says:            Translation:
4d07bf5
"backward compatible"          Old technology
4d07bf5
"Premium"                      Overpriced
4d07bf5
"Can't keep it on the shelf"   Unavailable
4d07bf5
"Stands alone"                 Piece of shit
4d07bf5
"Proprietary"                  Incompatible
4d07bf5
				(Scott Adams - The Dilbert principle)
4d07bf5
4d07bf5
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
4d07bf5
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
4d07bf5
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
4d07bf5
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///