diff options
Diffstat (limited to 'src/exec.zig')
| -rw-r--r-- | src/exec.zig | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/exec.zig b/src/exec.zig index aaca3e0e..ca79a481 100644 --- a/src/exec.zig +++ b/src/exec.zig @@ -1054,7 +1054,7 @@ pub fn applySettingBuiltin(p: *Pardes, setting: config.Runtime.Setting, arg: ?[] if (!p.settings.apply(setting, want)) p.reportFailure(p.active, "Shell: takes " ++ comptime config.Runtime.takes(.shell).?); }, // Bare, each says its value, as acme's Tab says the width. - inline .tab, .callstack_depth, .search_rows => |_, tag| if (arg == null) { + inline .tab, .callstack_depth => |_, tag| if (arg == null) { var said: [40]u8 = undefined; return p.setMessage(p.active, std.fmt.bufPrint(&said, "{s} {d}", .{ setting.word, @field(p.settings, @tagName(tag)) }) catch setting.word); } else if (!p.settings.apply(setting, arg)) { @@ -1095,14 +1095,6 @@ pub fn placeNew(p: *Pardes, from: usize, origin: ?usize, id: usize, kind: NewPan // No column left (the last one Delcol'd): a pane made from the workspace // tag opens one to go in. _ = layout.firstColumn(p); - // Anything asked from the finder column (a row looked at, a command - // there) goes where its query came from, never into the finder; and - // the rules that take the last column take the last that is not it. - const exec_column = p.exec_column; - defer p.exec_column = exec_column; - const away = p.finder.away(p, from, kind); - if (away) |c| p.exec_column = c; - const finder_column = p.finder.column(p); const asked = if (p.exec_column != null) null else origin; layout.compute(p); const before = p.rects; @@ -1112,10 +1104,9 @@ pub fn placeNew(p: *Pardes, from: usize, origin: ?usize, id: usize, kind: NewPan // (look.c:921-923, et->col). .scratch => layout.acmePlace(p, p.exec_column orelse columnOf(p, from), null, id), // +Errors, a command's output: the last column (util.c:94-98); a - // command run from a column's tag, that column. The finder's is - // never the last column for them. + // command run from a column's tag, that column. .command => layout.acmePlace(p, p.exec_column orelse p.ncol - 1, null, id), - .errors => layout.acmePlace(p, away orelse p.ncol - 1, null, id), + .errors => layout.acmePlace(p, p.ncol - 1, null, id), // makenewwindow(nil) for 9P's new (acme.c:877), else (t). .fs => layout.acmePlace(p, acmeColumn(p, from), null, id), .shell, .doc => layout.acmePlace(p, acmeColumn(p, from), asked, id), @@ -1148,7 +1139,7 @@ pub fn placeNew(p: *Pardes, from: usize, origin: ?usize, id: usize, kind: NewPan var c = p.ncol; while (c > 0) { c -= 1; - if (c == f.col or c == finder_column) continue; + if (c == f.col) continue; for (p.cols[c].panes[0..p.cols[c].n]) |k| p.rects[k] = before[k]; layout.snapColWeights(p, c); if (p.cols[c].n == 0) { |
