Merge branch 'master' into next

2011-09-22 20:11:44 +01:00
parent 143663f031 ef0f4e7299
commit 1717b88174
8 changed files with 28 additions and 14 deletions
--- a/src/cmdparse.y
+++ b/src/cmdparse.y
@ -544,7 +544,7 @@ kill:
        else {
            TAILQ_FOREACH(current, &owindows, owindows) {
                printf("matching: %p / %s\n", current->con, current->con->name);
-                tree_close(current->con, $2, false);
+                tree_close(current->con, $2, false, false);
            }
        }