patch 8.0.0785: wildcards are not expanded for :terminal
Problem: Wildcards are not expanded for :terminal.
Solution: Add FILES to the command flags. (Yasuhiro Matsumoto, closes #1883)
Also complete commands.
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 506a808..f913b19 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -2632,6 +2632,7 @@
* Any others?
*/
else if (ea.cmdidx == CMD_bang
+ || ea.cmdidx == CMD_terminal
|| ea.cmdidx == CMD_global
|| ea.cmdidx == CMD_vglobal
|| ea.usefilter)
@@ -3788,7 +3789,7 @@
xp->xp_context = EXPAND_FILES;
/* For a shell command more chars need to be escaped. */
- if (usefilter || ea.cmdidx == CMD_bang)
+ if (usefilter || ea.cmdidx == CMD_bang || ea.cmdidx == CMD_terminal)
{
#ifndef BACKSLASH_IN_FILENAME
xp->xp_shell = TRUE;
@@ -5040,13 +5041,14 @@
if (!eap->usefilter
&& !escaped
&& eap->cmdidx != CMD_bang
- && eap->cmdidx != CMD_make
- && eap->cmdidx != CMD_lmake
&& eap->cmdidx != CMD_grep
- && eap->cmdidx != CMD_lgrep
&& eap->cmdidx != CMD_grepadd
- && eap->cmdidx != CMD_lgrepadd
&& eap->cmdidx != CMD_hardcopy
+ && eap->cmdidx != CMD_lgrep
+ && eap->cmdidx != CMD_lgrepadd
+ && eap->cmdidx != CMD_lmake
+ && eap->cmdidx != CMD_make
+ && eap->cmdidx != CMD_terminal
#ifndef UNIX
&& !(eap->argt & NOSPC)
#endif
@@ -5076,7 +5078,8 @@
}
/* For a shell command a '!' must be escaped. */
- if ((eap->usefilter || eap->cmdidx == CMD_bang)
+ if ((eap->usefilter || eap->cmdidx == CMD_bang
+ || eap->cmdidx == CMD_terminal)
&& vim_strpbrk(repl, (char_u *)"!") != NULL)
{
char_u *l;
@@ -10516,7 +10519,7 @@
g_do_tagpreview = p_pvh;
prepare_tagpreview(TRUE);
- keep_help_flag = curwin_save->w_buffer->b_help;
+ keep_help_flag = bt_help(curwin_save->w_buffer);
do_exedit(eap, NULL);
keep_help_flag = FALSE;
if (curwin != curwin_save && win_valid(curwin_save))
@@ -11265,7 +11268,7 @@
{
if (ses_do_win(wp)
&& wp->w_buffer->b_ffname != NULL
- && !wp->w_buffer->b_help
+ && !bt_help(wp->w_buffer)
#ifdef FEAT_QUICKFIX
&& !bt_nofile(wp->w_buffer)
#endif
@@ -11549,7 +11552,7 @@
#endif
)
return (ssop_flags & SSOP_BLANK);
- if (wp->w_buffer->b_help)
+ if (bt_help(wp->w_buffer))
return (ssop_flags & SSOP_HELP);
return TRUE;
}
@@ -11679,7 +11682,7 @@
*/
if ((*flagp & SSOP_FOLDS)
&& wp->w_buffer->b_ffname != NULL
- && (*wp->w_buffer->b_p_bt == NUL || wp->w_buffer->b_help))
+ && (*wp->w_buffer->b_p_bt == NUL || bt_help(wp->w_buffer)))
{
if (put_folds(fd, wp) == FAIL)
return FAIL;