aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 9.0.0133: virtual text after line moves to joined line

Browse Source 
Problem:    Virtual text after line moves to joined line. (Yegappan
            Lakshmanan)
Solution:   When joining lines only keep virtual text after the last line.
This commit is contained in:
Bram Moolenaar
2022-08-01 22:18:50 +01:00
parent 09ff4b54fb
commit e175dc6911
6 changed files with 53 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ops.c
View File

@@ -2012,7 +2012,8 @@ do_join(
{
curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t));
#ifdef FEAT_PROP_POPUP
propcount += count_props((linenr_T) (curwin->w_cursor.lnum + t), t > 0);
propcount += count_props((linenr_T) (curwin->w_cursor.lnum + t),
t > 0, t + 1 == count);
#endif
if (t == 0 && setmark && (cmdmod.cmod_flags & CMOD_LOCKMARKS) == 0)
{
@@ -2147,7 +2148,6 @@ do_join(
curwin->w_cursor.lnum + t, t == count - 1,
(long)(cend - newp), spaces_removed);
#endif
if (t == 0)
break;
curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t - 1));