Mercurial > vim

changeset 9100:ddccff0480d2 v7.4.1834

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189 Author: Bram Moolenaar <Bram@vim.org> Date: Tue May 24 10:51:30 2016 +0200 patch 7.4.1834 Problem: Possible crash when conceal is active. Solution: Check for the screen to be valid when redrawing a line.
author Christian Brabandt <cb@256bit.org>
date Tue, 24 May 2016 11:00:09 +0200
parents 0ff9532b705e
children 5a74e6eee963
files src/screen.c src/version.c
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/screen.c
+++ b/src/screen.c
@@ -801,6 +801,10 @@ update_single_line(win_T *wp, linenr_T l
     int		row;
     int		j;
 
+    /* Don't do anything if the screen structures are (not yet) valid. */
+    if (!screen_valid(TRUE))
+	return;
+
     if (lnum >= wp->w_topline && lnum < wp->w_botline
 				 && foldedCount(wp, lnum, &win_foldinfo) == 0)
     {
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1834,
+/**/
     1833,
 /**/
     1832,