From 87f860070566aeb037a8245c105c9b1b00dc620e Mon Sep 17 00:00:00 2001
From: Tom Feist <shabble@metavore.org>
Date: Sat, 16 Jul 2011 06:50:17 +0100
Subject: trim out the caller() uglyness, since it's not actually needed for
 get_format().

---
 feature-tests/getchan.pl | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'feature-tests/getchan.pl')

diff --git a/feature-tests/getchan.pl b/feature-tests/getchan.pl
index 622f708..92044aa 100644
--- a/feature-tests/getchan.pl
+++ b/feature-tests/getchan.pl
@@ -80,15 +80,8 @@ my $state;
 sub get_format_string {
     my ($module, $tag, $theme) = @_;
 
-    $theme ||= Irssi::current_theme();
-    my $format_str;
-    {
-        # deeeeeeep black magic.
-        #print "Trying to get format for $module, $tag";
-        local *CORE::GLOBAL::caller = sub { $module };
-        $format_str = $theme->get_format($module, $tag);
-    }
-    return $format_str;
+    $theme ||= Irssi::current_theme;
+    return $theme->get_format($module, $tag);
 }
 
 
-- 
cgit v1.2.3