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
index bc542c7625c1d9a4e496a9fb9b9f5dc993f758b3..3a0a9bbb79d3395994d3c97663a72ec84474ac37 100644 (file)
--- 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"\e
+i#include   "bar.a"\e:
 :w
 :e Xdir1/dir2/bar.a
-i#include      "baz.a"\e
+i#include      "baz.a"\e:
 :w
 :e Xdir1/dir2/baz.a
-i#include            "foo.a"\e
+i#include            "foo.a"\e:
 :w
 :e Xbase.a
 :set path=Xdir1/dir2
-i#include    <foo.a>\e
+i#include    <foo.a>\e:
 :w
 :redir! >>test.out
 :checkpath!
@@ -79,17 +79,17 @@ STARTTEST
 :endfunction
 :let &includeexpr='DotsToSlashes()'
 :e! Xdir1/dir2/foo.b
-i%inc   /bar/\e
+i%inc   /bar/\e:
 :w
 :e Xdir1/dir2/bar.b
-i%inc      /baz/\e
+i%inc      /baz/\e:
 :w
 :e Xdir1/dir2/baz.b
-i%inc            /foo/\e
+i%inc            /foo/\e:
 :w
 :e Xbase.b
 :set path=Xdir1/dir2
-i%inc    /foo/\e
+i%inc    /foo/\e:
 :w
 :redir! >>test.out
 :checkpath!
@@ -112,20 +112,20 @@ STARTTEST
 :endfunction
 :let &includeexpr='StripNewlineChar()'
 :e! Xdir1/dir2/foo.c
-i%inc   bar.c\e
+i%inc   bar.c\e:
 :w
 :e Xdir1/dir2/bar.c
-i%inc      baz.c\e
+i%inc      baz.c\e:
 :w
 :e Xdir1/dir2/baz.c
-i%inc            foo.c\e
+i%inc            foo.c\e:
 :w
 :e Xdir1/dir2/FALSE.c
-i%inc            foo.c\e
+i%inc            foo.c\e:
 :w
 :e Xbase.c
 :set path=Xdir1/dir2
-i%inc    FALSE.c foo.c\e
+i%inc    FALSE.c foo.c\e:
 :w
 :redir! >>test.out
 :checkpath!

diff --git a/src/testdir/test29.in b/src/testdir/test29.in
index 1d6cb6f4d161b926f29eac00af85a8e780258deb..65e28c1c5bacab949bf898e0d08f3f6a6d565268 100644 (file)
--- a/src/testdir/test29.in
+++ b/src/testdir/test29.in
@@ -113,12 +113,12 @@ Avim3\15\e
 :iunmap <c-u>
 Avim4\15\15\e
 :" Test with backspace set to the compatible setting
-:set bs=
+:set backspace= visualbell
 A vim5\eA\15\15\e
 A vim6\eAzwei\au\15\e
 :inoremap <c-u> <left><c-u>
 A vim7\15\15\e
-: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
index b8bd9fc9cf87cca0138f61e601ffedf63cccbb49..b3ee49baa4da7c01ad6779c8519944209a8aa656 100644 (file)
--- a/src/testdir/test4.in
+++ b/src/testdir/test4.in
@@ -19,7 +19,7 @@ othis should be in column 1\e:wq " append text without autoindent to Xxx
 G:r Xxx             " include Xxx in the current file
 :set fo+=r          " issue #57 do not move cursor on <c-o> when autoindent is set
 Go# abcdef\e2hi
-\ fd0\eo# abcdef\e2hi\ fd0\e
+\ fd0\eo# abcdef\e2hi\ fd0\e:
 :?startstart?,$w! test.out
 :qa!
 ENDTEST

diff --git a/src/testdir/test61.in b/src/testdir/test61.in
index dc24ab980443fd13140f03f5f6269c04d0f4e932..b18bbb52cb8901abab81d74e51f043ca3a895cc5 100644 (file)
--- a/src/testdir/test61.in
+++ b/src/testdir/test61.in
@@ -87,19 +87,19 @@ ggO---\e:w >>test.out
 :so small.vim
 :set nocp viminfo+=nviminfo
 :enew!
-oa\e
+oa\e:
 :set ul=100
-ob\e
+ob\e:
 :set ul=100
 o1\ea2\12=setline('.','1234')
 
 \euu:"
-oc\e
+oc\e:
 :set ul=100
 o1\ea2\12=setline('.','1234')
 
 \eu:"
-od\e
+od\e:
 :set ul=100
 o1\ea2\12=string(123)
 \eu:"

diff --git a/src/testdir/test82.in b/src/testdir/test82.in
index 8503f5488fdec83d1663dda551b56f56b769d25b..5ee9116685d80ac3c950724cd95ab366452059fc 100644 (file)
--- 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
index 297d560d2f29e6feb8247fc92d171e9827841a0a..f24c1b83589b67857688d07063c1f02d6e0f4c05 100644 (file)
--- 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
index 6bac414f31b4782dff021fb1cf25adb2a840413c..27a87c617c7ddcd8e4406983e70a14936adf2244 100644 (file)
--- 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
index 9fac4d27d19916152e7eb509b385418107437cd5..934afdec1b7b4e723ce34bb8d44d1c96beffe975 100644 (file)
--- 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\+', '&*\9ffname ', '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
index f1e1c868d332389bc4910ceb8d67cc71980f7ced..16fed6d7edbbeba3efddc4f8522fa5e5e8b0c807 100644 (file)
--- a/src/testdir/test_autoformat_join.in
+++ b/src/testdir/test_autoformat_join.in
@@ -3,7 +3,7 @@ Tests for setting the '[,'] marks when joining lines.
 STARTTEST
 :so small.vim
 :/^\t\t/
-0gqj\e
+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
index 0f48baeca9c033d7556b3a606c509f1b1afe2189..e3b885ed333da04480acc62f440ddd851831df54 100644 (file)
--- 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 */
+/**/
+    819,
 /**/
     818,
 /**/