vim: src/quickfix.c comparison

comparison src/quickfix.c @ 13380:69517d67421f v8.0.1564

patch 8.0.1564: too many #ifdefs commit https://github.com/vim/vim/commit/f2bd8ef2b4507d02c6043affff8f7e85e3414d5f Author: Bram Moolenaar <Bram@vim.org> Date: Sun Mar 4 18:08:14 2018 +0100 patch 8.0.1564: too many #ifdefs Problem: Too many #ifdefs. Solution: Graduate the +autocmd feature. Takes away 450 #ifdefs and increases code size of tiny Vim by only 40 Kbyte.

author	Christian Brabandt <cb@256bit.org>
date	Sun, 04 Mar 2018 18:15:08 +0100
parents	66b8b29854d9
children	d0afc9aa7a43

comparison

equal deleted inserted replaced

-:0f9dd1b43244
+:69517d67421f
 if (old_last == NULL)
 {
 	/* Set the 'filetype' to "qf" each time after filling the buffer.
 	 * This resembles reading a file into a buffer, it's more logical when
 	 * using autocommands. */
-#ifdef FEAT_AUTOCMD
 	++curbuf_lock;
-#endif
 	set_option_value((char_u *)"ft", 0L, (char_u *)"qf", OPT_LOCAL);
 	curbuf->b_p_ma = FALSE;
-#ifdef FEAT_AUTOCMD
 	keep_filetype = TRUE;		/* don't detect 'filetype' */
 	apply_autocmds(EVENT_BUFREADPOST, (char_u *)"quickfix", NULL,
 							       FALSE, curbuf);
 	apply_autocmds(EVENT_BUFWINENTER, (char_u *)"quickfix", NULL,
 							       FALSE, curbuf);
 	keep_filetype = FALSE;
 	--curbuf_lock;
-#endif
 	/* make sure it will be redrawn */
 	redraw_curbuf_later(NOT_VALID);
 }
 /* Restore KeyTyped, setting 'filetype' may reset it. */
 char_u	*enc = NULL;
 unsigned	len;
 win_T	*wp = NULL;
 qf_info_T	*qi = &ql_info;
 int		res;
-#ifdef FEAT_AUTOCMD
 char_u	*au_name = NULL;
 /* Redirect ":grep" to ":vimgrep" if 'grepprg' is "internal". */
 if (grep_internal(eap->cmdidx))
 {
 	default: break;
 }
 if (au_name != NULL && apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name,
 					       curbuf->b_fname, TRUE, curbuf))
 {
-# ifdef FEAT_EVAL
+#ifdef FEAT_EVAL
 	if (aborting())
 	    return;
-# endif
-}
 #endif
+}
 #ifdef FEAT_MBYTE
 enc = (*curbuf->b_p_menc != NUL) ? curbuf->b_p_menc : p_menc;
 #endif
 if (eap->cmdidx == CMD_lmake || eap->cmdidx == CMD_lgrep
 					   *eap->cmdlinep, enc);
 if (wp != NULL)
 	qi = GET_LOC_LIST(wp);
 if (res >= 0 && qi != NULL)
 	qf_list_changed(qi, qi->qf_curlist);
-#ifdef FEAT_AUTOCMD
 if (au_name != NULL)
 {
 	apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name,
 					       curbuf->b_fname, TRUE, curbuf);
 	if (qi != NULL && qi->qf_curlist < qi->qf_listcount)
 	    res = qi->qf_lists[qi->qf_curlist].qf_count;
 	else
 	    res = 0;
 }
-#endif
 if (res > 0 && !eap->forceit)
 	qf_jump(qi, 0, 0, FALSE);		/* display first error */
 mch_remove(fname);
 vim_free(fname);
 ex_cfile(exarg_T *eap)
 {
 char_u	*enc = NULL;
 win_T	*wp = NULL;
 qf_info_T	*qi = &ql_info;
-#ifdef FEAT_AUTOCMD
 char_u	*au_name = NULL;
 int		save_qfid;
-#endif
 int		res;
-#ifdef FEAT_AUTOCMD
 switch (eap->cmdidx)
 {
 	case CMD_cfile:	    au_name = (char_u *)"cfile"; break;
 	case CMD_cgetfile:  au_name = (char_u *)"cgetfile"; break;
 	case CMD_caddfile:  au_name = (char_u *)"caddfile"; break;
 	case CMD_laddfile:  au_name = (char_u *)"laddfile"; break;
 	default: break;
 }
 if (au_name != NULL)
 	apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name, NULL, FALSE, curbuf);
