Tor Arvid Lund <torarvid@xxxxxxxxx> writes: >On Thu, Oct 21, 2010 at 1:43 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote: >> Pat Thoyts <patthoyts@xxxxxxxxxxxxxxxxxxxxx> writes: >> >>> This is a rather more complete implementation of whitespace highlighting >>> according to the core.whitespace setting. The diff view whitespace >>> highlights should match what you see with 'git diff' when color is >>> enabled for all the whitespace rules except cr-at-eol where there is >>> currently a rule to hide these. >>> >>> Suggested-by: Tor Arvid Lund <torarvid@xxxxxxxxx> >>> Signed-off-by: Pat Thoyts <patthoyts@xxxxxxxxxxxxxxxxxxxxx> >>> --- >> >> This might be a very stupid question, but isn't it an easier-to-maintain >> option to let underlying "git diff" color its output and convert the ANSI >> coloring to whatever Tcl wants to use, especially in the long run, instead >> of trying to replicate the logic to check whitespace breakages here? > >Hi Pat, and thanks again for doing the Tcl hacking :) > >I did a quick test (with core.whitespace unset, so the defaults should >be used). I wonder if there is a little bug somewhere else in git-gui. >If I have committed a line like this: > >............Hello world > >and change it to: > >........*Hello world > >I used '.' to indicate Space, and '*' to indicate Tab, so I changed 4 >spaces to one tab character. As I understand space-before-tab, this >should render 8 red spaces, 1 white Tab, and then "Hello world". But >instead I get 9 white spaces... So the tab gets converted to a space >(I verified that it was not my editor that converted it - it really is >8 SP and 1 TAB). This is caused by the tabstyle being defaulted to 'tabular'. This means the first tab on a line extends to the first tab position and if that lies to the left then the width of a single space is added. Looks like this widget should be using -tabstyle wordprocessor which would do what you expect and move to the next tab position. It is still a tab - just the display width looks wrong. > >If I change it to >***Hello world >so that there are no leading spaces, then the Tabs do not get converted. >Can you reproduce this? I have applied your patch on top of Junio's >master and build on msysgit on Vista 64 (if that matters). > > >Btw, I almost feel bad saying this after you implemented my >suggestion, but Junio's suggestion to parse the ANSI escapes seems >quite clever, doesn't it? Indeed - see my other post for an implementation. -- Pat Thoyts http://www.patthoyts.tk/ PGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html