diff options
| author | ckelsel <ckelsel@hotmail.com> | 2017-08-17 08:20:48 +0800 |
|---|---|---|
| committer | ckelsel <ckelsel@hotmail.com> | 2017-08-17 08:20:48 +0800 |
| commit | 673fc748237345914e0ad584bc4cba997c96a37e (patch) | |
| tree | 7f55a3b3dd362fbbc59ff204287a0aae99089e5e /src/nvim/move.c | |
| parent | 5d332084e1ca4c29b1ccb90ea44c3b861dac5701 (diff) | |
| parent | 5b32bce73c93a64970afe0e92e0a8ba2fed88619 (diff) | |
| download | rneovim-673fc748237345914e0ad584bc4cba997c96a37e.tar.gz rneovim-673fc748237345914e0ad584bc4cba997c96a37e.tar.bz2 rneovim-673fc748237345914e0ad584bc4cba997c96a37e.zip | |
Merge remote-tracking branch 'upstream/master'
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; |