diff options
author | Bram Moolenaar <Bram@vim.org> | 2022-12-17 15:03:02 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-12-17 15:03:02 +0000 |
commit | 417e88bb75ee8af1bf696760bba9f114a007f733 (patch) | |
tree | ff204c8776693594f47e6402cedc47d9714a4136 | |
parent | 8d754fada81df8d65ca6b9ebab72db71bfe5fd94 (diff) | |
download | vim-git-417e88bb75ee8af1bf696760bba9f114a007f733.tar.gz |
patch 9.0.1069: diff mode highlight fails for special charactersv9.0.1069
Problem: Diff mode highlight fails for special characters.
Solution: Adjust condition for setting "diff_hlf".
-rw-r--r-- | src/drawline.c | 5 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/drawline.c b/src/drawline.c index 79b187ff0..1d2627051 100644 --- a/src/drawline.c +++ b/src/drawline.c @@ -2211,8 +2211,9 @@ win_line( if (wlv.diff_hlf == HLF_CHD && ptr - line >= change_start && wlv.n_extra == 0) wlv.diff_hlf = HLF_TXD; // changed text - if (wlv.diff_hlf == HLF_TXD && (ptr - line > change_end - || wlv.n_extra > 0)) + if (wlv.diff_hlf == HLF_TXD + && ((ptr - line > change_end && wlv.n_extra == 0) + || (wlv.n_extra > 0 && wlv.extra_for_textprop))) wlv.diff_hlf = HLF_CHD; // changed line wlv.line_attr = HL_ATTR(wlv.diff_hlf); if (wp->w_p_cul && lnum == wp->w_cursor.lnum diff --git a/src/version.c b/src/version.c index b9755be38..89d71523a 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1069, +/**/ 1068, /**/ 1067, |