To: vim_dev@googlegroups.com Subject: Patch 8.2.2836 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2836 (after 8.2.2834) Problem: Build failure without the +quickfix feature. (John Marriott) Solution: Add #ifdef. Files: src/vim9compile.c, src/vim9execute.c, src/tag.c *** ../vim-8.2.2835/src/vim9compile.c 2021-05-05 22:40:52.516529163 +0200 --- src/vim9compile.c 2021-05-05 22:48:58.855660838 +0200 *************** *** 8704,8709 **** --- 8704,8710 ---- return compile_exec(line, eap, cctx); } + #ifdef FEAT_QUICKFIX static char_u * compile_cexpr(char_u *line, exarg_T *eap, cctx_T *cctx) { *************** *** 8731,8736 **** --- 8732,8738 ---- return p; } + #endif /* * Add a function to the list of :def functions. *************** *** 9296,9303 **** --- 9298,9310 ---- 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? *** ../vim-8.2.2835/src/vim9execute.c 2021-05-05 21:31:36.068018579 +0200 --- src/vim9execute.c 2021-05-05 22:47:41.055815778 +0200 *************** *** 1443,1453 **** --- 1443,1456 ---- 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,1468 **** --- 1466,1472 ---- if (res == FAIL) goto on_error; } + #endif break; // execute Ex command from pieces on the stack *************** *** 4415,4424 **** --- 4419,4431 ---- 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,4432 **** --- 4434,4440 ---- cer->cer_forceit ? "!" : "", cer->cer_cmdline); } + #endif break; case ISN_SUBSTITUTE: { *** ../vim-8.2.2835/src/tag.c 2021-03-21 14:49:53.453675479 +0100 --- src/tag.c 2021-05-05 22:45:49.248029942 +0200 *************** *** 3511,3517 **** // Save value of no_hlsearch, jumping to a tag is not a real search save_no_hlsearch = no_hlsearch; #endif ! #ifdef FEAT_PROP_POPUP // getfile() may have cleared options, apply 'previewpopup' again. if (g_do_tagpreview != 0 && *p_pvp != NUL) parse_previewpopup(curwin); --- 3511,3517 ---- // Save value of no_hlsearch, jumping to a tag is not a real search save_no_hlsearch = no_hlsearch; #endif ! #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); *** ../vim-8.2.2835/src/version.c 2021-05-05 22:40:52.516529163 +0200 --- src/version.c 2021-05-05 22:51:13.207383786 +0200 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2836, /**/ -- hundred-and-one symptoms of being an internet addict: 234. You started college as a chemistry major, and walk out four years later as an Internet provider. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///