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)

diff --git a/src/screen.c b/src/screen.c
index 1726fac82a36cb68d8c919ec441e11c35c4a6207..40d48ee22fbfa8f90a3d7ced81480d6064896199 100644 (file)
--- 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 60defc7e0931d3da4b29c0f403ee73621457a2d5..8ae028c868f00728774772d130036461dcebb831 100644 (file)
--- 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,
 /**/