-#endif
 #ifdef FEAT_MBYTE
 enc = (*curbuf->b_p_menc != NUL) ? curbuf->b_p_menc : p_menc;
 #endif
 #ifdef FEAT_BROWSE
 if (cmdmod.browse)
 			&& eap->cmdidx != CMD_laddfile), *eap->cmdlinep, enc);
 if (wp != NULL)
 	qi = GET_LOC_LIST(wp);
 if (res >= 0 && qi != NULL)
 	qf_list_changed(qi, qi->qf_curlist);
-#ifdef FEAT_AUTOCMD
 if (qi != NULL)
 	save_qfid = qi->qf_lists[qi->qf_curlist].qf_id;
 if (au_name != NULL)
 	apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name, NULL, FALSE, curbuf);
 /* An autocmd might have freed the quickfix/location list. Check whether it
 * is still valid. */
 if (qi != NULL && !qflist_valid(wp, save_qfid))
 	return;
-#endif
 if (res > 0 && (eap->cmdidx == CMD_cfile || eap->cmdidx == CMD_lfile))
 	qf_jump(qi, 0, 0, eap->forceit);	/* display first error */
 }
 /*
 char_u	*s;
 char_u	*p;
 int		fi;
 qf_info_T	*qi = &ql_info;
 int		loclist_cmd = FALSE;
-#ifdef FEAT_AUTOCMD
 int_u	save_qfid;
 qfline_T	*cur_qf_start;
 win_T	*wp;
-#endif
 long	lnum;
 buf_T	*buf;
 int		duplicate_name = FALSE;
 int		using_dummy;
 int		redraw_for_dummy = FALSE;
 int		found_match;
 buf_T	*first_match_buf = NULL;
 time_t	seconds = 0;
 int		save_mls;
-#if defined(FEAT_AUTOCMD) && defined(FEAT_SYN_HL)
+#if defined(FEAT_SYN_HL)
 char_u	*save_ei = NULL;
 #endif
 aco_save_T	aco;
 int		flags = 0;
 colnr_T	col;
 long	tomatch;
 char_u	*dirname_start = NULL;
 char_u	*dirname_now = NULL;
 char_u	*target_dir = NULL;
-#ifdef FEAT_AUTOCMD
 char_u	*au_name =  NULL;
 switch (eap->cmdidx)
 {
 	case CMD_vimgrep:     au_name = (char_u *)"vimgrep"; break;
 	default: break;
 }
 if (au_name != NULL && apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name,
 					       curbuf->b_fname, TRUE, curbuf))
 {
-# ifdef FEAT_EVAL
+#ifdef FEAT_EVAL
 	if (aborting())
 	    return;
-# endif
-}
 #endif
+}
 if (eap->cmdidx == CMD_lgrep
 	    || eap->cmdidx == CMD_lvimgrep
 	    || eap->cmdidx == CMD_lgrepadd
 	    || eap->cmdidx == CMD_lvimgrepadd)
 /* Remember the current directory, because a BufRead autocommand that does
 * ":lcd %:p:h" changes the meaning of short path names. */
 mch_dirname(dirname_start, MAXPATHL);
-#ifdef FEAT_AUTOCMD
 /* Remember the current values of the quickfix list and qf_start, so that
 * we can check for autocommands changing the current quickfix list. */
 save_qfid = qi->qf_lists[qi->qf_curlist].qf_id;
 cur_qf_start = qi->qf_lists[qi->qf_curlist].qf_start;
-#endif
 seconds = (time_t)0;
 for (fi = 0; fi < fcount && !got_int && tomatch > 0; ++fi)
 {
 	fname = shorten_fname1(fnames[fi]);
 	    /* Remember that a buffer with this name already exists. */
 	    duplicate_name = (buf != NULL);
 	    using_dummy = TRUE;
 	    redraw_for_dummy = TRUE;
-#if defined(FEAT_AUTOCMD) && defined(FEAT_SYN_HL)
+#if defined(FEAT_SYN_HL)
 	    /* Don't do Filetype autocommands to avoid loading syntax and
 	     * indent scripts, a great speed improvement. */
 	    save_ei = au_event_disable(",Filetype");
 #endif
 	    /* Don't use modelines here, it's useless. */
 	    /* Load file into a buffer, so that 'fileencoding' is detected,
 	     * autocommands applied, etc. */
 	    buf = load_dummy_buffer(fname, dirname_start, dirname_now);
 	    p_mls = save_mls;
-#if defined(FEAT_AUTOCMD) && defined(FEAT_SYN_HL)
+#if defined(FEAT_SYN_HL)
 	    au_event_restore(save_ei);
 #endif
 	}
 	else
 	    /* Use existing, loaded buffer. */
 	    using_dummy = FALSE;
