aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-11-21 14:31:33 +0100
committerDan Pasanen <dan.pasanen@gmail.com>2015-11-24 10:06:19 -0600
commit3b80b9545315ad32736a3d5cac2431a8c89bcb8b (patch)
tree21b73de2938f93ca06de8c63038f1129c8cc481c
parent56bbabc8ab402fc25d579a915650420ccc44c17d (diff)
downloadandroid_external_vim-3b80b9545315ad32736a3d5cac2431a8c89bcb8b.tar.gz
android_external_vim-3b80b9545315ad32736a3d5cac2431a8c89bcb8b.tar.bz2
android_external_vim-3b80b9545315ad32736a3d5cac2431a8c89bcb8b.zip
patch 7.4.932
Problem: test_utf8 has confusing dummy command. Solution: Use a real command instead of a colon.
-rw-r--r--src/testdir/test_utf8.in9
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 3 deletions
diff --git a/src/testdir/test_utf8.in b/src/testdir/test_utf8.in
index 1156342e3..a1bc0e37f 100644
--- a/src/testdir/test_utf8.in
+++ b/src/testdir/test_utf8.in
@@ -3,6 +3,7 @@ Tests for Unicode manipulations vim: set ft=vim :
STARTTEST
:so small.vim
:set encoding=utf-8
+:"
:" Visual block Insert adjusts for multi-byte char
:new
:call setline(1, ["aaa", "あああ", "bbb"])
@@ -11,29 +12,31 @@ STARTTEST
:
: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 :
+: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 :
+: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 :
+:command -nargs=1 -complete=customlist,CustomComplete3 Test3 echo
:call feedkeys(":Test3 \<C-L>'\<C-B>$put='\<CR>", 't')
:
:call garbagecollect(1)
diff --git a/src/version.c b/src/version.c
index 548d61189..30efcab42 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 */
/**/
+ 932,
+/**/
931,
/**/
930,