diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-01-15 22:10:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-15 22:10:05 +0100 |
| commit | 900708f93b16d8d78f107e2b9ee16ae20f3e55b1 (patch) | |
| tree | 2fb238118edd68e64dd91e943721d0e08c844b95 /src/nvim/ops.c | |
| parent | 7dd3910f47621dd422e8c37ad16512295a11f5cc (diff) | |
| parent | 808f5043055f9bd2f083befc0d50f00b0ffb5c25 (diff) | |
| download | rneovim-900708f93b16d8d78f107e2b9ee16ae20f3e55b1.tar.gz rneovim-900708f93b16d8d78f107e2b9ee16ae20f3e55b1.tar.bz2 rneovim-900708f93b16d8d78f107e2b9ee16ae20f3e55b1.zip | |
Merge #7855 from ckelsel/vim-8.0.0398
Diffstat (limited to 'src/nvim/ops.c')
| -rw-r--r-- | src/nvim/ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/ops.c b/src/nvim/ops.c index a5e131190d..295c985962 100644 --- a/src/nvim/ops.c +++ b/src/nvim/ops.c @@ -3177,9 +3177,9 @@ error: curbuf->b_op_start.lnum++; } // Skip mark_adjust when adding lines after the last one, there - // can't be marks there. + // can't be marks there. But still needed in diff mode. if (curbuf->b_op_start.lnum + (y_type == kMTCharWise) - 1 + nr_lines - < curbuf->b_ml.ml_line_count) { + < curbuf->b_ml.ml_line_count || curwin->w_p_diff) { mark_adjust(curbuf->b_op_start.lnum + (y_type == kMTCharWise), (linenr_T)MAXLNUM, nr_lines, 0L, false); } |