diff options
| author | Gary Johnson <garyjohn@spocom.com> | 2024-06-01 20:51:33 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-06-01 20:51:33 +0200 |
| commit | 88d4f255b7b7a19bb4f6489e0ad0956e47d51fed (patch) | |
| tree | 6d81fd5e8675a167ca253375b26b13f8f2e0f86c /src/edit.c | |
| parent | e299591498a20c5c587364e4df57f947dfc02897 (diff) | |
patch 9.1.0456: Left shift is incorrect with vartabstop and shiftwidth=0v9.1.0456
Problem: Left shift is incorrect with vartabstop and shiftwidth=0
Solution: make tabstop_at() function aware of shift direction
(Gary Johnson)
The problem was that with 'vartabstop' set and 'shiftwidth' equal 0,
left shifts using << were shifting the line to the wrong column. The
tabstop to the right of the first character in the line was being used
as the shift amount instead of the tabstop to the left of that first
character.
The reason was that the tabstop_at() function always returned the value
of the tabstop to the right of the given column and was not accounting
for the direction of the shift.
The solution was to make tabstop_at() aware of the direction of the
shift and to choose the tabtop accordingly.
A test was added to check this behavior and make sure it doesn't
regress.
While at it, also fix a few indentation/alignment issues.
fixes: #14864
closes: #14887
Signed-off-by: Gary Johnson <garyjohn@spocom.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
Diffstat (limited to 'src/edit.c')
| -rw-r--r-- | src/edit.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/edit.c b/src/edit.c index 075b39bff0..e75a1cf118 100644 --- a/src/edit.c +++ b/src/edit.c @@ -519,9 +519,10 @@ edit( if ( #ifdef FEAT_VARTABS - curwin->w_wcol < mincol - tabstop_at( - get_nolist_virtcol(), curbuf->b_p_ts, - curbuf->b_p_vts_array) + curwin->w_wcol < mincol - tabstop_at(get_nolist_virtcol(), + curbuf->b_p_ts, + curbuf->b_p_vts_array, + FALSE) #else (int)curwin->w_wcol < mincol - curbuf->b_p_ts #endif @@ -1310,7 +1311,7 @@ docomplete: c = ins_ctrl_ey(c); break; - default: + default: #ifdef UNIX if (c == intr_char) // special interrupt char goto do_intr; @@ -1842,7 +1843,7 @@ backspace_until_column(int col) * Only matters when there are composing characters. * Return TRUE when something was deleted. */ - static int + static int del_char_after_col(int limit_col UNUSED) { if (enc_utf8 && limit_col >= 0) |