undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-gui: support underline style when parsing diff output

Browse Source 
Suggested-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
This commit is contained in:
Pat Thoyts 2010-11-19 10:00:49 +00:00
parent 4198579b0a
commit 9af6413b96
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
git-gui.sh
View File

@ -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 clri3$n -background $c
} }
$ui_diff tag configure clr1 -font font_diffbold $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 $ui_diff tag conf d_info -foreground blue -font font_diffbold

2
lib/diff.tcl
View File

@ -504,7 +504,7 @@ proc read_diff {fd conflict_size cont_info} {
set prefix clr set prefix clr
foreach style [split $colbegin ";"] { foreach style [split $colbegin ";"] {
if {$style eq "7"} {append prefix i; continue} 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 a "$mark linestart + $posbegin chars"
set b "$mark linestart + $posend chars" set b "$mark linestart + $posend chars"
catch {$ui_diff tag add $prefix$style $a $b} catch {$ui_diff tag add $prefix$style $a $b}