From f803a7697808f63949ea26fc256d4c9a8647089e Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 9 Apr 2017 22:54:13 +0200
Subject: 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)
---
 src/testdir/test_options.vim | 20 ++++++++++++++++----
 src/version.c                |  2 ++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim
index 9cf5e5f11..d72ca74b2 100644
--- a/src/testdir/test_options.vim
+++ b/src/testdir/test_options.vim
@@ -280,10 +280,22 @@ func Test_set_ttytype()
     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 26df63410..e73e1fa81 100644
--- 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 */
+/**/
+    559,
 /**/
     558,
 /**/
-- 
cgit v1.2.1