1 files changed, 8 insertions, 14 deletions

diff --git a/src/pardes.zig b/src/pardes.zig
index ef713e0c..7fddf19f 100644
--- a/src/pardes.zig
+++ b/src/pardes.zig
@@ -5341,10 +5341,7 @@ pub const Pardes = struct {
         }
         // A 9P write that asked for the shell (pty/ctl's exec), waiting on
         // it, fails with what was said, as a failed Save's does.
-        const said = pane.msg[0..pane.msg_len];
-        const kept = @import("Messages.zig").clip(said, p.fs.late_failure.len);
-        @memcpy(p.fs.late_failure[0..kept.len], kept);
-        p.fs.late_failure_len = @intCast(kept.len);
+        p.noteLateFailure(id);
     }
 
     pub fn saveFailed(p: *Pardes, id: u8, path: []const u8, err: anyerror) void {
@@ -5362,10 +5359,7 @@ pub const Pardes = struct {
             p.reportFailure(id, std.fmt.bufPrint(&what, "Save {s}: no such directory", .{path}) catch "Save: no such directory")
         else
             p.reportError(id, std.fmt.bufPrint(&what, "Save {s}", .{path}) catch "Save", err);
-        const said = if (p.panes[id]) |pane| pane.msg[0..pane.msg_len] else "Save failed";
-        const kept = @import("Messages.zig").clip(said, p.fs.late_failure.len);
-        @memcpy(p.fs.late_failure[0..kept.len], kept);
-        p.fs.late_failure_len = @intCast(kept.len);
+        p.noteLateFailure(id);
     }
 
     /// A Dump the host could not write: said on the message row and in the
@@ -5388,10 +5382,7 @@ pub const Pardes = struct {
         } else p.reportError(p.active, operation, err);
         // In the words the message row has, so the write's err is the one
         // record of it (its msg goes: 9p_io, dropMessage).
-        const said = if (p.panes[p.active]) |pane| pane.msg[0..pane.msg_len] else "Dump failed";
-        const kept = @import("Messages.zig").clip(said, p.fs.late_failure.len);
-        @memcpy(p.fs.late_failure[0..kept.len], kept);
-        p.fs.late_failure_len = @intCast(kept.len);
+        p.noteLateFailure(p.active);
     }
 
     /// The path a watch is about: a real file's, or a PDF's.
@@ -6460,8 +6451,11 @@ pub const Pardes = struct {
     /// What was said of a failure just now on pane `id` is also the waiting
     /// 9P write's (9p_io, `fs.late_failure`).
     pub fn noteLateFailure(p: *Pardes, id: usize) void {
-        const pane = p.panes[id] orelse return;
-        const said = pane.msg[0..pane.msg_len];
+        // Said by reportFailure just now: its words fitted whole, the
+        // reason kept; else what the message row has.
+        const said = if (p.fs.said_at == p.fs.failures and p.fs.said_len > 0)
+            p.fs.said[0..p.fs.said_len]
+        else if (p.panes[id]) |pane| pane.msg[0..pane.msg_len] else return;
         const kept = @import("Messages.zig").clip(said, p.fs.late_failure.len);
         @memcpy(p.fs.late_failure[0..kept.len], kept);
         p.fs.late_failure_len = @intCast(kept.len);