To: vim_dev@googlegroups.com

Subject: Patch 7.4.935

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.4.935 (after 7.4.932)

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.

Files:      src/testdir/test_utf8.in

*** ../vim-7.4.934/src/testdir/test_utf8.in	2015-11-21 14:31:29.269812159 +0100

--- src/testdir/test_utf8.in	2015-11-22 15:04:56.698114325 +0100

***************

*** 9,15 ****

  :call setline(1, ["aaa", "あああ", "bbb"])

  :exe ":norm! gg0l\<C-V>jjIx\<Esc>"

  :let r = getline(1, '$')

! :

  :bwipeout!

  :$put=r

  :"

--- 9,15 ----

  :call setline(1, ["aaa", "あああ", "bbb"])

  :exe ":norm! gg0l\<C-V>jjIx\<Esc>"

  :let r = getline(1, '$')

! :"

  :bwipeout!

  :$put=r

  :"

***************

*** 25,44 ****

  :	return ['あ', 'い']

  :endfunction

  :command -nargs=1 -complete=customlist,CustomComplete1 Test1 echo

! :call feedkeys(":Test1 \<C-L>'\<C-B>$put='\<CR>", 't')

! :

  :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')

! :

  :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 garbagecollect(1)

  :/^start:/,$wq! test.out

  ENDTEST

--- 25,44 ----

  :	return ['あ', 'い']

  :endfunction

  :command -nargs=1 -complete=customlist,CustomComplete1 Test1 echo

! :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>", '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>", 'it')

! :"

  :call garbagecollect(1)

  :/^start:/,$wq! test.out

  ENDTEST

*** ../vim-7.4.934/src/version.c	2015-11-21 17:15:29.478748351 +0100

--- src/version.c	2015-11-22 15:06:49.884881491 +0100

***************

*** 743,744 ****

--- 743,746 ----

  {   /* Add new patch number below this line */

+ /**/

+     935,

  /**/

-- 

I have a watch cat! Just break in and she'll watch.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\

///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\

\\\  an exciting new programming language -- http://www.Zimbu.org        ///

 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///