summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/drawline.c4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/drawline.c b/src/drawline.c
index e3084d4c57..0be071876f 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 b5dae7fd19..bc3ddc1beb 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 */
/**/
+ 1756,
+/**/
1755,
/**/
1754,