Mercurial > vim
diff src/ops.c @ 11065:f5bd684e47a1 v8.0.0421
patch 8.0.0421: diff mode wrong when adding line at end of buffer
commit https://github.com/vim/vim/commit/f58a8475e17bd566760fc7e2a17d35ddf4edacf2
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Mar 5 18:03:04 2017 +0100
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 #1329)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 05 Mar 2017 18:15:04 +0100 |
| parents | e366b968bf08 |
| children | 778c10516955 |
line wrap: on
line diff
--- a/src/ops.c +++ b/src/ops.c @@ -3927,9 +3927,13 @@ 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 == MCHAR) - 1 + nr_lines - < curbuf->b_ml.ml_line_count) + < curbuf->b_ml.ml_line_count +#ifdef FEAT_DIFF + || curwin->w_p_diff +#endif + ) mark_adjust(curbuf->b_op_start.lnum + (y_type == MCHAR), (linenr_T)MAXLNUM, nr_lines, 0L); @@ -6311,7 +6315,7 @@ write_viminfo_registers(FILE *fp) /* * Routine to export any final X selection we had to the environment - * so that the text is still available after vim has exited. X selections + * so that the text is still available after Vim has exited. X selections * only exist while the owning application exists, so we write to the * permanent (while X runs) store CUT_BUFFER0. * Dump the CLIPBOARD selection if we own it (it's logically the more