Signed-off-by: Bert Wesarg <bert.wesarg@xxxxxxxxxxxxxx>
---
git-gui/git-gui.sh | 4 ++++
git-gui/lib/diff.tcl | 3 ++-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index d3acf0d..70c0483 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -3328,6 +3328,10 @@ foreach {n c} {0 black 1 red4 2 green4 3 yellow4 4 blue4 5 magenta4 6 cyan4 7 gr
$ui_diff tag configure clri4$n -foreground $c
$ui_diff tag configure clr3$n -foreground $c
$ui_diff tag configure clri3$n -background $c
+ $ui_diff tag configure clru4$n -underline 1 -background $c
+ $ui_diff tag configure clrui4$n -underline 1 -foreground $c
+ $ui_diff tag configure clru3$n -underline 1 -foreground $c
+ $ui_diff tag configure clrui3$n -underline 1 -background $c
}
$ui_diff tag configure clr1 -font font_diffbold
diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl
index dcf0711..f59477f 100644
--- a/git-gui/lib/diff.tcl
+++ b/git-gui/lib/diff.tcl
@@ -463,7 +463,8 @@ proc read_diff {fd cont_info} {
foreach {posbegin colbegin posend colend} $markup {
set prefix clr
- foreach style [split $colbegin ";"] {
+ foreach style [lsort -integer [split $colbegin ";"]] {
+ if {$style eq "4"} {append prefix u; continue}
if {$style eq "7"} {append prefix i; continue}
if {$style < 30 || $style > 47} {continue}
set a "$mark linestart + $posbegin chars"
--
tg: (6f10c41..) bw/git-gui/support-underline-ansi-styles (depends on: master)
--
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