summaryrefslogtreecommitdiffstats
path: root/debian/patches/patch-8.1.1046-the-secure-variable-is-used-inconsistently.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/patch-8.1.1046-the-secure-variable-is-used-inconsistently.patch')
-rw-r--r--debian/patches/patch-8.1.1046-the-secure-variable-is-used-inconsistently.patch14
1 files changed, 4 insertions, 10 deletions
diff --git a/debian/patches/patch-8.1.1046-the-secure-variable-is-used-inconsistently.patch b/debian/patches/patch-8.1.1046-the-secure-variable-is-used-inconsistently.patch
index bc56542..ec39eac 100644
--- a/debian/patches/patch-8.1.1046-the-secure-variable-is-used-inconsistently.patch
+++ b/debian/patches/patch-8.1.1046-the-secure-variable-is-used-inconsistently.patch
@@ -14,8 +14,6 @@ Signed-off-by: James McCoy <jamessan@debian.org>
src/version.c | 2 ++
3 files changed, 7 insertions(+), 6 deletions(-)
-diff --git a/src/buffer.c b/src/buffer.c
-index 98d505f..2c5c282 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5510,7 +5510,7 @@ chk_modeline(
@@ -27,8 +25,6 @@ index 98d505f..2c5c282 100644
retval = do_set(s, OPT_MODELINE | OPT_LOCAL | flags);
-diff --git a/src/option.c b/src/option.c
-index 77d1024..4b6157d 100644
--- a/src/option.c
+++ b/src/option.c
@@ -5161,13 +5161,12 @@ do_set(
@@ -49,16 +45,14 @@ index 77d1024..4b6157d 100644
// Handle side effects, and set the global value
// for ":set" on local options. Note: when setting
-diff --git a/src/version.c b/src/version.c
-index b59878e..1a7ffa4 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 */
-+/**/
-+ 1046,
/**/
++ 1046,
++/**/
948,
/**/
+ 884,