patch 8.1.1732: completion in cmdwin does not work for buffer-local commands
Problem: Completion in cmdwin does not work for buffer-local commands.
Solution: Use the right buffer. (closes #4711)
diff --git a/src/usercmd.c b/src/usercmd.c
index 9e09a8b..c04c80e 100644
--- a/src/usercmd.c
+++ b/src/usercmd.c
@@ -309,9 +309,16 @@
char_u *
get_user_commands(expand_T *xp UNUSED, int idx)
{
- if (idx < curbuf->b_ucmds.ga_len)
- return USER_CMD_GA(&curbuf->b_ucmds, idx)->uc_name;
- idx -= curbuf->b_ucmds.ga_len;
+ // In cmdwin, the alternative buffer should be used.
+ buf_T *buf =
+#ifdef FEAT_CMDWIN
+ (cmdwin_type != 0 && get_cmdline_type() == NUL) ? prevwin->w_buffer :
+#endif
+ curbuf;
+
+ 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;
return NULL;
@@ -395,7 +402,13 @@
long a;
garray_T *gap;
- gap = &curbuf->b_ucmds;
+ /* In cmdwin, the alternative buffer should be used. */
+ gap =
+#ifdef FEAT_CMDWIN
+ (cmdwin_type != 0 && get_cmdline_type() == NUL) ?
+ &prevwin->w_buffer->b_ucmds :
+#endif
+ &curbuf->b_ucmds;
for (;;)
{
for (i = 0; i < gap->ga_len; ++i)