patch 9.0.1756: failing cursorline sign test
Commit:
https://github.com/vim/vim/commit/e1eaae27f4f2d2522e45397756f3bca42be50988
Author: Christian Brabandt <[email protected]>
Date: Sat Aug 19 22:36:12 2023 +0200
patch 9.0.1756: failing cursorline sign test
Problem: failing cursorline sign test
Solution: only reset char attr, if cursorline
option is not set
Unfortunately, commit dbeadf05b6a152e7d9c5cc23d9202057f8e99884 causes a
failure with the sign test Test_sign_cursor_position()
The root cause is, that resetting the character attribute will also
reset the existing cursor line highlighting and this breaks the test,
that expects the cursor line highlighting to overrule the sign line
highlighting.
So change the condition to reset the character attribute by making sure
that this only happens, if the 'cursorline' option is not active and the
cursor is not at the same line as the line to be drawn
closes: #12854
closes: #12859
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/drawline.c b/src/drawline.c
index e3084d4c5..0be071876 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -3343,7 +3343,9 @@ win_line(
wlv.char_attr = wlv.line_attr;
#ifdef FEAT_SIGNS
// At end of line: if Sign is present with line highlight,
reset char_attr
- if (sign_present && wlv.sattr.sat_linehl > 0 &&
wlv.draw_state == WL_LINE)
+ // but not when cursorline is active
+ if (sign_present && wlv.sattr.sat_linehl > 0 &&
wlv.draw_state == WL_LINE
+ && !(wp->w_p_cul && lnum == wp->w_cursor.lnum))
wlv.char_attr = wlv.sattr.sat_linehl;
#endif
# ifdef FEAT_DIFF
diff --git a/src/version.c b/src/version.c
index b5dae7fd1..bc3ddc1be 100644
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1756,
/**/
1755,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1qXSoh-009X41-EK%40256bit.org.
