Mercurial > vim
changeset 2108:3cdf2a653e00 v7.2.391
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)
author | Bram Moolenaar <bram@zimbu.org> |
---|---|
date | Wed, 10 Mar 2010 14:46:26 +0100 |
parents | 4a4287c09953 |
children | 6c3c2e464a96 |
files | src/charset.c src/memline.c src/version.c |
diffstat | 3 files changed, 14 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/charset.c +++ b/src/charset.c @@ -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;
--- a/src/memline.c +++ b/src/memline.c @@ -2113,12 +2113,12 @@ errorret: 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);