From 8a20b0f25ebe3baae2044c5a6650b376e6971835 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 10 Aug 2011 14:32:39 +0200
Subject: updated for version 7.3.274 Problem:    With concealed characters
 tabs do not have the right size. Solution:   Use VCOL_HLC instead of vcol.
 (Eiichi Sato)

---
 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 1726fac82..40d48ee22 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4252,7 +4252,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
 		{
 		    /* tab amount depends on current column */
 		    n_extra = (int)wp->w_buffer->b_p_ts
-				   - vcol % (int)wp->w_buffer->b_p_ts - 1;
+				   - VCOL_HLC % (int)wp->w_buffer->b_p_ts - 1;
 #ifdef FEAT_MBYTE
 		    mb_utf8 = FALSE;	/* don't draw as UTF-8 */
 #endif
diff --git a/src/version.c b/src/version.c
index 60defc7e0..8ae028c86 100644
--- a/src/version.c
+++ b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    274,
 /**/
     273,
 /**/
-- 
cgit v1.2.1