patch 8.0.0812: terminal window colors shift when 'number' is set

Problem:    Terminal window colors shift when 'number' is set. (Nazri Ramliy)
Solution:   Use vcol instead of col.

diff --git a/src/screen.c b/src/screen.c
index 40f83c0b6fdcaa836f43a21222696102752308b0..a1e8b5fa05167ac9dee181ec177b2825161e8a44 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -4541,7 +4541,7 @@ win_line(
 #ifdef FEAT_TERMINAL
                if (get_term_attr)
                {
-                   syntax_attr = term_get_attr(wp->w_buffer, lnum, col);
+                   syntax_attr = term_get_attr(wp->w_buffer, lnum, vcol);
 
                    if (!attr_pri)
                        char_attr = syntax_attr;

diff --git a/src/version.c b/src/version.c
index 90d9273eba5bafefc249f3ed3641f792215a56f3..7a3e04a174bf9fa4655e9155069fed6c14bf4198 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    812,
 /**/
     811,
 /**/