diff options
Diffstat (limited to 'debian/patches/patch-8.1.1401-misspelled-mkspellmem-as-makespellmem.patch')
-rw-r--r-- | debian/patches/patch-8.1.1401-misspelled-mkspellmem-as-makespellmem.patch | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/debian/patches/patch-8.1.1401-misspelled-mkspellmem-as-makespellmem.patch b/debian/patches/patch-8.1.1401-misspelled-mkspellmem-as-makespellmem.patch index 5f422ac..e093f24 100644 --- a/debian/patches/patch-8.1.1401-misspelled-mkspellmem-as-makespellmem.patch +++ b/debian/patches/patch-8.1.1401-misspelled-mkspellmem-as-makespellmem.patch @@ -15,11 +15,9 @@ Signed-off-by: James McCoy <jamessan@debian.org> src/version.c | 2 ++ 3 files changed, 5 insertions(+), 7 deletions(-) -diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt -index 7b25f20..4ab87db 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt -@@ -5245,12 +5245,6 @@ A jump table for the options with a short description can be found at |Q_op|. +@@ -5245,12 +5245,6 @@ A jump table for the options with a shor < This option cannot be set from a |modeline| or in the |sandbox|, for security reasons. @@ -32,7 +30,7 @@ index 7b25f20..4ab87db 100644 *'matchpairs'* *'mps'* 'matchpairs' 'mps' string (default "(:),{:},[:]") local to buffer -@@ -5413,6 +5407,8 @@ A jump table for the options with a short description can be found at |Q_op|. +@@ -5413,6 +5407,8 @@ A jump table for the options with a shor < If you have less than 512 Mbyte |:mkspell| may fail for some languages, no matter what you set 'mkspellmem' to. @@ -41,8 +39,6 @@ index 7b25f20..4ab87db 100644 *'modeline'* *'ml'* *'nomodeline'* *'noml'* 'modeline' 'ml' boolean (Vim default: on (off for root), Debian: off, Vi default: off) -diff --git a/src/testdir/test_modeline.vim b/src/testdir/test_modeline.vim -index 7251036..b5513d5 100644 --- a/src/testdir/test_modeline.vim +++ b/src/testdir/test_modeline.vim @@ -116,7 +116,7 @@ func Test_modeline_fails_always() @@ -54,16 +50,14 @@ index 7251036..b5513d5 100644 call s:modeline_fails('mzschemedll', 'mzschemedll=Something()', 'E520:') call s:modeline_fails('mzschemegcdll', 'mzschemegcdll=Something()', 'E520:') call s:modeline_fails('modelineexpr', 'modelineexpr', 'E520:') -diff --git a/src/version.c b/src/version.c -index a0ca945..1b5d863 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 */ -+/**/ -+ 1401, /**/ ++ 1401, ++/**/ 1382, /**/ + 1368, |