patch 8.0.0559: setting ttytype to xxx does not always fail
Problem: Setting ttytype to xxx does not always fail as expected. (Marvin
Schmidt)
Solution: Catch both possible errors. (closes #1601)
diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim
index 9cf5e5f..d72ca74 100644
--- a/src/testdir/test_options.vim
+++ b/src/testdir/test_options.vim
@@ -280,10 +280,22 @@
set ttytype=xterm
call assert_equal('xterm', &ttytype)
call assert_equal(&ttytype, &term)
- " FIXME: "set ttytype=" gives E522 instead of E529
- " in travis on some builds. Why? Commented out this test for now.
- " call assert_fails('set ttytype=', 'E529:')
- call assert_fails('set ttytype=xxx', 'E522:')
+ " "set ttytype=" gives E522 instead of E529
+ " in travis on some builds. Why? Catch both for now
+ try
+ set ttytype=
+ call assert_report('set ttype= did not fail')
+ catch /E529\|E522/
+ endtry
+
+ " Some systems accept any terminal name and return dumb settings,
+ " check for failure of finding the entry and for missing 'cm' entry.
+ try
+ set ttytype=xxx
+ call assert_report('set ttype=xxx did not fail')
+ catch /E522\|E437/
+ endtry
+
set ttytype&
call assert_equal(&ttytype, &term)
endif
diff --git a/src/version.c b/src/version.c
index 26df634..e73e1fa 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 559,
+/**/
558,
/**/
557,