ThemeSel is Themes and FontSel is Fonts; the old words still work in init files and dumps

The user asked for the plainer words. Every use is renamed: the
builtins, leader paths, /commands, the docs and tutor, tests, and the
themesel golden, re-recorded. An init file's ThemeSel or FontSel runs
the new word and says `ThemeSel: renamed to Themes`, as ColumnTags is
said; a dump naming an output pane by the old word restores it.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

6 files changed, 39 insertions, 12 deletions

diff --git a/src/Output.zig b/src/Output.zig
index dd6ab92a..a75718bf 100644
--- a/src/Output.zig
+++ b/src/Output.zig
@@ -250,6 +250,9 @@ pub fn fromWord(w: []const u8) ?Origin {
     if (std.mem.eql(u8, w, "/")) return .search;
     if (std.mem.eql(u8, w, config.errors_buffer)) return .errors;
     if (std.mem.eql(u8, w, config.pdf_links_buffer)) return .pdf_links;
+    // A dump from before the rename names them by their old words.
+    if (std.mem.eql(u8, w, "ThemeSel")) return .{ .cmd = .Themes };
+    if (builtins.capabilities.font_picker) if (std.mem.eql(u8, w, "FontSel")) return .{ .cmd = .Fonts };
     if (std.meta.stringToEnum(Builtin, w)) |b|
         if (builtins.registry.outputTraits(b) != null) return .{ .cmd = b };
     if (std.meta.stringToEnum(lsp.Kind, w)) |k| return .{ .query = k };
@@ -591,13 +594,13 @@ pub fn openThemes(p: *Pardes, id: usize) !void {
         try out.writer.print(comptime config.Runtime.findAction(.theme).?.word ++ " {s}\n", .{t.name});
     }
     const content = try out.toOwnedSlice();
-    try openStepped(p, id, .{ .cmd = .ThemeSel }, content);
+    try openStepped(p, id, .{ .cmd = .Themes }, content);
 }
 
 pub fn isWalkRow(file: *const File.State, row: usize, line: []const u8) bool {
     const state = file.output orelse return true;
     if (usesLocationsConfig(state.from)) return isResultRow(file, row);
-    if (!std.meta.eql(state.from, Origin{ .cmd = .ThemeSel })) return true;
+    if (!std.meta.eql(state.from, Origin{ .cmd = .Themes })) return true;
     // Section labels are for reading, not stops in the command walk.
     return std.mem.startsWith(u8, std.mem.trimStart(u8, line, " \t"), comptime config.Runtime.findAction(.theme).?.word ++ " ");
 }
@@ -611,7 +614,7 @@ pub fn openFonts(p: *Pardes, id: usize) !void {
         for (font_list) |f|
             try out.writer.print(comptime config.Runtime.findAction(.font).?.word ++ " {s}\n", .{f.name});
         const content = try out.toOwnedSlice();
-        try openStepped(p, id, .{ .cmd = .FontSel }, content);
+        try openStepped(p, id, .{ .cmd = .Fonts }, content);
     }
 }
 
diff --git a/src/builtins.zig b/src/builtins.zig
index 2247fcbb..041eb1b8 100644
--- a/src/builtins.zig
+++ b/src/builtins.zig
@@ -741,7 +741,7 @@ pub const NextColor = struct {
 };
 
 /// List the themes in a pane, each a word to click.
