From 68c4bdd53cb54b6c0dccb2dcee446ef42ef3dedd Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 30 Jul 2017 13:57:41 +0200
Subject: 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.
---
 src/screen.c  | 2 +-
 src/version.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/screen.c b/src/screen.c
index 40f83c0b6..a1e8b5fa0 100644
--- 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 90d9273eb..7a3e04a17 100644
--- 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,
 /**/
-- 
cgit v1.2.1