minor extract_magic_comment source tweaks

alexch · Sep 15, 2011 · c537f08 · c537f08
1 parent 151854b
commit c537f08
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/lib/tilt/template.rb b/lib/tilt/template.rb
@@ -255,8 +255,11 @@ def unbind_compiled_method(method_name)
 
     def extract_magic_comment(script)
       comment = script.slice(/\A[ \t]*\#.*coding\s*[=:]\s*([[:alnum:]\-_]+).*$/)
-      return comment if comment and not %w[ascii-8bit binary].include?($1.downcase)
-      "# coding: #{@default_encoding}" if @default_encoding
+      if comment && !%w[ascii-8bit binary].include?($1.downcase)
+        comment
+      elsif @default_encoding
+        "# coding: #{@default_encoding}"
+      end
     end
 
     # Special case Ruby 1.9.1's broken yield.