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/term.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/term.c')
-rw-r--r-- | src/term.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/term.c b/src/term.c index d6ba5373b..f6f8eae61 100644 --- a/src/term.c +++ b/src/term.c @@ -179,13 +179,13 @@ static struct builtin_term builtin_termcaps[] = # ifdef TERMINFO {(int)KS_CDL, IF_EB("\033|%p1%dD", ESC_STR "|%p1%dD")}, {(int)KS_CS, IF_EB("\033|%p1%d;%p2%dR", ESC_STR "|%p1%d;%p2%dR")}, -# ifdef FEAT_VERTSPLIT +# ifdef FEAT_WINDOWS {(int)KS_CSV, IF_EB("\033|%p1%d;%p2%dV", ESC_STR "|%p1%d;%p2%dV")}, # endif # else {(int)KS_CDL, IF_EB("\033|%dD", ESC_STR "|%dD")}, {(int)KS_CS, IF_EB("\033|%d;%dR", ESC_STR "|%d;%dR")}, -# ifdef FEAT_VERTSPLIT +# ifdef FEAT_WINDOWS {(int)KS_CSV, IF_EB("\033|%d;%dV", ESC_STR "|%d;%dV")}, # endif # endif @@ -1080,7 +1080,7 @@ static struct builtin_term builtin_termcaps[] = # else {(int)KS_CS, "[%dCS%d]"}, # endif -# ifdef FEAT_VERTSPLIT +# ifdef FEAT_WINDOWS # ifdef TERMINFO {(int)KS_CSV, "[%p1%dCSV%p2%d]"}, # else @@ -2862,7 +2862,7 @@ win_new_shellsize(void) if (old_Columns != Columns) { old_Columns = Columns; -#ifdef FEAT_VERTSPLIT +#ifdef FEAT_WINDOWS shell_new_columns(); /* update window sizes */ #endif } @@ -3485,7 +3485,7 @@ scroll_region_set(win_T *wp, int off) { OUT_STR(tgoto((char *)T_CS, W_WINROW(wp) + wp->w_height - 1, W_WINROW(wp) + off)); -#ifdef FEAT_VERTSPLIT +#ifdef FEAT_WINDOWS if (*T_CSV != NUL && wp->w_width != Columns) OUT_STR(tgoto((char *)T_CSV, W_WINCOL(wp) + wp->w_width - 1, W_WINCOL(wp))); @@ -3500,7 +3500,7 @@ scroll_region_set(win_T *wp, int off) scroll_region_reset(void) { OUT_STR(tgoto((char *)T_CS, (int)Rows - 1, 0)); -#ifdef FEAT_VERTSPLIT +#ifdef FEAT_WINDOWS if (*T_CSV != NUL) OUT_STR(tgoto((char *)T_CSV, (int)Columns - 1, 0)); #endif |