r555 - Fix hilighting given @service, again

diff --git a/twirssi.pl b/twirssi.pl
index cc7c05520c20dc847200048a0c79f28dfaf6562b..4bb7078ec646f0fcf2f20e6b0d3fffc5064714b5 100644 (file)
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -11,7 +11,7 @@ $Data::Dumper::Indent = 1;
 use vars qw($VERSION %IRSSI);
 
 $VERSION = "2.1.3beta";
 use vars qw($VERSION %IRSSI);
 
 $VERSION = "2.1.3beta";

-my ($REV) = '$Rev: 554 $' =~ /(\d+)/;
+my ($REV) = '$Rev: 555 $' =~ /(\d+)/;

 %IRSSI = (
     authors     => 'Dan Boger',
     contact     => 'zigdon@gmail.com',
 %IRSSI = (
     authors     => 'Dan Boger',
     contact     => 'zigdon@gmail.com',


@@ -20,7 +20,7 @@ my ($REV) = '$Rev: 554 $' =~ /(\d+)/;
       . 'Can optionally set your bitlbee /away message to same',
     license => 'GNU GPL v2',
     url     => 'http://twirssi.com',
       . 'Can optionally set your bitlbee /away message to same',
     license => 'GNU GPL v2',
     url     => 'http://twirssi.com',

-    changed => '$Date: 2009-03-15 23:09:56 -0700 (Sun, 15 Mar 2009) $',
+    changed => '$Date: 2009-03-15 23:15:33 -0700 (Sun, 15 Mar 2009) $',

 );
 
 my $window;
 );
 
 my $window;


@@ -938,7 +938,9 @@ sub monitor_child {
 
             my $hilight_color =
               $irssi_to_mirc_colors{ Irssi::settings_get_str("hilight_color") };
 
             my $hilight_color =
               $irssi_to_mirc_colors{ Irssi::settings_get_str("hilight_color") };

-            if ( $_ eq '@'.substr($meta{account}, 0, index($meta{account}, "@"))
+            my $nick =
+              '@' . substr( $meta{account}, 0, index( $meta{account}, "@" ) );
+            if ( $_ =~ /\Q$nick\E(?:\W|$)/i

                 and Irssi::settings_get_bool("twirssi_hilights") )
             {
                 $meta{nick} = "\cC$hilight_color$meta{nick}\cO";
                 and Irssi::settings_get_bool("twirssi_hilights") )
             {
                 $meta{nick} = "\cC$hilight_color$meta{nick}\cO";