Mercurial > vim

changeset 8874:ccab37bb9ac9 v7.4.1724

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/73cd8fb3e87e4b29dfc489f58e56dee1839c18e5 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Apr 11 22:49:03 2016 +0200 patch 7.4.1724 Problem: Tabline test fails in GUI. Solution: Remove 'e' from 'guioptions'.
author Christian Brabandt <cb@256bit.org>
date Mon, 11 Apr 2016 23:00:05 +0200
parents c4939a6c52f0
children 31a3f0c0f011
files src/testdir/test_tabline.vim src/version.c
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,