summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-09-11 14:48:27 +0000
committerBram Moolenaar <Bram@vim.org>2009-09-11 14:48:27 +0000
commit86c800a1b39603ba612a4a4f6e76c64c3d022789 (patch)
tree14672b8568b67466c38574ae1f635fab68604e6c /src
parent5e69de4421cc356f57fc19d243e03b05c970e135 (diff)
downloadvim-86c800a1b39603ba612a4a4f6e76c64c3d022789.zip
updated for version 7.2-258
Diffstat (limited to 'src')
-rw-r--r--src/ui.c7
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 4 deletions
diff --git a/src/ui.c b/src/ui.c
index aa8a8ac49..df8008c84 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -3055,18 +3055,17 @@ vcol2col(wp, lnum, vcol)
int vcol;
{
/* try to advance to the specified column */
- int col = 0;
int count = 0;
char_u *ptr;
+ char_u *start;
- ptr = ml_get_buf(wp->w_buffer, lnum, FALSE);
+ start = ptr = ml_get_buf(wp->w_buffer, lnum, FALSE);
while (count <= vcol && *ptr != NUL)
{
- ++col;
count += win_lbr_chartabsize(wp, ptr, count, NULL);
mb_ptr_adv(ptr);
}
- return col;
+ return (int)(ptr - start);
}
#endif
diff --git a/src/version.c b/src/version.c
index be50d62b9..654b35028 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 258,
+/**/
257,
/**/
256,