# HG changeset patch # User Christian Brabandt # Date 1448201704 -3600 # Node ID b4b7b06c79512200b1a8330b7f129e8ada167c21 # Parent 428e7e65e0066c14cd9b10f5c65362421fa01343 commit https://github.com/vim/vim/commit/6040256d8b0404564ac6f192296b12ea9d175e7d Author: Bram Moolenaar Date: Sun Nov 22 15:08:59 2015 +0100 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 --- 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\jjIx\" :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 \'\$put='\", 't') -: +:call feedkeys(":Test1 \'\$put='\", 'it') +:" :function! CustomComplete2(lead, line, pos) : return ['あたし', 'あたま', 'あたりめ'] :endfunction :command -nargs=1 -complete=customlist,CustomComplete2 Test2 echo -:call feedkeys(":Test2 \'\$put='\", 't') -: +:call feedkeys(":Test2 \'\$put='\", 'it') +:" :function! CustomComplete3(lead, line, pos) : return ['Nこ', 'Nん', 'Nぶ'] :endfunction :command -nargs=1 -complete=customlist,CustomComplete3 Test3 echo -:call feedkeys(":Test3 \'\$put='\", 't') -: +:call feedkeys(":Test3 \'\$put='\", 'it') +:" :call garbagecollect(1) :/^start:/,$wq! test.out ENDTEST diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 935, +/**/ 934, /**/ 933,