1 files changed, 10 insertions, 5 deletions
diff --git a/src/builtins.zig b/src/builtins.zig
index 8fe49649..6aabba8d 100644
--- a/src/builtins.zig
+++ b/src/builtins.zig
@@ -609,11 +609,13 @@ pub const Kill = struct {
         const names = std.mem.trim(u8, c.arg orelse "", " \t\r\n");
         var stopped = false;
         var jobless = false;
+        var running = false;
         for (c.p.panes, 0..) |slot, id| {
             const pane = slot orelse continue;
             // A command pane's child is the command: the whole of its
             // process group goes, as acme's Kill ends the process.
             if (pane.command) |line| if (!pane.command_done) {
+                running = true;
                 const said = std.mem.trim(u8, line, " \t");
                 const first = said[0 .. std.mem.indexOfAny(u8, said, " \t") orelse said.len];
                 if (names.len > 0) {
@@ -627,6 +629,7 @@ pub const Kill = struct {
                 continue;
             };
             if (!panes.terminal.commandRunning(pane)) continue;
+            running = true;
             const sent = pane.sent_command.?;
             if (names.len > 0) {
                 var words = std.mem.tokenizeAny(u8, names, " \t");
@@ -640,9 +643,11 @@ pub const Kill = struct {
         }
         if (stopped) return;
         if (jobless) return c.p.reportFailure(c.id, "Kill: no job to signal (its shell runs it without job control)");
-        if (names.len > 0)
+        // Said, but no failure: a script's Kill, named or not, has nothing
+        // left to do. Only commands running, none of them the one named, is.
+        if (names.len > 0 and running)
             c.p.reportFailure(c.id, "Kill: no running command has that first word")
-        else // said, but no failure: a script's Kill has nothing left to do
+        else
             c.p.setMessage(c.id, "Kill: nothing running");
     }
 };
@@ -813,7 +818,8 @@ pub const ThemeFile = struct {
     pub const enabled = pardes.hosted;
     pub fn run(c: Ctx) void {
         if (comptime !enabled) unreachable;
-        const arg = std.mem.trim(u8, c.arg orelse return, " \t\r\n");
+        var home_buf: [4096]u8 = undefined;
+        const arg = pardes.filesystem.expandHome(std.mem.trim(u8, c.arg orelse return, " \t\r\n"), &home_buf);
         // Said with why, not "invalid theme path".
         if (!std.mem.endsWith(u8, arg, ".zon")) {
             var said: [320]u8 = undefined;
@@ -1304,9 +1310,8 @@ pub const Config = struct {
         // Not there yet: a pane named for it, which Save makes.
         const free = c.p.freeSlot() orelse return c.p.reportError(c.id, "Config", error.NoPaneSlots);
         c.p.newScratchFor(c.id, .scratch);
-        const pane = c.p.panes[free] orelse return;
+        if (c.p.panes[free] == null) return;
         @import("ninep/pane.zig").nameBuffer(c.p, free, path, false) catch |err| return c.p.reportError(c.id, "Config", err);
-        pane.file.?.make_dirs = true;
         c.p.active = free;
     }
 };