From 680c99b2efc7e2a9e6b3d611133f43fb7f8c6811 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 7 Jun 2018 15:18:41 +0200
Subject: [PATCH] patch 8.1.0038: popup test causes Vim to exit

Problem:    Popup test causes Vim to exit.
Solution:   Disable the broken part of the test for now.
---
 src/testdir/test_popup.vim | 4 ++++
 src/version.c              | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim
index 89cdf0e8c..cb61be21c 100644
--- a/src/testdir/test_popup.vim
+++ b/src/testdir/test_popup.vim
@@ -247,6 +247,10 @@ func! Test_popup_completion_insertmode()
   iunmap <F5>
 endfunc
 
+" TODO: Fix what breaks after this line.
+" - Do not use "q!", it may exit Vim if there is an error
+finish
+
 func Test_noinsert_complete()
   function! s:complTest1() abort
     call complete(1, ['source', 'soundfold'])
diff --git a/src/version.c b/src/version.c
index 100c01eeb..caec4d692 100644
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    38,
 /**/
     37,
 /**/
-- 
2.40.0