diff options
| author | James McCoy <jamessan@jamessan.com> | 2017-08-16 15:35:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-16 15:35:22 -0400 |
| commit | cea1248f7d357252d53df946093cdab4b889e6e5 (patch) | |
| tree | dec9b4d5ac528f206366d20453d699c1a5960694 /src/nvim/move.c | |
| parent | 6844ff756100a80fadf2818d35fbb2c5fe6cbaa4 (diff) | |
| parent | 8dddf5590796994254fb31b4cbe1736ec3faf9f6 (diff) | |
| download | rneovim-cea1248f7d357252d53df946093cdab4b889e6e5.tar.gz rneovim-cea1248f7d357252d53df946093cdab4b889e6e5.tar.bz2 rneovim-cea1248f7d357252d53df946093cdab4b889e6e5.zip | |
Merge pull request #7052 from ckelsel/vim-8.0.0044
vim-patch:8.0.0044
Diffstat (limited to 'src/nvim/move.c')
| -rw-r--r-- | src/nvim/move.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/nvim/move.c b/src/nvim/move.c index 81d46a7f17..4d646f5a4b 100644 --- a/src/nvim/move.c +++ b/src/nvim/move.c @@ -2147,14 +2147,12 @@ void do_check_cursorbind(void) curbuf = curwin->w_buffer; /* skip original window and windows with 'noscrollbind' */ if (curwin != old_curwin && curwin->w_p_crb) { - if (curwin->w_p_diff) - curwin->w_cursor.lnum - = diff_get_corresponding_line(old_curbuf, - line, - curbuf, - curwin->w_cursor.lnum); - else + if (curwin->w_p_diff) { + curwin->w_cursor.lnum = + diff_get_corresponding_line(old_curbuf, line); + } else { curwin->w_cursor.lnum = line; + } curwin->w_cursor.col = col; curwin->w_cursor.coladd = coladd; curwin->w_curswant = curswant; |