summaryrefslogtreecommitdiff
path: root/src/feature.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/feature.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/feature.h')
-rw-r--r--src/feature.h17
1 files changed, 4 insertions, 13 deletions
diff --git a/src/feature.h b/src/feature.h
index 455ab20ea..75b888033 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -97,6 +97,7 @@
/*
* +windows Multiple windows. Without this there is no help
* window and no status lines.
+ * +vertsplit Vertically split windows.
*/
#ifdef FEAT_SMALL
# define FEAT_WINDOWS
@@ -112,16 +113,6 @@
#endif
/*
- * +vertsplit Vertically split windows.
- */
-#ifdef FEAT_NORMAL
-# define FEAT_VERTSPLIT
-#endif
-#if defined(FEAT_VERTSPLIT) && !defined(FEAT_WINDOWS)
-# define FEAT_WINDOWS
-#endif
-
-/*
* +cmdhist Command line history.
*/
#ifdef FEAT_SMALL
@@ -144,8 +135,8 @@
# define FEAT_JUMPLIST
#endif
-/* the cmdline-window requires FEAT_VERTSPLIT and FEAT_CMDHIST */
-#if defined(FEAT_VERTSPLIT) && defined(FEAT_CMDHIST)
+/* the cmdline-window requires FEAT_WINDOWS and FEAT_CMDHIST */
+#if defined(FEAT_WINDOWS) && defined(FEAT_CMDHIST)
# define FEAT_CMDWIN
#endif
@@ -601,7 +592,7 @@
* +mksession ":mksession" command.
* Requires +windows and +vertsplit.
*/
-#if defined(FEAT_NORMAL) && defined(FEAT_WINDOWS) && defined(FEAT_VERTSPLIT)
+#if defined(FEAT_NORMAL) && defined(FEAT_WINDOWS)
# define FEAT_SESSION
#endif