summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-01-08 14:46:03 +0100
committerBram Moolenaar <Bram@vim.org>2011-01-08 14:46:03 +0100
commit13d831ff0c8879bdf59e6de35a106ccb9b4766da (patch)
tree07d6c808738fcc2558783cbc2a5554a653313bc9 /src
parentfd0e75683f248070496b0e315052ccfcfe7dee26 (diff)
downloadvim-git-13d831ff0c8879bdf59e6de35a106ccb9b4766da.tar.gz
updated for version 7.3.099v7.3.099
Problem: Crash when splitting a window with zero height. (Yukihiro Nakadaira) Solution: Don't set the fraction in a window with zero height.
Diffstat (limited to 'src')
-rw-r--r--src/version.c2
-rw-r--r--src/window.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/version.c b/src/version.c
index 3c12b2fa1..4e5e1a935 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 99,
+/**/
98,
/**/
97,
diff --git a/src/window.c b/src/window.c
index 7ac1da81a..b3a7f9e74 100644
--- a/src/window.c
+++ b/src/window.c
@@ -986,7 +986,8 @@ win_split_ins(size, flags, newwin, dir)
/* Set w_fraction now so that the cursor keeps the same relative
* vertical position. */
- set_fraction(oldwin);
+ if (oldwin->w_height > 0)
+ set_fraction(oldwin);
wp->w_fraction = oldwin->w_fraction;
#ifdef FEAT_VERTSPLIT