# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1553025607 -3600
# Node ID 5b29ab8415df025120d9750d5ee56008cd668200
# Parent  1aed002ab9bcb0665385b1ff6edbc0ed090bfe09
patch 8.1.1018: window cleared when entering Terminal-Normal twice

commit https://github.com/vim/vim/commit/8376c3d3216f65b93fb3bc03dbbe0c1bdf4faeff
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Mar 19 20:50:43 2019 +0100

    patch 8.1.1018: window cleared when entering Terminal-Normal twice

    Problem:    Window cleared when entering Terminal-Normal twice. (Epheien)
    Solution:   Don't cleanup scrollback when there is no postponed scrollback.
                (Christian Brabandt, closes #4126)

diff --git a/src/terminal.c b/src/terminal.c
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -2952,7 +2952,10 @@ handle_postponed_scrollback(term_T *term
 {
     int i;
 
-ch_log(NULL, "Moving postponed scrollback to scrollback");
+    if (term->tl_scrollback_postponed.ga_len == 0)
+	return;
+    ch_log(NULL, "Moving postponed scrollback to scrollback");
+
     // First remove the lines that were appended before, the pushed lines go
     // above it.
     cleanup_scrollback(term);
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -780,6 +780,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1018,
+/**/
     1017,
 /**/
     1016,