]> granicus.if.org Git - vim/commitdiff
updated for version 7.4.518 v7.4.518
authorBram Moolenaar <Bram@vim.org>
Wed, 19 Nov 2014 12:40:08 +0000 (13:40 +0100)
committerBram Moolenaar <Bram@vim.org>
Wed, 19 Nov 2014 12:40:08 +0000 (13:40 +0100)
Problem:    Using status line height in width computations.
Solution:   Use one instead. (Hirohito Higashi)

src/version.c
src/window.c

index ae9fbad89ddae6f171eee596d2dc6982957787ab..910ffaab9491d2f748e31f4112bc0c0df5fb1493 100644 (file)
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    518,
 /**/
     517,
 /**/
index b975a614207f96a81752890c388e06b6f7663729..6490fd3868f8986f30e589e618f1b994920e2cc0 100644 (file)
@@ -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;