commit 8c63e0ec314ba07d54b881dc629fe19e6eda1fb8
author Bram Moolenaar <Bram@vim.org> Tue Sep 25 22:17:54 2018 +0200
committer Bram Moolenaar <Bram@vim.org> Tue Sep 25 22:17:54 2018 +0200
tree 5013e60903788494a6b7f9bea4cf7f1fcbf8fcc7
parent 09037503ea5f957ad23121bc61e15e4bb1765edf

patch 8.1.0435: cursorline highlight not removed in some situation

Problem:    Cursorline highlight not removed in some situation. (Vitaly
            Yashin)
Solution:   Reset last_cursorline when resetting 'cursorline'. (Christian
            Brabandt, closes #3481)

src/move.c

diff --git a/src/move.c b/src/move.c
index e9a3eb9..c072758 100644
--- a/src/move.c
+++ b/src/move.c
@@ -125,6 +125,12 @@
 
 #ifdef FEAT_SYN_HL
 static linenr_T	last_cursorline = 0;
+
+    void
+reset_cursorline(void)
+{
+    last_cursorline = 0;
+}
 #endif
 
 /*

src/option.c

diff --git a/src/option.c b/src/option.c
index f89c473..19e2b4c 100644
--- a/src/option.c
+++ b/src/option.c
@@ -8306,6 +8306,11 @@
 	p_lrm = !p_lnr;
 #endif
 
+#ifdef FEAT_SYN_HL
+    else if ((int *)varp == &curwin->w_p_cul && !value && old_value)
+	reset_cursorline();
+#endif
+
 #ifdef FEAT_PERSISTENT_UNDO
     /* 'undofile' */
     else if ((int *)varp == &curbuf->b_p_udf || (int *)varp == &p_udf)

src/proto/move.pro

diff --git a/src/proto/move.pro b/src/proto/move.pro
index 3bc3fd9..f66e9cd 100644
--- a/src/proto/move.pro
+++ b/src/proto/move.pro
@@ -1,4 +1,5 @@
 /* move.c */
+void reset_cursorline(void);
 void update_topline_redraw(void);
 void update_topline(void);
 void update_curswant(void);

src/version.c

diff --git a/src/version.c b/src/version.c
index 73eff7d..d3b09ea 100644
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    435,
+/**/
     434,
 /**/
     433,