Making 'image-url' work for more dynamic arguments.

eval_apply.cpp

@@ -298,10 +298,10 @@ namespace Sass {
         Node base(eval(expr[0], prefix, env, f_env, new_Node, ctx));
         Node prefix(new_Node(Node::identifier, base.path(), base.line(), Token::make(ctx.image_path)));
         Node fullpath(new_Node(Node::concatenation, base.path(), base.line(), 2));
-        Node url(new_Node(Node::uri, base.path(), base.line(), 1));
         fullpath << prefix << base;
-        url << fullpath;
-        return url;
+        expr.pop_back();
+        expr << fullpath;
+        return expr;
       } break;
       
       case Node::function_call: {

node_emitters.cpp

@@ -278,6 +278,15 @@ namespace Sass {
         return result;
       } break;
 
+      case image_url: {
+        Node fullpath(at(0));
+        string result("url(\"");
+        result += fullpath[0].unquote();
+        result += fullpath[1].unquote();
+        result += "\")";
+        return result;
+      } break;
+
       case expansion: {
         // ignore it
         return "";