<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -11,8 +11,8 @@ $Data::Dumper::Indent = 1;
 
 use vars qw($VERSION %IRSSI);
 
-$VERSION = &quot;2.0.3&quot;;
-my ($REV) = '$Rev: 475 $' =~ /(\d+)/;
+$VERSION = &quot;2.0.4&quot;;
+my ($REV) = '$Rev: 476 $' =~ /(\d+)/;
 %IRSSI = (
     authors     =&gt; 'Dan Boger',
     contact     =&gt; 'zigdon@gmail.com',
@@ -21,7 +21,7 @@ my ($REV) = '$Rev: 475 $' =~ /(\d+)/;
       . 'Can optionally set your bitlbee /away message to same',
     license =&gt; 'GNU GPL v2',
     url     =&gt; 'http://twirssi.com',
-    changed =&gt; '$Date: 2009-02-16 20:36:03 -0800 (Mon, 16 Feb 2009) $',
+    changed =&gt; '$Date: 2009-02-16 20:50:17 -0800 (Mon, 16 Feb 2009) $',
 );
 
 my $window;
@@ -1099,11 +1099,12 @@ sub hilight {
     if ( Irssi::settings_get_str(&quot;twirssi_nick_color&quot;) ) {
         my $c = Irssi::settings_get_str(&quot;twirssi_nick_color&quot;);
         $c = $irssi_to_mirc_colors{$c};
-        $text =~ s/(^|\W)\@([-\w]+)/$1\cC$c\@$2\cO/g;
+        $text =~ s/(^|\W)\@([-\w]+)/$1\cC$c\@$2\cO/g if $c;
     }
     if ( Irssi::settings_get_str(&quot;twirssi_topic_color&quot;) ) {
         my $c = Irssi::settings_get_str(&quot;twirssi_topic_color&quot;);
-        $text =~ s/(^|\W)\#([-\w]+)/$1\cC$c\#$2\cO/g;
+        $c = $irssi_to_mirc_colors{$c};
+        $text =~ s/(^|\W)\#([-\w]+)/$1\cC$c\#$2\cO/g if $c;
     }
     $text =~ s/[\n\r]/ /g;
 </diff>
      <filename>twirssi.pl</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>ac43358c4d72271d294352065acb6c67e8dd1eec</id>
    </parent>
  </parents>
  <author>
    <name>Dan Boger</name>
    <email>zigdon@irc.peeron.com</email>
  </author>
  <url>http://github.com/bssteph/twirssi/commit/a4096004424ab94a9b48fe240cefe1aada290581</url>
  <id>a4096004424ab94a9b48fe240cefe1aada290581</id>
  <committed-date>2009-02-16T20:51:49-08:00</committed-date>
  <authored-date>2009-02-16T20:51:49-08:00</authored-date>
  <message>r476 - v2.0.4 - Fix #topics hilights</message>
  <tree>cfa6c380012fe02c2b7c90bf072d58dc6a3a3975</tree>
  <committer>
    <name>Dan Boger</name>
    <email>zigdon@irc.peeron.com</email>
  </committer>
</commit>
