aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

updated for version 7.4.365

Browse Source 
Problem:    Crash when using ":botright split" when there isn't much space.
Solution:   Add a check for the minimum width/height. (Yukihiro Nakadaira)
This commit is contained in:
Bram Moolenaar
2014-07-16 14:16:46 +02:00
parent db6ea06335
commit b4d2135518
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/version.c
View File

@@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
365,
/**/ /**/
364, 364,
/**/ /**/

16
src/window.c
View File

@@ -686,6 +686,8 @@ win_split_ins(size, flags, new_wp, dir)
int layout; int layout;
frame_T *frp, *curfrp; frame_T *frp, *curfrp;
int before; int before;
int minwidth;
int minheight;
if (flags & WSP_TOP) if (flags & WSP_TOP)
oldwin = firstwin; oldwin = firstwin;
@@ -725,11 +727,15 @@ win_split_ins(size, flags, new_wp, dir)
needed += p_wiw - p_wmw; needed += p_wiw - p_wmw;
if (p_ea || (flags & (WSP_BOT | WSP_TOP))) if (p_ea || (flags & (WSP_BOT | WSP_TOP)))
{ {
minwidth = frame_minwidth(topframe, NULL);
available = topframe->fr_width; available = topframe->fr_width;
needed += frame_minwidth(topframe, NULL); needed += minwidth;
} }
else else
{
minwidth = frame_minwidth(oldwin->w_frame, NULL);
available = oldwin->w_width; available = oldwin->w_width;
}
if (available < needed && new_wp == NULL) if (available < needed && new_wp == NULL)
{ {
EMSG(_(e_noroom)); EMSG(_(e_noroom));
@@ -739,6 +745,8 @@ win_split_ins(size, flags, new_wp, dir)
new_size = oldwin->w_width / 2; new_size = oldwin->w_width / 2;
if (new_size > oldwin->w_width - p_wmw - 1) if (new_size > oldwin->w_width - p_wmw - 1)
new_size = oldwin->w_width - p_wmw - 1; new_size = oldwin->w_width - p_wmw - 1;
if (new_size > available - minwidth - 1)
new_size = available - minwidth - 1;
if (new_size < p_wmw) if (new_size < p_wmw)
new_size = p_wmw; new_size = p_wmw;
@@ -786,11 +794,13 @@ win_split_ins(size, flags, new_wp, dir)
needed += p_wh - p_wmh; needed += p_wh - p_wmh;
if (p_ea || (flags & (WSP_BOT | WSP_TOP))) if (p_ea || (flags & (WSP_BOT | WSP_TOP)))
{ {
minheight = frame_minheight(topframe, NULL);
available = topframe->fr_height; available = topframe->fr_height;
needed += frame_minheight(topframe, NULL); needed += minheight;
} }
else else
{ {
minheight = frame_minheight(oldwin->w_frame, NULL);
available = oldwin->w_height; available = oldwin->w_height;
needed += p_wmh; needed += p_wmh;
} }
@@ -810,6 +820,8 @@ win_split_ins(size, flags, new_wp, dir)
if (new_size > oldwin_height - p_wmh - STATUS_HEIGHT) if (new_size > oldwin_height - p_wmh - STATUS_HEIGHT)
new_size = oldwin_height - p_wmh - STATUS_HEIGHT; new_size = oldwin_height - p_wmh - STATUS_HEIGHT;
if (new_size > available - minheight - STATUS_HEIGHT)
new_size = available - minheight - STATUS_HEIGHT;
if (new_size < p_wmh) if (new_size < p_wmh)
new_size = p_wmh; new_size = p_wmh;