-#ifdef FEAT_AUTOCMD
 	if (loclist_cmd)
 	{
 	    /*
 	     * Verify that the location list is still valid. An autocmd might
 	     * have freed the location list.
 		/* List cannot be found, create a new one. */
 		qf_new_list(qi, *eap->cmdlinep);
 		cur_qf_start = qi->qf_lists[qi->qf_curlist].qf_start;
 	    }
 	}
-#endif
 	if (buf == NULL)
 	{
 	    if (!got_int)
 		smsg((char_u *)_("Cannot open file \"%s\""), fname);
 		}
 		line_breakcheck();
 		if (got_int)
 		    break;
 	    }
-#ifdef FEAT_AUTOCMD
 	    cur_qf_start = qi->qf_lists[qi->qf_curlist].qf_start;
-#endif
 	    if (using_dummy)
 	    {
 		if (found_match && first_match_buf == NULL)
 		    first_match_buf = buf;
 		    /* The buffer is still loaded, the Filetype autocommands
 		     * need to be done now, in that buffer.  And the modelines
 		     * need to be done (again).  But not the window-local
 		     * options! */
 		    aucmd_prepbuf(&aco, buf);
-#if defined(FEAT_AUTOCMD) && defined(FEAT_SYN_HL)
+#if defined(FEAT_SYN_HL)
 		    apply_autocmds(EVENT_FILETYPE, buf->b_p_ft,
 						     buf->b_fname, TRUE, buf);
 #endif
 		    do_modelines(OPT_NOWIN);
 		    aucmd_restbuf(&aco);
 qi->qf_lists[qi->qf_curlist].qf_index = 1;
 qf_list_changed(qi, qi->qf_curlist);
 qf_update_buffer(qi, NULL);
-#ifdef FEAT_AUTOCMD
 if (au_name != NULL)
 	apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name,
 					       curbuf->b_fname, TRUE, curbuf);
 /*
 * The QuickFixCmdPost autocmd may free the quickfix list. Check the list
 * is still valid.
 */
 wp = loclist_cmd ? curwin : NULL;
 if (!qflist_valid(wp, save_qfid))
 	goto theend;
-#endif
 /* Jump to first match. */
 if (qi->qf_lists[qi->qf_curlist].qf_count > 0)
 {
 	if ((flags & VGR_NOJUMP) == 0)
 static void
 wipe_dummy_buffer(buf_T *buf, char_u *dirname_start)
 {
 if (curbuf != buf)		/* safety check */
 {
-#if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL)
+#if defined(FEAT_EVAL)
 	cleanup_T   cs;
 	/* Reset the error/interrupt/exception state here so that aborting()
 	 * returns FALSE when wiping out the buffer.  Otherwise it doesn't
 	 * work when got_int is set. */
 	enter_cleanup(&cs);
 #endif
 	wipe_buffer(buf, FALSE);
-#if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL)
+#if defined(FEAT_EVAL)
 	/* Restore the error/interrupt/exception state if not discarded by a
 	 * new aborting error, interrupt, or uncaught exception. */
 	leave_cleanup(&cs);
 #endif
 	/* When autocommands/'autochdir' option changed directory: go back. */
 void
 ex_cbuffer(exarg_T *eap)
 {
 buf_T	*buf = NULL;
 qf_info_T	*qi = &ql_info;
-#ifdef FEAT_AUTOCMD
 char_u	*au_name = NULL;
-#endif
 int		res;
-#ifdef FEAT_AUTOCMD
 switch (eap->cmdidx)
 {
 	case CMD_cbuffer:	au_name = (char_u *)"cbuffer"; break;
 	case CMD_cgetbuffer:	au_name = (char_u *)"cgetbuffer"; break;
 	case CMD_caddbuffer:	au_name = (char_u *)"caddbuffer"; break;
 	default: break;
 }
 if (au_name != NULL && apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name,
 					       curbuf->b_fname, TRUE, curbuf))
 {
-# ifdef FEAT_EVAL
+#ifdef FEAT_EVAL
 	if (aborting())
 	    return;
-# endif
-}
 #endif
+}
 /* Must come after autocommands. */
 if (eap->cmdidx == CMD_lbuffer
 	    || eap->cmdidx == CMD_lgetbuffer
 	    || eap->cmdidx == CMD_laddbuffer)
 			     && eap->cmdidx != CMD_laddbuffer),
 						   eap->line1, eap->line2,
 						   qf_title, NULL);
 	    if (res >= 0)
 		qf_list_changed(qi, qi->qf_curlist);
