vim: src/ex_cmds.c comparison

comparison src/ex_cmds.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	81c348d40312
children	6740c499de13

comparison

equal deleted inserted replaced

-:0f9dd1b43244
+:69517d67421f
 static int viminfo_encoding(vir_T *virp);
 static int read_viminfo_up_to_marks(vir_T *virp, int forceit, int writing);
 #endif
 static int check_readonly(int *forceit, buf_T *buf);
-#ifdef FEAT_AUTOCMD
 static void delbuf_msg(char_u *name);
-#endif
 static int
 #ifdef __BORLANDC__
 _RTLENTRYF
 #endif
 	help_compare(const void *s1, const void *s2);
 else				/* :range! */
 {
 	/* Careful: This may recursively call do_bang() again! (because of
 	 * autocommands) */
 	do_filter(line1, line2, eap, newcmd, do_in, do_out);
-#ifdef FEAT_AUTOCMD
 	apply_autocmds(EVENT_SHELLFILTERPOST, NULL, NULL, FALSE, curbuf);
-#endif
 }
 if (free_newcmd)
 	vim_free(newcmd);
 }
 char_u	*otmp = NULL;
 linenr_T	linecount;
 linenr_T	read_linecount;
 pos_T	cursor_save;
 char_u	*cmd_buf;
-#ifdef FEAT_AUTOCMD
 buf_T	*old_curbuf = curbuf;
-#endif
 int		shell_flags = 0;
 if (*cmd == NUL)	    /* no filter command */
 	return;
 if (itmp != NULL && buf_write(curbuf, itmp, NULL, line1, line2, eap,
 					   FALSE, FALSE, FALSE, TRUE) == FAIL)
 {
 	msg_putchar('\n');		/* keep message from buf_write() */
 	--no_wait_return;
-#if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL)
+#if defined(FEAT_EVAL)
 	if (!aborting())
 #endif
 	    (void)EMSG2(_(e_notcreate), itmp);	/* will call wait_return */
 	goto filterend;
 }
-#ifdef FEAT_AUTOCMD
 if (curbuf != old_curbuf)
 	goto filterend;
-#endif
 if (!do_out)
 	msg_putchar('\n');
 /* Create the shell command in allocated memory. */
 	if (otmp != NULL)
 	{
 	    if (readfile(otmp, NULL, line2, (linenr_T)0, (linenr_T)MAXLNUM,
 						    eap, READ_FILTER) != OK)
 	    {
-#if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL)
+#if defined(FEAT_EVAL)
 		if (!aborting())
 #endif
 		{
 		    msg_putchar('\n');
 		    EMSG2(_(e_notread), otmp);
 		}
 		goto error;
 	    }
-#ifdef FEAT_AUTOCMD
 	    if (curbuf != old_curbuf)
 		goto filterend;
-#endif
 	}
 	read_linecount = curbuf->b_ml.ml_line_count - read_linecount;
 	if (shell_flags & SHELL_READ)
 	wait_return(FALSE);
 }
 filterend:
-#ifdef FEAT_AUTOCMD
 if (curbuf != old_curbuf)
 {
 	--no_wait_return;
 	EMSG(_("E135: *Filter* Autocommands must not change current buffer"));
 }
-#endif
 if (itmp != NULL)
 	mch_remove(itmp);
 if (otmp != NULL)
 	mch_remove(otmp);
 vim_free(itmp);
 /*
 * For autocommands we want to get the output on the current screen, to
 * avoid having to type return below.
 */
 msg_putchar('\r');			/* put cursor at start of line */
-#ifdef FEAT_AUTOCMD
 if (!autocmd_busy)
