patch 8.0.1743: terminal window options are named inconsistently
Problem: Terminal window options are named inconsistently.
Solution: prefix terminal window options with "termwin". Keep the old names
for now as an alias.
diff --git a/src/testdir/gen_opt_test.vim b/src/testdir/gen_opt_test.vim
index e781a0d..58db1f9 100644
--- a/src/testdir/gen_opt_test.vim
+++ b/src/testdir/gen_opt_test.vim
@@ -130,8 +130,9 @@
\ 'tagcase': [['smart', 'match'], ['', 'xxx', 'smart,match']],
\ 'term': [[], []],
\ 'termguicolors': [[], []],
- \ 'termsize': [['', '24x80', '0x80', '32x0', '0x0'], ['xxx', '80', '8ax9', '24x80b']],
\ 'termencoding': [has('gui_gtk') ? [] : ['', 'utf-8'], ['xxx']],
+ \ 'termsize': [['', '24x80', '0x80', '32x0', '0x0'], ['xxx', '80', '8ax9', '24x80b']],
+ \ 'termwinsize': [['', '24x80', '0x80', '32x0', '0x0'], ['xxx', '80', '8ax9', '24x80b']],
\ 'toolbar': [['', 'icons', 'text'], ['xxx']],
\ 'toolbariconsize': [['', 'tiny', 'huge'], ['xxx']],
\ 'ttymouse': [['', 'xterm'], ['xxx']],
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 5137659..158bb98 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -273,7 +273,7 @@
func Test_terminal_scrollback()
let buf = Run_shell_in_terminal({})
- set terminalscroll=100
+ set termwinscroll=100
call writefile(range(150), 'Xtext')
if has('win32')
call term_sendkeys(buf, "type Xtext\<CR>")
@@ -289,7 +289,7 @@
call Stop_shell_in_terminal(buf)
call term_wait(buf)
exe buf . 'bwipe'
- set terminalscroll&
+ set termwinscroll&
endfunc
func Test_terminal_size()
@@ -1381,11 +1381,11 @@
exe buf . 'bwipe'
endfunc
-func Test_terminal_termsize_option_fixed()
+func Test_terminal_termwinsize_option_fixed()
if !CanRunVimInTerminal()
return
endif
- set termsize=6x40
+ set termwinsize=6x40
let text = []
for n in range(10)
call add(text, repeat(n, 50))
@@ -1407,15 +1407,15 @@
call StopVimInTerminal(buf)
call delete('Xwinsize')
- call assert_fails('set termsize=40', 'E474')
- call assert_fails('set termsize=10+40', 'E474')
- call assert_fails('set termsize=abc', 'E474')
+ call assert_fails('set termwinsize=40', 'E474')
+ call assert_fails('set termwinsize=10+40', 'E474')
+ call assert_fails('set termwinsize=abc', 'E474')
- set termsize=
+ set termwinsize=
endfunc
-func Test_terminal_termsize_option_zero()
- set termsize=0x0
+func Test_terminal_termwinsize_option_zero()
+ set termwinsize=0x0
let buf = Run_shell_in_terminal({})
let win = bufwinid(buf)
call assert_equal([winheight(win), winwidth(win)], term_getsize(buf))
@@ -1423,7 +1423,7 @@
call term_wait(buf)
exe buf . 'bwipe'
- set termsize=7x0
+ set termwinsize=7x0
let buf = Run_shell_in_terminal({})
let win = bufwinid(buf)
call assert_equal([7, winwidth(win)], term_getsize(buf))
@@ -1431,7 +1431,7 @@
call term_wait(buf)
exe buf . 'bwipe'
- set termsize=0x33
+ set termwinsize=0x33
let buf = Run_shell_in_terminal({})
let win = bufwinid(buf)
call assert_equal([winheight(win), 33], term_getsize(buf))
@@ -1439,11 +1439,11 @@
call term_wait(buf)
exe buf . 'bwipe'
- set termsize=
+ set termwinsize=
endfunc
-func Test_terminal_termsize_mininmum()
- set termsize=10*50
+func Test_terminal_termwinsize_mininmum()
+ set termwinsize=10*50
vsplit
let buf = Run_shell_in_terminal({})
let win = bufwinid(buf)
@@ -1469,7 +1469,7 @@
call term_wait(buf)
exe buf . 'bwipe'
- set termsize=0*0
+ set termwinsize=0*0
let buf = Run_shell_in_terminal({})
let win = bufwinid(buf)
call assert_equal([winheight(win), winwidth(win)], term_getsize(buf))
@@ -1477,5 +1477,5 @@
call term_wait(buf)
exe buf . 'bwipe'
- set termsize=
+ set termwinsize=
endfunc