summaryrefslogtreecommitdiffstats
path: root/patches/source/vim/patches/7.4.377
blob: e5d86bd6c85f099b052d3b0c18f0710528cb7b72 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
To: vim_dev@googlegroups.com
Subject: Patch 7.4.377
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.4.377
Problem:    When 'equalalways' is set a split may report "no room" even though
	    there is plenty of room.
Solution:   Compute the available room properly. (Yukihiro Nakadaira)
Files:	    src/window.c


*** ../vim-7.4.376/src/window.c	2014-07-16 23:39:50.251084976 +0200
--- src/window.c	2014-07-23 15:19:10.491918366 +0200
***************
*** 684,690 ****
      int		available;
      int		oldwin_height = 0;
      int		layout;
!     frame_T	*frp, *curfrp;
      int		before;
      int		minheight;
      int		wmh1;
--- 684,690 ----
      int		available;
      int		oldwin_height = 0;
      int		layout;
!     frame_T	*frp, *curfrp, *frp2, *prevfrp;
      int		before;
      int		minheight;
      int		wmh1;
***************
*** 730,741 ****
  	needed = wmw1 + 1;
  	if (flags & WSP_ROOM)
  	    needed += p_wiw - wmw1;
! 	if (p_ea || (flags & (WSP_BOT | WSP_TOP)))
  	{
  	    minwidth = frame_minwidth(topframe, NOWIN);
  	    available = topframe->fr_width;
  	    needed += minwidth;
  	}
  	else
  	{
  	    minwidth = frame_minwidth(oldwin->w_frame, NOWIN);
--- 730,758 ----
  	needed = wmw1 + 1;
  	if (flags & WSP_ROOM)
  	    needed += p_wiw - wmw1;
! 	if (flags & (WSP_BOT | WSP_TOP))
  	{
  	    minwidth = frame_minwidth(topframe, NOWIN);
  	    available = topframe->fr_width;
  	    needed += minwidth;
  	}
+ 	else if (p_ea)
+ 	{
+ 	    minwidth = frame_minwidth(oldwin->w_frame, NOWIN);
+ 	    prevfrp = oldwin->w_frame;
+ 	    for (frp = oldwin->w_frame->fr_parent; frp != NULL;
+ 							frp = frp->fr_parent)
+ 	    {
+ 		if (frp->fr_layout == FR_ROW)
+ 		    for (frp2 = frp->fr_child; frp2 != NULL;
+ 							frp2 = frp2->fr_next)
+ 			if (frp2 != prevfrp)
+ 			    minwidth += frame_minwidth(frp2, NOWIN);
+ 		prevfrp = frp;
+ 	    }
+ 	    available = topframe->fr_width;
+ 	    needed += minwidth;
+ 	}
  	else
  	{
  	    minwidth = frame_minwidth(oldwin->w_frame, NOWIN);
***************
*** 798,809 ****
  	needed = wmh1 + STATUS_HEIGHT;
  	if (flags & WSP_ROOM)
  	    needed += p_wh - wmh1;
! 	if (p_ea || (flags & (WSP_BOT | WSP_TOP)))
  	{
  	    minheight = frame_minheight(topframe, NOWIN) + need_status;
  	    available = topframe->fr_height;
  	    needed += minheight;
  	}
  	else
  	{
  	    minheight = frame_minheight(oldwin->w_frame, NOWIN) + need_status;
--- 815,843 ----
  	needed = wmh1 + STATUS_HEIGHT;
  	if (flags & WSP_ROOM)
  	    needed += p_wh - wmh1;
! 	if (flags & (WSP_BOT | WSP_TOP))
  	{
  	    minheight = frame_minheight(topframe, NOWIN) + need_status;
  	    available = topframe->fr_height;
  	    needed += minheight;
  	}
+ 	else if (p_ea)
+ 	{
+ 	    minheight = frame_minheight(oldwin->w_frame, NOWIN) + need_status;
+ 	    prevfrp = oldwin->w_frame;
+ 	    for (frp = oldwin->w_frame->fr_parent; frp != NULL;
+ 							frp = frp->fr_parent)
+ 	    {
+ 		if (frp->fr_layout == FR_COL)
+ 		    for (frp2 = frp->fr_child; frp2 != NULL;
+ 							frp2 = frp2->fr_next)
+ 			if (frp2 != prevfrp)
+ 			    minheight += frame_minheight(frp2, NOWIN);
+ 		prevfrp = frp;
+ 	    }
+ 	    available = topframe->fr_height;
+ 	    needed += minheight;
+ 	}
  	else
  	{
  	    minheight = frame_minheight(oldwin->w_frame, NOWIN) + need_status;
*** ../vim-7.4.376/src/version.c	2014-07-23 13:50:41.839956521 +0200
--- src/version.c	2014-07-23 15:20:33.227917771 +0200
***************
*** 736,737 ****
--- 736,739 ----
  {   /* Add new patch number below this line */
+ /**/
+     377,
  /**/

-- 
LARGE MAN:   Who's that then?
CART DRIVER: (Grudgingly) I dunno, Must be a king.
LARGE MAN:   Why?
CART DRIVER: He hasn't got shit all over him.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///