-#ifdef FEAT_AUTOCMD
 	    if (au_name != NULL)
 		apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name,
 						curbuf->b_fname, TRUE, curbuf);
-#endif
 	    if (res > 0 && (eap->cmdidx == CMD_cbuffer ||
 						eap->cmdidx == CMD_lbuffer))
 		qf_jump(qi, 0, 0, eap->forceit);  /* display first error */
 	}
 }
 void
 ex_cexpr(exarg_T *eap)
 {
 typval_T	*tv;
 qf_info_T	*qi = &ql_info;
-#ifdef FEAT_AUTOCMD
 char_u	*au_name = NULL;
-#endif
 int		res;
-#ifdef FEAT_AUTOCMD
 switch (eap->cmdidx)
 {
 	case CMD_cexpr:	    au_name = (char_u *)"cexpr"; break;
 	case CMD_cgetexpr:  au_name = (char_u *)"cgetexpr"; break;
 	case CMD_caddexpr:  au_name = (char_u *)"caddexpr"; break;
 	default: break;
 }
 if (au_name != NULL && apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name,
 					       curbuf->b_fname, TRUE, curbuf))
 {
-# ifdef FEAT_EVAL
+#ifdef FEAT_EVAL
 	if (aborting())
 	    return;
-# endif
-}
 #endif
+}
 if (eap->cmdidx == CMD_lexpr
 	    || eap->cmdidx == CMD_lgetexpr
 	    || eap->cmdidx == CMD_laddexpr)
 {
 			     && eap->cmdidx != CMD_laddexpr),
 				 (linenr_T)0, (linenr_T)0, *eap->cmdlinep,
 				 NULL);
 	    if (res >= 0)
 		qf_list_changed(qi, qi->qf_curlist);
-#ifdef FEAT_AUTOCMD
 	    if (au_name != NULL)
 		apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name,
 						curbuf->b_fname, TRUE, curbuf);
-#endif
 	    if (res > 0 && (eap->cmdidx == CMD_cexpr ||
 						eap->cmdidx == CMD_lexpr))
 		qf_jump(qi, 0, 0, eap->forceit);  /* display first error */
 	}
 	else
 #endif
 qf_info_T	*qi = &ql_info;
 qf_info_T	*save_qi;
 int		new_qi = FALSE;
 win_T	*wp;
-#ifdef FEAT_AUTOCMD
 char_u	*au_name =  NULL;
-#endif
 #ifdef FEAT_MULTI_LANG
 /* Check for a specified language */
 lang = check_help_lang(eap->arg);
 #endif
-#ifdef FEAT_AUTOCMD
 switch (eap->cmdidx)
 {
 	case CMD_helpgrep:  au_name = (char_u *)"helpgrep"; break;
 	case CMD_lhelpgrep: au_name = (char_u *)"lhelpgrep"; break;
 	default: break;
 }
 if (au_name != NULL && apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name,
 					       curbuf->b_fname, TRUE, curbuf))
 {
-# ifdef FEAT_EVAL
+#ifdef FEAT_EVAL
 	if (aborting())
 	    return;
-# endif
-}
 #endif
+}
 /* Make 'cpoptions' empty, the 'l' flag should not be used here. */
 save_cpo = p_cpo;
 p_cpo = empty_option;
 	free_string_option(save_cpo);
 qf_list_changed(qi, qi->qf_curlist);
 qf_update_buffer(qi, NULL);
-#ifdef FEAT_AUTOCMD
 if (au_name != NULL)
 {
 	apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name,
 					       curbuf->b_fname, TRUE, curbuf);
 	if (!new_qi && qi != save_qi && qf_find_buf(qi) == NULL)
 	    /* autocommands made "qi" invalid */
 	    return;
 }
-#endif
 /* Jump to first match. */
 if (qi->qf_lists[qi->qf_curlist].qf_count > 0)
 	qf_jump(qi, 0, 0, FALSE);
 else

Mercurial > vim

comparison src/quickfix.c @ 13380:69517d67421f v8.0.1564