mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-17 08:48:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4250 from jbradaric/vim-7.4.895

Browse Source 
vim-patch:7.4.895
This commit is contained in:
Justin M. Keyes
2016-02-22 00:45:51 -05:00
parent 9e00724c38 30b452b470
commit f08fd41282
2 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/nvim/ex_docmd.c
View File

@@ -2679,16 +2679,25 @@ set_one_cmd_context (
p = cmd + 1;
} else {
p = cmd;
while (ASCII_ISALPHA(*p) || *p == '*') /* Allow * wild card */
++p;
/* check for non-alpha command */
if (p == cmd && vim_strchr((char_u *)"@*!=><&~#", *p) != NULL)
++p;
/* for python 3.x: ":py3*" commands completion */
while (ASCII_ISALPHA(*p) || *p == '*') { // Allow * wild card
p++;
}
// a user command may contain digits
if (ASCII_ISUPPER(cmd[0])) {
while (ASCII_ISALNUM(*p) || *p == '*') {
p++;
}
}
// for python 3.x: ":py3*" commands completion
if (cmd[0] == 'p' && cmd[1] == 'y' && p == cmd + 2 && *p == '3') {
++p;
while (ASCII_ISALPHA(*p) || *p == '*')
++p;
p++;
while (ASCII_ISALPHA(*p) || *p == '*') {
p++;
}
}
// check for non-alpha command
if (p == cmd && vim_strchr((char_u *)"@*!=><&~#", *p) != NULL) {
p++;
}
len = (int)(p - cmd);
@@ -2702,9 +2711,11 @@ set_one_cmd_context (
(size_t)len) == 0)
break;
if (cmd[0] >= 'A' && cmd[0] <= 'Z')
while (ASCII_ISALNUM(*p) || *p == '*') /* Allow * wild card */
++p;
if (cmd[0] >= 'A' && cmd[0] <= 'Z') {
while (ASCII_ISALNUM(*p) || *p == '*') { // Allow * wild card
p++;
}
}
}
/*

2
src/nvim/version.c
View File

@@ -395,7 +395,7 @@ static int included_patches[] = {
898,
// 897 NA
// 896,
// 895,
895,
// 894 NA
// 893,
// 892,