1 files changed, 13 insertions, 5 deletions
diff --git a/src/pardes.zig b/src/pardes.zig
index 19fe51d1..141b214e 100644
--- a/src/pardes.zig
+++ b/src/pardes.zig
@@ -9,9 +9,9 @@ pub const look = @import("look.zig");
 pub const filesystem = @import("fs.zig");
 pub const ctlfs = @import("ninep/tree.zig");
 pub const syntax = @import("syntax.zig");
-pub const locations_config = @import("locations_config.zig");
 const tracy = @import("tracy.zig");
 pub const panes = @import("panes.zig");
+const locations = @import("locations.zig");
 pub const tagline = @import("tagline.zig");
 pub const exec = @import("exec.zig");
 const recent_files = @import("recent.zig");
@@ -492,7 +492,6 @@ test {
     _ = @import("surface.zig");
     _ = @import("body_layer.zig");
     _ = @import("draw.zig");
-    _ = @import("tag_layer.zig");
     _ = @import("dump.zig"); // its tests ran nowhere before
     _ = @import("recent.zig");
     _ = @import("Presentation.zig");
@@ -767,7 +766,7 @@ test "LocationsConfig command reports partial updates and survives restore" {
     _ = try p.setTestFile("source\n");
     try std.testing.expect(p.executeBuiltinLine(0, "LocationsConfig context:5 tscontext:on"));
     try std.testing.expect(p.executeBuiltinLine(0, "LocationsConfig tslocations:off"));
-    const expected: locations_config.Config = .{ .context = 5, .tscontext = true, .tslocations = false };
+    const expected: locations.Config = .{ .context = 5, .tscontext = true, .tslocations = false };
     try std.testing.expectEqual(expected, p.locations_config);
     try std.testing.expect(p.executeBuiltinLine(0, "LocationsConfig context:2 unknown:on"));
     try std.testing.expectEqual(expected, p.locations_config);
@@ -4393,8 +4392,8 @@ pub const Pardes = struct {
     /// (exec.placeNew). A Look click moves the keyboard but not this.
     active_column: u32 = 0,
     settings: config.Runtime = .{ .font = .{ .tagline_percent = config.gui_tagline_font_percent } },
-    locations_config: locations_config.Config = .{},
-    locations_cache: @import("locations_cache.zig").Cache = .{},
+    locations_config: locations.Config = .{},
+    locations_cache: locations.Cache = .{},
     tty_filter_palette: panes.Terminal.FilterPalette = .{},
     font_request_taken: bool = false,
     custom_theme: ?Theme = null,
@@ -5082,6 +5081,15 @@ pub const Pardes = struct {
             else
                 "Newcol: no space for a column: this one is too narrow to split");
         };
+        // A narrower column wraps long tags onto more rows, which can leave
+        // a pane under its tag and two rows: its column's rows are shared
+        // out again, and where they cannot hold every minimum there is no
+        // new column, as a size too small is refused.
+        for (0..p.ncol) |k| if (!layout.columnAtMinimums(p, k) and !layout.shareColumn(p, k)) {
+            layout.dropColumn(p, c);
+            layout.compute(p);
+            return p.reportFailure(from_id, "Newcol: no space for a column: the panes' tags would not fit");
+        };
         tagline.enterHeader(p, c);
     }