diff options
| author | Pat Thoyts <patthoyts@users.sourceforge.net> | 2010-11-19 22:22:20 +0000 |
|---|---|---|
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | 2011-11-04 16:16:54 +0000 |
| commit | 3f2fb173ace1afa7040d31cd3239c6a9cac49006 (patch) | |
| tree | db2c56993308503c388d4edfe4b2ac8078856cf6 | |
| parent | 9af6413b96c85c9fcd9c34c015cd8fae0219ee04 (diff) | |
| download | git-3f2fb173ace1afa7040d31cd3239c6a9cac49006.tar.gz | |
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>
| -rw-r--r-- | lib/diff.tcl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/diff.tcl b/lib/diff.tcl index 39e4d909b8..f5ed5d1dc6 100644 --- 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" |