From cfcd1ddd103129b309671cba5cff55e19a9908e4 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 21 Nov 2015 14:24:50 +0100 Subject: [PATCH 1/4] patch 7.4.931 Problem: Test 94 fails on some systems. Solution: Set 'encoding' to utf-8. --- src/testdir/test94.in | 2 +- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/testdir/test94.in b/src/testdir/test94.in index aa86fc1df9..238fef3749 100644 --- a/src/testdir/test94.in +++ b/src/testdir/test94.in @@ -17,7 +17,7 @@ Test cases: STARTTEST :so small.vim -:set nocp viminfo+=nviminfo +:set enc=utf-8 nocp viminfo+=nviminfo : :" User functions :function MoveToCap() diff --git a/src/version.c b/src/version.c index a518d8641d..548d611898 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 931, /**/ 930, /**/ From 8f08dab18df6dbf6c4b4973fd2d480e4bffb82d8 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 21 Nov 2015 14:31:33 +0100 Subject: [PATCH 2/4] patch 7.4.932 Problem: test_utf8 has confusing dummy command. Solution: Use a real command instead of a colon. --- src/testdir/test_utf8.in | 9 ++++++--- src/version.c | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/testdir/test_utf8.in b/src/testdir/test_utf8.in index 1156342e34..a1bc0e37f4 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 \'\$put='\", '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 \'\$put='\", '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 \'\$put='\", 't') : :call garbagecollect(1) diff --git a/src/version.c b/src/version.c index 548d611898..30efcab42d 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 932, /**/ 931, /**/ From e4eda3bc7157932b0bf380fd3fdc1ba8f4438b60 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 21 Nov 2015 16:28:50 +0100 Subject: [PATCH 3/4] patch 7.4.933 Problem: Crash when using longest completion match. Solution: Fix array index. --- src/ex_getln.c | 2 +- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ex_getln.c b/src/ex_getln.c index 33d612bfa8..0aeb4b8c8d 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -3704,7 +3704,7 @@ ExpandOne(xp, str, orig, options, mode) } else #endif - c0 = xp->xp_files[i][len]; + c0 = xp->xp_files[0][len]; for (i = 1; i < xp->xp_numfiles; ++i) { #ifdef FEAT_MBYTE diff --git a/src/version.c b/src/version.c index 30efcab42d..f43cad884f 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 933, /**/ 932, /**/ From 7487792ab14c1fb8dbdb37bdd74265d8b1d3be50 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 21 Nov 2015 17:15:33 +0100 Subject: [PATCH 4/4] patch 7.4.934 Problem: Appveyor also builds on a tag push. Solution: Add a skip_tags line. (Kenichi Ito, closes #489) --- appveyor.yml | 2 ++ src/version.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 3bda489a47..4700efc04f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,7 @@ version: "{build}" +skip_tags: true + before_build: - '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /release' diff --git a/src/version.c b/src/version.c index f43cad884f..6346587501 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 934, /**/ 933, /**/