From 280938d9321821e01729b63cdac325287dce5d1c Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sat, 22 Jun 2019 22:11:52 -0400 Subject: [PATCH] vim-patch:8.1.1401: misspelled mkspellmem as makespellmem Problem: Misspelled mkspellmem as makespellmem. Solution: Drop duplicate help entry, fix test. (Naruhiko Nishino, Ken Takata, closes vim/vim#4437) https://github.com/vim/vim/commit/076073950c44ea0e35bc39d539dc7ab41bf9c7ec --- runtime/doc/options.txt | 8 ++------ src/nvim/testdir/test_modeline.vim | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 1fc9e0e847..212e686f96 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -3790,12 +3790,6 @@ A jump table for the options with a short description can be found at |Q_op|. < This option cannot be set from a |modeline| or in the |sandbox|, for security reasons. - *'makespellmem'* *'msm'* -'makespellmem' 'msm' string (default "460000,2000,500") - global - Values relevant only when compressing a spell file, see |spell|. - This option cannot be set from a |modeline| or in the |sandbox|. - *'matchpairs'* *'mps'* 'matchpairs' 'mps' string (default "(:),{:},[:]") local to buffer @@ -3907,6 +3901,8 @@ A jump table for the options with a short description can be found at |Q_op|. < If you have less than 512 Mbyte |:mkspell| may fail for some languages, no matter what you set 'mkspellmem' to. + This option cannot be set from a |modeline| or in the |sandbox|. + *'modeline'* *'ml'* *'nomodeline'* *'noml'* 'modeline' 'ml' boolean (Vim default: on (off for root), Vi default: off) diff --git a/src/nvim/testdir/test_modeline.vim b/src/nvim/testdir/test_modeline.vim index e1d56727fe..1e196e07f0 100644 --- a/src/nvim/testdir/test_modeline.vim +++ b/src/nvim/testdir/test_modeline.vim @@ -116,7 +116,7 @@ func Test_modeline_fails_always() call s:modeline_fails('luadll', 'luadll=Something()', 'E520:') call s:modeline_fails('makeef', 'makeef=Something()', 'E520:') call s:modeline_fails('makeprg', 'makeprg=Something()', 'E520:') - call s:modeline_fails('makespellmem', 'makespellmem=Something()', 'E520:') + call s:modeline_fails('mkspellmem', 'mkspellmem=Something()', 'E520:') call s:modeline_fails('mzschemedll', 'mzschemedll=Something()', 'E520:') call s:modeline_fails('mzschemegcdll', 'mzschemegcdll=Something()', 'E520:') call s:modeline_fails('modelineexpr', 'modelineexpr=Something()', 'E520:')