From c19ad796ff9956d447f82c57d707afb3de1aad51 Mon Sep 17 00:00:00 2001
From: Nathan Weizenbaum <nex342@gmail.com>
Date: Sun, 14 Sep 2008 23:57:43 -0700
Subject: [PATCH] Allow mixins to take precedence over sibling selectors in
 ambiguous cases.

---
 lib/sass/engine.rb       | 2 +-
 test/sass/engine_test.rb | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/sass/engine.rb b/lib/sass/engine.rb
index c3195ee7..d2f2f4ee 100644
--- a/lib/sass/engine.rb
+++ b/lib/sass/engine.rb
@@ -251,7 +251,7 @@ END
       when MIXIN_DEFINITION_CHAR
         parse_mixin_definition(line)
       when MIXIN_INCLUDE_CHAR
-        if line.text[1].nil? || line.text[1] == ?\s
+        if line.text[1].nil?
           Tree::RuleNode.new(line.text, @options)
         else
           parse_mixin_include(line, root)
diff --git a/test/sass/engine_test.rb b/test/sass/engine_test.rb
index e6830dae..34dae4eb 100755
--- a/test/sass/engine_test.rb
+++ b/test/sass/engine_test.rb
@@ -336,7 +336,6 @@ SASS
   end
 
   def test_mixins_dont_interfere_with_sibling_combinator
-    assert_equal("foo + bar {\n  a: b; }\n", render("foo\n  + bar\n    a: b"))
     assert_equal("foo + bar {\n  a: b; }\nfoo + baz {\n  c: d; }\n",
                  render("foo\n  +\n    bar\n      a: b\n    baz\n      c: d"))
   end