patch 7.4.935

Problem:    test_utf8 fails on MS-Windows when executed with gvim.
Solution:   Use the insert flag on feedkeys() to put the string before the
            ":" that was already read when checking for available chars.

diff --git a/src/testdir/test_utf8.in b/src/testdir/test_utf8.in
index a1bc0e37f40398908dd21aba4addd1b847ea88f9..1d6a7a44ebb364483000c57135034238593f50b9 100644 (file)
--- a/src/testdir/test_utf8.in
+++ b/src/testdir/test_utf8.in
@@ -9,7 +9,7 @@ STARTTEST
 :call setline(1, ["aaa", "あああ", "bbb"])
 :exe ":norm! gg0l\<C-V>jjIx\<Esc>"
 :let r = getline(1, '$')
-:
+:"
 :bwipeout!
 :$put=r
 :"
@@ -25,20 +25,20 @@ STARTTEST
 :      return ['あ', 'い']
 :endfunction
 :command -nargs=1 -complete=customlist,CustomComplete1 Test1 echo
-:call feedkeys(":Test1 \<C-L>'\<C-B>$put='\<CR>", 't')
-:
+:call feedkeys(":Test1 \<C-L>'\<C-B>$put='\<CR>", 'it')
+:"
 :function! CustomComplete2(lead, line, pos)
 :      return ['あたし', 'あたま', 'あたりめ']
 :endfunction
 :command -nargs=1 -complete=customlist,CustomComplete2 Test2 echo
-:call feedkeys(":Test2 \<C-L>'\<C-B>$put='\<CR>", 't')
-:
+:call feedkeys(":Test2 \<C-L>'\<C-B>$put='\<CR>", 'it')
+:"
 :function! CustomComplete3(lead, line, pos)
 :      return ['Nこ', 'Nん', 'Nぶ']
 :endfunction
 :command -nargs=1 -complete=customlist,CustomComplete3 Test3 echo
-:call feedkeys(":Test3 \<C-L>'\<C-B>$put='\<CR>", 't')
-:
+:call feedkeys(":Test3 \<C-L>'\<C-B>$put='\<CR>", 'it')
+:"
 :call garbagecollect(1)
 :/^start:/,$wq! test.out
 ENDTEST

diff --git a/src/version.c b/src/version.c
index 63465875018790d8ef5a13cc31aaa428d91506d4..dafc3913d4508a9dcfdfb674b2663a6e841fbf3f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    935,
 /**/
     934,
 /**/