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

Merge branch 'jk/colors'

Browse Source 
"diff-highlight" (in contrib/) used to show byte-by-byte
differences, which meant that multi-byte characters can be chopped
in the middle.  It learned to pay attention to character boundaries
(assuming the UTF-8 payload).

* jk/colors:
  diff-highlight: do not split multibyte characters
This commit is contained in:
Junio C Hamano 2015-04-14 11:49:13 -07:00
commit 7a1aa0c288
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/diff-highlight/diff-highlight
View File

@ -1,5 +1,6 @@
#!/usr/bin/perl #!/usr/bin/perl
use 5.008;
use warnings FATAL => 'all'; use warnings FATAL => 'all';
use strict; use strict;
@ -164,8 +165,12 @@ sub highlight_pair {
sub split_line { sub split_line {
local $_ = shift; local $_ = shift;
return map { /$COLOR/ ? $_ : (split //) } return utf8::decode($_) ?
split /($COLOR*)/; map { utf8::encode($_); $_ }
map { /$COLOR/ ? $_ : (split //) }
split /($COLOR+)/ :
map { /$COLOR/ ? $_ : (split //) }
split /($COLOR+)/;
} }
sub highlight_line { sub highlight_line {