aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/ex_docmd.c
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-07-27 07:25:47 +0800
committerGitHub <noreply@github.com>2022-07-27 07:25:47 +0800
commit890d4023cd9de715a0102b1dd26ce249f11a47b4 (patch)
tree33055d64d0e674ab3cf591635fceafa9613df9c6 /src/nvim/ex_docmd.c
parent2fdb0de1975b015d8745141eaa18e62af793e0ef (diff)
downloadrneovim-890d4023cd9de715a0102b1dd26ce249f11a47b4.tar.gz
rneovim-890d4023cd9de715a0102b1dd26ce249f11a47b4.tar.bz2
rneovim-890d4023cd9de715a0102b1dd26ce249f11a47b4.zip
vim-patch:9.0.0081: command line completion of user command may have duplicates (#19529)
Problem: Command line completion of user command may have duplicates. (Dani Dickstein) Solution: Skip global user command if an identical buffer-local one is defined. (closes vim/vim#10797) https://github.com/vim/vim/commit/c2842adfb2ca0637f13e2793fefa18e7818684f9
Diffstat (limited to 'src/nvim/ex_docmd.c')
-rw-r--r--src/nvim/ex_docmd.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 0a9285b7fe..6963ede3ae 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -6788,9 +6788,18 @@ char *get_user_commands(expand_T *xp FUNC_ATTR_UNUSED, int idx)
if (idx < buf->b_ucmds.ga_len) {
return (char *)USER_CMD_GA(&buf->b_ucmds, idx)->uc_name;
}
+
idx -= buf->b_ucmds.ga_len;
if (idx < ucmds.ga_len) {
- return (char *)USER_CMD(idx)->uc_name;
+ char *name = (char *)USER_CMD(idx)->uc_name;
+
+ for (int i = 0; i < buf->b_ucmds.ga_len; i++) {
+ if (STRCMP(name, USER_CMD_GA(&buf->b_ucmds, i)->uc_name) == 0) {
+ // global command is overruled by buffer-local one
+ return "";
+ }
+ }
+ return name;
}
return NULL;
}