Oops, try not to drop the selector contexts.

Author: Aaron Leung

eval_apply.cpp

@@ -1107,12 +1107,12 @@ namespace Sass {
             size_t num_requests = extension_requests.count(sel);
             if (num_requests) {
               Node group(new_Node(Node::selector_group, sel.path(), sel.line(), 1 + num_requests));
-              group << sel;
+              group << expr[2];
               // for each of its extenders ...
               for (multimap<Node, Node>::iterator request = extension_requests.lower_bound(sel);
                    request != extension_requests.upper_bound(sel);
                    ++request) {
-                group << generate_extension(sel, request->second, new_Node);
+                group << generate_extension(expr[2], request->second, new_Node);
               }
               expr[2] = group;
             }
@@ -1129,7 +1129,7 @@ namespace Sass {
                 for (multimap<Node, Node>::iterator request = extension_requests.lower_bound(sel);
                      request != extension_requests.upper_bound(sel);
                      ++request) {
-                  group << generate_extension(sel, request->second, new_Node);
+                  group << generate_extension(group[i], request->second, new_Node);
                 }
               }
             }

sass_interface.cpp

@@ -48,7 +48,7 @@ extern "C" {
            doc.context.new_Node,
            doc.context);
     // extend_selectors(doc.context.pending_extensions, doc.context.extensions, doc.context.new_Node);
-    extend(doc.root, doc.context.extensions, doc.context.new_Node);
+    if (doc.context.has_extensions) extend(doc.root, doc.context.extensions, doc.context.new_Node);
     string output(doc.emit_css(static_cast<Document::CSS_Style>(style)));
     char* c_output = (char*) malloc(output.size() + 1);
     strcpy(c_output, output.c_str());