Merge remote-tracking branch 'vim/master'

Author: splhack

appveyor.yml

@@ -1,5 +1,7 @@
 version: "{build}"
 
+skip_tags: true
+
 before_build:
   - '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /release'
 

src/ex_getln.c

@@ -3715,7 +3715,7 @@ ExpandOne(xp, str, orig, options, mode)
 	    }
 	    else
 #endif
-		c0 = xp->xp_files[i][len];
+		c0 = xp->xp_files[0][len];
 	    for (i = 1; i < xp->xp_numfiles; ++i)
 	    {
 #ifdef FEAT_MBYTE

src/testdir/test94.in

@@ -17,7 +17,7 @@ Test cases:
 
 STARTTEST
 :so small.vim
-:set nocp viminfo+=nviminfo
+:set enc=utf-8 nocp viminfo+=nviminfo
 :
 :" User functions
 :function MoveToCap()

src/testdir/test_utf8.in

@@ -3,6 +3,7 @@ Tests for Unicode manipulations                vim: set ft=vim :
 STARTTEST
 :so small.vim
 :set encoding=utf-8
+:"
 :" Visual block Insert adjusts for multi-byte char
 :new
 :call setline(1, ["aaa", "あああ", "bbb"])
@@ -11,29 +12,31 @@ STARTTEST
 :
 :bwipeout!
 :$put=r
+:"
 :" Test for built-in function strchars()
 :for str in ["a", "あいa", "A\u20dd", "A\u20dd\u20dd", "\u20dd"]
 :	$put=strchars(str)
 :	$put=strchars(str, 0)
 :	$put=strchars(str, 1)
 :endfor
+:"
 :" Test for customlist completion
 :function! CustomComplete1(lead, line, pos)
 :	return ['あ', 'い']
 :endfunction
-:command -nargs=1 -complete=customlist,CustomComplete1 Test1 :
+:command -nargs=1 -complete=customlist,CustomComplete1 Test1 echo
 :call feedkeys(":Test1 \<C-L>'\<C-B>$put='\<CR>", 't')
 :
 :function! CustomComplete2(lead, line, pos)
 :	return ['あたし', 'あたま', 'あたりめ']
 :endfunction
-:command -nargs=1 -complete=customlist,CustomComplete2 Test2 :
+:command -nargs=1 -complete=customlist,CustomComplete2 Test2 echo
 :call feedkeys(":Test2 \<C-L>'\<C-B>$put='\<CR>", 't')
 :
 :function! CustomComplete3(lead, line, pos)
 :	return ['Nこ', 'Nん', 'Nぶ']
 :endfunction
-:command -nargs=1 -complete=customlist,CustomComplete3 Test3 :
+:command -nargs=1 -complete=customlist,CustomComplete3 Test3 echo
 :call feedkeys(":Test3 \<C-L>'\<C-B>$put='\<CR>", 't')
 :
 :call garbagecollect(1)

src/version.c

@@ -756,6 +756,14 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    934,
+/**/
+    933,
+/**/
+    932,
+/**/
+    931,
 /**/
     930,
 /**/