diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-12-27 17:14:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-27 17:14:31 -0500 |
| commit | a58c5509d94f01f4a4edd6b4784f8d00b70af5b3 (patch) | |
| tree | b3cadc41e6fd4c747de5635dc0fb7556ec5e6e13 /src/nvim/diff.c | |
| parent | f2be59d8f80f2a1a68d5976b9cec3fa55da3700e (diff) | |
| parent | cff4cad25a1236bd869843f9578b7f276518d9b8 (diff) | |
| download | rneovim-a58c5509d94f01f4a4edd6b4784f8d00b70af5b3.tar.gz rneovim-a58c5509d94f01f4a4edd6b4784f8d00b70af5b3.tar.bz2 rneovim-a58c5509d94f01f4a4edd6b4784f8d00b70af5b3.zip | |
Merge pull request #13607 from janlazo/vim-8.2.2221
vim-patch:8.1.2227,8.2.{315,928,1007,1052,1121,1580,2221,2229,2231,2232}
Diffstat (limited to 'src/nvim/diff.c')
| -rw-r--r-- | src/nvim/diff.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/nvim/diff.c b/src/nvim/diff.c index 1cdf84f9d0..93bc34fa4b 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -805,7 +805,7 @@ static void diff_try_update(diffio_T *dio, for (idx_new = idx_orig; idx_new < DB_COUNT; idx_new++) { buf = curtab->tp_diffbuf[idx_new]; if (buf_valid(buf)) { - buf_check_timestamp(buf, false); + buf_check_timestamp(buf); } } } @@ -1225,8 +1225,7 @@ void ex_diffpatch(exarg_T *eap) EMSG(_("E816: Cannot read patch output")); } else { if (curbuf->b_fname != NULL) { - newname = vim_strnsave(curbuf->b_fname, - (int)(STRLEN(curbuf->b_fname) + 4)); + newname = vim_strnsave(curbuf->b_fname, STRLEN(curbuf->b_fname) + 4); STRCAT(newname, ".new"); } |