+90
-1
lines changedFilter options
+90
-1
lines changed Original file line number Diff line number Diff line change
@@ -1692,7 +1692,7 @@ static void win_update(win_T *wp, Providers *providers)
1692 1692
if (eof) { // we hit the end of the file
1693 1693
wp->w_botline = buf->b_ml.ml_line_count + 1;
1694 1694
j = win_get_fill(wp, wp->w_botline);
1695 -
if (j > 0 && !wp->w_botfill) {
1695 +
if (j > 0 && !wp->w_botfill && row < wp->w_grid.Rows) {
1696 1696
// Display filler text below last line. win_line() will check
1697 1697
// for ml_line_count+1 and only draw filler lines
1698 1698
foldinfo_T info = FOLDINFO_INIT;
@@ -1031,6 +1031,69 @@ if (h->n_buckets < new_n_buckets) { // expand
1031 1031
|
1032 1032
]]}
1033 1033 1034 +
screen:try_resize(50, 11)
1035 +
feed('gg')
1036 +
screen:expect{grid=[[
1037 +
^if (h->n_buckets < new_n_buckets) { // expand |
1038 +
khkey_t *new_keys = (khkey_t *)krealloc((void *)|
1039 +
h->keys, new_n_buckets * sizeof(khkey_t)); |
1040 +
h->keys = new_keys; |
1041 +
if (kh_is_map && val_size) { |
1042 +
char *new_vals = krealloc( h->vals_buf, new_n_|
1043 +
buckets * val_size); |
1044 +
h->vals_buf = new_vals; |
1045 +
} |
1046 +
} |
1047 +
|
1048 +
]]}
1049 + 1050 +
feed('G<C-E>')
1051 +
screen:expect{grid=[[
1052 +
khkey_t *new_keys = (khkey_t *)krealloc((void *)|
1053 +
h->keys, new_n_buckets * sizeof(khkey_t)); |
1054 +
h->keys = new_keys; |
1055 +
if (kh_is_map && val_size) { |
1056 +
char *new_vals = krealloc( h->vals_buf, new_n_|
1057 +
buckets * val_size); |
1058 +
h->vals_buf = new_vals; |
1059 +
} |
1060 +
^} |
1061 +
Grugg |
1062 +
|
1063 +
]]}
1064 + 1065 +
feed('gg')
1066 +
screen:expect{grid=[[
1067 +
^if (h->n_buckets < new_n_buckets) { // expand |
1068 +
khkey_t *new_keys = (khkey_t *)krealloc((void *)|
1069 +
h->keys, new_n_buckets * sizeof(khkey_t)); |
1070 +
h->keys = new_keys; |
1071 +
if (kh_is_map && val_size) { |
1072 +
char *new_vals = krealloc( h->vals_buf, new_n_|
1073 +
buckets * val_size); |
1074 +
h->vals_buf = new_vals; |
1075 +
} |
1076 +
} |
1077 +
|
1078 +
]]}
1079 + 1080 +
screen:try_resize(50, 12)
1081 +
feed('G')
1082 +
screen:expect{grid=[[
1083 +
if (h->n_buckets < new_n_buckets) { // expand |
1084 +
khkey_t *new_keys = (khkey_t *)krealloc((void *)|
1085 +
h->keys, new_n_buckets * sizeof(khkey_t)); |
1086 +
h->keys = new_keys; |
1087 +
if (kh_is_map && val_size) { |
1088 +
char *new_vals = krealloc( h->vals_buf, new_n_|
1089 +
buckets * val_size); |
1090 +
h->vals_buf = new_vals; |
1091 +
} |
1092 +
^} |
1093 +
Grugg |
1094 +
|
1095 +
]]}
1096 + 1034 1097
meths.buf_del_extmark(0, ns, id)
1035 1098
screen:expect{grid=[[
1036 1099
if (h->n_buckets < new_n_buckets) { // expand |
@@ -186,6 +186,19 @@ describe('Diff mode screen', function()
186 186
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
187 187
:set diffopt+=internal |
188 188
]])
189 + 190 +
screen:try_resize(40, 9)
191 +
screen:expect([[
192 +
{1:+ }{5:^+-- 4 lines: 1···}{3:│}{1:+ }{5:+-- 4 lines: 1··}|
193 +
{1: }5 {3:│}{1: }5 |
194 +
{1: }6 {3:│}{1: }6 |
195 +
{1: }7 {3:│}{1: }7 |
196 +
{1: }8 {3:│}{1: }8 |
197 +
{1: }9 {3:│}{1: }9 |
198 +
{1: }10 {3:│}{1: }10 |
199 +
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
200 +
|
201 +
]])
189 202
end)
190 203 191 204
it('Add a line at the end of file 1', function()
@@ -232,6 +245,19 @@ describe('Diff mode screen', function()
232 245
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
233 246
:set diffopt+=internal |
234 247
]])
248 + 249 +
screen:try_resize(40, 9)
250 +
screen:expect([[
251 +
{1:+ }{5:^+-- 4 lines: 1···}{3:│}{1:+ }{5:+-- 4 lines: 1··}|
252 +
{1: }5 {3:│}{1: }5 |
253 +
{1: }6 {3:│}{1: }6 |
254 +
{1: }7 {3:│}{1: }7 |
255 +
{1: }8 {3:│}{1: }8 |
256 +
{1: }9 {3:│}{1: }9 |
257 +
{1: }10 {3:│}{1: }10 |
258 +
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
259 +
|
260 +
]])
235 261
end)
236 262 237 263
it('Add a line in the middle of file 2, remove on at the end of file 1', function()
You can’t perform that action at this time.
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4