mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
Merge pull request #21868 from zeertzjq/vim-9.0.1214
vim-patch:9.0.{1214,1215}
This commit is contained in:
commit
847e603554
@ -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;
|
||||
}
|
||||
|
@ -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.
|
||||
|
@ -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] == '-') {
|
||||
|
@ -629,6 +629,7 @@ func Test_WinScrolled_diff()
|
||||
\ }, event)
|
||||
|
||||
call StopVimInTerminal(buf)
|
||||
call delete('XscrollEvent')
|
||||
endfunc
|
||||
|
||||
func Test_WinClosed()
|
||||
|
Loading…
Reference in New Issue
Block a user