From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 5 May 2021 20:51:39 +0000 (+0200)
Subject: patch 8.2.2836: build failure without the +quickfix feature
X-Git-Tag: v8.2.2836
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b7c978154e0816f4dcfae8a06b4ba1bfb7f796f6;p=vim

patch 8.2.2836: build failure without the +quickfix feature

Problem:    Build failure without the +quickfix feature. (John Marriott)
Solution:   Add #ifdef.
---

diff --git a/src/tag.c b/src/tag.c
index 37ed66c6e..4eb7a4f43 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -3511,7 +3511,7 @@ jumpto_tag(
 	// Save value of no_hlsearch, jumping to a tag is not a real search
 	save_no_hlsearch = no_hlsearch;
 #endif
-#ifdef FEAT_PROP_POPUP
+#if defined(FEAT_PROP_POPUP) && defined(FEAT_QUICKFIX)
 	// getfile() may have cleared options, apply 'previewpopup' again.
 	if (g_do_tagpreview != 0 && *p_pvp != NUL)
 	    parse_previewpopup(curwin);
diff --git a/src/version.c b/src/version.c
index 9b53528bf..5ef8d7cc0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2836,
 /**/
     2835,
 /**/
diff --git a/src/vim9compile.c b/src/vim9compile.c
index ead193f38..a724d1ad9 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -8704,6 +8704,7 @@ compile_redir(char_u *line, exarg_T *eap, cctx_T *cctx)
     return compile_exec(line, eap, cctx);
 }
 
+#ifdef FEAT_QUICKFIX
     static char_u *
 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;
 }
+#endif
 
 /*
  * Add a function to the list of :def functions.
@@ -9296,8 +9298,13 @@ compile_def_function(
 	    case CMD_laddexpr:
 	    case CMD_cgetexpr:
 	    case CMD_lgetexpr:
+#ifdef FEAT_QUICKFIX
 		    ea.arg = p;
 		    line = compile_cexpr(line, &ea, &cctx);
+#else
+		    ex_ni(&ea);
+		    line = NULL;
+#endif
 		    break;
 
 	    // TODO: any other commands with an expression argument?
diff --git a/src/vim9execute.c b/src/vim9execute.c
index f260e6062..c8586b384 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -1443,11 +1443,14 @@ exec_instructions(ectx_T *ectx)
 		break;
 
 	    case ISN_CEXPR_AUCMD:
+#ifdef FEAT_QUICKFIX
 		if (trigger_cexpr_autocmd(iptr->isn_arg.number) == FAIL)
 		    goto on_error;
+#endif
 		break;
 
 	    case ISN_CEXPR_CORE:
+#ifdef FEAT_QUICKFIX
 		{
 		    exarg_T ea;
 		    int	    res;
@@ -1463,6 +1466,7 @@ exec_instructions(ectx_T *ectx)
 		    if (res == FAIL)
 			goto on_error;
 		}
+#endif
 		break;
 
 	    // 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" : "");
 		break;
 	    case ISN_CEXPR_AUCMD:
+#ifdef FEAT_QUICKFIX
 		smsg("%s%4d CEXPR pre %s", pfx, current,
 				       cexpr_get_auname(iptr->isn_arg.number));
+#endif
 		break;
 	    case ISN_CEXPR_CORE:
+#ifdef FEAT_QUICKFIX
 		{
 		    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_cmdline);
 		}
+#endif
 		break;
 	    case ISN_SUBSTITUTE:
 		{