forked from aniani/vim
patch 8.2.2836: build failure without the +quickfix feature
Problem: Build failure without the +quickfix feature. (John Marriott) Solution: Add #ifdef.
This commit is contained in:
@@ -3511,7 +3511,7 @@ jumpto_tag(
|
|||||||
// Save value of no_hlsearch, jumping to a tag is not a real search
|
// Save value of no_hlsearch, jumping to a tag is not a real search
|
||||||
save_no_hlsearch = no_hlsearch;
|
save_no_hlsearch = no_hlsearch;
|
||||||
#endif
|
#endif
|
||||||
#ifdef FEAT_PROP_POPUP
|
#if defined(FEAT_PROP_POPUP) && defined(FEAT_QUICKFIX)
|
||||||
// getfile() may have cleared options, apply 'previewpopup' again.
|
// getfile() may have cleared options, apply 'previewpopup' again.
|
||||||
if (g_do_tagpreview != 0 && *p_pvp != NUL)
|
if (g_do_tagpreview != 0 && *p_pvp != NUL)
|
||||||
parse_previewpopup(curwin);
|
parse_previewpopup(curwin);
|
||||||
|
@@ -750,6 +750,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
2836,
|
||||||
/**/
|
/**/
|
||||||
2835,
|
2835,
|
||||||
/**/
|
/**/
|
||||||
|
@@ -8704,6 +8704,7 @@ compile_redir(char_u *line, exarg_T *eap, cctx_T *cctx)
|
|||||||
return compile_exec(line, eap, cctx);
|
return compile_exec(line, eap, cctx);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef FEAT_QUICKFIX
|
||||||
static char_u *
|
static char_u *
|
||||||
compile_cexpr(char_u *line, exarg_T *eap, cctx_T *cctx)
|
compile_cexpr(char_u *line, exarg_T *eap, cctx_T *cctx)
|
||||||
{
|
{
|
||||||
@@ -8731,6 +8732,7 @@ compile_cexpr(char_u *line, exarg_T *eap, cctx_T *cctx)
|
|||||||
|
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Add a function to the list of :def functions.
|
* Add a function to the list of :def functions.
|
||||||
@@ -9296,8 +9298,13 @@ compile_def_function(
|
|||||||
case CMD_laddexpr:
|
case CMD_laddexpr:
|
||||||
case CMD_cgetexpr:
|
case CMD_cgetexpr:
|
||||||
case CMD_lgetexpr:
|
case CMD_lgetexpr:
|
||||||
|
#ifdef FEAT_QUICKFIX
|
||||||
ea.arg = p;
|
ea.arg = p;
|
||||||
line = compile_cexpr(line, &ea, &cctx);
|
line = compile_cexpr(line, &ea, &cctx);
|
||||||
|
#else
|
||||||
|
ex_ni(&ea);
|
||||||
|
line = NULL;
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
|
|
||||||
// TODO: any other commands with an expression argument?
|
// TODO: any other commands with an expression argument?
|
||||||
|
@@ -1443,11 +1443,14 @@ exec_instructions(ectx_T *ectx)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case ISN_CEXPR_AUCMD:
|
case ISN_CEXPR_AUCMD:
|
||||||
|
#ifdef FEAT_QUICKFIX
|
||||||
if (trigger_cexpr_autocmd(iptr->isn_arg.number) == FAIL)
|
if (trigger_cexpr_autocmd(iptr->isn_arg.number) == FAIL)
|
||||||
goto on_error;
|
goto on_error;
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ISN_CEXPR_CORE:
|
case ISN_CEXPR_CORE:
|
||||||
|
#ifdef FEAT_QUICKFIX
|
||||||
{
|
{
|
||||||
exarg_T ea;
|
exarg_T ea;
|
||||||
int res;
|
int res;
|
||||||
@@ -1463,6 +1466,7 @@ exec_instructions(ectx_T *ectx)
|
|||||||
if (res == FAIL)
|
if (res == FAIL)
|
||||||
goto on_error;
|
goto on_error;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
|
|
||||||
// execute Ex command from pieces on the stack
|
// execute Ex command from pieces on the stack
|
||||||
@@ -4415,10 +4419,13 @@ list_instructions(char *pfx, isn_T *instr, int instr_count, ufunc_T *ufunc)
|
|||||||
iptr->isn_arg.number ? " append" : "");
|
iptr->isn_arg.number ? " append" : "");
|
||||||
break;
|
break;
|
||||||
case ISN_CEXPR_AUCMD:
|
case ISN_CEXPR_AUCMD:
|
||||||
|
#ifdef FEAT_QUICKFIX
|
||||||
smsg("%s%4d CEXPR pre %s", pfx, current,
|
smsg("%s%4d CEXPR pre %s", pfx, current,
|
||||||
cexpr_get_auname(iptr->isn_arg.number));
|
cexpr_get_auname(iptr->isn_arg.number));
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
case ISN_CEXPR_CORE:
|
case ISN_CEXPR_CORE:
|
||||||
|
#ifdef FEAT_QUICKFIX
|
||||||
{
|
{
|
||||||
cexprref_T *cer = iptr->isn_arg.cexpr.cexpr_ref;
|
cexprref_T *cer = iptr->isn_arg.cexpr.cexpr_ref;
|
||||||
|
|
||||||
@@ -4427,6 +4434,7 @@ list_instructions(char *pfx, isn_T *instr, int instr_count, ufunc_T *ufunc)
|
|||||||
cer->cer_forceit ? "!" : "",
|
cer->cer_forceit ? "!" : "",
|
||||||
cer->cer_cmdline);
|
cer->cer_cmdline);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
case ISN_SUBSTITUTE:
|
case ISN_SUBSTITUTE:
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user