summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2011-08-10 14:32:39 +0200
committerBram Moolenaar <bram@vim.org>2011-08-10 14:32:39 +0200
commitb84f8263fd13c8d120d031b60bd62abee502a03f (patch)
treef06b38bc020ba413dcb3c9e32c74311de85171c2
parente82a052c15a0f381ab4d49440a06867324af6122 (diff)
downloadvim-b84f8263fd13c8d120d031b60bd62abee502a03f.tar.gz
updated for version 7.3.274v7.3.274v7-3-274
Problem: With concealed characters tabs do not have the right size. Solution: Use VCOL_HLC instead of vcol. (Eiichi Sato)
-rw-r--r--src/screen.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/screen.c b/src/screen.c
index 1726fac8..40d48ee2 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 60defc7e..8ae028c8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 274,
+/**/
273,
/**/
272,