Mercurial > vim
diff src/cmdexpand.c @ 18987:e378907d79bf v8.2.0054
patch 8.2.0054: :diffget and :diffput don't have good completion
Commit: https://github.com/vim/vim/commit/ae7dba896975051a3f0b7123faa08dac5635972d
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Dec 29 13:56:33 2019 +0100
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 https://github.com/vim/vim/issues/5409)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 29 Dec 2019 14:00:04 +0100 |
parents | baf890fa1621 |
children | cec4da73951a |
line wrap: on
line diff
--- a/src/cmdexpand.c +++ b/src/cmdexpand.c @@ -1582,7 +1582,15 @@ set_one_cmd_context( 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 @@ ExpandFromContext( 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);