changeset 16798:63ac51f16ea1 v8.1.1401

patch 8.1.1401: misspelled mkspellmem as makespellmem commit https://github.com/vim/vim/commit/076073950c44ea0e35bc39d539dc7ab41bf9c7ec Author: Bram Moolenaar <Bram@vim.org> Date: Sun May 26 19:20:43 2019 +0200 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 #4437)
author Bram Moolenaar <Bram@vim.org>
date Sun, 26 May 2019 19:30:05 +0200
parents 72e56d63f9d6
children 3c72f9c278b5
files runtime/doc/options.txt src/testdir/test_modeline.vim src/version.c
diffstat 3 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4913,12 +4913,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.
 
-						*'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
@@ -5070,6 +5064,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.
 
+	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)
--- a/src/testdir/test_modeline.vim
+++ b/src/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', 'E520:')
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1401,
+/**/
     1400,
 /**/
     1399,