vim: src/ex_docmd.c comparison

comparison src/ex_docmd.c @ 12477:68d7bc045dbe v8.0.1118

patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs commit https://github.com/vim/vim/commit/4033c55eca575777718c0701e26635a0cc47d907 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Sep 16 20:54:51 2017 +0200 patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs Problem: FEAT_WINDOWS adds a lot of #ifdefs while it is nearly always enabled and only adds 7% to the binary size of the tiny build. Solution: Graduate FEAT_WINDOWS.

author	Christian Brabandt <cb@256bit.org>
date	Sat, 16 Sep 2017 21:00:06 +0200
parents	937356f8f8d6
children	3ca08bf99396

comparison

equal deleted inserted replaced

-:2516383741e6
+:68d7bc045dbe
 # define ex_brewind		ex_ni
 # define ex_blast		ex_ni
 # define buflist_list		ex_ni
 # define ex_checktime		ex_ni
 #endif
-#if !defined(FEAT_LISTCMDS) || !defined(FEAT_WINDOWS)
+#if !defined(FEAT_LISTCMDS)
 # define ex_buffer_all		ex_ni
 #endif
 static char_u	*getargcmd(char_u **);
 static char_u	*skip_cmd_arg(char_u *p, int rembs);
 static int	getargopt(exarg_T *eap);
 # define qf_age			ex_ni
 # define qf_history		ex_ni
 # define ex_helpgrep		ex_ni
 # define ex_vimgrep		ex_ni
 #endif
-#if !defined(FEAT_QUICKFIX) || !defined(FEAT_WINDOWS)
+#if !defined(FEAT_QUICKFIX)
 # define ex_cclose		ex_ni
 # define ex_copen		ex_ni
 # define ex_cwindow		ex_ni
 # define ex_cbottom		ex_ni
 #endif
 static void	ex_highlight(exarg_T *eap);
 static void	ex_colorscheme(exarg_T *eap);
 static void	ex_quit(exarg_T *eap);
 static void	ex_cquit(exarg_T *eap);
 static void	ex_quit_all(exarg_T *eap);
-#ifdef FEAT_WINDOWS
 static void	ex_close(exarg_T *eap);
 static void	ex_win_close(int forceit, win_T *win, tabpage_T *tp);
 static void	ex_only(exarg_T *eap);
 static void	ex_resize(exarg_T *eap);
 static void	ex_stag(exarg_T *eap);
 static void	ex_tabclose(exarg_T *eap);
 static void	ex_tabonly(exarg_T *eap);
 static void	ex_tabnext(exarg_T *eap);
 static void	ex_tabmove(exarg_T *eap);
 static void	ex_tabs(exarg_T *eap);
-#else
+#if defined(FEAT_QUICKFIX)
-# define ex_close		ex_ni
-# define ex_only		ex_ni
-# define ex_all			ex_ni
-# define ex_resize		ex_ni
-# define ex_splitview		ex_ni
-# define ex_stag		ex_ni
-# define ex_tabnext		ex_ni
-# define ex_tabmove		ex_ni
-# define ex_tabs		ex_ni
-# define ex_tabclose		ex_ni
-# define ex_tabonly		ex_ni
-#endif
-#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
 static void	ex_pclose(exarg_T *eap);
 static void	ex_ptag(exarg_T *eap);
 static void	ex_pedit(exarg_T *eap);
 #else
 # define ex_pclose		ex_ni
 static void	ex_pwd(exarg_T *eap);
 static void	ex_equal(exarg_T *eap);
 static void	ex_sleep(exarg_T *eap);
 static void	do_exmap(exarg_T *eap, int isabbrev);
 static void	ex_winsize(exarg_T *eap);
-#ifdef FEAT_WINDOWS
 static void	ex_wincmd(exarg_T *eap);
-#else
-# define ex_wincmd	    ex_ni
-#endif
 #if defined(FEAT_GUI) || defined(UNIX) || defined(VMS) || defined(MSWIN)
 static void	ex_winpos(exarg_T *eap);
 #else
 # define ex_winpos	    ex_ni
 #endif
 static void	ex_findpat(exarg_T *eap);
 #else
 # define ex_findpat		ex_ni
 # define ex_checkpath		ex_ni
 #endif
