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>

diff --git a/git-gui.sh b/git-gui.sh
index 21033cb0bb373be19e8593683d88ebb33cba73d7..789c177b3b2eeb90a61ec94fd3b5e0f03773fa63 100755 (executable)
--- 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 cf8a95ec346a9a8afa60a3812d59a8caa4bb4c3f..39e4d909b8c5f0f90f56c8e4a202976673026605 100644 (file)
--- 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}