diff options
| author | Matthieu Coudron <mattator@gmail.com> | 2020-04-13 22:49:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-13 22:49:00 +0200 |
| commit | 93b2cb7a3824f91ee24ddf57406d5682699f684b (patch) | |
| tree | 4ea7bb4aca7520a26a749b0958046ba52b450d4f /src/nvim/extmark.c | |
| parent | 13b4a6fd4fa67794e76892cb362121a33a756f58 (diff) | |
| parent | cf223e7d78df5e8a63b84d423be55a29eefd8883 (diff) | |
| download | rneovim-93b2cb7a3824f91ee24ddf57406d5682699f684b.tar.gz rneovim-93b2cb7a3824f91ee24ddf57406d5682699f684b.tar.bz2 rneovim-93b2cb7a3824f91ee24ddf57406d5682699f684b.zip | |
Merge pull request #11997 from janlazo/vim-8.1.2389
[RDY]vim-patch:8.1.{1745,2147,2280,2282,},8.2.{41,134,365,366,381,387,389,397,398,406,415,457,464,473,474,507,544,549}
Diffstat (limited to 'src/nvim/extmark.c')
| -rw-r--r-- | src/nvim/extmark.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/extmark.c b/src/nvim/extmark.c index e77b556024..38d111f2aa 100644 --- a/src/nvim/extmark.c +++ b/src/nvim/extmark.c @@ -789,7 +789,7 @@ bool decorations_redraw_start(buf_T *buf, int top_row, ExtmarkItem *item = map_ref(uint64_t, ExtmarkItem)(buf->b_extmark_index, start_id, false); if ((!(mark.id&MARKTREE_END_FLAG) && altpos.row < top_row - && !kv_size(item->virt_text)) + && item && !kv_size(item->virt_text)) || ((mark.id&MARKTREE_END_FLAG) && altpos.row >= top_row)) { goto next_mark; } @@ -854,7 +854,7 @@ int decorations_redraw_col(buf_T *buf, int col, DecorationRedrawState *state) if (endpos.row < mark.row || (endpos.row == mark.row && endpos.col <= mark.col)) { - if (!kv_size(item->virt_text)) { + if (item && !kv_size(item->virt_text)) { goto next_mark; } } |