diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-03-19 22:11:51 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-03-19 22:11:51 +0100 |
commit | 44a2f923c00f1384c9ecde12fb5b4711bc20702e (patch) | |
tree | ff48a0f263f488b023e5b4c7d45af05dade92e8f /src/ex_docmd.c | |
parent | cc6cf9b9f9045a7d8b5923ea0c556e9a4c2567d3 (diff) | |
download | vim-git-44a2f923c00f1384c9ecde12fb5b4711bc20702e.tar.gz |
patch 7.4.1611v7.4.1611
Problem: The versplit feature makes the code uneccessary complicated.
Solution: Remove FEAT_VERTSPLIT, always support vertical splits when
FEAT_WINDOWS is defined.
Diffstat (limited to 'src/ex_docmd.c')
-rw-r--r-- | src/ex_docmd.c | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 12730a93d..26f421952 100644 --- 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 ) |