summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-03-09 13:55:01 +0100
committerBram Moolenaar <Bram@vim.org>2017-03-09 13:55:01 +0100
commitee1dd1cdc1f9a07e53b792e8762f515213b10c8a (patch)
treed9fad884aa0316d8692a02be302f909860a20da3
parent41042f3cfdb91f946e553456278a995e61dd8578 (diff)
downloadvim-git-ee1dd1cdc1f9a07e53b792e8762f515213b10c8a.tar.gz
patch 8.0.0436: running the options test sometimes resizes the terminalv8.0.0436
Problem: Running the options test sometimes resizes the terminal. Solution: Clear out t_WS.
-rw-r--r--src/testdir/gen_opt_test.vim3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/gen_opt_test.vim b/src/testdir/gen_opt_test.vim
index 4701981ee..16723be04 100644
--- a/src/testdir/gen_opt_test.vim
+++ b/src/testdir/gen_opt_test.vim
@@ -7,10 +7,13 @@ if 1
set nomore
+" The terminal size is restored at the end.
+" Clear out t_WS, we don't want to resize the actual terminal.
let script = [
\ 'let save_columns = &columns',
\ 'let save_lines = &lines',
\ 'let save_term = &term',
+ \ 'set t_WS=',
\ ]
/#define p_term
diff --git a/src/version.c b/src/version.c
index 1eea36e91..870b66b46 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 436,
+/**/
435,
/**/
434,