summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-11-19 13:40:08 +0100
committerBram Moolenaar <Bram@vim.org>2014-11-19 13:40:08 +0100
commitdf46f6f07f90c0014352ff05aecb8caf61e7cfa0 (patch)
tree8f5f3e1de8295777622709d955c0292c6eaab695 /src
parenta365091dbb94e0daea5ea58d1facb1102868cca5 (diff)
downloadvim-git-df46f6f07f90c0014352ff05aecb8caf61e7cfa0.tar.gz
updated for version 7.4.518v7.4.518
Problem: Using status line height in width computations. Solution: Use one instead. (Hirohito Higashi)
Diffstat (limited to 'src')
-rw-r--r--src/version.c2
-rw-r--r--src/window.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/version.c b/src/version.c
index ae9fbad89..910ffaab9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 518,
+/**/
517,
/**/
516,
diff --git a/src/window.c b/src/window.c
index b975a6142..6490fd386 100644
--- a/src/window.c
+++ b/src/window.c
@@ -796,7 +796,7 @@ win_split_ins(size, flags, new_wp, dir)
if (frp->fr_win != oldwin && frp->fr_win != NULL
&& (frp->fr_win->w_width > new_size
|| frp->fr_win->w_width > oldwin->w_width
- - new_size - STATUS_HEIGHT))
+ - new_size - 1))
{
do_equal = TRUE;
break;