diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 05:05:20 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 05:05:20 +0000 |
commit | d314229aa657bc23c0fc99aa79a347326095b190 (patch) | |
tree | e2a542e09db76f34502e20a5f9a8c1a4ef52c420 /debian/patches/patch-8.1.1382-error-when-editing-test-file.patch | |
parent | Adding debian version 2:8.1.0875-5+deb10u2. (diff) | |
download | vim-d314229aa657bc23c0fc99aa79a347326095b190.tar.xz vim-d314229aa657bc23c0fc99aa79a347326095b190.zip |
Adding debian version 2:8.1.0875-5+deb10u3.debian/2%8.1.0875-5+deb10u3
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/patch-8.1.1382-error-when-editing-test-file.patch')
-rw-r--r-- | debian/patches/patch-8.1.1382-error-when-editing-test-file.patch | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/debian/patches/patch-8.1.1382-error-when-editing-test-file.patch b/debian/patches/patch-8.1.1382-error-when-editing-test-file.patch index 114c2a4..d771c7c 100644 --- a/debian/patches/patch-8.1.1382-error-when-editing-test-file.patch +++ b/debian/patches/patch-8.1.1382-error-when-editing-test-file.patch @@ -15,11 +15,9 @@ Signed-off-by: James McCoy <jamessan@debian.org> src/version.c | 2 ++ 4 files changed, 4 insertions(+), 4 deletions(-) -diff --git a/src/testdir/test49.in b/src/testdir/test49.in -index a0c9e0d..79f13f6 100644 --- a/src/testdir/test49.in +++ b/src/testdir/test49.in -@@ -5,7 +5,7 @@ test49.failed, try to add one or more "G"s at the line ending in "test.out" +@@ -5,7 +5,7 @@ test49.failed, try to add one or more "G STARTTEST :so small.vim @@ -28,8 +26,6 @@ index a0c9e0d..79f13f6 100644 :lang mess C :so test49.vim :" Go back to this file and append the results from register r. -diff --git a/src/testdir/test49.vim b/src/testdir/test49.vim -index 97088f0..7393ec4 100644 --- a/src/testdir/test49.vim +++ b/src/testdir/test49.vim @@ -1,6 +1,6 @@ @@ -46,8 +42,6 @@ index 97088f0..7393ec4 100644 " vim: ts=8 sw=4 tw=80 fdm=marker -" vim: fdt=substitute(substitute(foldtext(),\ '\\%(^+--\\)\\@<=\\(\\s*\\)\\(.\\{-}\\)\:\ \\%(\"\ \\)\\=\\(Test\ \\d*\\)\:\\s*',\ '\\3\ (\\2)\:\ \\1',\ \"\"),\ '\\(Test\\s*\\)\\(\\d\\)\\D\\@=',\ '\\1\ \\2',\ "") "------------------------------------------------------------------------------- -diff --git a/src/testdir/test_vimscript.vim b/src/testdir/test_vimscript.vim -index 9de0a62..24379ed 100644 --- a/src/testdir/test_vimscript.vim +++ b/src/testdir/test_vimscript.vim @@ -1444,5 +1444,4 @@ endfunc @@ -56,16 +50,14 @@ index 9de0a62..24379ed 100644 " vim: ts=8 sw=4 tw=80 fdm=marker -" vim: fdt=substitute(substitute(foldtext(),\ '\\%(^+--\\)\\@<=\\(\\s*\\)\\(.\\{-}\\)\:\ \\%(\"\ \\)\\=\\(Test\ \\d*\\)\:\\s*',\ '\\3\ (\\2)\:\ \\1',\ \"\"),\ '\\(Test\\s*\\)\\(\\d\\)\\D\\@=',\ '\\1\ \\2',\ "") "------------------------------------------------------------------------------- -diff --git a/src/version.c b/src/version.c -index 90acd77..a0ca945 100644 --- a/src/version.c +++ b/src/version.c -@@ -791,6 +791,8 @@ static char *(features[]) = - +@@ -792,6 +792,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ -+/**/ -+ 1382, /**/ ++ 1382, ++/**/ 1368, /**/ + 1367, |