diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-11-22 15:08:59 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-11-22 15:08:59 +0100 |
| commit | 6040256d8b0404564ac6f192296b12ea9d175e7d (patch) | |
| tree | 4b309c0d1bbe80a85543ccfb596544b55433b773 | |
| parent | 7487792ab14c1fb8dbdb37bdd74265d8b1d3be50 (diff) | |
| download | vim-git-6040256d8b0404564ac6f192296b12ea9d175e7d.tar.gz | |
patch 7.4.935v7.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.
| -rw-r--r-- | src/testdir/test_utf8.in | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/testdir/test_utf8.in b/src/testdir/test_utf8.in index a1bc0e37f..1d6a7a44e 100644 --- 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 634658750..dafc3913d 100644 --- 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, |