--- rxvt-unicode/src/perl/matcher	2012/08/06 19:25:59	1.12
+++ rxvt-unicode/src/perl/matcher	2014/05/28 17:01:32	1.16
@@ -1,17 +1,17 @@
 #! perl
 
 # Author: Tim Pope <rxvt-unicodeNOSPAM@tpope.org>
-#          Bob Farrell <robertanthonyfarrell@gmail.com>
+#         Bob Farrell <robertanthonyfarrell@gmail.com>
 
-#:META:X_RESOURCE:%.launcher:string:default launcher command
-#:META:X_RESOURCE:%.button:string:the button, yeah
-#:META:X_RESOURCE:%.pattern.:string:extra pattern to match
-#:META:X_RESOURCE:%.launcher.:string:custom launcher for pattern
-#:META:X_RESOURCE:%.rend.:string:custom rednition for pattern
+#:META:RESOURCE:%.launcher:string:default launcher command
+#:META:RESOURCE:%.button:string:the button, yeah
+#:META:RESOURCE:%.pattern.:string:extra pattern to match
+#:META:RESOURCE:%.launcher.:string:custom launcher for pattern
+#:META:RESOURCE:%.rend.:string:custom rednition for pattern
 
 =head1 NAME
 
-  matcher - match strings in terminal output and change their rendition
+matcher - match strings in terminal output and change their rendition
 
 =head1 DESCRIPTION
 
@@ -19,7 +19,7 @@
 matching a certain pattern and make it clickable. When clicked with the
 mouse button specified in the C<matcher.button> resource (default 2, or
 middle), the program specified in the C<matcher.launcher> resource
-(default, the C<urlLauncher> resource, C<sensible-browser>) will be started
+(default, the C<url-launcher> resource, C<sensible-browser>) will be started
 with the matched text as first argument.  The default configuration is
 suitable for matching URLs and launching a web browser, like the
 former "mark-urls" extension.
@@ -33,9 +33,12 @@
 from the keyboard.  Simply bind a keysym to "perl:matcher:last" or
 "perl:matcher:list" as seen in the example below.
 
-Example configuration:
+Example: load and use the matcher extension with defaults.
 
     URxvt.perl-ext:           default,matcher
+
+Example: use a custom configuration.
+
     URxvt.url-launcher:       sensible-browser
     URxvt.keysym.C-Delete:    perl:matcher:last
     URxvt.keysym.M-Delete:    perl:matcher:list
@@ -75,29 +78,28 @@
    $self->exec_async( $self->{launcher}, @args );
 }
 
+# backwards compat
 sub on_user_command {
    my ($self, $cmd) = @_;
 
-   if($cmd =~ s/^matcher:list\b//) {
-      $self->matchlist();
+   if ($cmd =~ s/^matcher:list\b//) {
+      $self->matchlist;
    } else {
-      if($cmd =~ s/^matcher:last\b//) {
+      if ($cmd =~ s/^matcher:last\b//) {
          $self->most_recent;
-      }
-   # For backward compatibility
-    else {
-      if($cmd =~ s/^matcher\b//) {
+      } elsif ($cmd =~ s/^matcher\b//) {
+         # for backward compatibility
          $self->most_recent;
       }
    }
-  }
+
    ()
 }
 
 sub matchlist {
    my ($self) = @_;
    if ( $self->{showing} ) {
-     $self->{url_overlay}->hide();
+     $self->{url_overlay}->hide;
      $self->{showing} = 0;
      return;
    }