From d35711adc4cffe0c4aebd85c197080c7163bcb77 Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Tue, 30 Nov 2010 09:22:04 +0100 Subject: apply --whitespace=fix: fix tab-in-indent When the whitespace rule tab-in-indent is enabled, apply --whitespace=fix replaces tabs by the appropriate amount of blanks. The code used "dst->len % 8" as the criterion to stop adding blanks. But it forgot that dst holds more than just the current line. Consequently, the modulus was computed correctly only for the first added line, but not for the second and subsequent lines. Fix it. Signed-off-by: Johannes Sixt Acked-by: Chris Webb Signed-off-by: Junio C Hamano --- ws.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ws.c') diff --git a/ws.c b/ws.c index d7b8c33f14..b282e8c100 100644 --- a/ws.c +++ b/ws.c @@ -362,12 +362,13 @@ void ws_fix_copy(struct strbuf *dst, const char *src, int len, unsigned ws_rule, fixed = 1; } else if ((ws_rule & WS_TAB_IN_INDENT) && last_tab_in_indent >= 0) { /* Expand tabs into spaces */ + int start = dst->len; int last = last_tab_in_indent + 1; for (i = 0; i < last; i++) { if (src[i] == '\t') do { strbuf_addch(dst, ' '); - } while (dst->len % 8); + } while ((dst->len - start) % 8); else strbuf_addch(dst, src[i]); } -- cgit v1.2.3