diff options
| author | Matthieu Coudron <mattator@gmail.com> | 2020-11-14 19:35:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-14 19:35:26 +0100 |
| commit | 27d630926cab78511075159012ce6ac920d8747e (patch) | |
| tree | db9afbe90762056b2f2c538744ce04d571108b89 /src/nvim/diff.c | |
| parent | d8c69adbabe963142f433a2ddad172ff46413f15 (diff) | |
| parent | 5d6ecfa3c7447009da75842c611ea1b9f1db83e7 (diff) | |
| download | rneovim-27d630926cab78511075159012ce6ac920d8747e.tar.gz rneovim-27d630926cab78511075159012ce6ac920d8747e.tar.bz2 rneovim-27d630926cab78511075159012ce6ac920d8747e.zip | |
Merge pull request #13275 from janlazo/vim-8.1.0805
vim-patch:8.1.{805,806,809,810,811}
Diffstat (limited to 'src/nvim/diff.c')
| -rw-r--r-- | src/nvim/diff.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/nvim/diff.c b/src/nvim/diff.c index b9c293f6c8..1cdf84f9d0 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -719,15 +719,12 @@ static int diff_write_buffer(buf_T *buf, diffin_T *din) for (lnum = 1; lnum <= buf->b_ml.ml_line_count; lnum++) { for (s = ml_get_buf(buf, lnum, false); *s != NUL; ) { if (diff_flags & DIFF_ICASE) { - int c; - - // xdiff doesn't support ignoring case, fold-case the text. - int orig_len; char_u cbuf[MB_MAXBYTES + 1]; - c = PTR2CHAR(s); + // xdiff doesn't support ignoring case, fold-case the text. + int c = PTR2CHAR(s); c = utf_fold(c); - orig_len = utfc_ptr2len(s); + const int orig_len = utfc_ptr2len(s); if (utf_char2bytes(c, cbuf) != orig_len) { // TODO(Bram): handle byte length difference memmove(ptr + len, s, orig_len); |