aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/edit.c
diff options
context:
space:
mode:
authorBjörn Linse <bjorn.linse@gmail.com>2021-04-04 09:42:34 +0200
committerGitHub <noreply@github.com>2021-04-04 09:42:34 +0200
commitce976bf3559edca6d3a649c9053fab88959de6cf (patch)
tree4bcb56dae770723c0e7bce7ad97ce4ae574d64ee /src/nvim/edit.c
parent8e496b9dfd5b644f06536afea63e3088b9d83cf8 (diff)
parent7602c560508de35c9e211ecc732fda0ff3c06923 (diff)
downloadrneovim-ce976bf3559edca6d3a649c9053fab88959de6cf.tar.gz
rneovim-ce976bf3559edca6d3a649c9053fab88959de6cf.tar.bz2
rneovim-ce976bf3559edca6d3a649c9053fab88959de6cf.zip
Merge pull request #14278 from chentau/extmark_retab
extmark: buffer update fixes for `noexpandtab` and `:retab`
Diffstat (limited to 'src/nvim/edit.c')
-rw-r--r--src/nvim/edit.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 49bd170bcd..be0ab33d08 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -8787,10 +8787,6 @@ static bool ins_tab(void)
getvcol(curwin, &fpos, &vcol, NULL, NULL);
getvcol(curwin, cursor, &want_vcol, NULL, NULL);
- // save start of changed region for extmark_splice
- int start_row = fpos.lnum;
- colnr_T start_col = fpos.col;
-
// Use as many TABs as possible. Beware of 'breakindent', 'showbreak'
// and 'linebreak' adding extra virtual columns.
while (ascii_iswhite(*ptr)) {
@@ -8841,8 +8837,8 @@ static bool ins_tab(void)
}
}
if (!(State & VREPLACE_FLAG)) {
- extmark_splice_cols(curbuf, start_row - 1, start_col,
- cursor->col - start_col, fpos.col - start_col,
+ extmark_splice_cols(curbuf, fpos.lnum - 1, change_col,
+ cursor->col - change_col, fpos.col - change_col,
kExtmarkUndo);
}
}