-#if defined(FEAT_FIND_ID) && defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+#if defined(FEAT_FIND_ID) && defined(FEAT_QUICKFIX)
 static void	ex_psearch(exarg_T *eap);
 #else
 # define ex_psearch		ex_ni
 #endif
 static void	ex_tag(exarg_T *eap);
 	    buf = nextbuf;
 	}
 return buf->b_fnum;
 }
-#ifdef FEAT_WINDOWS
 static int current_win_nr(win_T *win);
 static int current_tab_nr(tabpage_T *tab);
 static int
 current_win_nr(win_T *win)
 # define CURRENT_WIN_NR current_win_nr(curwin)
 # define LAST_WIN_NR current_win_nr(NULL)
 # define CURRENT_TAB_NR current_tab_nr(curtab)
 # define LAST_TAB_NR current_tab_nr(NULL)
-#else
-# define CURRENT_WIN_NR 1
-# define LAST_WIN_NR 1
-# define CURRENT_TAB_NR 1
-# define LAST_TAB_NR 1
-#endif
 /*
 * Execute one Ex command.
 *
 * If 'sourcing' is TRUE, the command will be included in the error message.
 	switch (*p)
 	{
 	    /* When adding an entry, also modify cmd_exists(). */
 	    case 'a':	if (!checkforcmd(&ea.cmd, "aboveleft", 3))
 			    break;
-#ifdef FEAT_WINDOWS
 			cmdmod.split |= WSP_ABOVE;
-#endif
 			continue;
 	    case 'b':	if (checkforcmd(&ea.cmd, "belowright", 3))
 			{
-#ifdef FEAT_WINDOWS
 			    cmdmod.split |= WSP_BELOW;
-#endif
 			    continue;
 			}
 			if (checkforcmd(&ea.cmd, "browse", 3))
 			{
 #ifdef FEAT_BROWSE_CMD
 #endif
 			    continue;
 			}
 			if (!checkforcmd(&ea.cmd, "botright", 2))
 			    break;
-#ifdef FEAT_WINDOWS
 			cmdmod.split |= WSP_BOT;
-#endif
 			continue;
 	    case 'c':	if (!checkforcmd(&ea.cmd, "confirm", 4))
 			    break;
 #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
 			    continue;
 			}
 			if (!checkforcmd(&ea.cmd, "leftabove", 5))
 			    break;
-#ifdef FEAT_WINDOWS
 			cmdmod.split |= WSP_ABOVE;
-#endif
 			continue;
 	    case 'n':	if (checkforcmd(&ea.cmd, "noautocmd", 3))
 			{
 #ifdef FEAT_AUTOCMD
 			cmdmod.noswapfile = TRUE;
 			continue;
 	    case 'r':	if (!checkforcmd(&ea.cmd, "rightbelow", 6))
 			    break;
-#ifdef FEAT_WINDOWS
 			cmdmod.split |= WSP_BELOW;
-#endif
 			continue;
 	    case 's':	if (checkforcmd(&ea.cmd, "sandbox", 3))
 			{
 #ifdef HAVE_SANDBOX
 			}
 			continue;
 	    case 't':	if (checkforcmd(&p, "tab", 3))
 			{
-#ifdef FEAT_WINDOWS
 			    long tabnr = get_address(&ea, &ea.cmd, ADDR_TABS,
 							    ea.skip, FALSE, 1);
 			    if (tabnr == MAXLNUM)
 				cmdmod.tab = tabpage_index(curtab) + 1;
 			    else
 				    goto doend;
 				}
 				cmdmod.tab = tabnr + 1;
 			    }
 			    ea.cmd = p;
-#endif
 			    continue;
 			}
 			if (!checkforcmd(&ea.cmd, "topleft", 2))
 			    break;
-#ifdef FEAT_WINDOWS
 			cmdmod.split |= WSP_TOP;
-#endif
 			continue;
 	    case 'u':	if (!checkforcmd(&ea.cmd, "unsilent", 3))
 			    break;
 			if (save_msg_silent == -1)
 			msg_silent = 0;
 			continue;
 	    case 'v':	if (checkforcmd(&ea.cmd, "vertical", 4))
 			{
-#ifdef FEAT_WINDOWS
 			    cmdmod.split |= WSP_VERT;
-#endif
 			    continue;
 			}
 			if (!checkforcmd(&p, "verbose", 4))
 			    break;
 			if (verbose_save < 0)
 	if (ea.cmdidx != CMD_SIZE)
 	    ea.addr_type = cmdnames[(int)ea.cmdidx].cmd_addr_type;
 	else
 	    ea.addr_type = ADDR_LINES;
