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 8.1.2216: text property in wrong place after :substitute

Browse Source 
Problem:    Text property in wrong place after :substitute.
Solution:   Pass the new column instead of the old one. (Christian Brabandt,
            closes #4427)
This commit is contained in:
Bram Moolenaar
2019-10-25 22:13:29 +02:00
parent 7aee6876eb
commit 1fd30d7bae
3 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ex_cmds.c
View File

@@ -3856,6 +3856,7 @@ do_sub(exarg_T *eap)
colnr_T matchcol;
colnr_T prev_matchcol = MAXCOL;
char_u *new_end, *new_start = NULL;
colnr_T total_added = 0;
unsigned new_start_len = 0;
char_u *p1;
int did_sub = FALSE;
@@ -4279,13 +4280,18 @@ do_sub(exarg_T *eap)
#ifdef FEAT_TEXT_PROP
if (curbuf->b_has_textprop)
{
int bytes_added = sublen - 1 - (regmatch.endpos[0].col
- regmatch.startpos[0].col);
// When text properties are changed, need to save for
// undo first, unless done already.
if (adjust_prop_columns(lnum, regmatch.startpos[0].col,
sublen - 1 - (regmatch.endpos[0].col
- regmatch.startpos[0].col),
apc_flags))
if (adjust_prop_columns(lnum,
total_added + regmatch.startpos[0].col,
bytes_added, apc_flags))
apc_flags &= ~APC_SAVE_FOR_UNDO;
// Offset for column byte number of the text property
// in the resulting buffer afterwards.
total_added += bytes_added;
}
#endif
}