diff options
author | Ashkan Kiani <ashkan.k.kiani@gmail.com> | 2019-11-23 14:28:54 -0800 |
---|---|---|
committer | Ashkan Kiani <ashkan.k.kiani@gmail.com> | 2019-11-23 14:28:54 -0800 |
commit | 42c53d266afb989467879de29ef2e9ccdaa4b152 (patch) | |
tree | 5e7233a958aa6964e74911d35904c28d3a2582b7 /src/nvim/mark_extended.c | |
parent | 73487f4130581da72c9e838189aab39c79c177c5 (diff) | |
parent | 61d2a12743bcefbdd661b446b0b0fea7a1f77b17 (diff) | |
download | rneovim-42c53d266afb989467879de29ef2e9ccdaa4b152.tar.gz rneovim-42c53d266afb989467879de29ef2e9ccdaa4b152.tar.bz2 rneovim-42c53d266afb989467879de29ef2e9ccdaa4b152.zip |
Merge remote-tracking branch 'origin/master' into lsp-followup
Diffstat (limited to 'src/nvim/mark_extended.c')
-rw-r--r-- | src/nvim/mark_extended.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/nvim/mark_extended.c b/src/nvim/mark_extended.c index 01745f484d..91c2f919ce 100644 --- a/src/nvim/mark_extended.c +++ b/src/nvim/mark_extended.c @@ -910,6 +910,9 @@ void extmark_col_adjust(buf_T *buf, linenr_T lnum, bool marks_moved = extmark_col_adjust_impl(buf, lnum, mincol, lnum_amount, false, col_amount); + marks_moved |= bufhl_mark_col_adjust(buf, lnum, mincol, + lnum_amount, col_amount); + if (undo == kExtmarkUndo && marks_moved) { u_extmark_col_adjust(buf, lnum, mincol, lnum_amount, col_amount); } @@ -938,6 +941,7 @@ void extmark_col_adjust_delete(buf_T *buf, linenr_T lnum, marks_moved = extmark_col_adjust_impl(buf, lnum, mincol, 0, true, (long)endcol); + marks_moved |= bufhl_mark_col_adjust(buf, lnum, endcol, 0, mincol-(endcol+1)); // Deletes at the end of the line have different behaviour than the normal // case when deleted. // Cleanup any marks that are floating beyond the end of line. |