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>
Pat Thoyts committed
Nov 19, 2010 at 10:00 UTC
9af6413b96c85c9fcd9c34c015cd8fae0219ee04
2 files changed
+2
-1
git-gui.sh
+1
@@ -3376,6 +3376,7 @@ foreach {n c} {0 black 1 red4 2 green4 3 yellow4 4 blue4 5 magenta4 6 cyan4 7 gr
3376
$ui_diff tag configure clri3$n -background $c
3377
}
3378
$ui_diff tag configure clr1 -font font_diffbold
3379
+$ui_diff tag configure clr4 -underline 1
3380
3381
$ui_diff tag conf d_info -foreground blue -font font_diffbold
3382
lib/diff.tcl
+1
-1
@@ -504,7 +504,7 @@ proc read_diff {fd conflict_size cont_info} {
504
set prefix clr
505
foreach style [split $colbegin ";"] {
506
if {$style eq "7"} {append prefix i; continue}
507
- if {$style < 30 || $style > 47} {continue}
507
+ if {$style != 4 && ($style < 30 || $style > 47)} {continue}
508
set a "$mark linestart + $posbegin chars"
509
set b "$mark linestart + $posend chars"
510
catch {$ui_diff tag add $prefix$style $a $b}