-#ifdef FEAT_WINDOWS
 	/* :wincmd range depends on the argument. */
 	if (ea.cmdidx == CMD_wincmd && p != NULL)
 	    get_wincmd_addr_type(skipwhite(p), &ea);
-#endif
 }
 /* repeat for all ',' or ';' separated addresses */
 ea.cmd = cmd;
 for (;;)
 	    if (quote)
 		*buf++ = '"';
 	    *buf = '\0';
 	}
-#ifdef FEAT_WINDOWS
 	/* :aboveleft and :leftabove */
 	if (cmdmod.split & WSP_ABOVE)
 	    result += add_cmd_modifier(buf, "aboveleft", &multi_mods);
 	/* :belowright and :rightbelow */
 	if (cmdmod.split & WSP_BELOW)
 	    result += add_cmd_modifier(buf, "belowright", &multi_mods);
 	/* :botright */
 	if (cmdmod.split & WSP_BOT)
 	    result += add_cmd_modifier(buf, "botright", &multi_mods);
-#endif
 	/* the modifiers that are simple flags */
 	for (i = 0; mod_entries[i].varp != NULL; ++i)
 	    if (*mod_entries[i].varp)
 		result += add_cmd_modifier(buf, mod_entries[i].name,
 #endif
 	/* :silent */
 	if (msg_silent > 0)
 	    result += add_cmd_modifier(buf,
 		    emsg_silent > 0 ? "silent!" : "silent", &multi_mods);
-#ifdef FEAT_WINDOWS
 	/* :tab */
 	if (cmdmod.tab > 0)
 	    result += add_cmd_modifier(buf, "tab", &multi_mods);
 	/* :topleft */
 	if (cmdmod.split & WSP_TOP)
 	    result += add_cmd_modifier(buf, "topleft", &multi_mods);
-#endif
 	/* TODO: How to support :unsilent?*/
 	/* :verbose */
 	if (p_verbose > 0)
 	    result += add_cmd_modifier(buf, "verbose", &multi_mods);
-#ifdef FEAT_WINDOWS
 	/* :vertical */
 	if (cmdmod.split & WSP_VERT)
 	    result += add_cmd_modifier(buf, "vertical", &multi_mods);
-#endif
 	if (quote && buf != NULL)
 	{
 	    buf += result - 2;
 	    *buf = '"';
 	}
 * ":quit": quit current window, quit Vim if the last window is closed.
 */
 static void
 ex_quit(exarg_T *eap)
 {
-#if defined(FEAT_WINDOWS) || defined(FEAT_AUTOCMD)
 win_T	*wp;
-#endif
 #ifdef FEAT_CMDWIN
 if (cmdwin_type != 0)
 {
 	cmdwin_result = Ctrl_C;
 if (text_locked())
 {
 	text_locked_msg();
 	return;
 }
-#ifdef FEAT_WINDOWS
 if (eap->addr_count > 0)
 {
 	int	wnr = eap->line2;
 	for (wp = firstwin; wp->w_next != NULL; wp = wp->w_next)
 	    if (--wnr <= 0)
 		break;
 }
 else
-#endif
-#if defined(FEAT_WINDOWS) || defined(FEAT_AUTOCMD)
 	wp = curwin;
-#endif
 #ifdef FEAT_AUTOCMD
 apply_autocmds(EVENT_QUITPRE, NULL, NULL, FALSE, curbuf);
 /* Refuse to quit when locked or when the buffer in the last window is
 * being closed (can only happen in autocommands). */
-if (curbuf_locked()
+if (curbuf_locked() || !win_valid(wp)
-# ifdef FEAT_WINDOWS
-	    || !win_valid(wp)
-# endif
 	    || (wp->w_buffer->b_nwindows == 1 && wp->w_buffer->b_locked > 0))
 	return;
 #endif
 #ifdef FEAT_NETBEANS_INTG
 {
 	not_exiting();
 }
 else
 {
-#ifdef FEAT_WINDOWS
 	/* quit last window
 	 * Note: only_one_window() returns true, even so a help window is
 	 * still open. In that case only quit, if no address has been
 	 * specified. Example:
 	 * :h|wincmd w|1q     - don't quit
 	 * :h|wincmd w|q      - quit
 	 */
 	if (only_one_window() && (ONE_WINDOW || eap->addr_count == 0))
-#endif
 	    getout(0);
-#ifdef FEAT_WINDOWS
+#ifdef FEAT_GUI
-# ifdef FEAT_GUI
 	need_mouse_correct = TRUE;
-# endif
+#endif
 	/* close window; may free buffer */
 	win_close(wp, !buf_hide(wp->w_buffer) || eap->forceit);
-#endif
 }
 }
 /*
 * ":cquit".
 if (eap->forceit || !check_changed_any(FALSE, FALSE))
 	getout(0);
 not_exiting();
 }
-#if defined(FEAT_WINDOWS) || defined(PROTO)
 /*
 * ":close": close current window, unless it is the last one
 */
 static void
 ex_close(exarg_T *eap)
 {
 win_T	*win;
 int		winnr = 0;
-# ifdef FEAT_CMDWIN
+#ifdef FEAT_CMDWIN
 if (cmdwin_type != 0)
 	cmdwin_result = Ctrl_C;
 else
-# endif
+#endif
 	if (!text_locked()
 #ifdef FEAT_AUTOCMD
 		&& !curbuf_locked()
 #endif
 		)
 		ex_win_close(eap->forceit, win, NULL);
 	    }
 	}
 }
-# ifdef FEAT_QUICKFIX
+#ifdef FEAT_QUICKFIX
 /*
 * ":pclose": Close any preview window.
 */
 static void
 ex_pclose(exarg_T *eap)
 	{
 	    ex_win_close(eap->forceit, win, NULL);
 	    break;
 	}
 }
