summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/if_py_both.h9
-rw-r--r--src/if_python.c6
-rw-r--r--src/if_python3.c6
-rw-r--r--src/version.c2
4 files changed, 18 insertions, 5 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h
index e8a5f5de9..6ae3fe7f6 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -5831,11 +5831,10 @@ convert_dl(PyObject *obj, typval_T *tv,
}
/* As we are not using copy_tv which increments reference count we must
* do it ourself. */
- switch(tv->v_type)
- {
- case VAR_DICT: ++tv->vval.v_dict->dv_refcount; break;
- case VAR_LIST: ++tv->vval.v_list->lv_refcount; break;
- }
+ if (tv->v_type == VAR_DICT)
+ ++tv->vval.v_dict->dv_refcount;
+ else if (tv->v_type == VAR_LIST)
+ ++tv->vval.v_list->lv_refcount;
}
else
{
diff --git a/src/if_python.c b/src/if_python.c
index 43c89928e..4c2760e06 100644
--- a/src/if_python.c
+++ b/src/if_python.c
@@ -1556,6 +1556,12 @@ do_pyeval (char_u *str, typval_T *rettv)
rettv->v_type = VAR_NUMBER;
rettv->vval.v_number = 0;
break;
+ case VAR_NUMBER:
+ case VAR_STRING:
+ case VAR_FLOAT:
+ case VAR_JOB:
+ case VAR_SPECIAL:
+ break;
}
}
diff --git a/src/if_python3.c b/src/if_python3.c
index 569aca857..7194b6edb 100644
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -1649,6 +1649,12 @@ do_py3eval (char_u *str, typval_T *rettv)
rettv->v_type = VAR_NUMBER;
rettv->vval.v_number = 0;
break;
+ case VAR_NUMBER:
+ case VAR_STRING:
+ case VAR_FLOAT:
+ case VAR_JOB:
+ case VAR_SPECIAL:
+ break;
}
}
diff --git a/src/version.c b/src/version.c
index 626639a1c..74518d936 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1270,
+/**/
1269,
/**/
1268,