vim-patch:8.1.0539: cannot build without the sandbox

Problem:    Cannot build without the sandbox.
Solution:   Set the secure option instead of using the sandbox.  Also restrict
            the characters from 'spelllang' that are used for LANG.vim.
            (suggested by Yasuhiro Matsumoto)
https://github.com/vim/vim/commit/82e8c92ebef5afcac0c0fdb706ff163f9b3366f7

2 files changed, 8 insertions, 6 deletions

diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index b77bae47a9..ad1170e718 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -4945,11 +4945,11 @@ chk_modeline (
       save_SID = current_SID;
       current_SID = SID_MODELINE;
       // Make sure no risky things are executed as a side effect.
-      sandbox++;
+      ++secure;
 
       retval = do_set(s, OPT_MODELINE | OPT_LOCAL | flags);
 
-      sandbox--;
+      --secure;
       current_SID = save_SID;
       if (retval == FAIL)                     /* stop if error found */
         break;
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 0f6408c9d4..af2fe33505 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -3296,11 +3296,13 @@ ambw_end:
        * '.encoding'.
        */
       for (p = q; *p != NUL; ++p)
-        if (vim_strchr((char_u *)"_.,", *p) != NULL)
+        if (!ASCII_ISALPHA(*p) && *p != '-')
           break;
-      vim_snprintf((char *)fname, sizeof(fname), "spell/%.*s.vim",
-                   (int)(p - q), q);
-      source_runtime(fname, DIP_ALL);
+      if (p > q) {
+        vim_snprintf((char *)fname, sizeof(fname), "spell/%.*s.vim",
+                     (int)(p - q), q);
+        source_runtime(fname, DIP_ALL);
+      }
     }
   }