Permalink
Browse files

Merge branch 'master' of github.com:drnic/ruby-tmbundle

  • Loading branch information...
2 parents c99e353 + 78035a4 commit 9be85aa726b3e87788ee0260d835f5c520b0d3d4 @drnic committed Oct 10, 2010
Showing with 3 additions and 2 deletions.
  1. +1 −1 Support/RubyMate/catch_exception.rb
  2. +1 −1 Support/RubyMate/run_script.rb
  3. +1 −0 Tests/simple.rb
@@ -10,7 +10,7 @@
io = IO.for_fd(ENV['TM_ERROR_FD'].to_i)
io.write "<div id='exception_report' class='framed'>\n"
- io.write "<p id='exception'><strong>#{e.class.name}:</strong> #{CGI.escapeHTML e.message.sub(/`(\w+)'/, '‘\1’').sub(/ -- /, '')}</p>\n"
+ io.write "<p id='exception'><strong>#{e.class.name}:</strong> #{CGI.escapeHTML e.message.sub(/`(\w+)'/, "\1")}</p>\n"
io.write "<blockquote><table border='0' cellspacing='4' cellpadding='0'>\n"
@@ -31,7 +31,7 @@
htmlize(str).gsub(/[EF]+/, "<span style=\"color: red\">\\&</span>") +
"<br style=\"display: none\"/>"
elsif is_test_script
- out = str.map do |line|
+ out = str.chars.map do |line|
if line =~ /^(\s+)(\S.*?):(\d+)(?::in\s*`(.*?)')?/
indent, file, line, method = $1, $2, $3, $4
url, display_name = '', 'untitled document';
View
@@ -0,0 +1 @@
+puts "Simple."

0 comments on commit 9be85aa

Please sign in to comment.