summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-04-15 12:55:13 +0200
committerBram Moolenaar <Bram@vim.org>2018-04-15 12:55:13 +0200
commit8c94a549051cc4d4cbb8cabd321724a85fe40c23 (patch)
tree8bf1dca6dea673cd00f71bff48958104e01b005f
parent6e72cd0d7267b9545ef966a53e62706914a96042 (diff)
downloadvim-git-8c94a549051cc4d4cbb8cabd321724a85fe40c23.tar.gz
patch 8.0.1715: terminal buffer can be 1 more than 'terminalscroll' linesv8.0.1715
Problem: Terminal buffer can be 1 more than 'terminalscroll' lines. Solution: Change > to >=.
-rw-r--r--src/terminal.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
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
@@ -763,6 +763,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1715,
+/**/
1714,
/**/
1713,