diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-06-16 18:24:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-16 18:24:54 +0200 |
| commit | a503349e200dba09f5fc93363a3fc3a64dd7eeab (patch) | |
| tree | 5ce0d9f0f2f5bbf76821bb2965c94c793d0095f2 /src/nvim/normal.c | |
| parent | 26dc628ab3a640b4f713d38c71623982fedc997a (diff) | |
| parent | de022d25707718029abdb539484dd242e36e4aa5 (diff) | |
| download | rneovim-a503349e200dba09f5fc93363a3fc3a64dd7eeab.tar.gz rneovim-a503349e200dba09f5fc93363a3fc3a64dd7eeab.tar.bz2 rneovim-a503349e200dba09f5fc93363a3fc3a64dd7eeab.zip | |
Merge #8569 from janlazo/vim-8.0.0602
Diffstat (limited to 'src/nvim/normal.c')
| -rw-r--r-- | src/nvim/normal.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c index a7c4c255b7..6d3ffab030 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -5234,9 +5234,9 @@ static void nv_gotofile(cmdarg_T *cap) (void)autowrite(curbuf, false); } setpcmark(); - (void)do_ecmd(0, ptr, NULL, NULL, ECMD_LAST, - buf_hide(curbuf) ? ECMD_HIDE : 0, curwin); - if (cap->nchar == 'F' && lnum >= 0) { + if (do_ecmd(0, ptr, NULL, NULL, ECMD_LAST, + buf_hide(curbuf) ? ECMD_HIDE : 0, curwin) == OK + && cap->nchar == 'F' && lnum >= 0) { curwin->w_cursor.lnum = lnum; check_cursor_lnum(); beginline(BL_SOL | BL_FIX); @@ -7151,7 +7151,7 @@ static void set_op_var(int optype) assert(opchar0 >= 0 && opchar0 <= UCHAR_MAX); opchars[0] = (char) opchar0; - int opchar1 = get_extra_op_char(optype); + int opchar1 = get_extra_op_char(optype); assert(opchar1 >= 0 && opchar1 <= UCHAR_MAX); opchars[1] = (char) opchar1; |