0
0
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00

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.
This commit is contained in:
Bram Moolenaar
2015-11-22 15:08:59 +01:00
parent 7487792ab1
commit 6040256d8b
2 changed files with 9 additions and 7 deletions

View File

@@ -9,7 +9,7 @@ STARTTEST
:call setline(1, ["aaa", "あああ", "bbb"]) :call setline(1, ["aaa", "あああ", "bbb"])
:exe ":norm! gg0l\<C-V>jjIx\<Esc>" :exe ":norm! gg0l\<C-V>jjIx\<Esc>"
:let r = getline(1, '$') :let r = getline(1, '$')
: :"
:bwipeout! :bwipeout!
:$put=r :$put=r
:" :"
@@ -25,20 +25,20 @@ STARTTEST
: return ['あ', 'い'] : return ['あ', 'い']
:endfunction :endfunction
:command -nargs=1 -complete=customlist,CustomComplete1 Test1 echo :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) :function! CustomComplete2(lead, line, pos)
: return ['あたし', 'あたま', 'あたりめ'] : return ['あたし', 'あたま', 'あたりめ']
:endfunction :endfunction
:command -nargs=1 -complete=customlist,CustomComplete2 Test2 echo :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) :function! CustomComplete3(lead, line, pos)
: return ['Nこ', 'Nん', 'Nぶ'] : return ['Nこ', 'Nん', 'Nぶ']
:endfunction :endfunction
:command -nargs=1 -complete=customlist,CustomComplete3 Test3 echo :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) :call garbagecollect(1)
:/^start:/,$wq! test.out :/^start:/,$wq! test.out
ENDTEST ENDTEST

View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
935,
/**/ /**/
934, 934,
/**/ /**/