-#endif
 {
 #ifdef MSWIN
 	if (!winstart)
 #endif
 	    stoptermcap();
 if (!winstart)
 #endif
 	msg_putchar('\n');		/* may shift screen one line up */
 /* warning message before calling the shell */
-if (p_warn
+if (p_warn && !autocmd_busy && msg_silent == 0)
-#ifdef FEAT_AUTOCMD
-		&& !autocmd_busy
-#endif
-		&& msg_silent == 0)
 	FOR_ALL_BUFFERS(buf)
 	    if (bufIsChangedNotTerm(buf))
 	    {
 #ifdef FEAT_GUI_MSWIN
 		if (!winstart)
 {
 	msg_row = Rows - 1;
 	msg_col = 0;
 }
-#ifdef FEAT_AUTOCMD
 if (autocmd_busy)
 {
 	if (msg_silent == 0)
 	    redraw_later_clear();
 }
 else
-#endif
 {
 	/*
 	 * For ":sh" there is no need to call wait_return(), just redraw.
 	 * Also for the Win32 GUI (the output is in a console window).
 	 * Otherwise there is probably text on the screen that the user wants
 }
 /* display any error messages now */
 display_errors();
-#ifdef FEAT_AUTOCMD
 apply_autocmds(EVENT_SHELLCMDPOST, NULL, NULL, FALSE, curbuf);
-#endif
 }
 /*
 * Create a shell command from a command string, input redirection file and
 * output redirection file.
 rename_buffer(char_u *new_fname)
 {
 char_u	*fname, *sfname, *xfname;
 buf_T	*buf;
-#ifdef FEAT_AUTOCMD
 buf = curbuf;
 apply_autocmds(EVENT_BUFFILEPRE, NULL, NULL, FALSE, curbuf);
 /* buffer changed, don't change name now */
 if (buf != curbuf)
 	return FAIL;
-# ifdef FEAT_EVAL
+#ifdef FEAT_EVAL
 if (aborting())	    /* autocmds may abort script processing */
 	return FAIL;
-# endif
 #endif
 /*
 * The name of the current buffer will be changed.
 * A new (unlisted) buffer entry needs to be made to hold the old file
 * name, which will become the alternate file name.
 	if (buf != NULL && !cmdmod.keepalt)
 	    curwin->w_alt_fnum = buf->b_fnum;
 }
 vim_free(fname);
 vim_free(sfname);
-#ifdef FEAT_AUTOCMD
 apply_autocmds(EVENT_BUFFILEPOST, NULL, NULL, FALSE, curbuf);
-#endif
 /* Change directories when the 'acd' option is set. */
 DO_AUTOCHDIR
 return OK;
 }
 if (check_overwrite(eap, curbuf, fname, ffname, other) == OK)
 {
 	if (eap->cmdidx == CMD_saveas && alt_buf != NULL)
 	{
-#ifdef FEAT_AUTOCMD
 	    buf_T	*was_curbuf = curbuf;
 	    apply_autocmds(EVENT_BUFFILEPRE, NULL, NULL, FALSE, curbuf);
 	    apply_autocmds(EVENT_BUFFILEPRE, NULL, NULL, FALSE, alt_buf);
-# ifdef FEAT_EVAL
+#ifdef FEAT_EVAL
 	    if (curbuf != was_curbuf || aborting())
-# else
+#else
 	    if (curbuf != was_curbuf)
-# endif
+#endif
 	    {
 		/* buffer changed, don't change name now */
 		retval = FAIL;
 		goto theend;
 	    }
-#endif
 	    /* Exchange the file names for the current and the alternate
 	     * buffer.  This makes it look like we are now editing the buffer
 	     * under the new name.  Must be done before buf_write(), because
 	     * if there is no file name and 'cpo' contains 'F', it will set
 	     * the file name. */
 	    curbuf->b_ffname = fname;
 	    fname = alt_buf->b_sfname;
 	    alt_buf->b_sfname = curbuf->b_sfname;
 	    curbuf->b_sfname = fname;
 	    buf_name_changed(curbuf);
-#ifdef FEAT_AUTOCMD
 	    apply_autocmds(EVENT_BUFFILEPOST, NULL, NULL, FALSE, curbuf);
 	    apply_autocmds(EVENT_BUFFILEPOST, NULL, NULL, FALSE, alt_buf);
 	    if (!alt_buf->b_p_bl)
 	    {
 		alt_buf->b_p_bl = TRUE;
 		apply_autocmds(EVENT_BUFADD, NULL, NULL, FALSE, alt_buf);
 	    }
-# ifdef FEAT_EVAL
+#ifdef FEAT_EVAL
 	    if (curbuf != was_curbuf || aborting())
-# else
+#else
 	    if (curbuf != was_curbuf)
-# endif
+#endif
 	    {
 		/* buffer changed, don't write the file */
 		retval = FAIL;
 		goto theend;
 	    }
 	    }
 	    /* Autocommands may have changed buffer names, esp. when
 	     * 'autochdir' is set. */
 	    fname = curbuf->b_sfname;
-#endif
 	}
 	name_was_missing = curbuf->b_ffname == NULL;
 	retval = buf_write(curbuf, ffname, fname, eap->line1, eap->line2,
 	    {
 		++error;
 	    }
 	    else
 	    {
-#ifdef FEAT_AUTOCMD
 		bufref_T bufref;
 		set_bufref(&bufref, buf);
-#endif
 		if (buf_write_all(buf, eap->forceit) == FAIL)
 		    ++error;
-#ifdef FEAT_AUTOCMD
 		/* an autocommand may have deleted the buffer */
 		if (!bufref_valid(&bufref))
 		    buf = firstbuf;
-#endif
 	    }
 	    eap->forceit = save_forceit;    /* check_overwrite() may set it */
 	}
 }
 if (exiting)
 int		retval;
 char_u	*free_me = NULL;
 if (text_locked())
 	return GETFILE_ERROR;
