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

patch 8.1.0671: cursor in the wrong column after auto-formatting

Browse Source 
Problem:    Cursor in the wrong column after auto-formatting.
Solution:   Check for deleting more spaces than adding. (closes #3748)
This commit is contained in:
Bram Moolenaar
2018-12-31 23:58:24 +01:00
parent 3d631cb0b3
commit e1e714ef0d
6 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mark.c
View File

@@ -1211,6 +1211,8 @@ mark_adjust_internal(
posp->lnum += lnum_amount; \
if (col_amount < 0 && posp->col <= (colnr_T)-col_amount) \
posp->col = 0; \
else if (posp->col < spaces_removed) \
posp->col = col_amount + spaces_removed; \
else \
posp->col += col_amount; \
} \
@@ -1220,13 +1222,16 @@ mark_adjust_internal(
* Adjust marks in line "lnum" at column "mincol" and further: add
* "lnum_amount" to the line number and add "col_amount" to the column
* position.
* "spaces_removed" is the number of spaces that were removed, matters when the
* cursor is inside them.
*/
void
mark_col_adjust(
linenr_T lnum,
colnr_T mincol,
long lnum_amount,
long col_amount)
long col_amount,
int spaces_removed)
{
int i;
int fnum = curbuf->b_fnum;