1 files changed, 6 insertions, 6 deletions
diff --git a/src/Terminal.zig b/src/Terminal.zig
index e204b44c..91c23305 100644
--- a/src/Terminal.zig
+++ b/src/Terminal.zig
@@ -5,6 +5,7 @@ const std = @import("std");
 const pardes = @import("pardes.zig");
 const config = @import("config.zig");
 const Pardes = pardes.Pardes;
+const Surface = pardes.Surface;
 const modal = @import("modal.zig");
 const tracy = @import("tracy.zig");
 const dump = @import("dump.zig");
@@ -717,7 +718,7 @@ pub fn feedOutput(p: *Pardes, pane: *Pane, bytes: []const u8) void {
     if (comptime !enabled) return;
     if (pane.terminal == null) return;
     const has_positions = pane.ovl != null or pane.body.cur_pinned or pane.body.vsel.active or
-        pane.body.msel.active or pane.body.nsel > 0 or pane.body.append_at != null or pane.look_at != null or
+        pane.body.msel.active or pane.body.nsel > 0 or pane.body.last_edit != null or pane.look_at != null or
         pane.body.ed_undo_len > 0 or pane.body.ed_redo_len > 0 or pointerRowCount(pane) > 0;
     // Sticky bottom, as every other terminal does it: output drags the
     // viewport down only when the viewport was already on the last row, so
@@ -843,7 +844,7 @@ fn ingestWithPositions(pane: *Pane, bytes: []const u8) void {
         extra[nextra + 1] = &selection.arow;
         nextra += 2;
     }
-    if (pane.body.append_at) |*at| {
+    if (pane.body.last_edit) |*at| {
         extra[nextra] = &at.row;
         nextra += 1;
     }
@@ -1124,7 +1125,7 @@ pub fn enterTty(p: *Pardes, id: usize) void {
     // keeps its modal endpoint for the next return to editor mode.
     pane.body.cur_pinned = selected;
     pane.body.select = false;
-    pane.body.append_at = null;
+    pane.body.restore_cursor = false;
     pane.body.sticky_col = -1;
     pane.body.normal.clear();
 }
@@ -1386,7 +1387,7 @@ pub fn editText(p: *Pardes, pane: *Pane, lo: i32, hi: i32, col: i32) ?EditText {
 
 /// Consume a rewritten overlay, freeing the terminal edit text it replaces.
 pub fn setEditText(p: *Pardes, pane: *Pane, new: []u8) void {
-    const overlay = if (pane.ovl) |*value| value else return p.gpa.free(new);
+    const overlay = if (pane.ovl) |*value| value else return pardes.edit.retireEditText(p, new);
     for (0..pane.sel.len) |button| {
         pane.clearPointerSelection(button);
         pane.sel[button].state = .none;
@@ -1763,11 +1764,10 @@ const Anchor = struct {
     }
 };
 
-pub fn recolorAnsi(p: *Pardes, pane: *Pane, r: pardes.Rect, tx: u16, tw: u16, body_h: u16, body: []const u8) void {
+pub fn recolorAnsi(p: *Pardes, s: *Surface, pane: *Pane, r: pardes.Rect, tx: u16, tw: u16, body_h: u16, body: []const u8) void {
     // No emulator, no ANSI cells: the whole pass — and the 256-colour theme
     // projection behind it — is compiled out.
     if (comptime !enabled) return;
-    const s = &p.surface;
     if (pane.terminal == null) return;
     const body_y = p.bodyTop(pane, r);
     var filtered_storage: FilteredColors = undefined;