diff options
| author | Bram Moolenaar <Bram@vim.org> | 2011-09-02 14:07:36 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2011-09-02 14:07:36 +0200 |
| commit | 6c167c645124aca84ac3b57b5fd3b56f16593091 (patch) | |
| tree | eeeb499eefa3820333f4946c15a9732e5ea9f86c | |
| parent | 6fabcbe26002fd75f87c6775239b0e51e1169d68 (diff) | |
| download | vim-git-7.3.292.tar.gz | |
updated for version 7.3.292v7.3.292
Problem: Crash when using fold markers and selecting a visual block that
includes a folded line and goes to end of line. (Sam Lidder)
Solution: Check for the column to be MAXCOL. (James Vega)
| -rw-r--r-- | src/screen.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/screen.c b/src/screen.c index 40d48ee22..2c87e9b9e 100644 --- a/src/screen.c +++ b/src/screen.c @@ -2531,7 +2531,9 @@ fold_line(wp, fold_count, foldinfo, lnum, row) /* Visual block mode: highlight the chars part of the block */ if (wp->w_old_cursor_fcol + txtcol < (colnr_T)W_WIDTH(wp)) { - if (wp->w_old_cursor_lcol + txtcol < (colnr_T)W_WIDTH(wp)) + if (wp->w_old_cursor_lcol != MAXCOL + && wp->w_old_cursor_lcol + txtcol + < (colnr_T)W_WIDTH(wp)) len = wp->w_old_cursor_lcol; else len = W_WIDTH(wp) - txtcol; diff --git a/src/version.c b/src/version.c index a66bacbf9..e2e3085e8 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 */ /**/ + 292, +/**/ 291, /**/ 290, |