patch 8.0.0436: running the options test sometimes resizes the terminal

Problem:    Running the options test sometimes resizes the terminal.
Solution:   Clear out t_WS.

diff --git a/src/testdir/gen_opt_test.vim b/src/testdir/gen_opt_test.vim
index 4701981ee82d84a32a8856674369a9cee27edef9..16723be04ce3232922ef729388082c167e43d6e0 100644 (file)
--- 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 1eea36e91c1a2bd1bce4deb66d23d9ab86f33b8b..870b66b46e5aa2fdb41d6bf15b5b71d5915505bc 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    436,
 /**/
     435,
 /**/