-# endif
+#endif
 /*
 * Close window "win" and take care of handling closing the last window for a
 * modified buffer.
 */
 buf_T	*buf = win->w_buffer;
 need_hide = (bufIsChanged(buf) && buf->b_nwindows <= 1);
 if (need_hide && !buf_hide(buf) && !forceit)
 {
-# if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
+#if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
 	if ((p_confirm || cmdmod.confirm) && p_write)
 	{
 	    bufref_T bufref;
 	    set_bufref(&bufref, buf);
 	    if (bufref_valid(&bufref) && bufIsChanged(buf))
 		return;
 	    need_hide = FALSE;
 	}
 	else
-# endif
+#endif
 	{
 	    no_write_message();
 	    return;
 	}
 }
-# ifdef FEAT_GUI
+#ifdef FEAT_GUI
 need_mouse_correct = TRUE;
-# endif
+#endif
 /* free buffer when not hiding it or when it's a scratch buffer */
 if (tp == NULL)
 	win_close(win, !need_hide && !buf_hide(buf));
 else
 {
 if (eap->addr_count == 0)
 	eap->line2 = 9999;
 do_arg_all((int)eap->line2, eap->forceit, eap->cmdidx == CMD_drop);
 }
-#endif /* FEAT_WINDOWS */
 static void
 ex_hide(exarg_T *eap UNUSED)
 {
 /* ":hide" or ":hide | cmd": hide current window */
-#ifdef FEAT_WINDOWS
 if (!eap->skip)
 {
-# ifdef FEAT_GUI
+#ifdef FEAT_GUI
 	need_mouse_correct = TRUE;
-# endif
+#endif
 	if (eap->addr_count == 0)
 	    win_close(curwin, FALSE);	/* don't free buffer */
 	else
 	{
 	    int	winnr = 0;
 	    if (win == NULL)
 		win = lastwin;
 	    win_close(win, FALSE);
 	}
 }
-#endif
 }
 /*
 * ":stop" and ":suspend": Suspend Vim.
 */
 {
 	not_exiting();
 }
 else
 {
-#ifdef FEAT_WINDOWS
 	if (only_one_window())	    /* quit last window, exit Vim */
-#endif
 	    getout(0);
-#ifdef FEAT_WINDOWS
 # ifdef FEAT_GUI
 	need_mouse_correct = TRUE;
 # endif
 	/* Quit current window, may free the buffer. */
 	win_close(curwin, !buf_hide(curwin->w_buffer));
-#endif
 }
 }
 /*
 * ":print", ":list", ":number".
 ex_shell(exarg_T *eap UNUSED)
 {
 do_shell(NULL, 0);
 }
-#if (defined(FEAT_WINDOWS) && defined(HAVE_DROP_FILE)) \
+#if defined(HAVE_DROP_FILE) \
 	|| (defined(FEAT_GUI_GTK) && defined(FEAT_DND)) \
 	|| defined(FEAT_GUI_MSWIN) \
 	|| defined(FEAT_GUI_MAC) \
 	|| defined(PROTO)
 	split = check_changed(curbuf, CCGD_AW);
 	--emsg_off;
 }
 if (split)
 {
-# ifdef FEAT_WINDOWS
 	if (win_split(0, 0) == FAIL)
 	    return;
 	RESET_BINDING(curwin);
 	/* When splitting the window, create a new alist.  Otherwise the
 	 * existing one is overwritten. */
 	alist_unlink(curwin->w_alist);
 	alist_new();
