diff options
author | Robert Manea <gotmor@gmail.com> | 2009-06-18 23:31:38 +0200 |
---|---|---|
committer | Robert Manea <gotmor@gmail.com> | 2009-06-18 23:31:38 +0200 |
commit | 8c73265c01efad22307d2112860a613e20445b93 (patch) | |
tree | 2bd4bd6dcb59f2dd64704a18412968cc114449e4 /uzbl.c | |
parent | 53357d65eaac90ea3b51bc56d17851df00cd3891 (diff) |
allow @<...>@ inside of @(...)@ and vice versa
Diffstat (limited to 'uzbl.c')
-rw-r--r-- | uzbl.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -289,7 +289,7 @@ expand(char *s, gboolean recurse) { if(upto == ' ') s = vend; else s = vend+1; } - else if(!recurse && + else if(recurse != 1 && etype == EXP_EXPR) { mycmd = expand(ret, 1); g_spawn_command_line_sync(mycmd, &cmd_stdout, NULL, NULL, &err); @@ -305,9 +305,9 @@ expand(char *s, gboolean recurse) { } s = vend+2; } - else if(!recurse && + else if(recurse != 2 && etype == EXP_JS) { - mycmd = expand(ret, 1); + mycmd = expand(ret, 2); eval_js(uzbl.gui.web_view, mycmd, js_ret); g_free(mycmd); |