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