-# else
-	return;	    /* can't split, always fail */
-# endif
 }
 /*
 * Set up the new argument list.
 */
 alist_init(alist_T *al)
 {
 ga_init2(&al->al_ga, (int)sizeof(aentry_T), 5);
 }
-#if defined(FEAT_WINDOWS) || defined(PROTO)
 /*
 * Remove a reference from an argument list.
 * Ignored when the argument list is the global one.
 * If the argument list is no longer used by any window, free it.
 */
 	alist_clear(al);
 	vim_free(al);
 }
 }
-# if defined(FEAT_LISTCMDS) || defined(HAVE_DROP_FILE) || defined(PROTO)
+#if defined(FEAT_LISTCMDS) || defined(HAVE_DROP_FILE) || defined(PROTO)
 /*
 * Create a new argument list and use it for the current window.
 */
 void
 alist_new(void)
 	curwin->w_alist->al_refcount = 1;
 	curwin->w_alist->id = ++max_alist_id;
 	alist_init(curwin->w_alist);
 }
 }
-# endif
 #endif
 #if !defined(UNIX) || defined(PROTO)
 /*
 * Expand the file names in the global argument list.
 	}
 	vim_free(files);
 }
 else
 	FreeWild(count, files);
-#ifdef FEAT_WINDOWS
 if (al == &global_alist)
-#endif
 	arg_had_last = FALSE;
 }
 /*
 * Add file "fname" to argument list "al".
 */
 void
 alist_slash_adjust(void)
 {
 int		i;
-# ifdef FEAT_WINDOWS
 win_T	*wp;
 tabpage_T	*tp;
-# endif
 for (i = 0; i < GARGCOUNT; ++i)
 	if (GARGLIST[i].ae_fname != NULL)
 	    slash_adjust(GARGLIST[i].ae_fname);
-# ifdef FEAT_WINDOWS
 FOR_ALL_TAB_WINDOWS(tp, wp)
 	if (wp->w_alist != &global_alist)
 	    for (i = 0; i < WARGCOUNT(wp); ++i)
 		if (WARGLIST(wp)[i].ae_fname != NULL)
 		    slash_adjust(WARGLIST(wp)[i].ae_fname);
-# endif
 }
 #endif
 /*
 * ":preserve".
 ex_wrongmodifier(exarg_T *eap)
 {
 eap->errmsg = e_invcmd;
 }
-#ifdef FEAT_WINDOWS
 /*
 * :sview [+command] file	split window with new file, read-only
 * :split [[+command] file]	split window with current or new file
 * :vsplit [[+command] file]	split window vertically with current or new file
 * :new [[+command] file]	split window with no or new file
 */
 void
 ex_splitview(exarg_T *eap)
 {
 win_T	*old_curwin = curwin;
-# if defined(FEAT_SEARCHPATH) || defined(FEAT_BROWSE)
+#if defined(FEAT_SEARCHPATH) || defined(FEAT_BROWSE)
 char_u	*fname = NULL;
-# endif
+#endif
-# ifdef FEAT_BROWSE
+#ifdef FEAT_BROWSE
 int		browse_flag = cmdmod.browse;
-# endif
+#endif
-# ifdef FEAT_GUI
+#ifdef FEAT_GUI
 need_mouse_correct = TRUE;
-# endif
+#endif
-# ifdef FEAT_QUICKFIX
+#ifdef FEAT_QUICKFIX
 /* A ":split" in the quickfix window works like ":new".  Don't want two
 * quickfix windows.  But it's OK when doing ":tab split". */
 if (bt_quickfix(curbuf) && cmdmod.tab == 0)
 {
 	if (eap->cmdidx == CMD_split)
 	    eap->cmdidx = CMD_new;
 	if (eap->cmdidx == CMD_vsplit)
 	    eap->cmdidx = CMD_vnew;
 }
-# endif
+#endif
-# ifdef FEAT_SEARCHPATH
+#ifdef FEAT_SEARCHPATH
 if (eap->cmdidx == CMD_sfind || eap->cmdidx == CMD_tabfind)
 {
 	fname = find_file_in_path(eap->arg, (int)STRLEN(eap->arg),
 					  FNAME_MESS, TRUE, curbuf->b_ffname);
 	if (fname == NULL)
 	    goto theend;
 	eap->arg = fname;
 }
-#  ifdef FEAT_BROWSE
+# ifdef FEAT_BROWSE
 else
-#  endif
 # endif
-# ifdef FEAT_BROWSE
+#endif
+#ifdef FEAT_BROWSE
 if (cmdmod.browse
 	    && eap->cmdidx != CMD_vnew
 	    && eap->cmdidx != CMD_new)
 {
 # ifdef FEAT_AUTOCMD
 		goto theend;
 	    eap->arg = fname;
 	}
 }
 cmdmod.browse = FALSE;	/* Don't browse again in do_ecmd(). */
