diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-10-11 00:24:52 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-11 00:24:52 +0800 |
| commit | 26c653718097955dc4dfbeb45ab602c8dbe9dea5 (patch) | |
| tree | 9ae12e34472a4aa6dae4cfb381a0648705b1351d /src/nvim/eval/typval.c | |
| parent | 8781213f00a22e20abeb4282204e900db799f4b5 (diff) | |
| parent | 62a0c9f8c24b9115155cd4551976353ace3e2c5e (diff) | |
| download | rneovim-26c653718097955dc4dfbeb45ab602c8dbe9dea5.tar.gz rneovim-26c653718097955dc4dfbeb45ab602c8dbe9dea5.tar.bz2 rneovim-26c653718097955dc4dfbeb45ab602c8dbe9dea5.zip | |
Merge pull request #20574 from zeertzjq/vim-8.2.2184
vim-patch:8.2.{1465,2184,2670,2671},9.0.{0712,partial:0715}
Diffstat (limited to 'src/nvim/eval/typval.c')
| -rw-r--r-- | src/nvim/eval/typval.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c index 961c963170..a0b06aaaf4 100644 --- a/src/nvim/eval/typval.c +++ b/src/nvim/eval/typval.c @@ -3750,9 +3750,11 @@ varnumber_T tv_get_number_chk(const typval_T *const tv, bool *const ret_error) linenr_T tv_get_lnum(const typval_T *const tv) FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT { + const int did_emsg_before = did_emsg; linenr_T lnum = (linenr_T)tv_get_number_chk(tv, NULL); - if (lnum == 0) { // No valid number, try using same function as line() does. + if (lnum <= 0 && did_emsg_before == did_emsg && tv->v_type != VAR_NUMBER) { int fnum; + // No valid number, try using same function as line() does. pos_T *const fp = var2fpos(tv, true, &fnum, false); if (fp != NULL) { lnum = fp->lnum; |