Merge pull request #454 from kislyuk/master

Don't stop highlighting if one code block throws an exception.

lib/gollum/markup.rb

@@ -504,13 +504,15 @@ module Gollum
         blocks << [spec[:lang], code]
       end
 
-      highlighted = begin
+      highlighted = []
+      blocks.each do |lang, code|
         encoding ||= 'utf-8'
-        blocks.map { |lang, code|
+        begin
-          Pygments.highlight(code, :lexer => lang, :options => {:encoding => encoding.to_s})
+          hl_code = Pygments.highlight(code, :lexer => lang, :options => {:encoding => encoding.to_s})
-        }
+        rescue ::RubyPython::PythonError
-      rescue ::RubyPython::PythonError
+          hl_code = code
-        []
+        end
+        highlighted << hl_code
       end
       
       @codemap.each do |id, spec|