diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-01-18 07:21:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-18 07:21:57 +0800 |
| commit | 847e6035546f567ce6d30ff45a47550e9a335c6b (patch) | |
| tree | 1c8c9da2f6803c2c59884af7344f7309b60ebcdd | |
| parent | f4e03cbdbc88bd0c1095918df11450c98b729988 (diff) | |
| parent | 9a2dd52a6a2a17ae85102d738ab3620ef978d448 (diff) | |
| download | rneovim-847e6035546f567ce6d30ff45a47550e9a335c6b.tar.gz rneovim-847e6035546f567ce6d30ff45a47550e9a335c6b.tar.bz2 rneovim-847e6035546f567ce6d30ff45a47550e9a335c6b.zip | |
Merge pull request #21868 from zeertzjq/vim-9.0.1214
vim-patch:9.0.{1214,1215}
| -rw-r--r-- | src/nvim/ex_docmd.c | 2 | ||||
| -rw-r--r-- | src/nvim/option.c | 2 | ||||
| -rw-r--r-- | src/nvim/path.c | 4 | ||||
| -rw-r--r-- | 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 index 896130debf..d4f1169daf 100644 --- 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 index 0c2a2f7060..227001d556 100644 --- 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 index afc0563498..da3659b8b8 100644 --- 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 index 704ff6ec55..df3123c21a 100644 --- 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() |