ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/urxvt.pm
(Generate patch)

Comparing rxvt-unicode/src/urxvt.pm (file contents):
Revision 1.211 by root, Wed Jun 6 14:34:03 2012 UTC vs.
Revision 1.212 by root, Wed Jun 6 15:06:41 2012 UTC

953 my $r = $term->{meta}{resource}; 953 my $r = $term->{meta}{resource};
954 while (my ($pattern, $v) = each %$r) { 954 while (my ($pattern, $v) = each %$r) {
955 $name =~ y/-/./ if $isarg; 955 $name =~ y/-/./ if $isarg;
956 956
957 if ( 957 if (
958 $pattern =~ s/\*$// 958 $pattern =~ /\.$/
959 ? $pattern eq substr $name, 0, length $pattern 959 ? $pattern eq substr $name, 0, length $pattern
960 : $pattern eq $name 960 : $pattern eq $name
961 ) { 961 ) {
962 $name = "$urxvt::RESCLASS.$name"; 962 $name = "$urxvt::RESCLASS.$name";
963 963
988 988
989 $desc .= " (-pe $ext)"; 989 $desc .= " (-pe $ext)";
990 990
991 if ($usage_type == 1) { 991 if ($usage_type == 1) {
992 $pattern =~ y/./-/; 992 $pattern =~ y/./-/;
993 $pattern =~ s/\*/.../g; 993 $pattern =~ s/-$/-.../g;
994 994
995 if ($type eq "boolean") { 995 if ($type eq "boolean") {
996 urxvt::log sprintf " -%-30s %s\n", "/+$pattern", $desc; 996 urxvt::log sprintf " -%-30s %s\n", "/+$pattern", $desc;
997 } else { 997 } else {
998 urxvt::log sprintf " -%-30s %s\n", "$pattern $type", $desc; 998 urxvt::log sprintf " -%-30s %s\n", "$pattern $type", $desc;
1359 or next; 1359 or next;
1360 1360
1361 while (<$fh>) { 1361 while (<$fh>) {
1362 if (/^#:META:X_RESOURCE:(.*)/) { 1362 if (/^#:META:X_RESOURCE:(.*)/) {
1363 my ($pattern, $type, $desc) = split /:/, $1; 1363 my ($pattern, $type, $desc) = split /:/, $1;
1364 $pattern =~ s/^%\./$ext./g; # $$ in pattern == extension name 1364 $pattern =~ s/^%(?:\.|$)/$ext./g; # % in pattern == extension name
1365 if ($pattern =~ /[^a-zA-Z\*\.]/) { 1365 if ($pattern =~ /[^a-zA-Z\.]/) {
1366 warn "$dir/$ext: meta resource '$pattern' contains illegal characters (not alphanumeric nor . nor *)\n"; 1366 warn "$dir/$ext: meta resource '$pattern' contains illegal characters (not alphanumeric nor . nor *)\n";
1367 } else { 1367 } else {
1368 $meta{resource}{$pattern} = [$ext, $type, $desc]; 1368 $meta{resource}{$pattern} = [$ext, $type, $desc];
1369 } 1369 }
1370 } elsif (/^\s*(?:#|$)/) { 1370 } elsif (/^\s*(?:#|$)/) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines