Merge remote branch 'haml/stable' into stable

Conflicts: doc-src/SASS_CHANGELOG.md
miketierney · Nov 19, 2010 · abdcf1c · abdcf1c
2 parents bd5d035 + 7ce7a97
commit abdcf1c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/doc-src/SASS_CHANGELOG.md b/doc-src/SASS_CHANGELOG.md
@@ -8,6 +8,8 @@
 * When displaying a Sass error in an imported stylesheet,
   use the imported stylesheet's contents rather than the top-level stylesheet.
 
+* Fix a bug that caused some lines with non-ASCII characters to be ignored in Ruby 1.8.
+
 ## 3.0.24
 
 [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.24).

diff --git a/lib/sass/engine.rb b/lib/sass/engine.rb
@@ -237,7 +237,7 @@ def tabulate(string)
       comment_tab_str = nil
       first = true
       lines = []
-      string.gsub(/\r|\n|\r\n|\r\n/, "\n").scan(/^.*?$/).each_with_index do |line, index|
+      string.gsub(/\r|\n|\r\n|\r\n/, "\n").scan(/^[^\n]*?$/).each_with_index do |line, index|
         index += (@options[:line] || 1)
         if line.strip.empty?
           lines.last.text << "\n" if lines.last && lines.last.comment?