summaryrefslogtreecommitdiff
path: root/src/option.h
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-03-19 22:11:51 +0100
committerBram Moolenaar <Bram@vim.org>2016-03-19 22:11:51 +0100
commit44a2f923c00f1384c9ecde12fb5b4711bc20702e (patch)
treeff48a0f263f488b023e5b4c7d45af05dade92e8f /src/option.h
parentcc6cf9b9f9045a7d8b5923ea0c556e9a4c2567d3 (diff)
downloadvim-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/option.h')
-rw-r--r--src/option.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/option.h b/src/option.h
index e962ba379..cf7ba04e7 100644
--- a/src/option.h
+++ b/src/option.h
@@ -463,7 +463,7 @@ static char *(p_dy_values[]) = {"lastline", "uhex", NULL};
#define DY_LASTLINE 0x001
#define DY_UHEX 0x002
EXTERN int p_ed; /* 'edcompatible' */
-#ifdef FEAT_VERTSPLIT
+#ifdef FEAT_WINDOWS
EXTERN char_u *p_ead; /* 'eadirection' */
#endif
EXTERN int p_ea; /* 'equalalways' */
@@ -802,7 +802,7 @@ EXTERN char_u *p_tal; /* 'tabline' */
#ifdef FEAT_SPELL
EXTERN char_u *p_sps; /* 'spellsuggest' */
#endif
-#ifdef FEAT_VERTSPLIT
+#ifdef FEAT_WINDOWS
EXTERN int p_spr; /* 'splitright' */
#endif
EXTERN int p_sol; /* 'startofline' */
@@ -957,8 +957,6 @@ EXTERN int p_wmnu; /* 'wildmenu' */
#ifdef FEAT_WINDOWS
EXTERN long p_wh; /* 'winheight' */
EXTERN long p_wmh; /* 'winminheight' */
-#endif
-#ifdef FEAT_VERTSPLIT
EXTERN long p_wmw; /* 'winminwidth' */
EXTERN long p_wiw; /* 'winwidth' */
#endif
@@ -1172,8 +1170,6 @@ enum
#endif
#ifdef FEAT_WINDOWS
, WV_WFH
-#endif
-#ifdef FEAT_VERTSPLIT
, WV_WFW
#endif
, WV_WRAP