# HG changeset patch # User Christian Brabandt # Date 1454785204 -3600 # Node ID 3f7382858d4d6a1781c822403c5d049ac1dd14bd # Parent 78a6b6180d8c870a7b4d1bacb5dbece55b2a6d98 commit https://github.com/vim/vim/commit/81e7a9c3fb37cad46c8f04a5ce871fb06819a371 Author: Bram Moolenaar Date: Sat Feb 6 19:57:20 2016 +0100 patch 7.4.1270 Problem: Warnings for missing values in switch. Solution: Change switch to if-else or add values. diff --git a/src/if_py_both.h b/src/if_py_both.h --- 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 --- 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 --- 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 --- 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,