From c78438a23e1a6c53fac85433103010e08ca23c51 Mon Sep 17 00:00:00 2001
From: Kornelius Kalnbach <murphy@rubychan.de>
Date: Fri, 9 Sep 2011 01:02:50 +0200
Subject: remove obsolete workaround for old Rubinius incompatibility

---
 etc/CodeRay.tmproj    |  4 +++-
 lib/coderay/tokens.rb | 30 +++++-------------------------
 2 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/etc/CodeRay.tmproj b/etc/CodeRay.tmproj
index 97e606e..3f5152c 100644
--- a/etc/CodeRay.tmproj
+++ b/etc/CodeRay.tmproj
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>currentDocument</key>
+	<string>../lib/coderay/scanners/haml.rb</string>
 	<key>documents</key>
 	<array>
 		<dict>
@@ -118,7 +120,7 @@
 		</dict>
 		<dict>
 			<key>filename</key>
-			<string>../Rakefile</string>
+			<string>../rakefile</string>
 			<key>lastUsed</key>
 			<date>2011-08-23T02:18:45Z</date>
 		</dict>
diff --git a/lib/coderay/tokens.rb b/lib/coderay/tokens.rb
index 1566276..b357199 100644
--- a/lib/coderay/tokens.rb
+++ b/lib/coderay/tokens.rb
@@ -303,31 +303,11 @@ module CodeRay
       @dump = Marshal.load dump
     end
     
-    if defined?(RUBY_ENGINE) && RUBY_ENGINE['rbx']
-      #:nocov:
-      def text_token text, kind
-        self << text << kind
-      end
-      def begin_group kind
-        self << :begin_group << kind
-      end
-      def end_group kind
-        self << :end_group << kind
-      end
-      def begin_line kind
-        self << :begin_line << kind
-      end
-      def end_line kind
-        self << :end_line << kind
-      end
-      #:nocov:
-    else
-      alias text_token push
-      def begin_group kind; push :begin_group, kind end
-      def end_group kind; push :end_group, kind end
-      def begin_line kind; push :begin_line, kind end
-      def end_line kind; push :end_line, kind end
-    end
+    alias text_token push
+    def begin_group kind; push :begin_group, kind end
+    def end_group kind; push :end_group, kind end
+    def begin_line kind; push :begin_line, kind end
+    def end_line kind; push :end_line, kind end
     alias tokens concat
     
   end
-- 
cgit v1.2.1