diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-12-23 14:36:00 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-12-23 14:36:00 +0100 |
| commit | 23999d799cfe844b604f193183f8f84052c8e746 (patch) | |
| tree | 35d073cb39859acd906c9ac1c9fee90c251b2299 /src/move.c | |
| parent | 4072ba571babd733d1800c082416fe8fe3c28ed7 (diff) | |
| download | vim-git-8.2.2198.tar.gz | |
patch 8.2.2198: ml_get error when resizing window and using text propertyv8.2.2198
Problem: ml_get error when resizing window and using text property.
Solution: Validate botline of the right window. (closes #7528)
Diffstat (limited to 'src/move.c')
| -rw-r--r-- | src/move.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/move.c b/src/move.c index 69091fd3d..aa90b528a 100644 --- a/src/move.c +++ b/src/move.c @@ -541,6 +541,8 @@ set_topline(win_T *wp, linenr_T lnum) #endif // Approximate the value of w_botline wp->w_botline += lnum - wp->w_topline; + if (wp->w_botline > wp->w_buffer->b_ml.ml_line_count + 1) + wp->w_botline = wp->w_buffer->b_ml.ml_line_count + 1; wp->w_topline = lnum; wp->w_topline_was_set = TRUE; #ifdef FEAT_DIFF @@ -595,8 +597,17 @@ changed_line_abv_curs_win(win_T *wp) void validate_botline(void) { - if (!(curwin->w_valid & VALID_BOTLINE)) - comp_botline(curwin); + validate_botline_win(curwin); +} + +/* + * Make sure the value of wp->w_botline is valid. + */ + void +validate_botline_win(win_T *wp) +{ + if (!(wp->w_valid & VALID_BOTLINE)) + comp_botline(wp); } /* |