Mercurial > vim
diff src/ex_docmd.c @ 8643:24b43dd167eb v7.4.1611
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Mar 19 22:11:51 2016 +0100
patch 7.4.1611
Problem: The versplit feature makes the code uneccessary complicated.
Solution: Remove FEAT_VERTSPLIT, always support vertical splits when
FEAT_WINDOWS is defined.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 19 Mar 2016 22:15:06 +0100 |
parents | 63dc856bd13d |
children | b7eb7bbd71d0 |
line wrap: on
line diff
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -2013,7 +2013,7 @@ do_one_cmd( case 'v': if (checkforcmd(&ea.cmd, "vertical", 4)) { -#ifdef FEAT_VERTSPLIT +#ifdef FEAT_WINDOWS cmdmod.split |= WSP_VERT; #endif continue; @@ -7923,14 +7923,6 @@ ex_splitview(exarg_T *eap) int browse_flag = cmdmod.browse; # endif -# ifndef FEAT_VERTSPLIT - if (eap->cmdidx == CMD_vsplit || eap->cmdidx == CMD_vnew) - { - ex_ni(eap); - return; - } -# endif - # ifdef FEAT_GUI need_mouse_correct = TRUE; # endif @@ -7942,10 +7934,8 @@ ex_splitview(exarg_T *eap) { if (eap->cmdidx == CMD_split) eap->cmdidx = CMD_new; -# ifdef FEAT_VERTSPLIT if (eap->cmdidx == CMD_vsplit) eap->cmdidx = CMD_vnew; -# endif } # endif @@ -7964,9 +7954,7 @@ ex_splitview(exarg_T *eap) # endif # ifdef FEAT_BROWSE if (cmdmod.browse -# ifdef FEAT_VERTSPLIT && eap->cmdidx != CMD_vnew -# endif && eap->cmdidx != CMD_new) { # ifdef FEAT_AUTOCMD @@ -8224,11 +8212,10 @@ ex_resize(exarg_T *eap) ; } -#ifdef FEAT_GUI +# ifdef FEAT_GUI need_mouse_correct = TRUE; -#endif +# endif n = atol((char *)eap->arg); -#ifdef FEAT_VERTSPLIT if (cmdmod.split & WSP_VERT) { if (*eap->arg == '-' || *eap->arg == '+') @@ -8238,7 +8225,6 @@ ex_resize(exarg_T *eap) win_setwidth_win((int)n, wp); } else -#endif { if (*eap->arg == '-' || *eap->arg == '+') n += curwin->w_height; @@ -8397,7 +8383,7 @@ do_exedit( if ((eap->cmdidx == CMD_new || eap->cmdidx == CMD_tabnew || eap->cmdidx == CMD_tabedit -#ifdef FEAT_VERTSPLIT +#ifdef FEAT_WINDOWS || eap->cmdidx == CMD_vnew #endif ) && *eap->arg == NUL) @@ -8409,7 +8395,7 @@ do_exedit( old_curwin == NULL ? curwin : NULL); } else if ((eap->cmdidx != CMD_split -#ifdef FEAT_VERTSPLIT +#ifdef FEAT_WINDOWS && eap->cmdidx != CMD_vsplit #endif )