diff options
author | Bram Moolenaar <Bram@vim.org> | 2022-11-24 23:04:02 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-11-24 23:04:02 +0000 |
commit | 637862fc3ca68e3fc1ea9a178bd7f9d25a6e773b (patch) | |
tree | d1a4c78520664d9551797903971c642c13f94369 | |
parent | 6ac16f0c0fe923098b9df5ac430f1923045f16ea (diff) | |
download | vim-git-637862fc3ca68e3fc1ea9a178bd7f9d25a6e773b.tar.gz |
patch 9.0.0945: failures in the cursorline testv9.0.0945
Problem: Failures in the cursorline test.
Solution: Reset extra_attr only after a text property.
-rw-r--r-- | src/drawline.c | 14 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/drawline.c b/src/drawline.c index e6fdd7a0b..408f2d5bd 100644 --- a/src/drawline.c +++ b/src/drawline.c @@ -2403,9 +2403,6 @@ win_line( #if defined(FEAT_PROP_POPUP) if (wlv.n_extra <= 0) { - wlv.extra_for_textprop = FALSE; - in_linebreak = FALSE; - // Only restore search_attr and area_attr after "n_extra" in // the next screen line is also done. if (wlv.saved_n_extra <= 0) @@ -2414,10 +2411,15 @@ win_line( search_attr = saved_search_attr; if (area_attr == 0 && *ptr != NUL) area_attr = saved_area_attr; - // wlv.extra_attr should be used at this position but not - // any further. - reset_extra_attr = TRUE; + + if (wlv.extra_for_textprop) + // wlv.extra_attr should be used at this position but + // not any further. + reset_extra_attr = TRUE; } + + wlv.extra_for_textprop = FALSE; + in_linebreak = FALSE; } #endif } diff --git a/src/version.c b/src/version.c index b234cce90..875252892 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 */ /**/ + 945, +/**/ 944, /**/ 943, |