From 8376c3d3216f65b93fb3bc03dbbe0c1bdf4faeff Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 19 Mar 2019 20:50:43 +0100 Subject: [PATCH] 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) --- src/terminal.c | 5 ++++- src/version.c | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/terminal.c b/src/terminal.c index 8d05a188e..6b167792f 100644 --- 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 a49f6fb0c..18daa0696 100644 --- 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, /**/ -- 2.40.0