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/charset.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/charset.c')
| -rw-r--r-- | src/charset.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/charset.c b/src/charset.c index ad3f8bcfd..e008399e1 100644 --- a/src/charset.c +++ b/src/charset.c @@ -1093,7 +1093,7 @@ win_lbr_chartabsize( && vim_isbreak(c) && !vim_isbreak(s[1]) && wp->w_p_wrap -# ifdef FEAT_VERTSPLIT +# ifdef FEAT_WINDOWS && wp->w_width != 0 # endif ) @@ -1250,10 +1250,10 @@ in_win_border(win_T *wp, colnr_T vcol) int width1; /* width of first line (after line number) */ int width2; /* width of further lines */ -#ifdef FEAT_VERTSPLIT +# ifdef FEAT_WINDOWS if (wp->w_width == 0) /* there is no border */ return FALSE; -#endif +# endif width1 = W_WIDTH(wp) - win_col_off(wp); if ((int)vcol < width1 - 1) return FALSE; |