git-gui: sort the numeric ansi codes

This ensures that underline does not conflict with inverse colors.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>

diff --git a/lib/diff.tcl b/lib/diff.tcl
index 39e4d909b8c5f0f90f56c8e4a202976673026605..f5ed5d1dc66844fb58a2605285eb460fe14112a4 100644 (file)
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@ -502,7 +502,7 @@ proc read_diff {fd conflict_size cont_info} {
 
                foreach {posbegin colbegin posend colend} $markup {
                        set prefix clr
-                       foreach style [split $colbegin ";"] {
+                       foreach style [lsort -integer [split $colbegin ";"]] {
                                if {$style eq "7"} {append prefix i; continue}
                                if {$style != 4 && ($style < 30 || $style > 47)} {continue}
                                set a "$mark linestart + $posbegin chars"