diff options
| author | ckelsel <ckelsel@hotmail.com> | 2018-01-15 20:08:37 +0800 |
|---|---|---|
| committer | ckelsel <ckelsel@hotmail.com> | 2018-01-15 20:20:15 +0800 |
| commit | 808f5043055f9bd2f083befc0d50f00b0ffb5c25 (patch) | |
| tree | 73a82c06f9d8f1d8303def016b2c68e9260f2c70 /src/nvim/ops.c | |
| parent | 28998cfd815abd690ffa0b9bab786263af619008 (diff) | |
| download | rneovim-808f5043055f9bd2f083befc0d50f00b0ffb5c25.tar.gz rneovim-808f5043055f9bd2f083befc0d50f00b0ffb5c25.tar.bz2 rneovim-808f5043055f9bd2f083befc0d50f00b0ffb5c25.zip | |
vim-patch:8.0.0421: diff mode wrong when adding line at end of buffer
Problem: Diff mode is displayed wrong when adding a line at the end of a
buffer.
Solution: Adjust marks in diff mode. (James McCoy, closes vim/vim#1329)
https://github.com/vim/vim/commit/f58a8475e17bd566760fc7e2a17d35ddf4edacf2
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); } |