-# endif
+#endif
 /*
 * Either open new tab page or split the window.
 */
 if (eap->cmdidx == CMD_tabedit
 	    ui_breakcheck();
 	}
 }
 }
-#endif /* FEAT_WINDOWS */
 /*
 * ":mode": Set screen mode.
 * If no argument given, just get the screen size and redraw.
 */
 static void
 	shell_resized();
 else
 	mch_screenmode(eap->arg);
 }
-#ifdef FEAT_WINDOWS
 /*
 * ":resize".
 * set, increment or decrement current window height
 */
 static void
 	else if (n == 0 && eap->arg[0] == NUL)	/* default is very high */
 	    n = 9999;
 	win_setheight_win((int)n, wp);
 }
 }
-#endif
 /*
 * ":find [+command] <file>" command.
 */
 static void
 do_exedit(
 exarg_T	*eap,
 win_T	*old_curwin)	    /* curwin before doing a split or NULL */
 {
 int		n;
-#ifdef FEAT_WINDOWS
 int		need_hide;
-#endif
 int		exmode_was = exmode_active;
 /*
 * ":vi" command ends Ex mode.
 */
 }
 if ((eap->cmdidx == CMD_new
 		|| eap->cmdidx == CMD_tabnew
 		|| eap->cmdidx == CMD_tabedit
-#ifdef FEAT_WINDOWS
+		|| eap->cmdidx == CMD_vnew) && *eap->arg == NUL)
-		|| eap->cmdidx == CMD_vnew
-#endif
-		) && *eap->arg == NUL)
 {
 	/* ":new" or ":tabnew" without argument: edit an new empty buffer */
 	setpcmark();
 	(void)do_ecmd(0, NULL, NULL, eap, ECMD_ONE,
 		      ECMD_HIDE + (eap->forceit ? ECMD_FORCEIT : 0),
 		      old_curwin == NULL ? curwin : NULL);
 }