-pub const ThemeSel = struct {
+pub const Themes = struct {
     pub const scope: Scope = .session;
     pub const output: OutputTraits = .{ .name = config.themes_buffer, .steps = true, .commands = true };
     pub fn run(c: Ctx) void {
@@ -779,7 +779,7 @@ pub const DumpThemes = struct {
 };
 
 /// List the fonts in a pane, each a word to click.
-pub const FontSel = struct {
+pub const Fonts = struct {
     pub const scope: Scope = .session;
     pub const output: OutputTraits = .{ .name = config.fonts_buffer, .steps = true, .commands = true };
     pub const enabled = capabilities.font_picker;
diff --git a/src/colors.zig b/src/colors.zig
index 8319a112..5694998d 100644
--- a/src/colors.zig
+++ b/src/colors.zig
@@ -559,7 +559,7 @@ fn invalidateThemeDependentRasters(p: *Pardes) void {
 }
 
 /// Themes whose names share `name`'s first letter, a line of them, for a
-/// Theme given a name there is none of: all of them (ThemeSel) are too many
+/// Theme given a name there is none of: all of them (Themes) are too many
 /// for a message or a refused write.
 pub fn themesNear(buf: []u8, name: []const u8) []const u8 {
     var w = std.Io.Writer.fixed(buf);
diff --git a/src/config.zig b/src/config.zig
index c7ea5411..2b5bf280 100644
--- a/src/config.zig
+++ b/src/config.zig
@@ -88,7 +88,7 @@ pub const leader_path = paths: {
         .Wrap = "tw",
         .Tagbottom = "tb",
         .NextColor = "tn",
-        .ThemeSel = "tt",
+        .Themes = "tt",
         .Theme = null,
         .Shell = null,
         .Petscii = "tp",
@@ -109,7 +109,7 @@ pub const leader_path = paths: {
         .Exec = null,
     });
     if (builtins.capabilities.font_picker) {
-        table.set(.FontSel, "tf");
+        table.set(.Fonts, "tf");
         table.set(.Font, null);
         table.set(.TaglineSize, null);
     }
diff --git a/src/exec.zig b/src/exec.zig
index 60c4172d..1fc38b9c 100644
--- a/src/exec.zig
+++ b/src/exec.zig
@@ -811,11 +811,35 @@ pub fn applyStartupConfig(p: *Pardes) void {
         if (executeBuiltinLine(p, p.active, line)) continue;
         // A setting pardes no longer has is said, once, and changes nothing.
         const word = commandText(line);
-        if (std.mem.eql(u8, word[0 .. std.mem.indexOfAny(u8, word, " \t") orelse word.len], "ColumnTags"))
+        const head = word[0 .. std.mem.indexOfAny(u8, word, " \t") orelse word.len];
+        if (std.mem.eql(u8, head, "ColumnTags"))
             p.setMessage(p.active, "ColumnTags: column tags are always shown now; the init line is ignored");
+        // A word renamed runs as its new name, and says so, once a line.
+        for ([_][2][]const u8{ .{ "ThemeSel", "Themes" }, .{ "FontSel", "Fonts" } }) |renamed| if (std.mem.eql(u8, head, renamed[0])) {
+            _ = executeBuiltinLine(p, p.active, renamed[1]);
+            var said: [64]u8 = undefined;
+            p.setMessage(p.active, std.fmt.bufPrint(&said, "{s}: renamed to {s}", .{ renamed[0], renamed[1] }) catch "renamed");
+        };
     }
 }
 
+test "an init file's ThemeSel runs as Themes and says it was renamed" {
+    const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 80, .rows = 24 });
+    defer p.deinit();
+    p.opts.startup_config = "ThemeSel\n";
+    applyStartupConfig(p);
+    var listed = false;
+    for (p.panes) |slot| if (slot) |pane| if (pane.file) |f| if (f.output) |o| {
+        listed = listed or std.meta.eql(o.from, panes.Output.Origin{ .cmd = .Themes });
+    };
+    try std.testing.expect(listed);
+    var said = false;
+    for (p.panes) |slot| if (slot) |pane| {
+        said = said or std.mem.eql(u8, pane.msg[0..pane.msg_len], "ThemeSel: renamed to Themes");
+    };
+    try std.testing.expect(said);
+}
+
 test "an init file's retired ColumnTags line is said and ignored" {
     const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 80, .rows = 24 });
     defer p.deinit();
@@ -873,7 +897,7 @@ pub fn applySettingBuiltin(p: *Pardes, setting: config.Runtime.Setting, arg: ?[]
             if (!p.announce) return;
             var near: [96]u8 = undefined;
             var text: [200]u8 = undefined;
-            return p.reportFailure(p.active, std.fmt.bufPrint(&text, "Theme: no theme \"{s}\"; like it: {s}; ThemeSel lists all", .{ want[0..@min(want.len, 40)], colors.themesNear(&near, want) }) catch "Theme: no such theme");
+            return p.reportFailure(p.active, std.fmt.bufPrint(&text, "Theme: no theme \"{s}\"; like it: {s}; Themes lists all", .{ want[0..@min(want.len, 40)], colors.themesNear(&near, want) }) catch "Theme: no such theme");
         },
         .font => {
             if (comptime !font_picker) return;
diff --git a/src/ninep/ctl.zig b/src/ninep/ctl.zig
index 22a0923b..18a7eaa9 100644
--- a/src/ninep/ctl.zig
+++ b/src/ninep/ctl.zig
@@ -414,7 +414,7 @@ fn checkBuiltin(p: *Pardes, req: Req, line: []const u8, scope: builtins.Scope) ?
             // `refuse` quotes the line after it, in what is left of 128.
             var near: [40]u8 = undefined;
             var why: [104]u8 = undefined;
-            return refuse(p, req, std.fmt.bufPrint(&why, "bad value in control message; like it: {s}; ThemeSel lists all", .{pardes.colors.themesNear(&near, arg)}) catch "bad value in control message", line);
+            return refuse(p, req, std.fmt.bufPrint(&why, "bad value in control message; like it: {s}; Themes lists all", .{pardes.colors.themesNear(&near, arg)}) catch "bad value in control message", line);
         },
         .font => config.Runtime.FontSpec.parse(arg) != null,
         else => probe: {
@@ -1093,7 +1093,7 @@ test "the root ctl reads the settings as a write takes them, and takes the sessi
     try testing.expectEqualStrings("bad value in control message; takes acme, pardes \"Placement east\"", wr(p, root_ctl, "Placement east").reply.ename);
     const no_theme = wr(p, root_ctl, "Theme no-such-theme").reply.ename;
     try testing.expectStringStartsWith(no_theme, "bad value in control message; like it: n");
-    try testing.expect(std.mem.endsWith(u8, no_theme, "; ThemeSel lists all \"Theme no-such-theme\""));
+    try testing.expect(std.mem.endsWith(u8, no_theme, "; Themes lists all \"Theme no-such-theme\""));
     try testing.expectEqualStrings("wrong #args in control message \"Newcol 2\"", wr(p, root_ctl, "Newcol 2").reply.ename);
     try testing.expectEqualStrings("wrong #args in control message \"Theme\"", wr(p, root_ctl, "Theme").reply.ename);
     // A bare required word fails the check, so the line before never runs.