summaryrefslogtreecommitdiffstats
path: root/debian/patches/patch-8.1.1367-can-set-modelineexpr-in-modeline.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/patch-8.1.1367-can-set-modelineexpr-in-modeline.patch')
-rw-r--r--debian/patches/patch-8.1.1367-can-set-modelineexpr-in-modeline.patch14
1 files changed, 4 insertions, 10 deletions
diff --git a/debian/patches/patch-8.1.1367-can-set-modelineexpr-in-modeline.patch b/debian/patches/patch-8.1.1367-can-set-modelineexpr-in-modeline.patch
index fd94f36..715b301 100644
--- a/debian/patches/patch-8.1.1367-can-set-modelineexpr-in-modeline.patch
+++ b/debian/patches/patch-8.1.1367-can-set-modelineexpr-in-modeline.patch
@@ -14,8 +14,6 @@ Signed-off-by: James McCoy <jamessan@debian.org>
src/version.c | 2 ++
3 files changed, 4 insertions(+), 1 deletion(-)
-diff --git a/src/option.c b/src/option.c
-index e1e89d5..e3f5f5d 100644
--- a/src/option.c
+++ b/src/option.c
@@ -1892,7 +1892,7 @@ static struct vimoption options[] =
@@ -27,8 +25,6 @@ index e1e89d5..e3f5f5d 100644
(char_u *)&p_mle, PV_NONE,
{(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
{"modelines", "mls", P_NUM|P_VI_DEF,
-diff --git a/src/testdir/test_modeline.vim b/src/testdir/test_modeline.vim
-index 101116c..89c06ba 100644
--- a/src/testdir/test_modeline.vim
+++ b/src/testdir/test_modeline.vim
@@ -119,6 +119,7 @@ func Test_modeline_fails_always()
@@ -39,16 +35,14 @@ index 101116c..89c06ba 100644
call s:modeline_fails('omnifunc', 'omnifunc=Something()', 'E520:')
call s:modeline_fails('operatorfunc', 'operatorfunc=Something()', 'E520:')
call s:modeline_fails('perldll', 'perldll=Something()', 'E520:')
-diff --git a/src/version.c b/src/version.c
-index 2cbc426..0ce8831 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 */
-+/**/
-+ 1367,
/**/
++ 1367,
++/**/
1366,
/**/
+ 1365,