From 83a742621ff53c5c4e737d929a163bb38e1361c5 Mon Sep 17 00:00:00 2001
From: Daniel van Hoesel <daniel@danielvanhoesel.nl>
Date: Tue, 31 Dec 2013 13:44:19 +0100
Subject: [PATCH] Do not reset options when calling highlight

---
 lib/linguist/language.rb | 2 +-
 test/test_language.rb    | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/linguist/language.rb b/lib/linguist/language.rb
index bb91d126..955becb3 100644
--- a/lib/linguist/language.rb
+++ b/lib/linguist/language.rb
@@ -485,7 +485,7 @@ module Linguist
     #
     # Returns html String
     def colorize(text, options = {})
-      lexer.highlight(text, options = {})
+      lexer.highlight(text, options)
     end
 
     # Public: Return name as String representation
diff --git a/test/test_language.rb b/test/test_language.rb
index f16d0dbc..1e1d015f 100644
--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -384,6 +384,15 @@ class TestLanguage < Test::Unit::TestCase
 <div class="highlight"><pre><span class="k">def</span> <span class="nf">foo</span>
   <span class="s1">&#39;foo&#39;</span>
 <span class="k">end</span>
+</pre></div>
+    HTML
+  end
+
+  def test_colorize_with_options
+    assert_equal <<-HTML.chomp, Language['Ruby'].colorize("def foo\n  'foo'\nend\n", :options => { :cssclass => "highlight highlight-ruby" })
+<div class="highlight highlight-ruby"><pre><span class="k">def</span> <span class="nf">foo</span>
+  <span class="s1">&#39;foo&#39;</span>
+<span class="k">end</span>
 </pre></div>
     HTML
   end