diff options
author | Pat Thoyts <patthoyts@users.sourceforge.net> | 2010-11-19 10:00:49 +0000 |
---|---|---|
committer | Pat Thoyts <patthoyts@users.sourceforge.net> | 2011-11-04 16:16:52 +0000 |
commit | 9af6413b96c85c9fcd9c34c015cd8fae0219ee04 (patch) | |
tree | 4d3f55616dc43d8271e16da3b16449864133239d | |
parent | 4198579b0a35edfc17e77ba11be3f801e89205ab (diff) | |
download | git-9af6413b96c85c9fcd9c34c015cd8fae0219ee04.tar.gz |
git-gui: support underline style when parsing diff output
Suggested-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
-rwxr-xr-x | git-gui.sh | 1 | ||||
-rw-r--r-- | lib/diff.tcl | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/git-gui.sh b/git-gui.sh index 21033cb0bb..789c177b3b 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -3376,6 +3376,7 @@ foreach {n c} {0 black 1 red4 2 green4 3 yellow4 4 blue4 5 magenta4 6 cyan4 7 gr $ui_diff tag configure clri3$n -background $c } $ui_diff tag configure clr1 -font font_diffbold +$ui_diff tag configure clr4 -underline 1 $ui_diff tag conf d_info -foreground blue -font font_diffbold diff --git a/lib/diff.tcl b/lib/diff.tcl index cf8a95ec34..39e4d909b8 100644 --- a/lib/diff.tcl +++ b/lib/diff.tcl @@ -504,7 +504,7 @@ proc read_diff {fd conflict_size cont_info} { set prefix clr foreach style [split $colbegin ";"] { if {$style eq "7"} {append prefix i; continue} - if {$style < 30 || $style > 47} {continue} + if {$style != 4 && ($style < 30 || $style > 47)} {continue} set a "$mark linestart + $posbegin chars" set b "$mark linestart + $posend chars" catch {$ui_diff tag add $prefix$style $a $b} |