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
index 8d05a188e1354ad817f9dbdfa1600ae8ec0dea97..6b167792fa8aee41754ef76fa8559ebded0363cd 100644 (file)
--- 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
index a49f6fb0c6bd6ef275876ffb53a471551895f67a..18daa0696a1f48dcabd86d9e3760c3c5dd182e0b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -779,6 +779,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1018,
 /**/
     1017,
 /**/