diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 05:05:34 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 05:05:34 +0000 |
| commit | cbedd7c5597b906e5de95debeced81743a21a9f1 (patch) | |
| tree | 23004fa91a33d235aa7c06049d3420a238f24eb7 /debian/patches/patch-8.1.1365-source-command-doesn-t-check-for-the-sandb.patch | |
| parent | Releasing debian version 2:8.1.0875-5+deb10u2progress5u1. (diff) | |
| download | vim-cbedd7c5597b906e5de95debeced81743a21a9f1.tar.xz vim-cbedd7c5597b906e5de95debeced81743a21a9f1.zip | |
Merging debian version 2:8.1.0875-5+deb10u3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/patch-8.1.1365-source-command-doesn-t-check-for-the-sandb.patch')
| -rw-r--r-- | debian/patches/patch-8.1.1365-source-command-doesn-t-check-for-the-sandb.patch | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/debian/patches/patch-8.1.1365-source-command-doesn-t-check-for-the-sandb.patch b/debian/patches/patch-8.1.1365-source-command-doesn-t-check-for-the-sandb.patch index 0124ad8..64a7ae5 100644 --- a/debian/patches/patch-8.1.1365-source-command-doesn-t-check-for-the-sandb.patch +++ b/debian/patches/patch-8.1.1365-source-command-doesn-t-check-for-the-sandb.patch @@ -14,8 +14,6 @@ Signed-off-by: James McCoy <jamessan@debian.org> src/version.c | 2 ++ 3 files changed, 17 insertions(+) -diff --git a/src/getchar.c b/src/getchar.c -index fe74dbf..3e4c964 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -1407,6 +1407,12 @@ openscript( @@ -31,8 +29,6 @@ index fe74dbf..3e4c964 100644 #ifdef FEAT_EVAL if (ignore_script) /* Not reading from script, also don't open one. Warning message? */ -diff --git a/src/testdir/test_source.vim b/src/testdir/test_source.vim -index a33d286..5166baf 100644 --- a/src/testdir/test_source.vim +++ b/src/testdir/test_source.vim @@ -36,3 +36,12 @@ func Test_source_cmd() @@ -48,16 +44,14 @@ index a33d286..5166baf 100644 + call assert_fails('sandbox source! Xsourcehello', 'E48:') + bwipe! +endfunc -diff --git a/src/version.c b/src/version.c -index 1a7ffa4..3040409 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 */ -+/**/ -+ 1365, /**/ ++ 1365, ++/**/ 1046, /**/ + 948, |