[vim] 37/139: patch 7.4.1724 Problem: Tabline test fails in GUI. Solution: Remove 'e' from 'guioptions'.

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository vim.

commit 73cd8fb3e87e4b29dfc489f58e56dee1839c18e5
Author: Bram Moolenaar <Bram at 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'.
---
 src/testdir/test_tabline.vim | 6 ++++++
 src/version.c                | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/src/testdir/test_tabline.vim b/src/testdir/test_tabline.vim
index 6c7a02d..b08f299 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 0713142..e422527 100644
--- 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,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git