To: vim_dev@googlegroups.com

Subject: Patch 7.4.932

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.932 (after 7.4.926)

Problem:    test_utf8 has confusing dummy command.

Solution:   Use a real command instead of a colon.

Files:      src/testdir/test_utf8.in

*** ../vim-7.4.931/src/testdir/test_utf8.in	2015-11-19 19:00:01.768467013 +0100

--- src/testdir/test_utf8.in	2015-11-21 14:28:11.463946910 +0100

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

*** 3,8 ****

--- 3,9 ----

  STARTTEST

  :so small.vim

  :set encoding=utf-8

+ :"

  :" Visual block Insert adjusts for multi-byte char

  :new

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

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

*** 11,39 ****

  :

  :bwipeout!

  :$put=r

  :" Test for built-in function strchars()

  :for str in ["a", "あいa", "A\u20dd", "A\u20dd\u20dd", "\u20dd"]

  :	$put=strchars(str)

  :	$put=strchars(str, 0)

  :	$put=strchars(str, 1)

  :endfor

  :" Test for customlist completion

  :function! CustomComplete1(lead, line, pos)

  :	return ['あ', 'い']

  :endfunction

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

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

  :

  :function! CustomComplete2(lead, line, pos)

  :	return ['あたし', 'あたま', 'あたりめ']

  :endfunction

! :command -nargs=1 -complete=customlist,CustomComplete2 Test2 :

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

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

  :

  :call garbagecollect(1)

--- 12,42 ----

  :

  :bwipeout!

  :$put=r

+ :"

  :" Test for built-in function strchars()

  :for str in ["a", "あいa", "A\u20dd", "A\u20dd\u20dd", "\u20dd"]

  :	$put=strchars(str)

  :	$put=strchars(str, 0)

  :	$put=strchars(str, 1)

  :endfor

+ :"

  :" Test for customlist completion

  :function! CustomComplete1(lead, line, pos)

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

*** ../vim-7.4.931/src/version.c	2015-11-21 14:24:46.686156894 +0100

--- src/version.c	2015-11-21 14:31:12.165996746 +0100

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

*** 743,744 ****

--- 743,746 ----

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

+ /**/

+     932,

  /**/

-- 

hundred-and-one symptoms of being an internet addict:

121. You ask for e-mail adresses instead of telephone numbers.

 /// 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    ///