-#ifdef FEAT_AUTOCMD
 if (curbuf_locked())
 	return GETFILE_ERROR;
-#endif
 if (fnum == 0)
 {
 					/* make ffname full path, set sfname */
 	fname_expand(curbuf, &ffname, &sfname);
 int		flags,
 win_T	*oldwin)
 {
 int		other_file;		/* TRUE if editing another file */
 int		oldbuf;			/* TRUE if using existing buffer */
-#ifdef FEAT_AUTOCMD
 int		auto_buf = FALSE;	/* TRUE if autocommands brought us
 					   into the buffer unexpectedly */
 char_u	*new_name = NULL;
+#if defined(FEAT_EVAL)
 int		did_set_swapcommand = FALSE;
 #endif
 buf_T	*buf;
 bufref_T	bufref;
-#if defined(FEAT_AUTOCMD) || defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
 bufref_T	old_curbuf;
-#endif
 char_u	*free_fname = NULL;
 #ifdef FEAT_BROWSE
 char_u	*browse_file = NULL;
 #endif
 int		retval = FAIL;
 int		readfile_flags = 0;
 int		did_inc_redrawing_disabled = FALSE;
 if (eap != NULL)
 	command = eap->do_ecmd_cmd;
-#if defined(FEAT_AUTOCMD) || defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
 set_bufref(&old_curbuf, curbuf);
-#endif
 if (fnum != 0)
 {
 	if (fnum == curbuf->b_fnum)	/* file is already being edited */
 	    return OK;			/* nothing to do */
 else
 {
 #ifdef FEAT_BROWSE
 	if (cmdmod.browse)
 	{
-# ifdef FEAT_AUTOCMD
 	    if (
-#  ifdef FEAT_GUI
+# ifdef FEAT_GUI
 		!gui.in_use &&
-#  endif
+# endif
 		    au_has_group((char_u *)"FileExplorer"))
 	    {
 		/* No browsing supported but we do have the file explorer:
 		 * Edit the directory. */
 		if (ffname == NULL || !mch_isdir(ffname))
 		    ffname = (char_u *)".";
 	    }
 	    else
-# endif
 	    {
 		browse_file = do_browse(0, (char_u *)_("Edit File"), ffname,
 						    NULL, NULL, NULL, curbuf);
 		if (browse_file == NULL)
 		    goto theend;
 * End Visual mode before switching to another buffer, so the text can be
 * copied into the GUI selection buffer.
 */
 reset_VIsual();
-#ifdef FEAT_AUTOCMD
+#if defined(FEAT_EVAL)
 if ((command != NULL || newlnum > (linenr_T)0)
 	    && *get_vim_var_str(VV_SWAPCOMMAND) == NUL)
 {
 	int	len;
 	char_u	*p;
 		goto theend;
 	    }
 #endif
 	    buf = buflist_new(ffname, sfname, 0L,
 		    BLN_CURBUF | ((flags & ECMD_SET_HELP) ? 0 : BLN_LISTED));
-#ifdef FEAT_AUTOCMD
 	    /* autocommands may change curwin and curbuf */
 	    if (oldwin != NULL)
 		oldwin = curwin;
 	    set_bufref(&old_curbuf, curbuf);
-#endif
 	}
 	if (buf == NULL)
 	    goto theend;
 	if (buf->b_ml.ml_mfp == NULL)		/* no memfile yet */
 	{
 	    oldbuf = TRUE;
 	    set_bufref(&bufref, buf);
 	    (void)buf_check_timestamp(buf, FALSE);
 	    /* Check if autocommands made the buffer invalid or changed the
 	     * current buffer. */
-	    if (!bufref_valid(&bufref)
+	    if (!bufref_valid(&bufref) || curbuf != old_curbuf.br_buf)
-#ifdef FEAT_AUTOCMD
-		    || curbuf != old_curbuf.br_buf
-#endif
-		    )
 		goto theend;
 #ifdef FEAT_EVAL
 	    if (aborting())	    /* autocmds may abort script processing */
 		goto theend;
 #endif
 	 * If the current buffer was empty and has no file name, curbuf
 	 * is returned by buflist_new(), nothing to do here.
 	 */
 	if (buf != curbuf)
 	{
-#ifdef FEAT_AUTOCMD
 	    /*
 	     * Be careful: The autocommands may delete any buffer and change
 	     * the current buffer.
 	     * - If the buffer we are going to edit is deleted, give up.
 	     * - If the current buffer is deleted, prefer to load the new
 	    {
 		/* new buffer has been deleted */
 		delbuf_msg(new_name);	/* frees new_name */
 		goto theend;
 	    }
-# ifdef FEAT_EVAL
+#ifdef FEAT_EVAL
 	    if (aborting())	    /* autocmds may abort script processing */
 	    {
 		vim_free(new_name);
 		goto theend;
 	    }
-# endif
+#endif
 	    if (buf == curbuf)		/* already in new buffer */
 		auto_buf = TRUE;
 	    else
 	    {
 		win_T	    *the_curwin = curwin;
 		 * window.  And set b_locked for the same reason. */
 		the_curwin->w_closing = TRUE;
 		++buf->b_locked;
 		if (curbuf == old_curbuf.br_buf)
-#endif
 		    buf_copy_options(buf, BCO_ENTER);
 		/* Close the link to the current buffer. This will set
 		 * oldwin->w_buffer to NULL. */
 		u_sync(FALSE);
 		close_buffer(oldwin, curbuf,
 			       (flags & ECMD_HIDE) ? 0 : DOBUF_UNLOAD, FALSE);
-#ifdef FEAT_AUTOCMD
 		the_curwin->w_closing = FALSE;
 		--buf->b_locked;
-# ifdef FEAT_EVAL
+#ifdef FEAT_EVAL
 		/* autocmds may abort script processing */
 		if (aborting() && curwin->w_buffer != NULL)
 		{
 		    vim_free(new_name);
 		    goto theend;
 		}
-# endif
+#endif
 		/* Be careful again, like above. */
 		if (!bufref_valid(&au_new_curbuf))
 		{
 		    /* new buffer has been deleted */
 		    delbuf_msg(new_name);	/* frees new_name */
 		    goto theend;
 		}
 		if (buf == curbuf)		/* already in new buffer */
 		    auto_buf = TRUE;
 		else
-#endif
 		{
 #ifdef FEAT_SYN_HL
 		    /*
 		     * <VN> We could instead free the synblock
 		     * and re-attach to buffer, perhaps.
 		 * values.  Also restores old folding stuff. */
 		get_winopts(curbuf);
 #ifdef FEAT_SPELL
 		did_get_winopts = TRUE;
 #endif
-#ifdef FEAT_AUTOCMD
 	    }
 	    vim_free(new_name);
 	    au_new_curbuf.br_buf = NULL;
 	    au_new_curbuf.br_buf_free_count = 0;
-#endif
 	}
 	curwin->w_pcmark.lnum = 1;
 	curwin->w_pcmark.col = 0;
 }
 /* Don't redraw until the cursor is in the right line, otherwise
 * autocommands may cause ml_get errors. */
 ++RedrawingDisabled;
 did_inc_redrawing_disabled = TRUE;
-#ifdef FEAT_AUTOCMD
 buf = curbuf;
-#endif
 if ((flags & ECMD_SET_HELP) || keep_help_flag)
 {
 	prepare_help_buffer();
 }
 else
 	 * using CTRL-O to go back to a help file. */
 	if (!curbuf->b_help)
 	    set_buflisted(TRUE);
 }
-#ifdef FEAT_AUTOCMD
 /* If autocommands change buffers under our fingers, forget about
 * editing the file. */
 if (buf != curbuf)
 	goto theend;
-# ifdef FEAT_EVAL
+#ifdef FEAT_EVAL
 if (aborting())	    /* autocmds may abort script processing */
 	goto theend;
-# endif
+#endif
 /* Since we are starting to edit a file, consider the filetype to be
 * unset.  Helps for when an autocommand changes files and expects syntax
 * highlighting to work in the other file. */
 did_filetype = FALSE;
-#endif
 /*
 * other_file	oldbuf
 *  FALSE	FALSE	    re-edit same file, buffer is re-used
 *  FALSE	TRUE	    re-edit same file, nothing changes
 	if (newlnum == ECMD_LAST || newlnum == ECMD_LASTL)
 	{
 	    newlnum = curwin->w_cursor.lnum;
 	    solcol = curwin->w_cursor.col;
 	}
-#ifdef FEAT_AUTOCMD
 	buf = curbuf;
 	if (buf->b_fname != NULL)
 	    new_name = vim_strsave(buf->b_fname);
 	else
 	    new_name = NULL;
 	set_bufref(&bufref, buf);
-#endif
 	if (p_ur < 0 || curbuf->b_ml.ml_line_count <= p_ur)
 	{
 	    /* Save all the text, so that the reload can be undone.
 	     * Sync first so that this is a separate undo-able action. */
 	    u_sync(FALSE);
 	    if (u_savecommon(0, curbuf->b_ml.ml_line_count + 1, 0, TRUE)
 								     == FAIL)
 	    {
-#ifdef FEAT_AUTOCMD
 		vim_free(new_name);
-#endif
 		goto theend;
 	    }
 	    u_unchanged(curbuf);
 	    buf_freeall(curbuf, BFA_KEEP_UNDO);
 	    /* tell readfile() not to clear or reload undo info */
 	    readfile_flags = READ_KEEP_UNDO;
 	}
 	else
 	    buf_freeall(curbuf, 0);   /* free all things for buffer */
-#ifdef FEAT_AUTOCMD
 	/* If autocommands deleted the buffer we were going to re-edit, give
 	 * up and jump to the end. */
 	if (!bufref_valid(&bufref))
 	{
 	    delbuf_msg(new_name);	/* frees new_name */
 	/* If autocommands change buffers under our fingers, forget about
 	 * re-editing the file.  Should do the buf_clear_file(), but perhaps
 	 * the autocommands changed the buffer... */
 	if (buf != curbuf)
 	    goto theend;
-# ifdef FEAT_EVAL
+#ifdef FEAT_EVAL
 	if (aborting())	    /* autocmds may abort script processing */
 	    goto theend;
-# endif
 #endif
 	buf_clear_file(curbuf);
 	curbuf->b_op_start.lnum = 0;	/* clear '[ and '] marks */
 	curbuf->b_op_end.lnum = 0;
 }
 /*
 * Check if we are editing the w_arg_idx file in the argument list.
 */
 check_arg_idx(curwin);
-#ifdef FEAT_AUTOCMD
 if (!auto_buf)
-#endif
 {
 	/*
 	 * Set cursor and init window before reading the file and executing
 	 * autocommands.  This allows for the autocommands to position the
 	 * cursor.
 	    curbuf->b_flags |= BF_CHECK_RO; /* set/reset 'ro' flag */
 	    /*
 	     * Open the buffer and read the file.
 	     */
-#if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL)
+#if defined(FEAT_EVAL)
 	    if (should_abort(open_buffer(FALSE, eap, readfile_flags)))
 		retval = FAIL;
 #else
 	    (void)open_buffer(FALSE, eap, readfile_flags);
 #endif
 	    if (swap_exists_action == SEA_QUIT)
 		retval = FAIL;
 	    handle_swap_exists(&old_curbuf);
 #endif
 	}
-#ifdef FEAT_AUTOCMD
 	else
 	{
 	    /* Read the modelines, but only to set window-local options.  Any
 	     * buffer-local options have already been set and may have been
 	     * changed by the user. */
 								    &retval);
 	    apply_autocmds_retval(EVENT_BUFWINENTER, NULL, NULL, FALSE, curbuf,
 								    &retval);
 	}
 	check_arg_idx(curwin);
-#endif
 	/* If autocommands change the cursor position or topline, we should
 	 * keep it.  Also when it moves within a line. */
 	if (!EQUAL_POS(curwin->w_cursor, orig_pos))
 	{
 /*
 * Did not read the file, need to show some info about the file.
 * Do this after setting the cursor.
 */
-if (oldbuf
+if (oldbuf && !auto_buf)
-#ifdef FEAT_AUTOCMD
-		&& !auto_buf
-#endif
-			    )
 {
 	int	msg_scroll_save = msg_scroll;
 	/* Obey the 'O' flag in 'cpoptions': overwrite any previous file
 	 * message. */
 #endif
 theend:
 if (did_inc_redrawing_disabled)
 	--RedrawingDisabled;
-#ifdef FEAT_AUTOCMD
+#if defined(FEAT_EVAL)
 if (did_set_swapcommand)
 	set_vim_var_string(VV_SWAPCOMMAND, NULL, -1);
 #endif
 #ifdef FEAT_BROWSE
 vim_free(browse_file);
 #endif
 vim_free(free_fname);
 return retval;
 }
-#ifdef FEAT_AUTOCMD
 static void
 delbuf_msg(char_u *name)
 {
 EMSG2(_("E143: Autocommands unexpectedly deleted new buffer %s"),
 	    name == NULL ? (char_u *)"" : name);
 vim_free(name);
 au_new_curbuf.br_buf = NULL;
 au_new_curbuf.br_buf_free_count = 0;
 }
-#endif
 static int append_indent = 0;	    /* autoindent for first line */
 /*
 * ":insert" and ":append", also used by ":change"
 /*
 * Check for a match on each line.
 */
 line2 = eap->line2;
 for (lnum = eap->line1; lnum <= line2 && !(got_quit
-#if defined(FEAT_EVAL) && defined(FEAT_AUTOCMD)
+#if defined(FEAT_EVAL)
 		|| aborting()
 #endif
 		); ++lnum)
 {
 	nmatch = vim_regexec_multi(&regmatch, curwin, curbuf, lnum,
 char_u	*fname;
 char_u	*p;
 char_u	*rt;
 int		mustfree;
-#ifdef FEAT_AUTOCMD
 /* Set filetype to "help" if still needed. */
 if (STRCMP(curbuf->b_p_ft, "help") != 0)
 {
 	++curbuf_lock;
 	set_option_value((char_u *)"ft", 0L, (char_u *)"help", OPT_LOCAL);
 	--curbuf_lock;
 }
-#endif
 #ifdef FEAT_SYN_HL
 if (!syntax_present(curwin))
 #endif
 {

Mercurial > vim

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