@@ -507,11 +507,15 @@ sub in_unit_test {
507
507
508
508
sub get_less_charset {
509
509
my @less_char_vars = (" LESSCHARSET" , " LESSCHARDEF" , " LC_ALL" , " LC_CTYPE" , " LANG" );
510
- foreach (@less_char_vars ) {
511
- return $ENV {$_ } if defined $ENV {$_ };
510
+ foreach my $key (@less_char_vars ) {
511
+ my $val = $ENV {$key };
512
+
513
+ if (defined $val ) {
514
+ return ($key , $val );
515
+ }
512
516
}
513
517
514
- return " " ;
518
+ return () ;
515
519
}
516
520
517
521
sub should_print_unicode {
@@ -521,7 +525,7 @@ sub should_print_unicode {
521
525
}
522
526
523
527
# Otherwise, assume we're piping to less(1)
524
- my $ less_charset = get_less_charset();
528
+ my ( $less_env_var , $ less_charset) = get_less_charset();
525
529
if ($less_charset =~ / utf-?8/i ) {
526
530
return 1;
527
531
}
@@ -933,19 +937,24 @@ sub get_terminal_width {
933
937
}
934
938
935
939
sub show_debug_info {
940
+ my @less = get_less_charset();
936
941
my $git_ver = trim(` git --version` );
937
- $git_ver =~ s / [^\d .]// g ;
942
+ $git_ver =~ s / [^\d .]// g ;
938
943
939
944
print " Diff-so-fancy : v$VERSION \n " ;
940
945
print " Git : v$git_ver \n " ;
941
946
print " Perl : $^V\n " ;
942
947
print " \n " ;
943
948
944
- print " Supports Unicode: " . yes_no(should_print_unicode()) . " \n " ;
945
- print " Unicode Ruler : " . yes_no($use_unicode_dash_for_ruler ) . " \n " ;
946
949
print " Terminal width : " . get_terminal_width() . " \n " ;
947
950
print " Terminal \$ LANG : " . $ENV {LANG } . " \n " ;
948
- print " Less Charset : " . get_less_charset() . " \n " ;
951
+ print " \n " ;
952
+ print " Supports Unicode: " . yes_no(should_print_unicode()) . " \n " ;
953
+ print " Unicode Ruler : " . yes_no($use_unicode_dash_for_ruler ) . " \n " ;
954
+ print " \n " ;
955
+ print " Less Charset Var: " . ($less [0] // " " ) . " \n " ;
956
+ print " Less Charset : " . ($less [1] // " " ) . " \n " ;
957
+ print " \n " ;
949
958
print " Is Windows : " . yes_no(is_windows()) . " \n " ;
950
959
print " Operating System: $^O\n " ;
951
960
}
0 commit comments