From: Bram Moolenaar Date: Wed, 20 Dec 2017 21:32:20 +0000 (+0100) Subject: patch 8.0.1418: no test for expanding backticks X-Git-Tag: v8.0.1418 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ae6f8651251013bafef9de1aed09069deaae8122;p=vim patch 8.0.1418: no test for expanding backticks Problem: No test for expanding backticks. Solution: Add a test. (Dominique Pelle, closes #2479) --- diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim index e753866bc..35ab0fb33 100644 --- a/src/testdir/test_normal.vim +++ b/src/testdir/test_normal.vim @@ -404,6 +404,15 @@ func! Test_normal10_expand() call assert_equal(expected[i], expand(''), 'i == ' . i) endfor + if executable('echo') + " Test expand(`...`) i.e. backticks command expansion. + " MS-Windows has a trailing space. + call assert_match('^abcde *$', expand('`echo abcde`')) + endif + + " Test expand(`=...`) i.e. backticks expression expansion + call assert_equal('5', expand('`=2+3`')) + " clean up bw! endfunc @@ -1537,12 +1546,12 @@ fun! Test_normal29_brace() \ 'the ''{'' flag is in ''cpoptions'' then ''{'' in the first column is used as a', \ 'paragraph boundary |posix|.', \ '{', - \ 'This is no paragaraph', + \ 'This is no paragraph', \ 'unless the ''{'' is set', \ 'in ''cpoptions''', \ '}', \ '.IP', - \ 'The nroff macros IP seperates a paragraph', + \ 'The nroff macros IP separates a paragraph', \ 'That means, it must be a ''.''', \ 'followed by IP', \ '.LPIt does not matter, if afterwards some', @@ -1557,7 +1566,7 @@ fun! Test_normal29_brace() 1 norm! 0d2} call assert_equal(['.IP', - \ 'The nroff macros IP seperates a paragraph', 'That means, it must be a ''.''', 'followed by IP', + \ 'The nroff macros IP separates a paragraph', 'That means, it must be a ''.''', 'followed by IP', \ '.LPIt does not matter, if afterwards some', 'more characters follow.', '.SHAlso section boundaries from the nroff', \ 'macros terminate a paragraph. That means', 'a character like this:', '.NH', 'End of text here', ''], getline(1,'$')) norm! 0d} @@ -1576,21 +1585,21 @@ fun! Test_normal29_brace() set cpo+={ 1 norm! 0d2} - call assert_equal(['{', 'This is no paragaraph', 'unless the ''{'' is set', 'in ''cpoptions''', '}', - \ '.IP', 'The nroff macros IP seperates a paragraph', 'That means, it must be a ''.''', + call assert_equal(['{', 'This is no paragraph', 'unless the ''{'' is set', 'in ''cpoptions''', '}', + \ '.IP', 'The nroff macros IP separates a paragraph', 'That means, it must be a ''.''', \ 'followed by IP', '.LPIt does not matter, if afterwards some', 'more characters follow.', \ '.SHAlso section boundaries from the nroff', 'macros terminate a paragraph. That means', \ 'a character like this:', '.NH', 'End of text here', ''], getline(1,'$')) $ norm! d} - call assert_equal(['{', 'This is no paragaraph', 'unless the ''{'' is set', 'in ''cpoptions''', '}', - \ '.IP', 'The nroff macros IP seperates a paragraph', 'That means, it must be a ''.''', + call assert_equal(['{', 'This is no paragraph', 'unless the ''{'' is set', 'in ''cpoptions''', '}', + \ '.IP', 'The nroff macros IP separates a paragraph', 'That means, it must be a ''.''', \ 'followed by IP', '.LPIt does not matter, if afterwards some', 'more characters follow.', \ '.SHAlso section boundaries from the nroff', 'macros terminate a paragraph. That means', \ 'a character like this:', '.NH', 'End of text here', ''], getline(1,'$')) norm! gg} norm! d5} - call assert_equal(['{', 'This is no paragaraph', 'unless the ''{'' is set', 'in ''cpoptions''', '}', ''], getline(1,'$')) + call assert_equal(['{', 'This is no paragraph', 'unless the ''{'' is set', 'in ''cpoptions''', '}', ''], getline(1,'$')) " clean up set cpo-={ diff --git a/src/version.c b/src/version.c index 2ab6aac0f..9f034d78c 100644 --- a/src/version.c +++ b/src/version.c @@ -771,6 +771,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1418, /**/ 1417, /**/