summaryrefslogtreecommitdiff
path: root/src/ninep
diff options
context:
space:
mode:
Diffstat (limited to 'src/ninep')
-rw-r--r--src/ninep/ctl.zig11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/ninep/ctl.zig b/src/ninep/ctl.zig
index f8cda59a..3784cf41 100644
--- a/src/ninep/ctl.zig
+++ b/src/ninep/ctl.zig
@@ -690,7 +690,7 @@ pub fn writePager(p: *Pardes, req: Req) Reply {
/// The text a /pager open wrote after its directory (`held`), a program's
/// output for a terminal, put in the +Pager `serial` as `pardes -` once
/// wrote it to the body: through ghostty-vt (pager.zig), its colours kept
-/// as the pane's spans unless PagerColor is off, one undo step, and left
+/// as the pane's spans, one undo step, and left
/// clean. Reads of the pane are its plain text. The held bytes go either way.
pub fn fillPager(p: *Pardes, serial: u32, held: *std.ArrayList(u8)) error{OutOfMemory}!void {
if (held.items.len == 0) return;
@@ -698,7 +698,7 @@ pub fn fillPager(p: *Pardes, serial: u32, held: *std.ArrayList(u8)) error{OutOfM
const id = p.paneBySerial(serial) orelse return;
const pane = p.panes[id].?;
const f = if (pane.file) |*file| file else return;
- const page = try pardes.pager.parse(p.gpa, held.items, p.settings.pager_color);
+ const page = try pardes.pager.parse(p.gpa, held.items);
held.clearAndFree(p.gpa);
if (page.text.len == 0 and f.content.len == 0) return page.deinit(p.gpa);
if (!pane.fs.nomark) panes.File.pushUndo(p, pane);
@@ -2715,9 +2715,8 @@ test "what a /pager open writes after its directory is the text: plain in the bo
try testing.expectEqualStrings("red /a\nNext\n", f.content);
try testing.expectEqual(@as(usize, 0), f.pager_spans.len);
- // PagerColor off, and an open closed with no read: the same text, plain,
- // in at the editor's next step (a close through a mount never waits).
- p.settings.pager_color = false;
+ // An open closed with no read: the text in at the editor's next step
+ // (a close through a mount never waits), its colours kept.
const kept = try testing.allocator.dupe(u8, f.content);
defer testing.allocator.free(kept);
const shut = call(p, .{ .tag = 7, .op = .open, .node = pager, .omode = 1 }).reply.handle;
@@ -2734,7 +2733,7 @@ test "what a /pager open writes after its directory is the text: plain in the bo
try testing.expectEqualStrings("", next.content);
fillClosedPagers(p);
try testing.expectEqualStrings("green\n", next.content);
- try testing.expectEqual(@as(usize, 0), next.pager_spans.len);
+ try testing.expectEqual(@as(usize, 1), next.pager_spans.len);
try testing.expectEqual(next.revision, next.saved_revision);
}