Patch 9.0.1069

[Bram Moolenaar]

Patch 9.0.1069 (after 9.0.1067)
Problem: Diff mode highlight fails for special characters.
Solution: Adjust condition for setting "diff_hlf".
Files: src/drawline.c


*** ../vim-9.0.1068/src/drawline.c 2022-12-17 11:32:37.918855670 +0000
--- src/drawline.c 2022-12-17 15:02:10.043292201 +0000
***************
*** 2211,2218 ****
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))
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
--- 2211,2219 ----
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)
! || (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
*** ../vim-9.0.1068/src/version.c 2022-12-17 13:49:10.654887610 +0000
--- src/version.c 2022-12-17 14:35:19.634188630 +0000
***************
*** 697,698 ****
--- 697,700 ----
{ /* Add new patch number below this line */
+ /**/
+ 1069,
/**/

--
A real patriot is the fellow who gets a parking ticket and rejoices
that the system works.


/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///