Merge remote-tracking branch 'origin/master' into revamp-doc

joaotavora · May 10, 2012 · 8b7285b · 8b7285b
2 parents bdcecc0 + bbef037
commit 8b7285b
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/extras/textmate_import.rb b/extras/textmate_import.rb
@@ -19,6 +19,7 @@
 require 'shellwords' # String#shellescape
 require 'ruby-debug' if $DEBUG
 
+Encoding.default_external = Encoding::UTF_8 if RUBY_VERSION > '1.8.7'
 
 opts = Trollop::options do
   opt :bundle_dir, "TextMate bundle directory", :short => '-d', :type => :string