summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-05-15 19:44:39 +0200
committerBram Moolenaar <Bram@vim.org>2013-05-15 19:44:39 +0200
commit54e8f005815342b9d1f5e92a766eb4783f5ad414 (patch)
tree5a30579510dc55c2371768cac7d4de2ac4171048
parent2cd7362e309aa6993ef355a7860fad549f30d239 (diff)
downloadvim-54e8f005815342b9d1f5e92a766eb4783f5ad414.zip
updated for version 7.3.959
Problem: Missing error number. Solution: Assign an error number.
-rw-r--r--src/if_python3.c6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/if_python3.c b/src/if_python3.c
index 1d167142c..18987b7aa 100644
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -1007,7 +1007,8 @@ ex_py3file(exarg_T *eap)
DoPy3Command(eap, buffer, NULL);
}
-void ex_py3do(exarg_T *eap)
+ void
+ex_py3do(exarg_T *eap)
{
linenr_T i;
const char *code_hdr = "def " DOPY_FUNC "(line, linenr):\n ";
@@ -1068,8 +1069,7 @@ void ex_py3do(exarg_T *eap)
{
if (!PyUnicode_Check(pyret))
{
- /* TODO: a proper error number */
- EMSG(_("E000: return value must be an instance of str"));
+ EMSG(_("E863: return value must be an instance of str"));
Py_XDECREF(pyret);
status = 1;
goto out;
diff --git a/src/version.c b/src/version.c
index aee5207dd..abdf18af2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 959,
+/**/
958,
/**/
957,