From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 26 May 2019 17:20:43 +0000 (+0200)
Subject: patch 8.1.1401: misspelled mkspellmem as makespellmem
X-Git-Tag: v8.1.1401
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=076073950c44ea0e35bc39d539dc7ab41bf9c7ec;p=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 #4437)
---

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index e7bb4fd7f..fd2ae6a6e 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4913,12 +4913,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
@@ -5070,6 +5064,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/testdir/test_modeline.vim b/src/testdir/test_modeline.vim
index fb3628b27..21ac1e9fa 100644
--- 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:')
diff --git a/src/version.c b/src/version.c
index 4f876639c..940ac1440 100644
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1401,
 /**/
     1400,
 /**/