From 6c167c645124aca84ac3b57b5fd3b56f16593091 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 2 Sep 2011 14:07:36 +0200 Subject: updated for version 7.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) --- src/screen.c | 4 +++- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) 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 @@ -709,6 +709,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 292, /**/ 291, /**/ -- cgit v1.2.1