diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-12-10 22:24:11 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-12-10 22:24:11 +0300 |
| commit | f572bd7e4e15a99cc19244a4411c6a596309f489 (patch) | |
| tree | 609a71fd0b7a0a61703ff477b30fc374c6d87c0d /src | |
| parent | ac4bbf55f6d6b9b252dd90fe800626850022b690 (diff) | |
| download | rneovim-f572bd7e4e15a99cc19244a4411c6a596309f489.tar.gz rneovim-f572bd7e4e15a99cc19244a4411c6a596309f489.tar.bz2 rneovim-f572bd7e4e15a99cc19244a4411c6a596309f489.zip | |
eval,functests: Fix tests and complete() and setline() behaviour
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 2f908f70a9..81dd6434a1 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -7496,7 +7496,7 @@ static void f_complete(typval_T *argvars, typval_T *rettv, FunPtr fptr) if (!undo_allowed()) return; - if (argvars[1].v_type != VAR_LIST || argvars[1].vval.v_list == NULL) { + if (argvars[1].v_type != VAR_LIST) { EMSG(_(e_invarg)); return; } @@ -14540,20 +14540,19 @@ static void f_setline(typval_T *argvars, typval_T *rettv, FunPtr fptr) line = tv_get_string_chk(&argvars[1]); } - /* default result is zero == OK */ + // Default result is zero == OK. for (;; ) { - if (l != NULL) { // List argument, get next string. - if (li == NULL) { - break; - } - line = tv_get_string_chk(TV_LIST_ITEM_TV(li)); - li = TV_LIST_ITEM_NEXT(l, li); + if (li == NULL) { + break; } + line = tv_get_string_chk(TV_LIST_ITEM_TV(li)); + li = TV_LIST_ITEM_NEXT(l, li); - rettv->vval.v_number = 1; /* FAIL */ - if (line == NULL || lnum < 1 || lnum > curbuf->b_ml.ml_line_count + 1) + rettv->vval.v_number = 1; // FAIL + if (line == NULL || lnum < 1 || lnum > curbuf->b_ml.ml_line_count + 1) { break; + } /* When coming here from Insert mode, sync undo, so that this can be * undone separately from what was previously inserted. */ |