From 6b04f4db08c18fac921e37fb09d02025093c8aae Mon Sep 17 00:00:00 2001 From: CJ van den Berg Date: Fri, 15 Aug 2025 11:22:43 +0200 Subject: [PATCH 1/2] fix: entering the same minimode twice causes an empty keybind set --- src/tui/tui.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tui/tui.zig b/src/tui/tui.zig index c84880c..ed5640e 100644 --- a/src/tui/tui.zig +++ b/src/tui/tui.zig @@ -1036,10 +1036,10 @@ const cmds = struct { fn enter_mini_mode(self: *Self, comptime mode: anytype, ctx: Ctx) !void { command.executeName("disable_fast_scroll", .{}) catch {}; command.executeName("disable_jump_mode", .{}) catch {}; - const input_mode_, const mini_mode_ = try mode.create(self.allocator, ctx); if (self.mini_mode_) |_| try exit_mini_mode(self, .{}); if (self.input_mode_outer_) |_| try exit_overlay_mode(self, .{}); if (self.input_mode_outer_ != null) @panic("exit_overlay_mode failed"); + const input_mode_, const mini_mode_ = try mode.create(self.allocator, ctx); self.input_mode_outer_ = self.input_mode_; self.input_mode_ = input_mode_; self.mini_mode_ = mini_mode_; From b043dfe34f8ad708e79bd7466bcae179a0a906e0 Mon Sep 17 00:00:00 2001 From: CJ van den Berg Date: Fri, 15 Aug 2025 11:27:08 +0200 Subject: [PATCH 2/2] feat: reduce mode indicator clutter --- src/tui/status/linenumstate.zig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tui/status/linenumstate.zig b/src/tui/status/linenumstate.zig index 3c29e48..9c6813c 100644 --- a/src/tui/status/linenumstate.zig +++ b/src/tui/status/linenumstate.zig @@ -90,11 +90,11 @@ fn format(self: *Self) void { const writer = fbs.writer(); const eol_mode = switch (self.eol_mode) { .lf => "", - .crlf => " [␍␊]", + .crlf => " ␍␊", }; const indent_mode = switch (self.indent_mode) { .spaces, .auto => "", - .tabs => " [⭾]", + .tabs => " ⭾ ", }; std.fmt.format(writer, "{s}{s} Ln ", .{ eol_mode, indent_mode }) catch {}; self.format_count(writer, self.line + 1, self.padding orelse 0) catch {};