updated for version 7.4.220

Problem:    Test 105 does not work in a shadow dir. (James McCoy)
Solution:   Omit "src/" from the checked path.

diff --git a/src/testdir/test105.in b/src/testdir/test105.in
index 284f3bf4eb703bcb0e963fa5694fd42dac9530d8..58c4f84c0d0a4dec7d1163ede38e836a60c3a6e5 100644 (file)
--- a/src/testdir/test105.in
+++ b/src/testdir/test105.in
@@ -7,7 +7,7 @@ STARTTEST
 :set shellslash
 :let tab="\t"
 :command -nargs=1 Put :let expr=<q-args> | $put =expr.tab.strtrans(string(eval(expr)))
-:let $HOME=fnamemodify('.', ':p:h:h:h')
+:let $HOME=fnamemodify('.', ':p:h:h')
 :Put fnamemodify('.',              ':p'      )[-1:]
 :Put fnamemodify('.',              ':p:h'    )[-1:]
 :Put fnamemodify('test.out',       ':p'      )[-1:]
@@ -23,7 +23,7 @@ STARTTEST
 :Put fnamemodify('abc.fb2.tar.gz', ':r'      )
 :Put fnamemodify('abc.fb2.tar.gz', ':r:r'    )
 :Put fnamemodify('abc.fb2.tar.gz', ':r:r:r'  )
-:Put substitute(fnamemodify('abc.fb2.tar.gz', ':p:r:r'), '.*\(src/testdir/.*\)', '\1', '')
+:Put substitute(fnamemodify('abc.fb2.tar.gz', ':p:r:r'), '.*\(testdir/.*\)', '\1', '')
 :Put fnamemodify('abc.fb2.tar.gz', ':e'      )
 :Put fnamemodify('abc.fb2.tar.gz', ':e:e'    )
 :Put fnamemodify('abc.fb2.tar.gz', ':e:e:e'  )

diff --git a/src/testdir/test105.ok b/src/testdir/test105.ok
index 0681597c05fd50f56d8af3c15537de606c85eeb4..5f1de5f9e637bcacfc9026798b55ebffa47ffe22 100644 (file)
--- a/src/testdir/test105.ok
+++ b/src/testdir/test105.ok
@@ -3,8 +3,8 @@ fnamemodify('.',              ':p:h'    )[-1:]  'r'
 fnamemodify('test.out',       ':p'      )[-1:] 't'
 fnamemodify('test.out',       ':.'      )      'test.out'
 fnamemodify('../testdir/a',   ':.'      )      'a'
-fnamemodify('test.out',       ':~'      )      '~/src/testdir/test.out'
-fnamemodify('../testdir/a',   ':~'      )      '~/src/testdir/a'
+fnamemodify('test.out',       ':~'      )      '~/testdir/test.out'
+fnamemodify('../testdir/a',   ':~'      )      '~/testdir/a'
 fnamemodify('../testdir/a',   ':t'      )      'a'
 fnamemodify('.',              ':p:t'    )      ''
 fnamemodify('test.out',       ':p:t'    )      'test.out'
@@ -13,7 +13,7 @@ fnamemodify('test.out',       ':p:t:e'  )     'out'
 fnamemodify('abc.fb2.tar.gz', ':r'      )      'abc.fb2.tar'
 fnamemodify('abc.fb2.tar.gz', ':r:r'    )      'abc.fb2'
 fnamemodify('abc.fb2.tar.gz', ':r:r:r'  )      'abc'
-substitute(fnamemodify('abc.fb2.tar.gz', ':p:r:r'), '.*\(src/testdir/.*\)', '\1', '')  'src/testdir/abc.fb2'
+substitute(fnamemodify('abc.fb2.tar.gz', ':p:r:r'), '.*\(testdir/.*\)', '\1', '')      'testdir/abc.fb2'
 fnamemodify('abc.fb2.tar.gz', ':e'      )      'gz'
 fnamemodify('abc.fb2.tar.gz', ':e:e'    )      'tar.gz'
 fnamemodify('abc.fb2.tar.gz', ':e:e:e'  )      'fb2.tar.gz'

diff --git a/src/version.c b/src/version.c
index 0f5fb5a5164d21546021b1eb60f76b48cc68dfc2..224646513c10eec3a399cfc1a22404722b5e19b5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    220,
 /**/
     219,
 /**/