From ffea8c99d9658b0b51a848a6f674851851e78fa7 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 13 Mar 2017 20:37:15 +0100
Subject: [PATCH 1/3] patch 8.0.0455: the mode test may hang

Problem:    The mode test may hang in Test_mode(). (Michael Soyka)
Solution:   Set 'complete' to only search the current buffer (as suggested by
            Michael)
---
 src/testdir/test_functions.vim | 8 ++++++--
 src/version.c                  | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index af877e49b1..e2a4e8c7df 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -313,15 +313,18 @@ endfunc
 
 " Tests for the mode() function
 let current_modes = ''
-func! Save_mode()
+func Save_mode()
   let g:current_modes = mode(0) . '-' . mode(1)
   return ''
 endfunc
 
-func! Test_mode()
+func Test_mode()
   new
   call append(0, ["Blue Ball Black", "Brown Band Bowl", ""])
 
+  " Only complete from the current buffer.
+  set complete=.
+
   inoremap <F2> <C-R>=Save_mode()<CR>
 
   normal! 3G
@@ -430,6 +433,7 @@ func! Test_mode()
 
   bwipe!
   iunmap <F2>
+  set complete&
 endfunc
 
 func Test_getbufvar()
diff --git a/src/version.c b/src/version.c
index 2f9c3150d3..aa40ae1fd9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    455,
 /**/
     454,
 /**/

From 26a280c47a1c6e32cdced79032dc495c60710d0d Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 13 Mar 2017 21:50:55 +0100
Subject: [PATCH 2/3] Fix duplication of patch.

---
 src/testdir/test_charsearch_utf8.vim | 22 ----------------------
 src/version.c                        |  2 --
 2 files changed, 24 deletions(-)

diff --git a/src/testdir/test_charsearch_utf8.vim b/src/testdir/test_charsearch_utf8.vim
index b700a8c756..ade7dd408c 100644
--- a/src/testdir/test_charsearch_utf8.vim
+++ b/src/testdir/test_charsearch_utf8.vim
@@ -20,25 +20,3 @@ function! Test_search_cmds()
 endfunction
 
 " vim: shiftwidth=2 sts=2 expandtab
-" Tests for related f{char} and t{char} using utf-8.
-if !has('multi_byte')
-  finish
-endif
-
-" Test for t,f,F,T movement commands
-function! Test_search_cmds()
-  new!
-  call setline(1, "・最初から最後まで最強のVimは最高")
-  1
-  normal! f最
-  call assert_equal([0, 1, 4, 0], getpos('.'))
-  normal! ;
-  call assert_equal([0, 1, 16, 0], getpos('.'))
-  normal! 2;
-  call assert_equal([0, 1, 43, 0], getpos('.'))
-  normal! ,
-  call assert_equal([0, 1, 28, 0], getpos('.'))
-  bw!
-endfunction
-
-" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index aa40ae1fd9..4f0066bf81 100644
--- a/src/version.c
+++ b/src/version.c
@@ -784,8 +784,6 @@ static int included_patches[] =
     447,
 /**/
     446,
-/**/
-    446,
 /**/
     445,
 /**/

From 84be8b66604ef28c0e249284da3c6f0cab1c25ae Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 13 Mar 2017 22:41:42 +0100
Subject: [PATCH 3/3] patch 8.0.0456: typo in MinGW test makefile

Problem:    Typo in MinGW test makefile.
Solution:   Change an underscore to a dot. (Michael Soyka)
---
 src/testdir/Make_ming.mak | 2 +-
 src/version.c             | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index 7e13c0f787..dbf94f0559 100644
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -129,7 +129,7 @@ test_gui.res: test_gui.vim
 
 test_gui_init.res: test_gui_init.vim
 	@echo "$(VIMPROG)" > vimcmd
-	$(VIMPROG) -u gui_preinit_vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $<
+	$(VIMPROG) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $<
 	@$(DEL) vimcmd
 
 opt_test.vim: ../option.c gen_opt_test.vim
diff --git a/src/version.c b/src/version.c
index 4f0066bf81..56c66b5517 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    456,
 /**/
     455,
 /**/