patch 8.2.0054: :diffget and :diffput don't have good completion
Problem: :diffget and :diffput don't have good completion.
Solution: Add proper completion. (Dominique Pelle, closes #5409)
diff --git a/src/cmdexpand.c b/src/cmdexpand.c
index 1a7f9f2..9dc78ed 100644
--- a/src/cmdexpand.c
+++ b/src/cmdexpand.c
@@ -1582,7 +1582,15 @@
xp->xp_context = EXPAND_BUFFERS;
xp->xp_pattern = arg;
break;
-
+#ifdef FEAT_DIFF
+ case CMD_diffget:
+ case CMD_diffput:
+ // If current buffer is in diff mode, complete buffer names
+ // which are in diff mode, and different than current buffer.
+ xp->xp_context = EXPAND_DIFF_BUFFERS;
+ xp->xp_pattern = arg;
+ break;
+#endif
case CMD_USER:
case CMD_USER_BUF:
if (compl != EXPAND_NOTHING)
@@ -2069,6 +2077,10 @@
return ExpandOldSetting(num_file, file);
if (xp->xp_context == EXPAND_BUFFERS)
return ExpandBufnames(pat, num_file, file, options);
+#ifdef FEAT_DIFF
+ if (xp->xp_context == EXPAND_DIFF_BUFFERS)
+ return ExpandBufnames(pat, num_file, file, options | BUF_DIFF_FILTER);
+#endif
if (xp->xp_context == EXPAND_TAGS
|| xp->xp_context == EXPAND_TAGS_LISTFILES)
return expand_tags(xp->xp_context == EXPAND_TAGS, pat, num_file, file);