updated for version 7.2.391
Problem: Internal alloc(0) error when doing "CTRL-V $ c". (Martti Kuparinen)
Solution: Fix computations in getvcol(). (partly by Lech Lorens)
diff --git a/src/charset.c b/src/charset.c
index 5b0e71c..ef162e4 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1255,7 +1255,10 @@
vcol = 0;
ptr = ml_get_buf(wp->w_buffer, pos->lnum, FALSE);
- posptr = ptr + pos->col;
+ if (pos->col == MAXCOL)
+ posptr = NULL; /* continue until the NUL */
+ else
+ posptr = ptr + pos->col;
/*
* This function is used very often, do some speed optimizations.
@@ -1313,7 +1316,7 @@
incr = CHARSIZE(c);
}
- if (ptr >= posptr) /* character at pos->col */
+ if (posptr != NULL && ptr >= posptr) /* character at pos->col */
break;
vcol += incr;
@@ -1334,7 +1337,7 @@
break;
}
- if (ptr >= posptr) /* character at pos->col */
+ if (posptr != NULL && ptr >= posptr) /* character at pos->col */
break;
vcol += incr;
diff --git a/src/memline.c b/src/memline.c
index 29a6e5c..102b61e 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -2113,12 +2113,12 @@
if (buf->b_ml.ml_mfp == NULL) /* there are no lines */
return (char_u *)"";
-/*
- * See if it is the same line as requested last time.
- * Otherwise may need to flush last used line.
- * Don't use the last used line when 'swapfile' is reset, need to load all
- * blocks.
- */
+ /*
+ * See if it is the same line as requested last time.
+ * Otherwise may need to flush last used line.
+ * Don't use the last used line when 'swapfile' is reset, need to load all
+ * blocks.
+ */
if (buf->b_ml.ml_line_lnum != lnum || mf_dont_release)
{
ml_flush_line(buf);
diff --git a/src/version.c b/src/version.c
index 18f3ba5..a635aad 100644
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 391,
+/**/
390,
/**/
389,