patch 9.0.0081: command line completion of user command may have duplicates
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 #10797)
diff --git a/src/usercmd.c b/src/usercmd.c
index 1d9c86f..7113511 100644
--- a/src/usercmd.c
+++ b/src/usercmd.c
@@ -363,9 +363,19 @@
if (idx < buf->b_ucmds.ga_len)
return USER_CMD_GA(&buf->b_ucmds, idx)->uc_name;
+
idx -= buf->b_ucmds.ga_len;
if (idx < ucmds.ga_len)
- return USER_CMD(idx)->uc_name;
+ {
+ int i;
+ char_u *name = USER_CMD(idx)->uc_name;
+
+ for (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 (char_u *)"";
+ return name;
+ }
return NULL;
}