From 73cd8fb3e87e4b29dfc489f58e56dee1839c18e5 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 11 Apr 2016 22:49:03 +0200 Subject: patch 7.4.1724 Problem: Tabline test fails in GUI. Solution: Remove 'e' from 'guioptions'. --- src/testdir/test_tabline.vim | 6 ++++++ src/version.c | 2 ++ 2 files changed, 8 insertions(+) (limited to 'src') diff --git a/src/testdir/test_tabline.vim b/src/testdir/test_tabline.vim index 6c7a02d65..b08f299fd 100644 --- 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 0713142b0..e422527ef 100644 --- 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, /**/ -- cgit v1.2.1