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 e7bb4fd7fa6fa218caae4f3ccf5debfa22d4b6a5..fd2ae6a6efeccbbaf55af12cbc5cb31a01553768 100644 (file)
--- 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 fb3628b273989ef02a7e18a6766c0f897a7a5e46..21ac1e9fabe9647a57df570513db7a2aff833252 100644 (file)
--- 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 4f876639c1ded47775dae96b3d2f59373aa32226..940ac1440ec4b6c9ce140913a62fc8145d065008 100644 (file)
--- 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,
 /**/