Skip to content

Commit 6040256

Browse files
committed
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.
1 parent 7487792 commit 6040256

2 files changed

Lines changed: 9 additions & 7 deletions

File tree

src/testdir/test_utf8.in

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ STARTTEST
99
:call setline(1, ["aaa", "あああ", "bbb"])
1010
:exe ":norm! gg0l\<C-V>jjIx\<Esc>"
1111
:let r = getline(1, '$')
12-
:
12+
:"
1313
:bwipeout!
1414
:$put=r
1515
:"
@@ -25,20 +25,20 @@ STARTTEST
2525
: return ['', '']
2626
:endfunction
2727
:command -nargs=1 -complete=customlist,CustomComplete1 Test1 echo
28-
:call feedkeys(":Test1 \<C-L>'\<C-B>$put='\<CR>", 't')
29-
:
28+
:call feedkeys(":Test1 \<C-L>'\<C-B>$put='\<CR>", 'it')
29+
:"
3030
:function! CustomComplete2(lead, line, pos)
3131
: return ['あたし', 'あたま', 'あたりめ']
3232
:endfunction
3333
:command -nargs=1 -complete=customlist,CustomComplete2 Test2 echo
34-
:call feedkeys(":Test2 \<C-L>'\<C-B>$put='\<CR>", 't')
35-
:
34+
:call feedkeys(":Test2 \<C-L>'\<C-B>$put='\<CR>", 'it')
35+
:"
3636
:function! CustomComplete3(lead, line, pos)
3737
: return ['Nこ', 'Nん', 'Nぶ']
3838
:endfunction
3939
:command -nargs=1 -complete=customlist,CustomComplete3 Test3 echo
40-
:call feedkeys(":Test3 \<C-L>'\<C-B>$put='\<CR>", 't')
41-
:
40+
:call feedkeys(":Test3 \<C-L>'\<C-B>$put='\<CR>", 'it')
41+
:"
4242
:call garbagecollect(1)
4343
:/^start:/,$wq! test.out
4444
ENDTEST

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,8 @@ static char *(features[]) =
741741

742742
static int included_patches[] =
743743
{ /* Add new patch number below this line */
744+
/**/
745+
935,
744746
/**/
745747
934,
746748
/**/

0 commit comments

Comments
 (0)