# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1464080409 -7200
# Node ID ddccff0480d247ed426130d8db017499da2b044a
# Parent  0ff9532b705e300fddb0c48326cba8d9169e815c
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.

diff --git a/src/screen.c b/src/screen.c
--- 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)
     {
diff --git a/src/version.c b/src/version.c
--- 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,