neovim

commit 847e6035546f567ce6d30ff45a47550e9a335c6b
parent f4e03cbdbc88bd0c1095918df11450c98b729988
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Wed, 18 Jan 2023 07:21:57 +0800

Merge pull request #21868 from zeertzjq/vim-9.0.1214

vim-patch:9.0.{1214,1215}
Diffstat:
M
src/nvim/ex_docmd.c
 | 
2
+-
M
src/nvim/option.c
 | 
2
+-
M
src/nvim/path.c
 | 
4
++--
M
src/nvim/testdir/test_autocmd.vim
 | 
1
+

4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
@@ -2852,7 +2852,7 @@ bool checkforcmd(char **pp, const char *cmd, int len)
       break;
     }
   }
-  if (i >= len && !isalpha((uint8_t)(*pp)[i])) {
+  if (i >= len && !ASCII_ISALPHA((*pp)[i])) {
     *pp = skipwhite(*pp + i);
     return true;
   }
diff --git a/src/nvim/option.c b/src/nvim/option.c
@@ -1106,7 +1106,7 @@ int do_set(char *arg, int opt_flags)
     char *errmsg = NULL;
     char *startarg = arg;             // remember for error message
 
-    if (strncmp(arg, "all", 3) == 0 && !isalpha((uint8_t)arg[3])
+    if (strncmp(arg, "all", 3) == 0 && !ASCII_ISALPHA(arg[3])
         && !(opt_flags & OPT_MODELINE)) {
       // ":set all"  show all options.
       // ":set all&" set all options to their default value.
diff --git a/src/nvim/path.c b/src/nvim/path.c
@@ -1768,7 +1768,7 @@ int path_with_url(const char *fname)
   // non-URL text.
 
   // first character must be alpha
-  if (!isalpha((uint8_t)(*fname))) {
+  if (!ASCII_ISALPHA(*fname)) {
     return 0;
   }
 
@@ -1777,7 +1777,7 @@ int path_with_url(const char *fname)
   }
 
   // check body: alpha or dash
-  for (p = fname + 1; (isalpha((uint8_t)(*p)) || (*p == '-')); p++) {}
+  for (p = fname + 1; (ASCII_ISALPHA(*p) || (*p == '-')); p++) {}
 
   // check last char is not a dash
   if (p[-1] == '-') {
diff --git a/src/nvim/testdir/test_autocmd.vim b/src/nvim/testdir/test_autocmd.vim
@@ -629,6 +629,7 @@ func Test_WinScrolled_diff()
         \ }, event)
 
   call StopVimInTerminal(buf)
+  call delete('XscrollEvent')
 endfunc
 
 func Test_WinClosed()