# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1485896404 -3600
# Node ID dd93e5439ffd203f0d46e9eebfa304f1a54913a3
# Parent  14c7e1c23ebbfb37775981d6b34e36df1f45cadf
patch 8.0.0274: possible recursive screen updating causes trouble

commit https://github.com/vim/vim/commit/070b33da93ad3a191664bb61f5ccc50781460c03
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Jan 31 21:53:39 2017 +0100

    patch 8.0.0274: possible recursive screen updating causes trouble

    Problem:    When update_single_line() is called recursively, or another screen
                update happens while it is busy, errors may occur.
    Solution:   Check and update updating_screen. (Christian Brabandt)

diff --git a/src/screen.c b/src/screen.c
--- a/src/screen.c
+++ b/src/screen.c
@@ -824,8 +824,9 @@ update_single_line(win_T *wp, linenr_T l
     int		j;
 
     /* Don't do anything if the screen structures are (not yet) valid. */
-    if (!screen_valid(TRUE))
+    if (!screen_valid(TRUE) || updating_screen)
 	return;
+    updating_screen = TRUE;
 
     if (lnum >= wp->w_topline && lnum < wp->w_botline
 				 && foldedCount(wp, lnum, &win_foldinfo) == 0)
@@ -865,13 +866,11 @@ update_single_line(win_T *wp, linenr_T l
 # endif
     }
     need_cursor_line_redraw = FALSE;
+    updating_screen = FALSE;
 }
 #endif
 
 #if defined(FEAT_SIGNS) || defined(FEAT_GUI)
-static void update_prepare(void);
-static void update_finish(void);
-
 /*
  * Prepare for updating one or more windows.
  * Caller must check for "updating_screen" already set to avoid recursiveness.
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    274,
+/**/
     273,
 /**/
     272,