# HG changeset patch # User Bram Moolenaar # Date 1439310828 -7200 # Node ID bc269cf15ccd91867532970df2b493d3b1ad9d83 # Parent 6db4f492c515a00b5dde4ee51ca711dfd7de984e patch 7.4.819 Problem: Beeping when running the tests. Solution: Fix 41 beeps. (Roland Eggner) diff --git a/src/testdir/test17.in b/src/testdir/test17.in --- a/src/testdir/test17.in +++ b/src/testdir/test17.in @@ -49,17 +49,17 @@ STARTTEST :!mkdir Xdir1 :!mkdir "Xdir1/dir2" :e! Xdir1/dir2/foo.a -i#include "bar.a" +i#include "bar.a": :w :e Xdir1/dir2/bar.a -i#include "baz.a" +i#include "baz.a": :w :e Xdir1/dir2/baz.a -i#include "foo.a" +i#include "foo.a": :w :e Xbase.a :set path=Xdir1/dir2 -i#include  +i#include : :w :redir! >>test.out :checkpath! @@ -79,17 +79,17 @@ STARTTEST :endfunction :let &includeexpr='DotsToSlashes()' :e! Xdir1/dir2/foo.b -i%inc /bar/ +i%inc /bar/: :w :e Xdir1/dir2/bar.b -i%inc /baz/ +i%inc /baz/: :w :e Xdir1/dir2/baz.b -i%inc /foo/ +i%inc /foo/: :w :e Xbase.b :set path=Xdir1/dir2 -i%inc /foo/ +i%inc /foo/: :w :redir! >>test.out :checkpath! @@ -112,20 +112,20 @@ STARTTEST :endfunction :let &includeexpr='StripNewlineChar()' :e! Xdir1/dir2/foo.c -i%inc bar.c +i%inc bar.c: :w :e Xdir1/dir2/bar.c -i%inc baz.c +i%inc baz.c: :w :e Xdir1/dir2/baz.c -i%inc foo.c +i%inc foo.c: :w :e Xdir1/dir2/FALSE.c -i%inc foo.c +i%inc foo.c: :w :e Xbase.c :set path=Xdir1/dir2 -i%inc FALSE.c foo.c +i%inc FALSE.c foo.c: :w :redir! >>test.out :checkpath! diff --git a/src/testdir/test29.in b/src/testdir/test29.in --- a/src/testdir/test29.in +++ b/src/testdir/test29.in @@ -113,12 +113,12 @@ Avim3 :iunmap Avim4 :" Test with backspace set to the compatible setting -:set bs= +:set backspace= visualbell A vim5A A vim6Azweiu :inoremap A vim7 -:set cp +:set compatible novisualbell ENDTEST 1 this shouldn't be deleted 2 this shouldn't be deleted diff --git a/src/testdir/test4.in b/src/testdir/test4.in --- a/src/testdir/test4.in +++ b/src/testdir/test4.in @@ -19,7 +19,7 @@ othis should be in column 1:wq " append G:r Xxx " include Xxx in the current file :set fo+=r " issue #57 do not move cursor on when autoindent is set Go# abcdef2hi -d0o# abcdef2hid0 +d0o# abcdef2hid0: :?startstart?,$w! test.out :qa! ENDTEST diff --git a/src/testdir/test61.in b/src/testdir/test61.in --- a/src/testdir/test61.in +++ b/src/testdir/test61.in @@ -87,19 +87,19 @@ ggO---:w >>test.out :so small.vim :set nocp viminfo+=nviminfo :enew! -oa +oa: :set ul=100 -ob +ob: :set ul=100 o1a2=setline('.','1234') uu:" -oc +oc: :set ul=100 o1a2=setline('.','1234') u:" -od +od: :set ul=100 o1a2=string(123) u:" diff --git a/src/testdir/test82.in b/src/testdir/test82.in --- a/src/testdir/test82.in +++ b/src/testdir/test82.in @@ -9,7 +9,7 @@ STARTTEST : qa! :endif :set enc=utf8 -ggdG +ggdG: : :function! Ch(a, op, b, expected) : if eval(printf('"%s" %s "%s"', a:a, a:op, a:b)) != a:expected diff --git a/src/testdir/test83.in b/src/testdir/test83.in --- a/src/testdir/test83.in +++ b/src/testdir/test83.in @@ -8,16 +8,16 @@ STARTTEST : w! test.out : qa! :endif - +: :/^text for tags1$/,/^text for tags1$/+1w! Xtags1.txt :/^text for tags2$/,/^text for tags2$/+1w! Xtags2.txt :/^text for tags3$/,/^text for tags3$/+1w! Xtags3.txt :/^tags1$/+1,/^tags1-end$/-1w! Xtags1 - -ggdG - +: +ggdG: +: :call setline('.', 'Results of test83') - +: :" case1: :new :set tags=Xtags1 @@ -30,7 +30,7 @@ ggdG : close : put ='case1: ok' :endif - +: :" case2: :new :set tags=test83-tags2 @@ -43,7 +43,7 @@ ggdG : close : put ='case2: ok' :endif - +: :" case3: :new :set tags=test83-tags3 @@ -57,7 +57,7 @@ ggdG : put ='case3: ok' :endif :close - +: :wq! test.out ENDTEST diff --git a/src/testdir/test90.in b/src/testdir/test90.in --- a/src/testdir/test90.in +++ b/src/testdir/test90.in @@ -46,7 +46,7 @@ STARTTEST : let res='ng' :endif :$put =testcase.res -" +:" :/^start:/,$wq! test.out ENDTEST diff --git a/src/testdir/test95.in b/src/testdir/test95.in --- a/src/testdir/test95.in +++ b/src/testdir/test95.in @@ -18,7 +18,7 @@ STARTTEST :" etc. :" When there is no match use only the first two items. :let tl = [] - +: :"""" Multi-byte character tests. These will fail unless vim is compiled :"""" with Multibyte (FEAT_MBYTE) or BIG/HUGE features. :call add(tl, [2, '[[:alpha:][=a=]]\+', '879 aiaãâaiuvna ', 'aiaãâaiuvna']) @@ -26,15 +26,15 @@ STARTTEST :call add(tl, [2, '[^ม ]\+', 'มม oijasoifjos ifjoisj f osij j มมมมม abcd', 'oijasoifjos']) :call add(tl, [2, ' [^ ]\+', 'start มabcdม ', ' มabcdม']) :call add(tl, [2, '[ม[:alpha:][=a=]]\+', '879 aiaãมâมaiuvna ', 'aiaãมâมaiuvna']) - +: :" this is not a normal "i" but 0xec :call add(tl, [2, '\p\+', 'ìa', 'ìa']) :call add(tl, [2, '\p*', 'aあ', 'aあ']) - +: :"""" Test recognition of some character classes :call add(tl, [2, '\i\+', '&*¨xx ', 'xx']) :call add(tl, [2, '\f\+', '&*Ÿfname ', 'fname']) - +: :"""" Test composing character matching :call add(tl, [2, '.ม', 'xม่x yมy', 'yม']) :call add(tl, [2, '.ม่', 'xม่x yมy', 'xม่']) @@ -56,8 +56,8 @@ STARTTEST :call add(tl, [2, 'a\%C', "ca\u0300t", "a\u0300"]) :call add(tl, [2, 'ca\%C', "ca\u0300t", "ca\u0300"]) :call add(tl, [2, 'ca\%Ct', "ca\u0300t", "ca\u0300t"]) - - +: +: :"""" Test \Z :call add(tl, [2, 'ú\Z', 'x']) :call add(tl, [2, 'יהוה\Z', 'יהוה', 'יהוה']) @@ -75,12 +75,12 @@ STARTTEST :call add(tl, [2, "\\Z\u05b9", "xy\u05b9z", "y\u05b9"]) :call add(tl, [1, "\u05b9\\+\\Z", "xy\u05b9z\u05b9 ", "y\u05b9z\u05b9"]) :call add(tl, [1, "\\Z\u05b9\\+", "xy\u05b9z\u05b9 ", "y\u05b9z\u05b9"]) - +: :"""" Combining different tests and features :call add(tl, [2, '[^[=a=]]\+', 'ddaãâbcd', 'dd']) - +: :"""" Run the tests - +: :" :for t in tl : let re = t[0] @@ -124,7 +124,7 @@ STARTTEST : endfor :endfor :unlet t tl e l - +: :" check that 'ambiwidth' does not change the meaning of \p :set regexpengine=1 ambiwidth=single :$put ='eng 1 ambi single: ' . match(\"\u00EC\", '\p') @@ -134,7 +134,7 @@ STARTTEST :$put ='eng 2 ambi single: ' . match(\"\u00EC\", '\p') :set regexpengine=2 ambiwidth=double :$put ='eng 2 ambi double: ' . match(\"\u00EC\", '\p') - +: :/\%#=1^Results/,$wq! test.out ENDTEST diff --git a/src/testdir/test_autoformat_join.in b/src/testdir/test_autoformat_join.in --- a/src/testdir/test_autoformat_join.in +++ b/src/testdir/test_autoformat_join.in @@ -3,7 +3,7 @@ Tests for setting the '[,'] marks when j STARTTEST :so small.vim :/^\t\t/ -0gqj +0gqj: :let a=string(getpos("'[")).'/'.string(getpos("']")) :/^This line/;'}-join :let b=string(getpos("'[")).'/'.string(getpos("']")) diff --git a/src/version.c b/src/version.c --- 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 */ /**/ + 819, +/**/ 818, /**/ 817,