Merge remote-tracking branch 'vim/master'

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

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

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()

src/version.c

@@ -779,6 +779,10 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    456,
+/**/
+    455,
 /**/
     454,
 /**/
@@ -797,8 +801,6 @@ static int included_patches[] =
     447,
 /**/
     446,
-/**/
-    446,
 /**/
     445,
 /**/