File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -2123,7 +2123,11 @@ win_update(win_T *wp)
21232123
21242124 wp -> w_lines [idx ].wl_lnum = lnum ;
21252125 wp -> w_lines [idx ].wl_valid = TRUE;
2126- if (row > wp -> w_height ) /* past end of screen */
2126+
2127+ /* Past end of the window or end of the screen. Note that after
2128+ * resizing wp->w_height may be end up too big. That's a problem
2129+ * elsewhere, but prevent a crash here. */
2130+ if (row > wp -> w_height || row + wp -> w_winrow >= Rows )
21272131 {
21282132 /* we may need the size of that too long line later on */
21292133 if (dollar_vcol == -1 )
Original file line number Diff line number Diff line change @@ -761,6 +761,8 @@ static char *(features[]) =
761761
762762static int included_patches [] =
763763{ /* Add new patch number below this line */
764+ /**/
765+ 1228 ,
764766/**/
765767 1227 ,
766768/**/
You can’t perform that action at this time.
0 commit comments