Permalink
Browse files

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)
  • Loading branch information...
Bram Moolenaar
Bram Moolenaar committed Mar 10, 2010
1 parent 1c3a921 commit 622d45c4bc1fad6bf51dcdcc31a38b377c271a30
Showing with 14 additions and 9 deletions.
  1. +6 −3 src/charset.c
  2. +6 −6 src/memline.c
  3. +2 −0 src/version.c
View
@@ -1255,7 +1255,10 @@ getvcol(wp, pos, start, cursor, end)
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 @@ getvcol(wp, pos, start, cursor, end)
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 @@ getvcol(wp, pos, start, cursor, end)
break;
}
- if (ptr >= posptr) /* character at pos->col */
+ if (posptr != NULL && ptr >= posptr) /* character at pos->col */
break;
vcol += incr;
View
@@ -2113,12 +2113,12 @@ ml_get_buf(buf, lnum, will_change)
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);
View
@@ -681,6 +681,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 391,
/**/
390,
/**/

0 comments on commit 622d45c

Please sign in to comment.