# HG changeset patch # User Christian Brabandt # Date 1460408405 -7200 # Node ID ccab37bb9ac979facb8ac0467aa7c8262d7bf6f8 # Parent c4939a6c52f0e418c7c5f88a0fd93b13a82bcafc commit https://github.com/vim/vim/commit/73cd8fb3e87e4b29dfc489f58e56dee1839c18e5 Author: Bram Moolenaar Date: Mon Apr 11 22:49:03 2016 +0200 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 --- 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 --- a/src/version.c +++ b/src/version.c @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1724, +/**/ 1723, /**/ 1722,