patch 7.4.1724

Problem:    Tabline test fails in GUI.
Solution:   Remove 'e' from 'guioptions'.

diff --git a/src/testdir/test_tabline.vim b/src/testdir/test_tabline.vim
index 6c7a02d65001643adf50251b1331bd00be5830f4..b08f299fd023e995c38c95336542dac8845dd920 100644 (file)
--- a/src/testdir/test_tabline.vim
+++ b/src/testdir/test_tabline.vim
@@ -14,6 +14,9 @@ function! TablineWithError()
 endfunction
 
 function! Test_caught_error_in_tabline()
+  if has('gui')
+    set guioptions-=e
+  endif
   let showtabline_save = &showtabline
   set showtabline=2
   let s:func_in_tabline_called = 0
@@ -27,6 +30,9 @@ function! Test_caught_error_in_tabline()
 endfunction
 
 function! Test_tabline_will_be_disabled_with_error()
+  if has('gui')
+    set guioptions-=e
+  endif
   let showtabline_save = &showtabline
   set showtabline=2
   let s:func_in_tabline_called = 0

diff --git a/src/version.c b/src/version.c
index 0713142b0787f5ce62db54a081eea31b1e32acb8..e422527ef2a50616f01da7bf8908a4c82cceb10a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1724,
 /**/
     1723,
 /**/