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)

diff --git a/src/screen.c b/src/screen.c
index 40d48ee22fbfa8f90a3d7ced81480d6064896199..2c87e9b9ef0143e78d116b8f1b466badb455ba8d 100644 (file)
--- 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 a66bacbf91a5139c88746bb7e1b33257f028a0a5..e2e3085e8095eb263ec68ea7b6eeab5eaced3fc5 100644 (file)
--- 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,
 /**/