-else if ((eap->cmdidx != CMD_split
+else if ((eap->cmdidx != CMD_split && eap->cmdidx != CMD_vsplit)
-#ifdef FEAT_WINDOWS
-		&& eap->cmdidx != CMD_vsplit
-#endif
-		)
 	    || *eap->arg != NUL
 #ifdef FEAT_BROWSE
 	    || cmdmod.browse
 #endif
 	    )
 		    + (eap->cmdidx == CMD_badd ? ECMD_ADDBUF : 0 )
 #endif
 		    , old_curwin == NULL ? curwin : NULL) == FAIL)
 	{
 	    /* Editing the file failed.  If the window was split, close it. */
-#ifdef FEAT_WINDOWS
 	    if (old_curwin != NULL)
 	    {
 		need_hide = (curbufIsChanged() && curbuf->b_nwindows <= 1);
 		if (!need_hide || buf_hide(curbuf))
 		{
-# if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL)
+#if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL)
 		    cleanup_T   cs;
 		    /* Reset the error/interrupt/exception state here so that
 		     * aborting() returns FALSE when closing a window. */
 		    enter_cleanup(&cs);
-# endif
+#endif
-# ifdef FEAT_GUI
+#ifdef FEAT_GUI
 		    need_mouse_correct = TRUE;
-# endif
+#endif
 		    win_close(curwin, !need_hide && !buf_hide(curbuf));
-# if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL)
+#if defined(FEAT_AUTOCMD) && 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
+#endif
 		}
 	    }
-#endif
 	}
 	else if (readonlymode && curbuf->b_nwindows == 1)
 	{
 	    /* When editing an already visited buffer, 'readonly' won't be set
 	     * but the previous value is kept.  With ":view" and ":sview" we
 	if (n != curwin->w_arg_idx_invalid)
 	    maketitle();
 #endif
 }
-#ifdef FEAT_WINDOWS
 /*
 * if ":split file" worked, set alternate file name in old window to new
 * file
 */
 if (old_curwin != NULL
 	    && curwin != old_curwin
 	    && win_valid(old_curwin)
 	    && old_curwin->w_buffer != curbuf
 	    && !cmdmod.keepalt)
 	old_curwin->w_alt_fnum = curbuf->b_fnum;
-#endif
 ex_no_reprint = TRUE;
 }
 #ifndef FEAT_GUI
 	    else
 		scrolldown(-y, TRUE);
 	    curwin->w_scbind_pos = topline;
 	    redraw_later(VALID);
 	    cursor_correct();
-#ifdef FEAT_WINDOWS
 	    curwin->w_redr_status = TRUE;
-#endif
 	}
 }
 curwin = save_curwin;
 curbuf = save_curbuf;
 if (curwin->w_p_scb)
 	set_shellsize(w, h, TRUE);
 else
 	EMSG(_("E465: :winsize requires two number arguments"));
 }
-#ifdef FEAT_WINDOWS
 static void
 ex_wincmd(exarg_T *eap)
 {
 int		xchar = NUL;
 char_u	*p;
 	do_window(*eap->arg, eap->addr_count > 0 ? eap->line2 : 0L, xchar);
 	postponed_split_flags = 0;
 	postponed_split_tab = 0;
 }
 }
-#endif
 #if defined(FEAT_GUI) || defined(UNIX) || defined(VMS) || defined(MSWIN)
 /*
 * ":winpos".
 */
 * ":redrawstatus": force redraw of status line(s)
 */
 static void
 ex_redrawstatus(exarg_T *eap UNUSED)
 {
-#if defined(FEAT_WINDOWS)
 int		r = RedrawingDisabled;
 int		p = p_lz;
 RedrawingDisabled = 0;
 p_lz = FALSE;
 	status_redraw_curbuf();
 update_screen(VIsual_active ? INVERTED : 0);
 RedrawingDisabled = r;
 p_lz = p;
 out_flush();
-#endif
 }
 static void
 close_redir(void)
 {
 find_pattern_in_path(NULL, 0, 0, FALSE, FALSE, CHECK_PATH, 1L,
 				   eap->forceit ? ACTION_SHOW_ALL : ACTION_SHOW,
 					      (linenr_T)1, (linenr_T)MAXLNUM);
 }
-#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+#if defined(FEAT_QUICKFIX)
 /*
 * ":psearch"
 */
 static void
 ex_psearch(exarg_T *eap)
 			    *eap->cmd == 'd' ?	FIND_DEFINE : FIND_ANY,
 			    n, action, eap->line1, eap->line2);
 }
 #endif
-#ifdef FEAT_WINDOWS
+#ifdef FEAT_QUICKFIX
-# ifdef FEAT_QUICKFIX
 /*
 * ":ptag", ":ptselect", ":ptjump", ":ptnext", etc.
 */
 static void
 ex_ptag(exarg_T *eap)
 	redraw_later(VALID);
 	win_enter(curwin_save, TRUE);
 }
 g_do_tagpreview = 0;
 }
-# endif
+#endif
 /*
 * ":stag", ":stselect" and ":stjump".
 */
 static void
 postponed_split_tab = cmdmod.tab;
 ex_tag_cmd(eap, cmdnames[eap->cmdidx].cmd_name + 1);
 postponed_split_flags = 0;
 postponed_split_tab = 0;
 }
-#endif
 /*
 * ":tag", ":tselect", ":tjump", ":tnext", etc.
 */
 static void

Mercurial > vim

comparison src/ex_docmd.c @ 12477:68d7bc045dbe v8.0.1118