Karsten Hopp 17f88d
To: vim_dev@googlegroups.com
Karsten Hopp 17f88d
Subject: Patch 7.3.959
Karsten Hopp 17f88d
Fcc: outbox
Karsten Hopp 17f88d
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp 17f88d
Mime-Version: 1.0
Karsten Hopp 17f88d
Content-Type: text/plain; charset=UTF-8
Karsten Hopp 17f88d
Content-Transfer-Encoding: 8bit
Karsten Hopp 17f88d
------------
Karsten Hopp 17f88d
Karsten Hopp 17f88d
Patch 7.3.959 (after 7.3.957)
Karsten Hopp 17f88d
Problem:    Missing error number.
Karsten Hopp 17f88d
Solution:   Assign an error number.
Karsten Hopp 17f88d
Files:	    src/if_python3.c
Karsten Hopp 17f88d
Karsten Hopp 17f88d
Karsten Hopp 17f88d
*** ../vim-7.3.958/src/if_python3.c	2013-05-15 18:28:08.000000000 +0200
Karsten Hopp 17f88d
--- src/if_python3.c	2013-05-15 19:41:51.000000000 +0200
Karsten Hopp 17f88d
***************
Karsten Hopp 17f88d
*** 1007,1013 ****
Karsten Hopp 17f88d
      DoPy3Command(eap, buffer, NULL);
Karsten Hopp 17f88d
  }
Karsten Hopp 17f88d
  
Karsten Hopp 17f88d
! void ex_py3do(exarg_T *eap)
Karsten Hopp 17f88d
  {
Karsten Hopp 17f88d
      linenr_T		i;
Karsten Hopp 17f88d
      const char		*code_hdr = "def " DOPY_FUNC "(line, linenr):\n ";
Karsten Hopp 17f88d
--- 1007,1014 ----
Karsten Hopp 17f88d
      DoPy3Command(eap, buffer, NULL);
Karsten Hopp 17f88d
  }
Karsten Hopp 17f88d
  
Karsten Hopp 17f88d
!     void
Karsten Hopp 17f88d
! ex_py3do(exarg_T *eap)
Karsten Hopp 17f88d
  {
Karsten Hopp 17f88d
      linenr_T		i;
Karsten Hopp 17f88d
      const char		*code_hdr = "def " DOPY_FUNC "(line, linenr):\n ";
Karsten Hopp 17f88d
***************
Karsten Hopp 17f88d
*** 1068,1075 ****
Karsten Hopp 17f88d
  	{
Karsten Hopp 17f88d
  	    if (!PyUnicode_Check(pyret))
Karsten Hopp 17f88d
  	    {
Karsten Hopp 17f88d
! 		/* TODO: a proper error number */
Karsten Hopp 17f88d
! 		EMSG(_("E000: return value must be an instance of str"));
Karsten Hopp 17f88d
  		Py_XDECREF(pyret);
Karsten Hopp 17f88d
  		status = 1;
Karsten Hopp 17f88d
  		goto out;
Karsten Hopp 17f88d
--- 1069,1075 ----
Karsten Hopp 17f88d
  	{
Karsten Hopp 17f88d
  	    if (!PyUnicode_Check(pyret))
Karsten Hopp 17f88d
  	    {
Karsten Hopp 17f88d
! 		EMSG(_("E863: return value must be an instance of str"));
Karsten Hopp 17f88d
  		Py_XDECREF(pyret);
Karsten Hopp 17f88d
  		status = 1;
Karsten Hopp 17f88d
  		goto out;
Karsten Hopp 17f88d
*** ../vim-7.3.958/src/version.c	2013-05-15 19:07:03.000000000 +0200
Karsten Hopp 17f88d
--- src/version.c	2013-05-15 19:38:05.000000000 +0200
Karsten Hopp 17f88d
***************
Karsten Hopp 17f88d
*** 730,731 ****
Karsten Hopp 17f88d
--- 730,733 ----
Karsten Hopp 17f88d
  {   /* Add new patch number below this line */
Karsten Hopp 17f88d
+ /**/
Karsten Hopp 17f88d
+     959,
Karsten Hopp 17f88d
  /**/
Karsten Hopp 17f88d
Karsten Hopp 17f88d
Karsten Hopp 17f88d
-- 
Karsten Hopp 17f88d
CRONE:  Who sent you?
Karsten Hopp 17f88d
ARTHUR: The Knights Who Say Ni!
Karsten Hopp 17f88d
CRONE:  Aaaagh!  (she looks around in rear) No!  We have no shrubberies here.
Karsten Hopp 17f88d
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
Karsten Hopp 17f88d
Karsten Hopp 17f88d
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp 17f88d
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp 17f88d
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
Karsten Hopp 17f88d
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///