From 8c94a549051cc4d4cbb8cabd321724a85fe40c23 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 15 Apr 2018 12:55:13 +0200 Subject: [PATCH] patch 8.0.1715: terminal buffer can be 1 more than 'terminalscroll' lines Problem: Terminal buffer can be 1 more than 'terminalscroll' lines. Solution: Change > to >=. --- src/terminal.c | 2 +- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/terminal.c b/src/terminal.c index be594c405..93b6f9286 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -2518,7 +2518,7 @@ handle_pushline(int cols, const VTermScreenCell *cells, void *user) /* If the number of lines that are stored goes over 'termscrollback' then * delete the first 10%. */ - if (term->tl_scrollback.ga_len > p_tlsl) + if (term->tl_scrollback.ga_len >= p_tlsl) { int todo = p_tlsl / 10; int i; diff --git a/src/version.c b/src/version.c index 76596f2bf..6ac76faeb 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1715, /**/ 1714, /**/