From 767aefd1e1cfd79e2a240a59d2d16bfb326f062d Mon Sep 17 00:00:00 2001
From: Gabriel Schneider <gbrls@0x4200.cafe>
Date: Mon, 28 Sep 2026 15:59:00 -0300
Subject: Registers hold a value per range, and "<reg> names one

Registers.zig replaces the one yank buffer: every register keeps a value per
range, y fills them in document order, and p, P, R and insert Ctrl-r put
value i at range i, repeating the last (helix paste_impl). "<reg> names the
register for the next command; _ swallows, # numbers the ranges, . is each
range's text, % the file's name, / the last s/S pattern, and + and * are the
system clipboard through the ClipYank and ClipPaste paths. SPC y now writes
+ alone, as helix's does. The acme chords and a paste into a terminal take
the default register joined by newlines. The msel-yank-paste waiver is gone.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 src/Text.zig | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/Text.zig')

diff --git a/src/Text.zig b/src/Text.zig
index 43dd8a95..7ad243a1 100644
--- a/src/Text.zig
+++ b/src/Text.zig
@@ -66,6 +66,8 @@ select: bool = false,
 /// non-vertical range write resets it to -1.
 sticky_col: i32 = -1,
 append_at: ?struct { row: i32, col: i32 } = null,
+/// insert `Ctrl-r` was pressed: the next key names the register to insert
+reg_wait: bool = false,
 normal: modal.Normal.State = .{},
 /// last f/F/t/T motion, for Alt-. repeat
 find_op: u8 = 0,
-- 
cgit v1.3


From c811c34ed3bcd23954414125b45c7cac67307d5d Mon Sep 17 00:00:00 2001
From: Gabriel Schneider <gbrls@0x4200.cafe>
Date: Mon, 28 Sep 2026 16:04:12 -0300
Subject: Every range lives through insert mode, carried through each edit

Insert mode dropped the selection on the first key and restored only the
primary's appended-over span on Esc. Now each insert-mode edit is made at the
bare cursor as before, and the range is then carried through it with helix's
Range::map rules: typing slides an i range and stretches an a range, Enter
(which now also drops the blanks before the cursor, as helix does) slides or
stretches by what the cursor moved, and an arrow collapses. The replay gives
every other range the same. Esc after a pulls each range's end back by one
(helix restore_cursor), which replaces Text.append_at. The wiX-edit-drops-sel
and msel-append waivers are gone.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 docs/helix-keys.md         |  36 ++++++++-----
 docs/selections.md         |  22 +++++---
 src/Output.zig             |   2 +-
 src/Terminal.zig           |   8 +--
 src/Text.zig               |   4 +-
 src/edit.zig               | 127 ++++++++++++++++++++++++++++++++++++---------
 src/look.zig               |   2 +-
 src/mouse.zig              |   4 +-
 src/normal.zig             |   6 +--
 src/tagline.zig            |   4 +-
 test/hxcases/cases.jsonl   |  15 ++++++
 test/hxcases/goldens.jsonl |  15 ++++++
 test/hxcases/waivers.jsonl |   2 -
 test/mode.zig              |   6 +--
 test/panes.zig             |   4 +-
 transactions.txt           |  15 ++----
 16 files changed, 194 insertions(+), 78 deletions(-)

(limited to 'src/Text.zig')

diff --git a/docs/helix-keys.md b/docs/helix-keys.md
index 90efc463..35f62765 100644
--- a/docs/helix-keys.md
+++ b/docs/helix-keys.md
@@ -7,10 +7,17 @@ checkout (`~/05-genizah/helix`); that checkout now sits on the local
 `pardes-harness` branch, whose three commits add only the harness, so
 `book/src/keymap.md` is byte-identical at its tip (694e7dfd). As of phase 5
 every helix-equivalent row in A and B is differentially verified against real
-helix (see "Differential testing" at the bottom). Five of the six waivers are
-named in the row they belong to; the sixth, `wiX-edit-drops-sel`, belongs to no
-single key — it is the anchor-only divergence every insert-mode edit shares —
-and is described in the Files list at the bottom instead.
+helix (see "Differential testing" at the bottom). Every waiver is named in the
+row it belongs to.
+
+**The reference helix is fixed at one commit:** the `hx-harness` built from
+`694e7dfdd` on the genizah checkout's `pardes-harness` branch, which is upstream
+`278b24389` (2026-06-29, `25.07-905`) plus the three harness commits. "helix"
+in this document means that build, not the 25.07.1 release, which differs on
+counted `Alt-(`/`Alt-)` and on `&`. Upstream master was 82 commits further on
+2026-09-28 (`079a789e`); of those only `416a0e09` (continuing a comment in an
+injected `comment` layer) touches the editing code, and it needs tree-sitter,
+which the harness runs without.
 
 Code map, by SYMBOL — line numbers rot, names do not. Body-normal key
 RECOGNITION is `modal.Normal` in `src/modal.zig`: a state machine over `Role` (one
@@ -227,7 +234,7 @@ grew `sels` + `primary`, emitted only when there is more than one range.
 | `y` with several ranges | one value per range, pasted back value i at range i by `p`/`P`/`R` and insert `Ctrl-r`; the acme cut/paste chords and a paste into a terminal take the values joined by newlines | `Registers.zig` | helix-verified |
 | `"<reg>` | the next command's register: any character names one of its own. Computed ones: `_` swallows writes and reads nothing (`"_d`), `#` is each range's number from 1, `.` each range's text, `%` the file's name, `/` the last `s`/`S` pattern; `+`/`*` the system clipboard. A count typed before `"` stays the command's | helix `select_register` | helix-verified |
 | insert `Ctrl-r <reg>` | type this range's value of the register (`Ctrl-r #` numbers the cursors). Esc after `Ctrl-r` only cancels it. `Ctrl-r +` reads what pardes last put on the clipboard, not the desktop's | helix `insert_register` | helix-verified |
-| `a` … `Esc` with several ranges | the primary's appended-over span is restored; the others collapse to bare cursors | `Pane.append_at` is a single field. Waived (`msel-append`) | waived |
+| insert mode with a selection | every range is carried through each edit as helix maps it (`Range::map`): typing at the head of an `i` range slides it, typing at the end of an `a` range stretches it, Enter slides or stretches it by what the cursor moved, and an arrow key collapses it. Esc after `a` pulls each range's end back one character (helix `restore_cursor`) | `edit.insertKey`, `Text.restore_cursor` | helix-verified |
 | `&` | align selections into columns: the k-th range of each line is column k, and spaces go in before each range until its head reaches the column's widest head, in display cells (`File.rawDisplayCol`) | helix `align_selections` as of the harness's helix (25.07.1 grouped columns differently). A range over several lines refuses. A TAB counts as `tab_width` cells, not up to the next stop | helix-verified |
 | `Alt-)` / `Alt-(` / `<n>Alt-)` | rotate the CONTENTS of the selections forward / back by one range (n ranges), in one edit; each range comes back over the text it now holds and the primary moves with its text | helix `rotate_selection_contents_*` as of the harness's helix: 25.07.1 read the count as a GROUP size instead (rotate by one within each run of n ranges) and left the primary where it was, which is what helix-golf's `invert_dictionary_2` relies on | helix-verified |
 
@@ -389,11 +396,11 @@ Files (all in `test/hxcases/`):
   (runs the `hx-harness` binary from the helix checkout; override with
   `$HX_HARNESS`). Only needed when cases change — the diff itself runs
   offline.
-- `waivers.jsonl` — named exemptions, each with a reason. Three live ones:
-  `wiX-edit-drops-sel` and `msel-append` (helix maps selections through
-  insert-mode edits, pardes does not) and `alt-c-window-op` (the pardes
-  window op deliberately shadows helix change-noyank). `msel-yank-paste`
-  went with registers of one value per range; `sel-regex-caret` and
+- `waivers.jsonl` — named exemptions, each with a reason. One live one:
+  `alt-c-window-op` (the pardes window op deliberately shadows helix
+  change-noyank). `wiX-edit-drops-sel` and `msel-append` went when insert
+  mode began carrying every range through its edits, `msel-yank-paste` with
+  registers of one value per range, `sel-regex-caret` and
   `sel-regex-dot-newline` when `s`/`S` began searching line by line.
 - `parity.jsonl` — 80 further cases, used only by the parity gate below.
 - `parity-waivers.jsonl` — 14 named exemptions for the parity gate, in three
@@ -412,10 +419,11 @@ Files (all in `test/hxcases/`):
   tested when an earlier one misses. The goldens are
   `hx-harness test/hxcases/golf.jsonl`; `zig build hxgolf` runs them. All ten examples reproduce their published result in hx 25.07.1 under
   the site's own conditions (a file of the example's language, auto-pairs
-  on). Under the harness pins two do not: `csv_to_sql` needs auto-pairs to
-  close its `VALUES (`, and `invert_dictionary_2` needs 25.07's
-  `<count>Alt-(` (rotate within groups of count) where the harness's newer
-  helix rotates by count.
+  on). Under the harness two do not, and their goldens are the harness's
+  anyway, which pardes follows: `csv_to_sql` needs auto-pairs (off in the
+  harness and absent in pardes) to close its `VALUES (`, and
+  `invert_dictionary_2` needs 25.07.1's `<count>Alt-(` (rotate within groups
+  of count) where the reference helix rotates by count.
 - `smoke.jsonl` — 20 cases referenced by nothing in the tree: no build step,
   no script. Either wire it up or delete it.
 
diff --git a/docs/selections.md b/docs/selections.md
index 0f000e2c..c08ccb14 100644
--- a/docs/selections.md
+++ b/docs/selections.md
@@ -3,6 +3,8 @@
 How normal mode holds and changes its selections, and where that differs from
 helix's `Selection` (a list of ranges over gap offsets, with a primary index).
 Key-by-key behaviour is in docs/helix-keys.md; this is the model underneath.
+"helix" here is the reference build docs/helix-keys.md names: `hx-harness`
+at `694e7dfdd`, upstream `278b24389`.
 
 ## What a selection is
 
@@ -25,8 +27,9 @@ plus up to 63 others.
   `s`, `n`/`N`, ...) rather than left behind by a motion. Only pardes reads
   it: the look (Enter) and execute (Tab) chords act on explicit selections
   and on the word under the cursor otherwise.
-- `select` is `v` extend mode. `append_at` remembers where an `a` began, so
-  Esc can give back the range it appended over.
+- `select` is `v` extend mode. `restore_cursor` says the insert session
+  began with `a`, so Esc gives each range back the character it was
+  stretched by.
 
 `Text.setRanges` is the one writer of a whole selection: it sorts by start,
 merges ranges that overlap or share a start (helix `normalize`), follows the
@@ -67,6 +70,17 @@ A parsed action has a scope (`modal.Normal.Action.scope`).
   look) runs once from the primary and drops back to one cursor
   (`normal.multiOnce`).
 
+## Insert mode
+
+Each range lives on through insert mode. Every insert-mode edit happens at
+the cursor, so `edit.insertKey` runs it on the bare cursor and then carries
+the range through what it did to the text, with helix's `Range::map` rules:
+at an insertion, a backward range's head and an empty range move past it
+and a forward range's head stays before it, so typing slides an `i` range
+and stretches an `a` range. Enter slides or stretches the range by what the
+cursor moved; an arrow key collapses it. The other ranges get the same by
+the replay.
+
 ## Undo, registers, repeat
 
 - One keystroke is one undo step however many ranges it edited: only the
@@ -86,10 +100,6 @@ A parsed action has a scope (`modal.Normal.Action.scope`).
 
 ## Where it differs from helix
 
-- Insert mode: helix maps every range through each keystroke's edit, so a
-  range an `i`/`a` started from stretches over what is typed and keeps its
-  anchor. Here only the cursor cells move, and after Esc only the primary's
-  `append_at` span comes back (waivers `wiX-edit-drops-sel`, `msel-append`).
 - Direction of a one-character range: both of its cells are the same cell,
   so it has none. helix can flip one (`Alt-;`) and the commands that read
   the head (`&`, the next extend) see the difference.
diff --git a/src/Output.zig b/src/Output.zig
index 6e1765a7..201b5491 100644
--- a/src/Output.zig
+++ b/src/Output.zig
@@ -749,7 +749,7 @@ pub fn resetBody(p: *Pardes, pane: *Pane) void {
     pane.body.select = false;
     pane.sel = @splat(.{});
     pane.body.sticky_col = -1;
-    pane.body.append_at = null;
+    pane.body.restore_cursor = false;
     pane.body.normal.clear();
     pane.look_at = null;
     if (p.look_hover_wait) |wait| if (wait.serial == pane.serial) {
diff --git a/src/Terminal.zig b/src/Terminal.zig
index e204b44c..e3378007 100644
--- a/src/Terminal.zig
+++ b/src/Terminal.zig
@@ -717,7 +717,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.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,10 +843,6 @@ fn ingestWithPositions(pane: *Pane, bytes: []const u8) void {
         extra[nextra + 1] = &selection.arow;
         nextra += 2;
     }
-    if (pane.body.append_at) |*at| {
-        extra[nextra] = &at.row;
-        nextra += 1;
-    }
     if (pane.look_at) |*at| {
         extra[nextra] = &at.row;
         nextra += 1;
@@ -1124,7 +1120,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();
 }
diff --git a/src/Text.zig b/src/Text.zig
index 7ad243a1..764b8a6a 100644
--- a/src/Text.zig
+++ b/src/Text.zig
@@ -65,7 +65,9 @@ select: bool = false,
 /// sticky goal column for j/k runs (helix old_visual_position): any
 /// non-vertical range write resets it to -1.
 sticky_col: i32 = -1,
-append_at: ?struct { row: i32, col: i32 } = null,
+/// The insert session began with `a`: on Esc every range gives back the
+/// one character it was stretched by (helix restore_cursor).
+restore_cursor: bool = false,
 /// insert `Ctrl-r` was pressed: the next key names the register to insert
 reg_wait: bool = false,
 normal: modal.Normal.State = .{},
diff --git a/src/edit.zig b/src/edit.zig
index 14d8b7ed..8f6f09c6 100644
--- a/src/edit.zig
+++ b/src/edit.zig
@@ -344,28 +344,20 @@ pub fn exitInsert(p: *Pardes, t: *Text) void {
     t.reg_wait = false;
     t.msel.active = false;
     t.normal.clear();
-    if (t.append_at) |aa| {
-        t.append_at = null;
-        const text = flatSurface(p, t) catch return;
-        const gap = modal.offsetAt(text, .{ .row = @intCast(@max(0, t.cur_row)), .col = @intCast(@max(0, t.cur_col)) });
-        const a_off = modal.offsetAt(text, .{ .row = @intCast(@max(0, aa.row)), .col = @intCast(@max(0, aa.col)) });
-        const back = @max(a_off, modal.prevGrapheme(text, gap));
-        const bc = modal.positionAt(text, back);
-        t.cur_row = @intCast(bc.row);
-        t.cur_col = @intCast(bc.col);
-        t.vsel = .{ .active = a_off != back, .row = aa.row, .col = aa.col, .explicit = false };
-        t.cur_pinned = true;
-        t.show();
-        for (t.sels[0..t.nsel]) |*s| {
-            const sgap = modal.offsetAt(text, .{ .row = @intCast(@max(0, s.row)), .col = @intCast(@max(0, s.col)) });
-            const b2 = if (back == gap) sgap else modal.prevGrapheme(text, sgap);
-            const bp = modal.positionAt(text, b2);
-            s.row = @intCast(bp.row);
-            s.col = @intCast(bp.col);
-            s.arow = s.row;
-            s.acol = s.col;
-        }
+    if (!t.restore_cursor) return;
+    t.restore_cursor = false;
+    // helix enter_normal_mode: every range, from its start to the char
+    // before its end when it points forward, else to its end
+    const expl = (t.vsel.active and t.vsel.explicit) or t.msel.active;
+    const text = flatSurface(p, t) catch return;
+    var rs: [Text.max_selections]modal.Selection = undefined;
+    const got = t.ranges(text, 0, &rs);
+    for (rs[0..got.n]) |*r| {
+        const from = @min(r.anchor, r.head);
+        const to = @max(r.anchor, r.head);
+        r.* = .{ .anchor = from, .head = if (r.head > r.anchor) @max(from, modal.prevGrapheme(text, to)) else to };
     }
+    t.setRanges(text, rs[0..got.n], &.{}, got.pri, expl);
 }
 
 pub fn paneCursorLines(p: *Pardes, t: *Text) ![]const []const u8 {
@@ -518,7 +510,7 @@ pub fn enterInsert(p: *Pardes, t: *Text, where: InsertAt, cnt: usize) void {
     // `u` undoes the whole session and restores what was selected
     pushUndo(p, t);
     t.select = false;
-    t.append_at = null;
+    t.restore_cursor = false;
     t.sticky_col = -1;
     const text = flatSurface(p, t) catch {
         t.mode = .insert;
@@ -544,12 +536,14 @@ pub fn enterInsert(p: *Pardes, t: *Text, where: InsertAt, cnt: usize) void {
             const lo_col = if (b) |bb| bb.lo_col else t.cur_col;
             const hi_row = if (b) |bb| bb.hi_row else t.cur_row;
             const hi_col = if (b) |bb| bb.hi_col else t.cur_col;
-            t.append_at = .{ .row = lo_row, .col = lo_col };
+            t.restore_cursor = true;
             const gap = modal.nextGrapheme(text, modal.offsetAt(text, .{ .row = @intCast(@max(0, hi_row)), .col = @intCast(@max(0, hi_col)) }));
             const gc = modal.positionAt(text, gap);
             t.cur_row = @intCast(gc.row);
             t.cur_col = @intCast(gc.col);
-            t.vsel = .{ .active = b != null, .row = lo_row, .col = lo_col, .explicit = false };
+            // helix append_mode: the range reaches one past its end, which
+            // is where typing goes; a bare cursor becomes a range too
+            t.vsel = .{ .active = true, .row = lo_row, .col = lo_col, .explicit = false };
             t.cur_pinned = true;
         },
         .line_start => {
@@ -634,6 +628,72 @@ pub fn insertKey(p: *Pardes, t: *Text, key: Key) void {
         t.reg_wait = true;
         return;
     }
+    // helix maps every range through each insert-mode edit (Range::map):
+    // the edits below work on the bare cursor, and the range the cursor
+    // heads is carried through what they did to the text afterwards
+    if (!t.vsel.active) return insertEdit(p, t, key);
+    const old = flatSurface(p, t) catch return insertEdit(p, t, key);
+    const r = t.primaryRange(old, 0);
+    const c = modal.selectionCursor(old, r);
+    const old_len = old.len;
+    const explicit = t.vsel.explicit;
+    t.vsel.active = false;
+    insertEdit(p, t, key);
+    if (t.mode != .insert) return;
+    const new = flatSurface(p, t) catch return;
+    const c2 = modal.offsetAt(new, .{ .row = @intCast(@max(0, t.cur_row)), .col = @intCast(@max(0, t.cur_col)) });
+    // every insert-mode edit happens at the cursor: an insertion there, or
+    // a deletion that ends there (backward) or starts there (forward)
+    if (key.cp == Key.enter) {
+        // helix insert_newline: an appending range stretches by what the
+        // cursor moved, any other slides by it
+        const d = @as(isize, @intCast(c2)) - @as(isize, @intCast(c));
+        const head: usize = @intCast(@as(isize, @intCast(r.head)) + d);
+        const anchor: usize = if (c > r.anchor) r.anchor else @intCast(@as(isize, @intCast(r.anchor)) + d);
+        return setInsertRange(t, new, .{ .anchor = anchor, .head = head }, explicit);
+    }
+    var at: usize = c;
+    var del: usize = 0;
+    var ins: usize = 0;
+    if (new.len > old_len and c2 == c + (new.len - old_len)) {
+        ins = new.len - old_len;
+    } else if (new.len < old_len and c2 + (old_len - new.len) == c) {
+        at = c2;
+        del = old_len - new.len;
+    } else if (new.len < old_len and c2 == c) {
+        del = old_len - new.len;
+    } else if (new.len != old_len or c2 != c) {
+        return; // a motion: the range collapses onto the cursor (helix)
+    }
+    // helix Assoc: the head sticks after an insertion at it when the range
+    // points backward or is empty, the anchor when it points forward
+    const fwd = r.anchor < r.head;
+    setInsertRange(t, new, .{
+        .anchor = mapThroughEdit(r.anchor, at, del, ins, !fwd and r.anchor != r.head),
+        .head = mapThroughEdit(r.head, at, del, ins, fwd),
+    }, explicit);
+}
+
+fn setInsertRange(t: *Text, new: []const u8, mapped: modal.Selection, explicit: bool) void {
+    const cells = Text.rangeCells(new, mapped);
+    const cc = modal.positionAt(new, cells.cur);
+    const ac = modal.positionAt(new, cells.anc);
+    t.cur_row = @intCast(cc.row);
+    t.cur_col = @intCast(cc.col);
+    t.vsel = .{ .active = cells.anc != cells.cur, .row = @intCast(ac.row), .col = @intCast(ac.col), .explicit = explicit };
+}
+
+/// A position through one edit at `at` that deleted `del` bytes and put
+/// `ins` in (one of the two is 0). A position exactly at an insertion stays
+/// before it when `before` is set, else moves past it.
+fn mapThroughEdit(pos: usize, at: usize, del: usize, ins: usize, before: bool) usize {
+    if (pos < at) return pos;
+    if (del > 0) return if (pos < at + del) at else pos - del;
+    if (pos == at and before) return pos;
+    return pos + ins;
+}
+
+fn insertEdit(p: *Pardes, t: *Text, key: Key) void {
     t.vsel.active = false;
     if (!t.cur_pinned) pinPaneCursor(p, t);
     _ = clampFileCursor(t);
@@ -748,12 +808,29 @@ pub fn insertKey(p: *Pardes, t: *Text, key: Key) void {
     switch (key.cp) {
         Key.enter => {
             const line = modal.lineSlice(text, c.row);
+            const before = line[0..@min(c.col, line.len)];
+            // helix insert_newline: after nothing but blanks, the line
+            // itself moves down, blanks and all; else the blanks before the
+            // cursor go and the new line takes the indent
+            if (std.mem.indexOfNone(u8, before, " \t") == null) {
+                const new = modal.insertAt(p.gpa, text, .{ .row = c.row, .col = 0 }, "\n") catch return;
+                setEditText(p, t, new);
+                t.cur_row += 1;
+                t.cur_pinned = true;
+                t.show();
+                return;
+            }
             const indent = modal.newlineIndentWidth(line, c.col);
             const arena = p.scratch.allocator();
             const block = arena.alloc(u8, 1 + indent) catch return;
             block[0] = '\n';
             @memset(block[1..], ' ');
-            const new = modal.insertAt(p.gpa, text, c, block) catch return;
+            // a tag keeps its blanks: they part its words, and the last
+            // may be its read-only prefix's
+            const kept = if (t.what == .body) std.mem.trimEnd(u8, before, " \t").len else c.col;
+            const cut = modal.deleteSpan(p.gpa, text, .{ .row = c.row, .col = kept }, c) catch return;
+            defer p.gpa.free(cut);
+            const new = modal.insertAt(p.gpa, cut, .{ .row = c.row, .col = kept }, block) catch return;
             setEditText(p, t, new);
             t.cur_row += 1;
             t.cur_col = @intCast(indent);
diff --git a/src/look.zig b/src/look.zig
index 5e2d6068..30fb0dab 100644
--- a/src/look.zig
+++ b/src/look.zig
@@ -1016,7 +1016,7 @@ pub fn clearNavigationSelection(p: *Pardes, pane: *Pane) void {
     pane.body.nsel = 0;
     pane.body.select = false;
     pane.body.normal.clear();
-    pane.body.append_at = null;
+    pane.body.restore_cursor = false;
     pane.body.sticky_col = -1;
     for (0..pane.sel.len) |slot| pane.clearPointerSelection(slot);
     pane.sel = @splat(.{});
diff --git a/src/mouse.zig b/src/mouse.zig
index 91ec41a6..d1c32b40 100644
--- a/src/mouse.zig
+++ b/src/mouse.zig
@@ -747,7 +747,7 @@ fn mirrorTtySelection(p: *Pardes, pane: *Pane) void {
     pane.body.vsel.active = false;
     pane.body.nsel = 0;
     pane.body.select = false;
-    pane.body.append_at = null;
+    pane.body.restore_cursor = false;
     pane.body.sticky_col = -1;
     pane.body.normal.clear();
     edit.setYank(p, text);
@@ -859,7 +859,7 @@ fn dragRelease(p: *Pardes, button: Mouse.Button) void {
                     pane.body.vsel.active = false;
                     pane.body.nsel = 0; // a click says WHERE the one cursor is
                     pane.body.select = false;
-                    pane.body.append_at = null;
+                    pane.body.restore_cursor = false;
                     pane.body.sticky_col = -1;
                     if (s.ctrl) p.lspRequest(s.id, .definition, "");
                 }
diff --git a/src/normal.zig b/src/normal.zig
index f5e868a4..53e416fd 100644
--- a/src/normal.zig
+++ b/src/normal.zig
@@ -149,7 +149,7 @@ const KeyState = struct {
     normal: modal.Normal.State,
     find_op: u8,
     find_ch: u21,
-    append_at: @FieldType(Text, "append_at"),
+    restore_cursor: bool,
     reg_wait: bool,
 
     fn of(t: *Text) KeyState {
@@ -159,7 +159,7 @@ const KeyState = struct {
             .normal = t.normal,
             .find_op = t.find_op,
             .find_ch = t.find_ch,
-            .append_at = t.append_at,
+            .restore_cursor = t.restore_cursor,
             .reg_wait = t.reg_wait,
         };
     }
@@ -170,7 +170,7 @@ const KeyState = struct {
         t.normal = s.normal;
         t.find_op = s.find_op;
         t.find_ch = s.find_ch;
-        t.append_at = s.append_at;
+        t.restore_cursor = s.restore_cursor;
         t.reg_wait = s.reg_wait;
     }
 };
diff --git a/src/tagline.zig b/src/tagline.zig
index 14bf5677..1c060a66 100644
--- a/src/tagline.zig
+++ b/src/tagline.zig
@@ -219,7 +219,7 @@ pub fn enterTag(p: *Pardes, pane: *Pane) void {
     t.msel.active = false;
     t.nsel = 0;
     t.select = false;
-    t.append_at = null;
+    t.restore_cursor = false;
     t.sticky_col = -1;
     t.mode = .normal;
     t.normal.clear();
@@ -325,7 +325,7 @@ pub fn enterHeader(p: *Pardes, column: ?usize) void {
     t.msel.active = false;
     t.nsel = 0;
     t.select = false;
-    t.append_at = null;
+    t.restore_cursor = false;
     t.mode = .normal;
     t.normal.clear();
 }
diff --git a/test/hxcases/cases.jsonl b/test/hxcases/cases.jsonl
index 7ba44f09..ba75c611 100644
--- a/test/hxcases/cases.jsonl
+++ b/test/hxcases/cases.jsonl
@@ -344,6 +344,21 @@
 {"name": "i-keeps-sel-start", "pane": "file", "text": "alpha beta\n", "keys": "wi"}
 {"name": "wa-sel-end", "pane": "file", "text": "alpha beta\n", "keys": "wa"}
 {"name": "wiX-edit-drops-sel", "pane": "file", "text": "alpha beta\n", "keys": "wiX<esc>"}
+{"name": "reg-selection-insert", "pane": "file", "text": "ab\n", "keys": "vli<C-r>.<esc>"}
+{"name": "ins-sel-backspace", "pane": "file", "text": "alpha beta\n", "keys": "wi<backspace><esc>"}
+{"name": "ins-append-enter", "pane": "file", "text": "ab cd\n", "keys": "wa<ret>x<esc>"}
+{"name": "ins-append-backspace", "pane": "file", "text": "ab cd\n", "keys": "ea<backspace><backspace><esc>"}
+{"name": "ins-sel-delete", "pane": "file", "text": "ab cd\n", "keys": "wi<del><esc>"}
+{"name": "ins-sel-arrow-collapses", "pane": "file", "text": "ab cd\n", "keys": "wi<right><esc>"}
+{"name": "msel-insert-keeps-ranges", "pane": "file", "text": "ab cd\nab cd\n", "keys": "wCiX<esc>"}
+{"name": "msel-append-lines", "pane": "file", "text": "aa\nbb\n", "keys": "%<A-s>a!<esc>"}
+{"name": "ins-append-bare", "pane": "file", "text": "ab\n", "keys": "axy<esc>"}
+{"name": "ins-change-then-type", "pane": "file", "text": "ab cd\n", "keys": "wcX<esc>"}
+{"name": "ins-open-below-sel", "pane": "file", "text": "ab\ncd\n", "keys": "xoX<esc>"}
+{"name": "ins-enter-trims-blanks", "pane": "file", "text": "ab   cd\n", "keys": "5li<ret><esc>"}
+{"name": "ins-enter-in-indent", "pane": "file", "text": "    ab\n", "keys": "2li<ret><esc>"}
+{"name": "ins-enter-after-open", "pane": "file", "text": "    ab\n", "keys": "o<ret>x<esc>"}
+{"name": "msel-ins-enter", "pane": "file", "text": "ab cd\nab cd\n", "keys": "wCa<ret><esc>"}
 {"name": "a-esc-restore", "pane": "file", "text": "abc\n", "keys": "a<esc>"}
 {"name": "ax-restore", "pane": "file", "text": "abc\n", "keys": "ax<esc>"}
 {"name": "lax-restore", "pane": "file", "text": "abc\n", "keys": "lax<esc>"}
diff --git a/test/hxcases/goldens.jsonl b/test/hxcases/goldens.jsonl
index f6a6aada..188b7ce4 100644
--- a/test/hxcases/goldens.jsonl
+++ b/test/hxcases/goldens.jsonl
@@ -344,6 +344,21 @@
 {"name":"i-keeps-sel-start","text":"alpha beta\n","mode":"insert","cursor":{"row":0,"col":0},"anchor":{"row":0,"col":5}}
 {"name":"wa-sel-end","text":"alpha beta\n","mode":"insert","cursor":{"row":0,"col":6},"anchor":{"row":0,"col":0}}
 {"name":"wiX-edit-drops-sel","text":"Xalpha beta\n","mode":"normal","cursor":{"row":0,"col":1},"anchor":{"row":0,"col":6}}
+{"name":"reg-selection-insert","text":"abab\n","mode":"normal","cursor":{"row":0,"col":2},"anchor":{"row":0,"col":3}}
+{"name":"ins-sel-backspace","text":"alpha beta\n","mode":"normal","cursor":{"row":0,"col":0},"anchor":{"row":0,"col":5}}
+{"name":"ins-append-enter","text":"ab\nxcd\n","mode":"normal","cursor":{"row":1,"col":0},"anchor":{"row":0,"col":0}}
+{"name":"ins-append-backspace","text":" cd\n","mode":"normal","cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0}}
+{"name":"ins-sel-delete","text":"b cd\n","mode":"normal","cursor":{"row":0,"col":0},"anchor":{"row":0,"col":1}}
+{"name":"ins-sel-arrow-collapses","text":"ab cd\n","mode":"normal","cursor":{"row":0,"col":1},"anchor":{"row":0,"col":1}}
+{"name":"msel-insert-keeps-ranges","text":"Xab cd\nXab cd\n","mode":"normal","cursor":{"row":1,"col":1},"anchor":{"row":1,"col":3},"sels":[{"cursor":{"row":0,"col":1},"anchor":{"row":0,"col":3}},{"cursor":{"row":1,"col":1},"anchor":{"row":1,"col":3}}],"primary":1}
+{"name":"msel-append-lines","text":"aa!\nbb!\n","mode":"normal","cursor":{"row":0,"col":2},"anchor":{"row":0,"col":0},"sels":[{"cursor":{"row":0,"col":2},"anchor":{"row":0,"col":0}},{"cursor":{"row":1,"col":2},"anchor":{"row":1,"col":0}}],"primary":0}
+{"name":"ins-append-bare","text":"axyb\n","mode":"normal","cursor":{"row":0,"col":2},"anchor":{"row":0,"col":0}}
+{"name":"ins-change-then-type","text":"Xcd\n","mode":"normal","cursor":{"row":0,"col":1},"anchor":{"row":0,"col":1}}
+{"name":"ins-open-below-sel","text":"ab\nX\ncd\n","mode":"normal","cursor":{"row":1,"col":1},"anchor":{"row":1,"col":1}}
+{"name":"ins-enter-trims-blanks","text":"ab\ncd\n","mode":"normal","cursor":{"row":1,"col":0},"anchor":{"row":1,"col":0}}
+{"name":"ins-enter-in-indent","text":"\n    ab\n","mode":"normal","cursor":{"row":1,"col":2},"anchor":{"row":1,"col":2}}
+{"name":"ins-enter-after-open","text":"    ab\n\n    x\n","mode":"normal","cursor":{"row":2,"col":5},"anchor":{"row":2,"col":5}}
+{"name":"msel-ins-enter","text":"ab\ncd\nab\ncd\n","mode":"normal","cursor":{"row":2,"col":2},"anchor":{"row":2,"col":0},"sels":[{"cursor":{"row":0,"col":2},"anchor":{"row":0,"col":0}},{"cursor":{"row":2,"col":2},"anchor":{"row":2,"col":0}}],"primary":1}
 {"name":"a-esc-restore","text":"abc\n","mode":"normal","cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0}}
 {"name":"ax-restore","text":"axbc\n","mode":"normal","cursor":{"row":0,"col":1},"anchor":{"row":0,"col":0}}
 {"name":"lax-restore","text":"abxc\n","mode":"normal","cursor":{"row":0,"col":2},"anchor":{"row":0,"col":1}}
diff --git a/test/hxcases/waivers.jsonl b/test/hxcases/waivers.jsonl
index 8ac3bd9c..2d74e346 100644
--- a/test/hxcases/waivers.jsonl
+++ b/test/hxcases/waivers.jsonl
@@ -1,3 +1 @@
-{"name":"wiX-edit-drops-sel","reason":"Insert edits clear the selection instead of tracking its anchor.","reference":{"name":"wiX-edit-drops-sel","text":"Xalpha beta\n","mode":"normal","cursor":{"row":0,"col":1},"anchor":{"row":0,"col":6}},"expected":{"name":"wiX-edit-drops-sel","text":"Xalpha beta\n","mode":"normal","cursor":{"row":0,"col":1},"anchor":{"row":0,"col":1}}}
 {"name":"alt-c-window-op","reason":"Alt-c moves a pane to a new column instead of Helix's change-noyank.","reference":{"name":"alt-c-window-op","text":"bc def\n","mode":"insert","cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0}},"expected":{"name":"alt-c-window-op","text":"abc def\n","mode":"normal","cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0}}}
-{"name":"msel-append","reason":"Append-mode selection origins are tracked only for the primary selection.","reference":{"name":"msel-append","text":"aza\nbzb\n","mode":"normal","cursor":{"row":1,"col":1},"anchor":{"row":1,"col":0},"sels":[{"cursor":{"row":0,"col":1},"anchor":{"row":0,"col":0}},{"cursor":{"row":1,"col":1},"anchor":{"row":1,"col":0}}],"primary":1},"expected":{"name":"msel-append","text":"aza\nbzb\n","mode":"normal","cursor":{"row":1,"col":1},"anchor":{"row":1,"col":0},"sels":[{"cursor":{"row":0,"col":1},"anchor":{"row":0,"col":1}},{"cursor":{"row":1,"col":1},"anchor":{"row":1,"col":0}}],"primary":1}}
diff --git a/test/mode.zig b/test/mode.zig
index c7d7d548..cba93c30 100644
--- a/test/mode.zig
+++ b/test/mode.zig
@@ -79,14 +79,14 @@ test "Mode from actual tag Exec preserves parked file and output insert transact
             p.update(.{ .key = .{ .cp = pardes.Key.tab } });
             try std.testing.expectEqual(panes.Text.Mode.normal, pane.body.mode);
             try std.testing.expect(pane.focus == .body);
-            try std.testing.expect(pane.body.append_at == null);
+            try std.testing.expect(!pane.body.restore_cursor);
             p.update(.{ .key = .{ .cp = 'u' } });
             try std.testing.expectEqualStrings("ab\n", pane.file.?.content);
             p.update(.{ .key = .{ .cp = 'a' } });
             p.update(.{ .key = .{ .cp = 'z', .text = "z" } });
-            try std.testing.expect(pane.body.append_at != null);
+            try std.testing.expect(pane.body.restore_cursor);
             try mode(p, 0, .normal);
-            try std.testing.expect(pane.body.append_at == null);
+            try std.testing.expect(!pane.body.restore_cursor);
             p.update(.{ .key = .{ .cp = 'u' } });
             try std.testing.expectEqualStrings("ab\n", pane.file.?.content);
         }
diff --git a/test/panes.zig b/test/panes.zig
index cbf9d097..4e98f449 100644
--- a/test/panes.zig
+++ b/test/panes.zig
@@ -4547,7 +4547,7 @@ const LookResetTests = struct {
         pane.body.nsel = 1;
         pane.body.select = true;
         pane.body.normal.count = 5;
-        pane.body.append_at = .{ .row = 0, .col = 3 };
+        pane.body.restore_cursor = true;
         pane.body.sticky_col = 7;
         for (0..pane.sel.len) |slot| {
             pane.clearPointerSelection(slot);
@@ -4567,7 +4567,7 @@ const LookResetTests = struct {
         try std.testing.expectEqual(@as(u8, 0), pane.body.nsel);
         try std.testing.expect(!pane.body.select);
         try std.testing.expectEqual(modal.Normal.State{}, pane.body.normal);
-        try std.testing.expect(pane.body.append_at == null);
+        try std.testing.expect(!pane.body.restore_cursor);
         try std.testing.expectEqual(@as(i32, -1), pane.body.sticky_col);
         for (pane.sel) |selection| try std.testing.expectEqual(.none, selection.state);
         for (pane.pointer_selections) |selection| try std.testing.expect(selection == null);
diff --git a/transactions.txt b/transactions.txt
index 6c2e7646..8d2fda3f 100644
--- a/transactions.txt
+++ b/transactions.txt
@@ -1,13 +1,8 @@
-Selection anchors through insert-mode edits, and the transaction model
-=======================================================================
-
-STATUS: still open. `wiX-edit-drops-sel` is line 1 of test/hxcases/waivers.jsonl,
-so the gap below describes the code as it stands rather than something already
-fixed. One correction to the sentence that follows: it is not quite "the one
-place". Line 3 of the same file, `msel-append`, says in its own words "Same
-family as wiX-edit-drops-sel: pardes does not map selections through insert-mode
-edits" — so the gap has two waivers, and what is singular is the CAUSE below,
-not the number of divergences it produces.
+STATUS: closed for the waivers. Insert mode now carries every range through
+each edit (edit.insertKey maps the range with helix's Range::map rules after
+the edit is made), so `wiX-edit-drops-sel` and `msel-append` are gone. What
+follows is the original analysis; the delta layer it proposes was not needed
+for that and stays unbuilt.
 
 The one place the helix differential suite shows a real structural gap
 (waiver "wiX-edit-drops-sel" in test/hxcases/waivers.jsonl): helix keeps a
-- 
cgit v1.3


From 7ce5d94b5d48b68c86d015060ebcabe63e299e1a Mon Sep 17 00:00:00 2001
From: Gabriel Schneider <gbrls@0x4200.cafe>
Date: Mon, 28 Sep 2026 16:24:59 -0300
Subject: A selection holds up to 1024 ranges on the desktop, 64 on the board

The limit was 64 everywhere, which helix-golf's enumerate_and_align outgrows
(%s |\d+ makes 121 ranges). It is now memory.limits.selections, per platform,
and the counts that hold it are u16. The ranges stay inline in each Text, so a
pane grows by about 80 KiB on the desktop (three texts and the regex prompt's
snapshot); the Pane size budget in Terminal.zig moves from 128 to 160 KiB and
says why.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 docs/helix-keys.md         |  2 +-
 docs/selections.md         |  8 +++++---
 src/Pipe.zig               |  6 +++---
 src/Terminal.zig           |  5 ++++-
 src/Text.zig               |  5 +++--
 src/exec.zig               |  4 ++--
 src/memory.zig             |  4 ++++
 src/normal.zig             |  2 +-
 src/panes.zig              |  4 ++--
 src/pardes.zig             |  4 ++--
 test/hxcases/cases.jsonl   |  2 ++
 test/hxcases/goldens.jsonl |  2 ++
 test/panes.zig             | 10 +++++-----
 13 files changed, 36 insertions(+), 22 deletions(-)

(limited to 'src/Text.zig')

diff --git a/docs/helix-keys.md b/docs/helix-keys.md
index 3d02893b..1c9e0763 100644
--- a/docs/helix-keys.md
+++ b/docs/helix-keys.md
@@ -276,7 +276,7 @@ keeps the matches it found so far.
 | an all-lowercase pattern | matches case-blind | helix's smart-case. mvzr has no such flag, so the surface is lowercased instead (ASCII folding is byte-for-byte, so the offsets are identical) | helix-verified |
 | `^` and `$` | hold at every line's start and end | helix compiles with `multi_line(true)`; pardes gets the same by searching each line as its own haystack (`src/regexp.zig`) | helix-verified |
 | `.` | never matches a newline | as the Rust regex crate: a pattern without `\n` searches line by line, and one that names `\n` has its `.`s made `[^\n]` (`src/regexp.zig`) | helix-verified |
-| more than 64 matches | the ones past `MAX_SELS` are dropped | the ceiling the whole selection model has, not this key's |
+| many matches | up to `memory.limits.selections` ranges: 1024 on the desktop, 64 on the board; matches past it are dropped | helix has no limit. The ranges are held inline in every `Text` (about 20 KiB each on the desktop) | helix-verified up to the limit |
 | `K` / `Alt-K` | keep / remove ranges matching a regex | **skipped**: the same prompt, filtering instead of splitting — worth adding next |
 
 ### `Ctrl-c` — toggle comments
diff --git a/docs/selections.md b/docs/selections.md
index 202ec3d9..59c4415b 100644
--- a/docs/selections.md
+++ b/docs/selections.md
@@ -10,7 +10,8 @@ at `694e7dfdd`, upstream `278b24389`.
 
 Every `Text` (src/Text.zig) has its own: a pane's body, its tag, a prompt's
 answer, a column's or the workspace's tag. A selection is one primary range
-plus up to 63 others.
+plus others, up to `memory.limits.selections` in all (1024 on the
+desktop, 64 on the board).
 
 - The PRIMARY is where the cursor always was: `cur_row`/`cur_col` is the
   head, `vsel.row`/`vsel.col` the anchor while `vsel.active`, and a bare
@@ -33,7 +34,7 @@ plus up to 63 others.
 
 `Text.setRanges` is the one writer of a whole selection: it sorts by start,
 merges ranges that overlap or share a start (helix `normalize`), follows the
-primary through the merges, and keeps the first 64. `setRange` writes one
+primary through the merges, and keeps the first `max_selections`. `setRange` writes one
 range and drops the others.
 
 ## Making, splitting, merging, rotating, removing
@@ -107,7 +108,8 @@ the replay.
 - Direction of a one-character range: both of its cells are the same cell,
   so it has none. helix can flip one (`Alt-;`) and the commands that read
   the head (`&`, the next extend) see the difference.
-- Count: at most 64 ranges; matches past that are dropped silently.
+- Count: at most `memory.limits.selections` ranges (1024 on the desktop, 64
+  on the board); matches past that are dropped silently.
 - `n`/`N` walk the look ring (acme), not regex search hits, and there is no
   `*`; helix-golf's `*`, `""N` and `n` do not apply.
 - `s`/`S` match as sam does (docs/helix-keys.md, "Regex selection"): each
diff --git a/src/Pipe.zig b/src/Pipe.zig
index 37145edf..48e98b7b 100644
--- a/src/Pipe.zig
+++ b/src/Pipe.zig
@@ -55,10 +55,10 @@ pub const PendingPipe = struct {
     cwd: []u8,
     inputs: []selection_pipe.Input,
     ranges: [panes.Text.max_selections]modal.Selection,
-    primary: u8,
+    primary: u16,
     explicit: bool,
     how: modal.Normal.PipeBehavior,
-    nranges: u8,
+    nranges: u16,
 
     pub fn deinit(wait: *PendingPipe, gpa: std.mem.Allocator) void {
         gpa.free(wait.command);
@@ -453,7 +453,7 @@ test "selection pipe replaces all ranges atomically and undo restores them" {
     p.update(.{ .pipe_resp = .{ .id = id, .success = true, .outputs = outputs } });
     try std.testing.expectEqualSlices(u8, "AA bb \n", pane.file.?.content);
     try std.testing.expectEqual(@as(usize, 1), pane.file.?.history.undo_len);
-    try std.testing.expectEqual(@as(u8, 1), pane.body.nsel);
+    try std.testing.expectEqual(@as(u16, 1), pane.body.nsel);
     try std.testing.expectEqual(@as(i32, 1), pane.body.cur_col);
     try std.testing.expectEqual(@as(i32, 6), pane.body.sels[0].col);
     try std.testing.expect(!denied.has_induced_failure);
diff --git a/src/Terminal.zig b/src/Terminal.zig
index 4f94533d..1ff561b1 100644
--- a/src/Terminal.zig
+++ b/src/Terminal.zig
@@ -545,7 +545,10 @@ test "replay ownership is terminal-only and construction rolls back on allocatio
             try std.testing.expectEqual(terminal and enabled, pane.terminal != null);
         }
     };
-    try std.testing.expect(@sizeOf(Pane) < 128 * 1024);
+    // Most of it is the three texts' selections, limits.selections ranges
+    // each held inline (about 20 KiB a text on the desktop), and the regex
+    // prompt's snapshot of them.
+    try std.testing.expect(@sizeOf(Pane) < 160 * 1024);
     try std.testing.checkAllAllocationFailures(std.testing.allocator, Case.run, .{false});
     try std.testing.checkAllAllocationFailures(std.testing.allocator, Case.run, .{true});
 }
diff --git a/src/Text.zig b/src/Text.zig
index 764b8a6a..56ee199b 100644
--- a/src/Text.zig
+++ b/src/Text.zig
@@ -11,6 +11,7 @@ const std = @import("std");
 const panes = @import("panes.zig");
 const modal = @import("modal.zig");
 const config = @import("config.zig");
+const memory = @import("memory.zig");
 const Pane = panes.Pane;
 const File = panes.File;
 const Terminal = panes.Terminal;
@@ -36,7 +37,7 @@ pub const CharSel = struct {
     explicit: bool = false,
 };
 
-pub const max_selections = 64;
+pub const max_selections = memory.limits.selections;
 
 pub const SelRange = struct {
     row: i32,
@@ -60,7 +61,7 @@ cur_col: i32 = 0,
 msel: LineSel = .{},
 vsel: CharSel = .{},
 sels: [max_selections - 1]SelRange = undefined,
-nsel: u8 = 0,
+nsel: u16 = 0,
 select: bool = false,
 /// sticky goal column for j/k runs (helix old_visual_position): any
 /// non-vertical range write resets it to -1.
diff --git a/src/exec.zig b/src/exec.zig
index 1b82d2a8..455a325e 100644
--- a/src/exec.zig
+++ b/src/exec.zig
@@ -752,7 +752,7 @@ test "the acme chords act once per selection, not once on the primary" {
         .{ .anchor = 7, .head = 13 },
     };
     pane.body.setRanges(pane.file.?.content, &ranges, &.{}, 0, true);
-    try std.testing.expectEqual(@as(u8, 1), pane.body.nsel);
+    try std.testing.expectEqual(@as(u16, 1), pane.body.nsel);
 
     const before = p.ncol;
     p.update(.{ .key = .{ .cp = Key.tab } }); // config.exec_key: Exec
@@ -760,7 +760,7 @@ test "the acme chords act once per selection, not once on the primary" {
     // other cursor, so one keystroke over two cursors made one column.
     try std.testing.expectEqual(before + 2, p.ncol);
     // ...and the chord consumed the selection exactly as it does with one.
-    try std.testing.expectEqual(@as(u8, 0), p.panes[0].?.body.nsel);
+    try std.testing.expectEqual(@as(u16, 0), p.panes[0].?.body.nsel);
 }
 
 test "a switch clicked with a selection held flips unless the selection says on or off" {
diff --git a/src/memory.zig b/src/memory.zig
index 7b6ee2c0..abfd40f6 100644
--- a/src/memory.zig
+++ b/src/memory.zig
@@ -17,6 +17,9 @@ pub const limits = struct {
     pub const wrap_rows = if (board) 128 else 256;
     pub const undo_max = if (board) 16 else 256;
     pub const message_log = if (board) 16 else 128;
+    /// ranges one selection holds; helix has no limit, and a `%s` over a
+    /// file's words wants hundreds
+    pub const selections = if (board) 64 else 1024;
     /// /log's ring, which records whether or not anyone reads it.
     pub const log_bytes: usize = if (board) 4 * KiB else 64 * KiB;
     pub const max_tag_tail: usize = if (board) 512 else 4096;
@@ -187,6 +190,7 @@ test "memory limits preserve desktop capacities" {
     try std.testing.expectEqual(256, limits.wrap_rows);
     try std.testing.expectEqual(256, limits.undo_max);
     try std.testing.expectEqual(128, limits.message_log);
+    try std.testing.expectEqual(1024, limits.selections);
     try std.testing.expectEqual(@as(usize, 4096), limits.max_tag_tail);
     try std.testing.expectEqual(@as(usize, 4095), limits.host_path_cap);
     try std.testing.expectEqual(config.embed_sources, limits.embedded_sources);
diff --git a/src/normal.zig b/src/normal.zig
index 542c9fb3..98ba80d6 100644
--- a/src/normal.zig
+++ b/src/normal.zig
@@ -771,7 +771,7 @@ test "flat text movement and selection replay need no scratch rows" {
     pane.body.sels[0] = .{ .row = 3072, .col = 0, .arow = 3072, .acol = 0 };
     handleNormal(p, &pane.body, .{ .cp = 'l' });
     handleNormal(p, &pane.body, .{ .cp = 'j' });
-    try std.testing.expectEqual(@as(u8, 1), pane.body.nsel);
+    try std.testing.expectEqual(@as(u16, 1), pane.body.nsel);
     try std.testing.expectEqual(@as(i32, 1025), pane.body.cur_row);
     try std.testing.expectEqual(@as(i32, 1), pane.body.cur_col);
     try std.testing.expectEqual(@as(i32, 3073), pane.body.sels[0].row);
diff --git a/src/panes.zig b/src/panes.zig
index 9234912f..67954abd 100644
--- a/src/panes.zig
+++ b/src/panes.zig
@@ -155,8 +155,8 @@ pub const Pane = struct {
     search_row: ?usize = null,
     look_at: ?LookSpot = null,
     sel_snap: [Text.max_selections]modal.Selection = undefined,
-    nsel_snap: u8 = 0,
-    sel_snap_pri: u8 = 0,
+    nsel_snap: u16 = 0,
+    sel_snap_pri: u16 = 0,
     sel_snap_expl: bool = false,
     /// The tag: what the user keeps after the computed prefix (the path, the
     /// dirty marker, a PDF's page), its cursor, selections and undo. The
diff --git a/src/pardes.zig b/src/pardes.zig
index 87041f39..a7bcb195 100644
--- a/src/pardes.zig
+++ b/src/pardes.zig
@@ -3123,7 +3123,7 @@ test "s in a header selects in the header's own text" {
     const text = try edit.flatSurface(p, &p.global_tag);
     const got = p.global_tag.ranges(text, 0, &ranges);
     try std.testing.expectEqual(@as(usize, 3), got.n); // Newcol, Joincol, NextColor
-    try std.testing.expectEqual(@as(u8, 0), pane.body.nsel);
+    try std.testing.expectEqual(@as(u16, 0), pane.body.nsel);
 }
 
 test "Enter in a header runs the word under its cursor, as the execute key does" {
@@ -7547,7 +7547,7 @@ test "jump history clears selections and lands at the recorded cursor" {
         try std.testing.expectEqual(@as(usize, 2), p.njumps);
         try std.testing.expectEqual(@as(u32, 3), p.jumps[0].line);
         try std.testing.expect(!pane.body.vsel.active and !pane.body.msel.active and !pane.body.select);
-        try std.testing.expectEqual(@as(u8, 0), pane.body.nsel);
+        try std.testing.expectEqual(@as(u16, 0), pane.body.nsel);
         try std.testing.expectEqual(.none, pane.sel[0].state);
         try std.testing.expect(pane.pointer_selections[0] == null);
         try std.testing.expectEqual(@as(i32, if (index == 0) 2 else 0), pane.body.cur_row);
diff --git a/test/hxcases/cases.jsonl b/test/hxcases/cases.jsonl
index 8d6b0e6e..7aeb12e8 100644
--- a/test/hxcases/cases.jsonl
+++ b/test/hxcases/cases.jsonl
@@ -430,6 +430,8 @@
 {"name": "msel-rotate-contents-lengths", "pane": "file", "text": "one to three\n", "keys": "%s\\w+<ret>)<A-(>"}
 {"name": "msel-rotate-contents-backward", "pane": "file", "text": "ab cde\n", "keys": "%s\\w+<ret><A-;><A-)>"}
 {"name": "msel-rotate-contents-lines", "pane": "file", "text": "aa\nbbb\n", "keys": "%<A-s><A-)>"}
+{"name": "sel-many-ranges", "pane": "file", "text": "w w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\n", "keys": "%sw<ret>"}
+{"name": "sel-many-ranges-edit", "pane": "file", "text": "w w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\n", "keys": "%sw<ret>cxy<esc>"}
 {"name": "msel-align-basic", "pane": "file", "text": "a=1\nbbb=2\n", "keys": "%s=<ret>&"}
 {"name": "msel-align-columns", "pane": "file", "text": "a,b,c\nccc,d,e\n", "keys": "%s,<ret>&"}
 {"name": "msel-align-uneven", "pane": "file", "text": "a,b\nccc,d,eee,f\n", "keys": "%s,<ret>&"}
diff --git a/test/hxcases/goldens.jsonl b/test/hxcases/goldens.jsonl
index d62cb633..b8221c4c 100644
--- a/test/hxcases/goldens.jsonl
+++ b/test/hxcases/goldens.jsonl
@@ -430,6 +430,8 @@
 {"name":"msel-rotate-contents-lengths","text":"to three one\n","mode":"normal","cursor":{"row":0,"col":1},"anchor":{"row":0,"col":0},"sels":[{"cursor":{"row":0,"col":1},"anchor":{"row":0,"col":0}},{"cursor":{"row":0,"col":7},"anchor":{"row":0,"col":3}},{"cursor":{"row":0,"col":11},"anchor":{"row":0,"col":9}}],"primary":0}
 {"name":"msel-rotate-contents-backward","text":"cde ab\n","mode":"normal","cursor":{"row":0,"col":4},"anchor":{"row":0,"col":5},"sels":[{"cursor":{"row":0,"col":0},"anchor":{"row":0,"col":2}},{"cursor":{"row":0,"col":4},"anchor":{"row":0,"col":5}}],"primary":1}
 {"name":"msel-rotate-contents-lines","text":"bbb\naa\n","mode":"normal","cursor":{"row":1,"col":1},"anchor":{"row":1,"col":0},"sels":[{"cursor":{"row":0,"col":2},"anchor":{"row":0,"col":0}},{"cursor":{"row":1,"col":1},"anchor":{"row":1,"col":0}}],"primary":1}
+{"name":"sel-many-ranges","text":"w w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\n","mode":"normal","cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0},"sels":[{"cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0}},{"cursor":{"row":0,"col":2},"anchor":{"row":0,"col":2}},{"cursor":{"row":0,"col":4},"anchor":{"row":0,"col":4}},{"cursor":{"row":0,"col":6},"anchor":{"row":0,"col":6}},{"cursor":{"row":0,"col":8},"anchor":{"row":0,"col":8}},{"cursor":{"row":0,"col":10},"anchor":{"row":0,"col":10}},{"cursor":{"row":0,"col":12},"anchor":{"row":0,"col":12}},{"cursor":{"row":0,"col":14},"anchor":{"row":0,"col":14}},{"cursor":{"row":0,"col":16},"anchor":{"row":0,"col":16}},{"cursor":{"row":0,"col":18},"anchor":{"row":0,"col":18}},{"cursor":{"row":0,"col":20},"anchor":{"row":0,"col":20}},{"cursor":{"row":0,"col":22},"anchor":{"row":0,"col":22}},{"cursor":{"row":0,"col":24},"anchor":{"row":0,"col":24}},{"cursor":{"row":0,"col":26},"anchor":{"row":0,"col":26}},{"cursor":{"row":0,"col":28},"anchor":{"row":0,"col":28}},{"cursor":{"row":0,"col":30},"anchor":{"row":0,"col":30}},{"cursor":{"row":0,"col":32},"anchor":{"row":0,"col":32}},{"cursor":{"row":0,"col":34},"anchor":{"row":0,"col":34}},{"cursor":{"row":0,"col":36},"anchor":{"row":0,"col":36}},{"cursor":{"row":0,"col":38},"anchor":{"row":0,"col":38}},{"cursor":{"row":1,"col":0},"anchor":{"row":1,"col":0}},{"cursor":{"row":1,"col":2},"anchor":{"row":1,"col":2}},{"cursor":{"row":1,"col":4},"anchor":{"row":1,"col":4}},{"cursor":{"row":1,"col":6},"anchor":{"row":1,"col":6}},{"cursor":{"row":1,"col":8},"anchor":{"row":1,"col":8}},{"cursor":{"row":1,"col":10},"anchor":{"row":1,"col":10}},{"cursor":{"row":1,"col":12},"anchor":{"row":1,"col":12}},{"cursor":{"row":1,"col":14},"anchor":{"row":1,"col":14}},{"cursor":{"row":1,"col":16},"anchor":{"row":1,"col":16}},{"cursor":{"row":1,"col":18},"anchor":{"row":1,"col":18}},{"cursor":{"row":1,"col":20},"anchor":{"row":1,"col":20}},{"cursor":{"row":1,"col":22},"anchor":{"row":1,"col":22}},{"cursor":{"row":1,"col":24},"anchor":{"row":1,"col":24}},{"cursor":{"row":1,"col":26},"anchor":{"row":1,"col":26}},{"cursor":{"row":1,"col":28},"anchor":{"row":1,"col":28}},{"cursor":{"row":1,"col":30},"anchor":{"row":1,"col":30}},{"cursor":{"row":1,"col":32},"anchor":{"row":1,"col":32}},{"cursor":{"row":1,"col":34},"anchor":{"row":1,"col":34}},{"cursor":{"row":1,"col":36},"anchor":{"row":1,"col":36}},{"cursor":{"row":1,"col":38},"anchor":{"row":1,"col":38}},{"cursor":{"row":2,"col":0},"anchor":{"row":2,"col":0}},{"cursor":{"row":2,"col":2},"anchor":{"row":2,"col":2}},{"cursor":{"row":2,"col":4},"anchor":{"row":2,"col":4}},{"cursor":{"row":2,"col":6},"anchor":{"row":2,"col":6}},{"cursor":{"row":2,"col":8},"anchor":{"row":2,"col":8}},{"cursor":{"row":2,"col":10},"anchor":{"row":2,"col":10}},{"cursor":{"row":2,"col":12},"anchor":{"row":2,"col":12}},{"cursor":{"row":2,"col":14},"anchor":{"row":2,"col":14}},{"cursor":{"row":2,"col":16},"anchor":{"row":2,"col":16}},{"cursor":{"row":2,"col":18},"anchor":{"row":2,"col":18}},{"cursor":{"row":2,"col":20},"anchor":{"row":2,"col":20}},{"cursor":{"row":2,"col":22},"anchor":{"row":2,"col":22}},{"cursor":{"row":2,"col":24},"anchor":{"row":2,"col":24}},{"cursor":{"row":2,"col":26},"anchor":{"row":2,"col":26}},{"cursor":{"row":2,"col":28},"anchor":{"row":2,"col":28}},{"cursor":{"row":2,"col":30},"anchor":{"row":2,"col":30}},{"cursor":{"row":2,"col":32},"anchor":{"row":2,"col":32}},{"cursor":{"row":2,"col":34},"anchor":{"row":2,"col":34}},{"cursor":{"row":2,"col":36},"anchor":{"row":2,"col":36}},{"cursor":{"row":2,"col":38},"anchor":{"row":2,"col":38}},{"cursor":{"row":3,"col":0},"anchor":{"row":3,"col":0}},{"cursor":{"row":3,"col":2},"anchor":{"row":3,"col":2}},{"cursor":{"row":3,"col":4},"anchor":{"row":3,"col":4}},{"cursor":{"row":3,"col":6},"anchor":{"row":3,"col":6}},{"cursor":{"row":3,"col":8},"anchor":{"row":3,"col":8}},{"cursor":{"row":3,"col":10},"anchor":{"row":3,"col":10}},{"cursor":{"row":3,"col":12},"anchor":{"row":3,"col":12}},{"cursor":{"row":3,"col":14},"anchor":{"row":3,"col":14}},{"cursor":{"row":3,"col":16},"anchor":{"row":3,"col":16}},{"cursor":{"row":3,"col":18},"anchor":{"row":3,"col":18}},{"cursor":{"row":3,"col":20},"anchor":{"row":3,"col":20}},{"cursor":{"row":3,"col":22},"anchor":{"row":3,"col":22}},{"cursor":{"row":3,"col":24},"anchor":{"row":3,"col":24}},{"cursor":{"row":3,"col":26},"anchor":{"row":3,"col":26}},{"cursor":{"row":3,"col":28},"anchor":{"row":3,"col":28}},{"cursor":{"row":3,"col":30},"anchor":{"row":3,"col":30}},{"cursor":{"row":3,"col":32},"anchor":{"row":3,"col":32}},{"cursor":{"row":3,"col":34},"anchor":{"row":3,"col":34}},{"cursor":{"row":3,"col":36},"anchor":{"row":3,"col":36}},{"cursor":{"row":3,"col":38},"anchor":{"row":3,"col":38}},{"cursor":{"row":4,"col":0},"anchor":{"row":4,"col":0}},{"cursor":{"row":4,"col":2},"anchor":{"row":4,"col":2}},{"cursor":{"row":4,"col":4},"anchor":{"row":4,"col":4}},{"cursor":{"row":4,"col":6},"anchor":{"row":4,"col":6}},{"cursor":{"row":4,"col":8},"anchor":{"row":4,"col":8}},{"cursor":{"row":4,"col":10},"anchor":{"row":4,"col":10}},{"cursor":{"row":4,"col":12},"anchor":{"row":4,"col":12}},{"cursor":{"row":4,"col":14},"anchor":{"row":4,"col":14}},{"cursor":{"row":4,"col":16},"anchor":{"row":4,"col":16}},{"cursor":{"row":4,"col":18},"anchor":{"row":4,"col":18}},{"cursor":{"row":4,"col":20},"anchor":{"row":4,"col":20}},{"cursor":{"row":4,"col":22},"anchor":{"row":4,"col":22}},{"cursor":{"row":4,"col":24},"anchor":{"row":4,"col":24}},{"cursor":{"row":4,"col":26},"anchor":{"row":4,"col":26}},{"cursor":{"row":4,"col":28},"anchor":{"row":4,"col":28}},{"cursor":{"row":4,"col":30},"anchor":{"row":4,"col":30}},{"cursor":{"row":4,"col":32},"anchor":{"row":4,"col":32}},{"cursor":{"row":4,"col":34},"anchor":{"row":4,"col":34}},{"cursor":{"row":4,"col":36},"anchor":{"row":4,"col":36}},{"cursor":{"row":4,"col":38},"anchor":{"row":4,"col":38}},{"cursor":{"row":5,"col":0},"anchor":{"row":5,"col":0}},{"cursor":{"row":5,"col":2},"anchor":{"row":5,"col":2}},{"cursor":{"row":5,"col":4},"anchor":{"row":5,"col":4}},{"cursor":{"row":5,"col":6},"anchor":{"row":5,"col":6}},{"cursor":{"row":5,"col":8},"anchor":{"row":5,"col":8}},{"cursor":{"row":5,"col":10},"anchor":{"row":5,"col":10}},{"cursor":{"row":5,"col":12},"anchor":{"row":5,"col":12}},{"cursor":{"row":5,"col":14},"anchor":{"row":5,"col":14}},{"cursor":{"row":5,"col":16},"anchor":{"row":5,"col":16}},{"cursor":{"row":5,"col":18},"anchor":{"row":5,"col":18}},{"cursor":{"row":5,"col":20},"anchor":{"row":5,"col":20}},{"cursor":{"row":5,"col":22},"anchor":{"row":5,"col":22}},{"cursor":{"row":5,"col":24},"anchor":{"row":5,"col":24}},{"cursor":{"row":5,"col":26},"anchor":{"row":5,"col":26}},{"cursor":{"row":5,"col":28},"anchor":{"row":5,"col":28}},{"cursor":{"row":5,"col":30},"anchor":{"row":5,"col":30}},{"cursor":{"row":5,"col":32},"anchor":{"row":5,"col":32}},{"cursor":{"row":5,"col":34},"anchor":{"row":5,"col":34}},{"cursor":{"row":5,"col":36},"anchor":{"row":5,"col":36}},{"cursor":{"row":5,"col":38},"anchor":{"row":5,"col":38}},{"cursor":{"row":6,"col":0},"anchor":{"row":6,"col":0}},{"cursor":{"row":6,"col":2},"anchor":{"row":6,"col":2}},{"cursor":{"row":6,"col":4},"anchor":{"row":6,"col":4}},{"cursor":{"row":6,"col":6},"anchor":{"row":6,"col":6}},{"cursor":{"row":6,"col":8},"anchor":{"row":6,"col":8}},{"cursor":{"row":6,"col":10},"anchor":{"row":6,"col":10}},{"cursor":{"row":6,"col":12},"anchor":{"row":6,"col":12}},{"cursor":{"row":6,"col":14},"anchor":{"row":6,"col":14}},{"cursor":{"row":6,"col":16},"anchor":{"row":6,"col":16}},{"cursor":{"row":6,"col":18},"anchor":{"row":6,"col":18}},{"cursor":{"row":6,"col":20},"anchor":{"row":6,"col":20}},{"cursor":{"row":6,"col":22},"anchor":{"row":6,"col":22}},{"cursor":{"row":6,"col":24},"anchor":{"row":6,"col":24}},{"cursor":{"row":6,"col":26},"anchor":{"row":6,"col":26}},{"cursor":{"row":6,"col":28},"anchor":{"row":6,"col":28}},{"cursor":{"row":6,"col":30},"anchor":{"row":6,"col":30}},{"cursor":{"row":6,"col":32},"anchor":{"row":6,"col":32}},{"cursor":{"row":6,"col":34},"anchor":{"row":6,"col":34}},{"cursor":{"row":6,"col":36},"anchor":{"row":6,"col":36}},{"cursor":{"row":6,"col":38},"anchor":{"row":6,"col":38}},{"cursor":{"row":7,"col":0},"anchor":{"row":7,"col":0}},{"cursor":{"row":7,"col":2},"anchor":{"row":7,"col":2}},{"cursor":{"row":7,"col":4},"anchor":{"row":7,"col":4}},{"cursor":{"row":7,"col":6},"anchor":{"row":7,"col":6}},{"cursor":{"row":7,"col":8},"anchor":{"row":7,"col":8}},{"cursor":{"row":7,"col":10},"anchor":{"row":7,"col":10}},{"cursor":{"row":7,"col":12},"anchor":{"row":7,"col":12}},{"cursor":{"row":7,"col":14},"anchor":{"row":7,"col":14}},{"cursor":{"row":7,"col":16},"anchor":{"row":7,"col":16}},{"cursor":{"row":7,"col":18},"anchor":{"row":7,"col":18}},{"cursor":{"row":7,"col":20},"anchor":{"row":7,"col":20}},{"cursor":{"row":7,"col":22},"anchor":{"row":7,"col":22}},{"cursor":{"row":7,"col":24},"anchor":{"row":7,"col":24}},{"cursor":{"row":7,"col":26},"anchor":{"row":7,"col":26}},{"cursor":{"row":7,"col":28},"anchor":{"row":7,"col":28}},{"cursor":{"row":7,"col":30},"anchor":{"row":7,"col":30}},{"cursor":{"row":7,"col":32},"anchor":{"row":7,"col":32}},{"cursor":{"row":7,"col":34},"anchor":{"row":7,"col":34}},{"cursor":{"row":7,"col":36},"anchor":{"row":7,"col":36}},{"cursor":{"row":7,"col":38},"anchor":{"row":7,"col":38}},{"cursor":{"row":8,"col":0},"anchor":{"row":8,"col":0}},{"cursor":{"row":8,"col":2},"anchor":{"row":8,"col":2}},{"cursor":{"row":8,"col":4},"anchor":{"row":8,"col":4}},{"cursor":{"row":8,"col":6},"anchor":{"row":8,"col":6}},{"cursor":{"row":8,"col":8},"anchor":{"row":8,"col":8}},{"cursor":{"row":8,"col":10},"anchor":{"row":8,"col":10}},{"cursor":{"row":8,"col":12},"anchor":{"row":8,"col":12}},{"cursor":{"row":8,"col":14},"anchor":{"row":8,"col":14}},{"cursor":{"row":8,"col":16},"anchor":{"row":8,"col":16}},{"cursor":{"row":8,"col":18},"anchor":{"row":8,"col":18}},{"cursor":{"row":8,"col":20},"anchor":{"row":8,"col":20}},{"cursor":{"row":8,"col":22},"anchor":{"row":8,"col":22}},{"cursor":{"row":8,"col":24},"anchor":{"row":8,"col":24}},{"cursor":{"row":8,"col":26},"anchor":{"row":8,"col":26}},{"cursor":{"row":8,"col":28},"anchor":{"row":8,"col":28}},{"cursor":{"row":8,"col":30},"anchor":{"row":8,"col":30}},{"cursor":{"row":8,"col":32},"anchor":{"row":8,"col":32}},{"cursor":{"row":8,"col":34},"anchor":{"row":8,"col":34}},{"cursor":{"row":8,"col":36},"anchor":{"row":8,"col":36}},{"cursor":{"row":8,"col":38},"anchor":{"row":8,"col":38}},{"cursor":{"row":9,"col":0},"anchor":{"row":9,"col":0}},{"cursor":{"row":9,"col":2},"anchor":{"row":9,"col":2}},{"cursor":{"row":9,"col":4},"anchor":{"row":9,"col":4}},{"cursor":{"row":9,"col":6},"anchor":{"row":9,"col":6}},{"cursor":{"row":9,"col":8},"anchor":{"row":9,"col":8}},{"cursor":{"row":9,"col":10},"anchor":{"row":9,"col":10}},{"cursor":{"row":9,"col":12},"anchor":{"row":9,"col":12}},{"cursor":{"row":9,"col":14},"anchor":{"row":9,"col":14}},{"cursor":{"row":9,"col":16},"anchor":{"row":9,"col":16}},{"cursor":{"row":9,"col":18},"anchor":{"row":9,"col":18}},{"cursor":{"row":9,"col":20},"anchor":{"row":9,"col":20}},{"cursor":{"row":9,"col":22},"anchor":{"row":9,"col":22}},{"cursor":{"row":9,"col":24},"anchor":{"row":9,"col":24}},{"cursor":{"row":9,"col":26},"anchor":{"row":9,"col":26}},{"cursor":{"row":9,"col":28},"anchor":{"row":9,"col":28}},{"cursor":{"row":9,"col":30},"anchor":{"row":9,"col":30}},{"cursor":{"row":9,"col":32},"anchor":{"row":9,"col":32}},{"cursor":{"row":9,"col":34},"anchor":{"row":9,"col":34}},{"cursor":{"row":9,"col":36},"anchor":{"row":9,"col":36}},{"cursor":{"row":9,"col":38},"anchor":{"row":9,"col":38}}],"primary":0}
+{"name":"sel-many-ranges-edit","text":"xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy\nxy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy\nxy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy\nxy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy\nxy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy\nxy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy\nxy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy\nxy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy\nxy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy\nxy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy\n","mode":"normal","cursor":{"row":0,"col":2},"anchor":{"row":0,"col":2},"sels":[{"cursor":{"row":0,"col":2},"anchor":{"row":0,"col":2}},{"cursor":{"row":0,"col":5},"anchor":{"row":0,"col":5}},{"cursor":{"row":0,"col":8},"anchor":{"row":0,"col":8}},{"cursor":{"row":0,"col":11},"anchor":{"row":0,"col":11}},{"cursor":{"row":0,"col":14},"anchor":{"row":0,"col":14}},{"cursor":{"row":0,"col":17},"anchor":{"row":0,"col":17}},{"cursor":{"row":0,"col":20},"anchor":{"row":0,"col":20}},{"cursor":{"row":0,"col":23},"anchor":{"row":0,"col":23}},{"cursor":{"row":0,"col":26},"anchor":{"row":0,"col":26}},{"cursor":{"row":0,"col":29},"anchor":{"row":0,"col":29}},{"cursor":{"row":0,"col":32},"anchor":{"row":0,"col":32}},{"cursor":{"row":0,"col":35},"anchor":{"row":0,"col":35}},{"cursor":{"row":0,"col":38},"anchor":{"row":0,"col":38}},{"cursor":{"row":0,"col":41},"anchor":{"row":0,"col":41}},{"cursor":{"row":0,"col":44},"anchor":{"row":0,"col":44}},{"cursor":{"row":0,"col":47},"anchor":{"row":0,"col":47}},{"cursor":{"row":0,"col":50},"anchor":{"row":0,"col":50}},{"cursor":{"row":0,"col":53},"anchor":{"row":0,"col":53}},{"cursor":{"row":0,"col":56},"anchor":{"row":0,"col":56}},{"cursor":{"row":0,"col":59},"anchor":{"row":0,"col":59}},{"cursor":{"row":1,"col":2},"anchor":{"row":1,"col":2}},{"cursor":{"row":1,"col":5},"anchor":{"row":1,"col":5}},{"cursor":{"row":1,"col":8},"anchor":{"row":1,"col":8}},{"cursor":{"row":1,"col":11},"anchor":{"row":1,"col":11}},{"cursor":{"row":1,"col":14},"anchor":{"row":1,"col":14}},{"cursor":{"row":1,"col":17},"anchor":{"row":1,"col":17}},{"cursor":{"row":1,"col":20},"anchor":{"row":1,"col":20}},{"cursor":{"row":1,"col":23},"anchor":{"row":1,"col":23}},{"cursor":{"row":1,"col":26},"anchor":{"row":1,"col":26}},{"cursor":{"row":1,"col":29},"anchor":{"row":1,"col":29}},{"cursor":{"row":1,"col":32},"anchor":{"row":1,"col":32}},{"cursor":{"row":1,"col":35},"anchor":{"row":1,"col":35}},{"cursor":{"row":1,"col":38},"anchor":{"row":1,"col":38}},{"cursor":{"row":1,"col":41},"anchor":{"row":1,"col":41}},{"cursor":{"row":1,"col":44},"anchor":{"row":1,"col":44}},{"cursor":{"row":1,"col":47},"anchor":{"row":1,"col":47}},{"cursor":{"row":1,"col":50},"anchor":{"row":1,"col":50}},{"cursor":{"row":1,"col":53},"anchor":{"row":1,"col":53}},{"cursor":{"row":1,"col":56},"anchor":{"row":1,"col":56}},{"cursor":{"row":1,"col":59},"anchor":{"row":1,"col":59}},{"cursor":{"row":2,"col":2},"anchor":{"row":2,"col":2}},{"cursor":{"row":2,"col":5},"anchor":{"row":2,"col":5}},{"cursor":{"row":2,"col":8},"anchor":{"row":2,"col":8}},{"cursor":{"row":2,"col":11},"anchor":{"row":2,"col":11}},{"cursor":{"row":2,"col":14},"anchor":{"row":2,"col":14}},{"cursor":{"row":2,"col":17},"anchor":{"row":2,"col":17}},{"cursor":{"row":2,"col":20},"anchor":{"row":2,"col":20}},{"cursor":{"row":2,"col":23},"anchor":{"row":2,"col":23}},{"cursor":{"row":2,"col":26},"anchor":{"row":2,"col":26}},{"cursor":{"row":2,"col":29},"anchor":{"row":2,"col":29}},{"cursor":{"row":2,"col":32},"anchor":{"row":2,"col":32}},{"cursor":{"row":2,"col":35},"anchor":{"row":2,"col":35}},{"cursor":{"row":2,"col":38},"anchor":{"row":2,"col":38}},{"cursor":{"row":2,"col":41},"anchor":{"row":2,"col":41}},{"cursor":{"row":2,"col":44},"anchor":{"row":2,"col":44}},{"cursor":{"row":2,"col":47},"anchor":{"row":2,"col":47}},{"cursor":{"row":2,"col":50},"anchor":{"row":2,"col":50}},{"cursor":{"row":2,"col":53},"anchor":{"row":2,"col":53}},{"cursor":{"row":2,"col":56},"anchor":{"row":2,"col":56}},{"cursor":{"row":2,"col":59},"anchor":{"row":2,"col":59}},{"cursor":{"row":3,"col":2},"anchor":{"row":3,"col":2}},{"cursor":{"row":3,"col":5},"anchor":{"row":3,"col":5}},{"cursor":{"row":3,"col":8},"anchor":{"row":3,"col":8}},{"cursor":{"row":3,"col":11},"anchor":{"row":3,"col":11}},{"cursor":{"row":3,"col":14},"anchor":{"row":3,"col":14}},{"cursor":{"row":3,"col":17},"anchor":{"row":3,"col":17}},{"cursor":{"row":3,"col":20},"anchor":{"row":3,"col":20}},{"cursor":{"row":3,"col":23},"anchor":{"row":3,"col":23}},{"cursor":{"row":3,"col":26},"anchor":{"row":3,"col":26}},{"cursor":{"row":3,"col":29},"anchor":{"row":3,"col":29}},{"cursor":{"row":3,"col":32},"anchor":{"row":3,"col":32}},{"cursor":{"row":3,"col":35},"anchor":{"row":3,"col":35}},{"cursor":{"row":3,"col":38},"anchor":{"row":3,"col":38}},{"cursor":{"row":3,"col":41},"anchor":{"row":3,"col":41}},{"cursor":{"row":3,"col":44},"anchor":{"row":3,"col":44}},{"cursor":{"row":3,"col":47},"anchor":{"row":3,"col":47}},{"cursor":{"row":3,"col":50},"anchor":{"row":3,"col":50}},{"cursor":{"row":3,"col":53},"anchor":{"row":3,"col":53}},{"cursor":{"row":3,"col":56},"anchor":{"row":3,"col":56}},{"cursor":{"row":3,"col":59},"anchor":{"row":3,"col":59}},{"cursor":{"row":4,"col":2},"anchor":{"row":4,"col":2}},{"cursor":{"row":4,"col":5},"anchor":{"row":4,"col":5}},{"cursor":{"row":4,"col":8},"anchor":{"row":4,"col":8}},{"cursor":{"row":4,"col":11},"anchor":{"row":4,"col":11}},{"cursor":{"row":4,"col":14},"anchor":{"row":4,"col":14}},{"cursor":{"row":4,"col":17},"anchor":{"row":4,"col":17}},{"cursor":{"row":4,"col":20},"anchor":{"row":4,"col":20}},{"cursor":{"row":4,"col":23},"anchor":{"row":4,"col":23}},{"cursor":{"row":4,"col":26},"anchor":{"row":4,"col":26}},{"cursor":{"row":4,"col":29},"anchor":{"row":4,"col":29}},{"cursor":{"row":4,"col":32},"anchor":{"row":4,"col":32}},{"cursor":{"row":4,"col":35},"anchor":{"row":4,"col":35}},{"cursor":{"row":4,"col":38},"anchor":{"row":4,"col":38}},{"cursor":{"row":4,"col":41},"anchor":{"row":4,"col":41}},{"cursor":{"row":4,"col":44},"anchor":{"row":4,"col":44}},{"cursor":{"row":4,"col":47},"anchor":{"row":4,"col":47}},{"cursor":{"row":4,"col":50},"anchor":{"row":4,"col":50}},{"cursor":{"row":4,"col":53},"anchor":{"row":4,"col":53}},{"cursor":{"row":4,"col":56},"anchor":{"row":4,"col":56}},{"cursor":{"row":4,"col":59},"anchor":{"row":4,"col":59}},{"cursor":{"row":5,"col":2},"anchor":{"row":5,"col":2}},{"cursor":{"row":5,"col":5},"anchor":{"row":5,"col":5}},{"cursor":{"row":5,"col":8},"anchor":{"row":5,"col":8}},{"cursor":{"row":5,"col":11},"anchor":{"row":5,"col":11}},{"cursor":{"row":5,"col":14},"anchor":{"row":5,"col":14}},{"cursor":{"row":5,"col":17},"anchor":{"row":5,"col":17}},{"cursor":{"row":5,"col":20},"anchor":{"row":5,"col":20}},{"cursor":{"row":5,"col":23},"anchor":{"row":5,"col":23}},{"cursor":{"row":5,"col":26},"anchor":{"row":5,"col":26}},{"cursor":{"row":5,"col":29},"anchor":{"row":5,"col":29}},{"cursor":{"row":5,"col":32},"anchor":{"row":5,"col":32}},{"cursor":{"row":5,"col":35},"anchor":{"row":5,"col":35}},{"cursor":{"row":5,"col":38},"anchor":{"row":5,"col":38}},{"cursor":{"row":5,"col":41},"anchor":{"row":5,"col":41}},{"cursor":{"row":5,"col":44},"anchor":{"row":5,"col":44}},{"cursor":{"row":5,"col":47},"anchor":{"row":5,"col":47}},{"cursor":{"row":5,"col":50},"anchor":{"row":5,"col":50}},{"cursor":{"row":5,"col":53},"anchor":{"row":5,"col":53}},{"cursor":{"row":5,"col":56},"anchor":{"row":5,"col":56}},{"cursor":{"row":5,"col":59},"anchor":{"row":5,"col":59}},{"cursor":{"row":6,"col":2},"anchor":{"row":6,"col":2}},{"cursor":{"row":6,"col":5},"anchor":{"row":6,"col":5}},{"cursor":{"row":6,"col":8},"anchor":{"row":6,"col":8}},{"cursor":{"row":6,"col":11},"anchor":{"row":6,"col":11}},{"cursor":{"row":6,"col":14},"anchor":{"row":6,"col":14}},{"cursor":{"row":6,"col":17},"anchor":{"row":6,"col":17}},{"cursor":{"row":6,"col":20},"anchor":{"row":6,"col":20}},{"cursor":{"row":6,"col":23},"anchor":{"row":6,"col":23}},{"cursor":{"row":6,"col":26},"anchor":{"row":6,"col":26}},{"cursor":{"row":6,"col":29},"anchor":{"row":6,"col":29}},{"cursor":{"row":6,"col":32},"anchor":{"row":6,"col":32}},{"cursor":{"row":6,"col":35},"anchor":{"row":6,"col":35}},{"cursor":{"row":6,"col":38},"anchor":{"row":6,"col":38}},{"cursor":{"row":6,"col":41},"anchor":{"row":6,"col":41}},{"cursor":{"row":6,"col":44},"anchor":{"row":6,"col":44}},{"cursor":{"row":6,"col":47},"anchor":{"row":6,"col":47}},{"cursor":{"row":6,"col":50},"anchor":{"row":6,"col":50}},{"cursor":{"row":6,"col":53},"anchor":{"row":6,"col":53}},{"cursor":{"row":6,"col":56},"anchor":{"row":6,"col":56}},{"cursor":{"row":6,"col":59},"anchor":{"row":6,"col":59}},{"cursor":{"row":7,"col":2},"anchor":{"row":7,"col":2}},{"cursor":{"row":7,"col":5},"anchor":{"row":7,"col":5}},{"cursor":{"row":7,"col":8},"anchor":{"row":7,"col":8}},{"cursor":{"row":7,"col":11},"anchor":{"row":7,"col":11}},{"cursor":{"row":7,"col":14},"anchor":{"row":7,"col":14}},{"cursor":{"row":7,"col":17},"anchor":{"row":7,"col":17}},{"cursor":{"row":7,"col":20},"anchor":{"row":7,"col":20}},{"cursor":{"row":7,"col":23},"anchor":{"row":7,"col":23}},{"cursor":{"row":7,"col":26},"anchor":{"row":7,"col":26}},{"cursor":{"row":7,"col":29},"anchor":{"row":7,"col":29}},{"cursor":{"row":7,"col":32},"anchor":{"row":7,"col":32}},{"cursor":{"row":7,"col":35},"anchor":{"row":7,"col":35}},{"cursor":{"row":7,"col":38},"anchor":{"row":7,"col":38}},{"cursor":{"row":7,"col":41},"anchor":{"row":7,"col":41}},{"cursor":{"row":7,"col":44},"anchor":{"row":7,"col":44}},{"cursor":{"row":7,"col":47},"anchor":{"row":7,"col":47}},{"cursor":{"row":7,"col":50},"anchor":{"row":7,"col":50}},{"cursor":{"row":7,"col":53},"anchor":{"row":7,"col":53}},{"cursor":{"row":7,"col":56},"anchor":{"row":7,"col":56}},{"cursor":{"row":7,"col":59},"anchor":{"row":7,"col":59}},{"cursor":{"row":8,"col":2},"anchor":{"row":8,"col":2}},{"cursor":{"row":8,"col":5},"anchor":{"row":8,"col":5}},{"cursor":{"row":8,"col":8},"anchor":{"row":8,"col":8}},{"cursor":{"row":8,"col":11},"anchor":{"row":8,"col":11}},{"cursor":{"row":8,"col":14},"anchor":{"row":8,"col":14}},{"cursor":{"row":8,"col":17},"anchor":{"row":8,"col":17}},{"cursor":{"row":8,"col":20},"anchor":{"row":8,"col":20}},{"cursor":{"row":8,"col":23},"anchor":{"row":8,"col":23}},{"cursor":{"row":8,"col":26},"anchor":{"row":8,"col":26}},{"cursor":{"row":8,"col":29},"anchor":{"row":8,"col":29}},{"cursor":{"row":8,"col":32},"anchor":{"row":8,"col":32}},{"cursor":{"row":8,"col":35},"anchor":{"row":8,"col":35}},{"cursor":{"row":8,"col":38},"anchor":{"row":8,"col":38}},{"cursor":{"row":8,"col":41},"anchor":{"row":8,"col":41}},{"cursor":{"row":8,"col":44},"anchor":{"row":8,"col":44}},{"cursor":{"row":8,"col":47},"anchor":{"row":8,"col":47}},{"cursor":{"row":8,"col":50},"anchor":{"row":8,"col":50}},{"cursor":{"row":8,"col":53},"anchor":{"row":8,"col":53}},{"cursor":{"row":8,"col":56},"anchor":{"row":8,"col":56}},{"cursor":{"row":8,"col":59},"anchor":{"row":8,"col":59}},{"cursor":{"row":9,"col":2},"anchor":{"row":9,"col":2}},{"cursor":{"row":9,"col":5},"anchor":{"row":9,"col":5}},{"cursor":{"row":9,"col":8},"anchor":{"row":9,"col":8}},{"cursor":{"row":9,"col":11},"anchor":{"row":9,"col":11}},{"cursor":{"row":9,"col":14},"anchor":{"row":9,"col":14}},{"cursor":{"row":9,"col":17},"anchor":{"row":9,"col":17}},{"cursor":{"row":9,"col":20},"anchor":{"row":9,"col":20}},{"cursor":{"row":9,"col":23},"anchor":{"row":9,"col":23}},{"cursor":{"row":9,"col":26},"anchor":{"row":9,"col":26}},{"cursor":{"row":9,"col":29},"anchor":{"row":9,"col":29}},{"cursor":{"row":9,"col":32},"anchor":{"row":9,"col":32}},{"cursor":{"row":9,"col":35},"anchor":{"row":9,"col":35}},{"cursor":{"row":9,"col":38},"anchor":{"row":9,"col":38}},{"cursor":{"row":9,"col":41},"anchor":{"row":9,"col":41}},{"cursor":{"row":9,"col":44},"anchor":{"row":9,"col":44}},{"cursor":{"row":9,"col":47},"anchor":{"row":9,"col":47}},{"cursor":{"row":9,"col":50},"anchor":{"row":9,"col":50}},{"cursor":{"row":9,"col":53},"anchor":{"row":9,"col":53}},{"cursor":{"row":9,"col":56},"anchor":{"row":9,"col":56}},{"cursor":{"row":9,"col":59},"anchor":{"row":9,"col":59}}],"primary":0}
 {"name":"msel-align-basic","text":"a  =1\nbbb=2\n","mode":"normal","cursor":{"row":0,"col":3},"anchor":{"row":0,"col":3},"sels":[{"cursor":{"row":0,"col":3},"anchor":{"row":0,"col":3}},{"cursor":{"row":1,"col":3},"anchor":{"row":1,"col":3}}],"primary":0}
 {"name":"msel-align-columns","text":"a  ,b,c\nccc,d,e\n","mode":"normal","cursor":{"row":0,"col":3},"anchor":{"row":0,"col":3},"sels":[{"cursor":{"row":0,"col":3},"anchor":{"row":0,"col":3}},{"cursor":{"row":0,"col":5},"anchor":{"row":0,"col":5}},{"cursor":{"row":1,"col":3},"anchor":{"row":1,"col":3}},{"cursor":{"row":1,"col":5},"anchor":{"row":1,"col":5}}],"primary":0}
 {"name":"msel-align-uneven","text":"a  ,b\nccc,d,eee,f\n","mode":"normal","cursor":{"row":0,"col":3},"anchor":{"row":0,"col":3},"sels":[{"cursor":{"row":0,"col":3},"anchor":{"row":0,"col":3}},{"cursor":{"row":1,"col":3},"anchor":{"row":1,"col":3}},{"cursor":{"row":1,"col":5},"anchor":{"row":1,"col":5}},{"cursor":{"row":1,"col":9},"anchor":{"row":1,"col":9}}],"primary":0}
diff --git a/test/panes.zig b/test/panes.zig
index f0e1ba3d..a56c07bf 100644
--- a/test/panes.zig
+++ b/test/panes.zig
@@ -305,7 +305,7 @@ const TagNavigationTests = struct {
         try std.testing.expectEqual(@as(usize, 2), got.n);
         for (ranges[0..got.n]) |range| try std.testing.expectEqualStrings("S", text[@min(range.anchor, range.head)..@max(range.anchor, range.head)]);
         // the body's selection is its own
-        try std.testing.expectEqual(@as(u8, 0), pane.body.nsel);
+        try std.testing.expectEqual(@as(u16, 0), pane.body.nsel);
         // `/` from the tag is the body's search, as acme's Look from a tag is
         key(p, ',');
         key(p, '/');
@@ -1984,8 +1984,8 @@ test "prompt cancellation restores the selection before regex previews" {
         p.update(.{ .key = .{ .cp = case.pattern[0], .text = case.pattern } });
         try std.testing.expectEqual(case.secondary, pane.body.nsel);
         p.update(.{ .key = .{ .cp = Key.escape } });
-        try std.testing.expectEqual(@as(u8, 0), pane.body.nsel);
-        try std.testing.expectEqual(@as(u8, 0), pane.nsel_snap);
+        try std.testing.expectEqual(@as(u16, 0), pane.body.nsel);
+        try std.testing.expectEqual(@as(u16, 0), pane.nsel_snap);
         try std.testing.expectEqual(@as(i32, 10), pane.body.cur_col);
         try std.testing.expectEqual(@as(i32, 0), pane.body.vsel.col);
         try std.testing.expect(pane.body.vsel.active and pane.body.vsel.explicit);
@@ -2761,7 +2761,7 @@ const OutputTests = struct {
         try fillResults(p, 0, "/", .{ .query = .hover }, "", try p.gpa.dupe(u8, "short\n"), null);
         try std.testing.expectEqualStrings("short\n", result.file.?.content);
         try std.testing.expect(!result.body.vsel.active and !result.body.msel.active and !result.body.select);
-        try std.testing.expectEqual(@as(u8, 0), result.body.nsel);
+        try std.testing.expectEqual(@as(u16, 0), result.body.nsel);
         try std.testing.expectEqual(@as(i32, 0), result.body.cur_row);
         try std.testing.expectEqual(@as(i32, 0), result.body.cur_col);
         try std.testing.expectEqual(@as(usize, 0), result.file.?.scroll);
@@ -4581,7 +4581,7 @@ const LookResetTests = struct {
 
     fn cleared(pane: *const Pane) !void {
         try std.testing.expect(!pane.body.msel.active);
-        try std.testing.expectEqual(@as(u8, 0), pane.body.nsel);
+        try std.testing.expectEqual(@as(u16, 0), pane.body.nsel);
         try std.testing.expect(!pane.body.select);
         try std.testing.expectEqual(modal.Normal.State{}, pane.body.normal);
         try std.testing.expect(!pane.body.restore_cursor);
-- 
cgit v1.3


From 79cdf76fd2dd0ba03622bfe742b525b770d51684 Mon Sep 17 00:00:00 2001
From: Gabriel Schneider <gbrls@0x4200.cafe>
Date: Mon, 28 Sep 2026 16:29:36 -0300
Subject: K and Alt-K keep or drop the ranges a regex matches in; Alt-: turns
 every range forward

K and Alt-K share the s/S prompt, which now carries a mode rather than a
split flag: a range stays when a match starts inside it (K) or when none does
(Alt-K), the primary becomes the first, and keeping none leaves the selection
as it was (helix keep_or_remove_matches). Alt-: is ensure_selections_forward.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 docs/helix-keys.md         |  4 ++--
 docs/selections.md         |  2 ++
 src/Text.zig               |  9 +++++++
 src/config.zig             |  5 ++++
 src/edit.zig               |  5 ++--
 src/look.zig               |  2 +-
 src/modal.zig              | 15 +++++++++---
 src/normal.zig             | 58 ++++++++++++++++++++++++++++++++--------------
 src/pardes.zig             |  4 ++--
 test/hxcases/cases.jsonl   |  8 +++++++
 test/hxcases/goldens.jsonl |  8 +++++++
 11 files changed, 92 insertions(+), 28 deletions(-)

(limited to 'src/Text.zig')

diff --git a/docs/helix-keys.md b/docs/helix-keys.md
index 1c9e0763..5c3972a5 100644
--- a/docs/helix-keys.md
+++ b/docs/helix-keys.md
@@ -212,6 +212,7 @@ found. Pure text math in `modal.zig`: `findChar`, `matchBracket`,
 | --- | --- | --- | --- |
 | `;` | collapse selection to cursor | drops vsel/msel, cursor stays | helix-verified (phase 5) |
 | `Alt-;` | flip anchor and head | vsel: swap cursor ↔ anchor; msel: cursor to the other end (r0/r1 swapped to keep the cursor-at-r1 invariant) | helix-verified (phase 5) |
+| `Alt-:` | make every range point forward | helix `ensure_selections_forward` | helix-verified |
 | `%` | select whole buffer | vsel anchor 0,0, cursor on the buffer's last char | helix-verified (phase 5) |
 | `X` | snap selection to line bounds | vsel → msel over its row span; bare cursor → 1-line msel; msel: already line-wise, no-op | helix-verified (phase 5) |
 | `Alt-x` | shrink selection to line bounds | vsel only: partial first/last lines drop out; nothing left collapses the selection; msel: no-op | helix-verified (phase 5) |
@@ -277,7 +278,7 @@ keeps the matches it found so far.
 | `^` and `$` | hold at every line's start and end | helix compiles with `multi_line(true)`; pardes gets the same by searching each line as its own haystack (`src/regexp.zig`) | helix-verified |
 | `.` | never matches a newline | as the Rust regex crate: a pattern without `\n` searches line by line, and one that names `\n` has its `.`s made `[^\n]` (`src/regexp.zig`) | helix-verified |
 | many matches | up to `memory.limits.selections` ranges: 1024 on the desktop, 64 on the board; matches past it are dropped | helix has no limit. The ranges are held inline in every `Text` (about 20 KiB each on the desktop) | helix-verified up to the limit |
-| `K` / `Alt-K` | keep / remove ranges matching a regex | **skipped**: the same prompt, filtering instead of splitting — worth adding next |
+| `K<pat>` / `Alt-K<pat>` Enter | keep only the ranges a match starts inside / only those none does; primary 0, and keeping none leaves the selection alone | helix `keep_selections` / `remove_selections`, on the same prompt as `s`/`S` (markers `Keep /`, `Remove /`). The range is searched as `s` searches it, line by line with its lines' context, where helix matches the range's text alone: a `^` right at a range that starts mid-line matches in helix and not here | helix-verified |
 
 ### `Ctrl-c` — toggle comments
 
@@ -357,7 +358,6 @@ text.
 | insert `Ctrl-x` | completion menu | completion exists, but not as a popup: insert-mode Tab straight after a `.` opens a buffer of candidate DECLARATIONS (section A). helix's menu itself is skipped |
 | `Ctrl-s` (normal) | save jumplist position | jumplist itself is implemented (`Ctrl-o`/`Ctrl-i`, section A); only the explicit save point is skipped |
 | `Alt-u` / `Alt-U` | undo-history earlier/later | history timeline — linear snapshot u/U covers pardes |
-| `K Alt-K`, `Alt-:` | regex keep/remove, ensure-forward | `K`/`Alt-K` are the same prompt `s`/`S` now have, filtering instead of splitting (`s S` moved to "Regex selection" in A, the rest of the family to "Multiple cursors") |
 | `:` | command mode | side-effects/file-ops — pardes builtins live in the tag, and `:` is bound to focusing it (section A) |
 | `gf` | goto file under selection | covered by pardes Enter-look |
 | `Ctrl-z` | suspend | pardes IS the terminal multiplexer |
diff --git a/docs/selections.md b/docs/selections.md
index 59c4415b..203cf1de 100644
--- a/docs/selections.md
+++ b/docs/selections.md
@@ -44,6 +44,8 @@ range and drops the others.
   per line), `<n>o`/`<n>O`, and `Alt-J` (the spaces a join put in). `s`/`S`
   re-run on every keystroke from the selection the prompt opened on
   (`Pane.sel_snap`); Esc is that snapshot restored.
+- `K`/`Alt-K` keep or drop the ranges a regex matches in, on the `s` prompt;
+  `Alt-:` turns every range forward.
 - `Alt-minus` merges all into one, `Alt-_` the consecutive ones, `_` trims
   whitespace (dropping all-blank ranges).
 - `)`/`(` rotate which range is primary; `Alt-)`/`Alt-(` rotate the TEXT
diff --git a/src/Text.zig b/src/Text.zig
index 56ee199b..411c2ec8 100644
--- a/src/Text.zig
+++ b/src/Text.zig
@@ -328,6 +328,15 @@ pub fn multiSelAction(t: *Text, text: []const u8, kind: modal.Normal.Multi, cnt:
         }
         return setRanges(t, text, out[0..m], &.{}, pri, expl);
     }
+    if (kind == .ensure_forward) {
+        // helix ensure_selections_forward: every range points forward
+        for (rs[0..n]) |*r| {
+            const from = @min(r.anchor, r.head);
+            r.head = @max(r.anchor, r.head);
+            r.anchor = from;
+        }
+        return setRanges(t, text, rs[0..n], &.{}, got.pri, expl);
+    }
     if (kind == .split_newline) {
         // helix selection::split_on_newline — one range per line the
         // selection covers, the newlines themselves left out
diff --git a/src/config.zig b/src/config.zig
index bc053176..8c5c9771 100644
--- a/src/config.zig
+++ b/src/config.zig
@@ -414,6 +414,8 @@ pub const symbol_marker = " WsSymbols /";
 pub const save_marker = " Save ";
 pub const select_marker = " Select /";
 pub const split_marker = " Split /";
+pub const keep_marker = " Keep /";
+pub const remove_marker = " Remove /";
 pub const pipe_marker = " |";
 
 pub const search_buffer = "+Search";
@@ -532,6 +534,9 @@ pub const trim_sels: []const Chord = &.{.{ .cp = '_' }};
 
 pub const select_regex: []const Chord = &.{.{ .cp = 's' }};
 pub const split_regex: []const Chord = &.{.{ .cp = 'S' }};
+pub const keep_regex: []const Chord = &.{.{ .cp = 'K' }};
+pub const remove_regex: []const Chord = &.{.{ .cp = 'K', .alt = true }};
+pub const ensure_forward: []const Chord = &.{.{ .cp = ':', .alt = true }};
 
 pub const delete: []const Chord = &.{.{ .cp = 'd' }};
 pub const delete_noyank: []const Chord = &.{.{ .cp = 'd', .alt = true }};
diff --git a/src/edit.zig b/src/edit.zig
index a373741c..5e0d20a4 100644
--- a/src/edit.zig
+++ b/src/edit.zig
@@ -148,7 +148,7 @@ pub fn applyPaste(p: *Pardes, bytes: []const u8) void {
             n += 1;
         };
         if (n > 0) insertKey(p, &pane.input, .{ .cp = line[0], .text = line[0..n] });
-        if (normal.selRegexArmed(pane)) |a| if (p.promptTarget(pane)) |t| normal.applySelRegex(p, pane, t, a.pat, a.split);
+        if (normal.selRegexArmed(pane)) |a| if (p.promptTarget(pane)) |t| normal.applySelRegex(p, pane, t, a.pat, a.mode);
         return;
     }
     if (pane.focus == .tag) return pasteInto(p, &pane.tag, bytes);
@@ -355,7 +355,8 @@ pub fn exitInsert(p: *Pardes, t: *Text) void {
     for (rs[0..got.n]) |*r| {
         const from = @min(r.anchor, r.head);
         const to = @max(r.anchor, r.head);
-        r.* = .{ .anchor = from, .head = if (r.head > r.anchor) @max(from, modal.prevGrapheme(text, to)) else to };
+        const head = if (r.head > r.anchor) @max(from, modal.prevGrapheme(text, to)) else to;
+        r.* = .{ .anchor = from, .head = head };
     }
     t.setRanges(text, rs[0..got.n], &.{}, got.pri, expl);
 }
diff --git a/src/look.zig b/src/look.zig
index 30fb0dab..3da2e044 100644
--- a/src/look.zig
+++ b/src/look.zig
@@ -505,7 +505,7 @@ pub fn submitSearch(p: *Pardes, id: usize) void {
     if (normal.selRegexArmed(pane)) |a| {
         // helix keeps the pattern in `/`
         if (a.pat.len > 0) p.registers.put(p.gpa, '/', a.pat, 0, 1, true);
-        return if (p.promptTarget(pane)) |t| normal.applySelRegex(p, pane, t, a.pat, a.split);
+        return if (p.promptTarget(pane)) |t| normal.applySelRegex(p, pane, t, a.pat, a.mode);
     }
     const armed = pane.promptText() orelse return;
     const slash = std.mem.indexOfScalar(u8, armed, '/') orelse return;
diff --git a/src/modal.zig b/src/modal.zig
index 34c4dac7..f5f3081e 100644
--- a/src/modal.zig
+++ b/src/modal.zig
@@ -97,6 +97,9 @@ pub const Normal = struct {
         trim_sels,
         select_regex,
         split_regex,
+        keep_regex,
+        remove_regex,
+        ensure_forward,
 
         delete,
         delete_noyank,
@@ -210,6 +213,8 @@ pub const Normal = struct {
         }
     };
 
+    /// what the s/S/K/Alt-K prompt does with its pattern's matches
+    pub const RegexMode = enum { select, split, keep, remove };
     pub const Scope = enum { once, per_selection };
     pub const Direction = enum { backward, forward };
     pub const Motion = enum {
@@ -262,6 +267,7 @@ pub const Normal = struct {
         merge,
         merge_consecutive,
         trim,
+        ensure_forward,
     };
     pub const Edit = enum {
         delete,
@@ -314,7 +320,7 @@ pub const Normal = struct {
         insert: struct { kind: Insert, count: u32 },
         select: struct { kind: Select, count: u32 },
         multi: struct { kind: Multi, count: u32 },
-        select_regex: bool, // false = select, true = split
+        select_regex: RegexMode,
         edit: struct { kind: Edit, count: u32 },
         lsp: Lsp,
         adjust_number: i64,
@@ -577,8 +583,11 @@ pub const Normal = struct {
         if (key.has(.merge_sels)) return resultAction(.{ .multi = .{ .kind = .merge, .count = count } });
         if (key.has(.merge_consecutive_sels)) return resultAction(.{ .multi = .{ .kind = .merge_consecutive, .count = count } });
         if (key.has(.trim_sels)) return resultAction(.{ .multi = .{ .kind = .trim, .count = count } });
-        if (key.has(.select_regex)) return resultAction(.{ .select_regex = false });
-        if (key.has(.split_regex)) return resultAction(.{ .select_regex = true });
+        if (key.has(.select_regex)) return resultAction(.{ .select_regex = .select });
+        if (key.has(.split_regex)) return resultAction(.{ .select_regex = .split });
+        if (key.has(.keep_regex)) return resultAction(.{ .select_regex = .keep });
+        if (key.has(.remove_regex)) return resultAction(.{ .select_regex = .remove });
+        if (key.has(.ensure_forward)) return resultAction(.{ .multi = .{ .kind = .ensure_forward, .count = count } });
 
         if (key.has(.delete)) return resultAction(.{ .edit = .{ .kind = .delete, .count = count } });
         if (key.has(.delete_noyank)) return resultAction(.{ .edit = .{ .kind = .delete_noyank, .count = count } });
diff --git a/src/normal.zig b/src/normal.zig
index 98ba80d6..d6c646ef 100644
--- a/src/normal.zig
+++ b/src/normal.zig
@@ -69,27 +69,38 @@ pub fn multiOnce(p: *Pardes) bool {
     return p.multi_first;
 }
 
-fn startSelRegex(p: *Pardes, pane: *Pane, t: *Text, split: bool) void {
+fn startSelRegex(p: *Pardes, pane: *Pane, t: *Text, mode: modal.Normal.RegexMode) void {
     const text = edit.flatSurface(p, t) catch return;
     const got = t.ranges(text, 0, &pane.sel_snap);
     pane.nsel_snap = @intCast(got.n);
     pane.sel_snap_pri = @intCast(got.pri);
     pane.sel_snap_expl = (t.vsel.active and t.vsel.explicit) or t.msel.active;
-    p.startPrompt(pane, t, .{ .search = if (split) config.split_marker else config.select_marker });
+    p.startPrompt(pane, t, .{ .search = regexMarker(mode) });
 }
 
-pub fn selRegexArmed(pane: *Pane) ?struct { pat: []const u8, split: bool } {
+fn regexMarker(mode: modal.Normal.RegexMode) []const u8 {
+    return switch (mode) {
+        .select => config.select_marker,
+        .split => config.split_marker,
+        .keep => config.keep_marker,
+        .remove => config.remove_marker,
+    };
+}
+
+pub fn selRegexArmed(pane: *Pane) ?struct { pat: []const u8, mode: modal.Normal.RegexMode } {
     if (pane.prompt != .search or pane.nsel_snap == 0) return null;
     const armed = pane.input.own orelse "";
-    const split = std.mem.startsWith(u8, armed, config.split_marker);
-    if (!split and !std.mem.startsWith(u8, armed, config.select_marker)) return null;
+    const mode: modal.Normal.RegexMode = for (std.enums.values(modal.Normal.RegexMode)) |m| {
+        if (std.mem.startsWith(u8, armed, regexMarker(m))) break m;
+    } else return null;
     const slash = std.mem.indexOfScalar(u8, armed, '/') orelse return null;
-    return .{ .pat = armed[slash + 1 ..], .split = split };
+    return .{ .pat = armed[slash + 1 ..], .mode = mode };
 }
 
-/// Select (or split on) `pat` inside the selections `t` had when s/S was
-/// pressed; the prompt's snapshot of them lives on `pane`.
-pub fn applySelRegex(p: *Pardes, pane: *Pane, t: *Text, pat: []const u8, split: bool) void {
+/// Select (or split on, keep or remove by) `pat` inside the selections `t`
+/// had when s/S/K/Alt-K was pressed; the prompt's snapshot of them lives on
+/// `pane`.
+pub fn applySelRegex(p: *Pardes, pane: *Pane, t: *Text, pat: []const u8, mode: modal.Normal.RegexMode) void {
     const text = edit.flatSurface(p, t) catch return;
     const snap = pane.sel_snap[0..pane.nsel_snap];
     var out: [Text.max_selections]modal.Selection = undefined;
@@ -108,6 +119,17 @@ pub fn applySelRegex(p: *Pardes, pane: *Pane, t: *Text, pat: []const u8, split:
             const from = @min(r.anchor, r.head);
             const to = @min(@max(r.anchor, r.head), text.len);
             if (from >= to) continue;
+            if (mode == .keep or mode == .remove) {
+                // helix keep_or_remove_matches: the range stays when a match
+                // starts inside it (K), or when none does (Alt-K)
+                const hit_at = re.find(hay_all, from, to, to) catch null;
+                const found = if (hit_at) |h| h.start < to else false;
+                if (found == (mode == .keep) and m < Text.max_selections) {
+                    out[m] = r;
+                    m += 1;
+                }
+                continue;
+            }
             // Searched as sam searches, the way addr does (regexp.zig): the
             // text around the selection still says where its lines begin.
             var at = from;
@@ -115,7 +137,7 @@ pub fn applySelRegex(p: *Pardes, pane: *Pane, t: *Text, pat: []const u8, split:
             while (at < to and m < Text.max_selections) {
                 // A search too slow to finish keeps what it found so far.
                 const hit_at = (re.find(hay_all, at, to, to) catch break) orelse break;
-                if (split) {
+                if (mode == .split) {
                     out[m] = .{ .anchor = piece, .head = hit_at.start };
                     m += 1;
                     piece = hit_at.end;
@@ -126,7 +148,7 @@ pub fn applySelRegex(p: *Pardes, pane: *Pane, t: *Text, pat: []const u8, split:
                 // an empty match would otherwise never advance
                 at = if (hit_at.end > hit_at.start) hit_at.end else hit_at.end + 1;
             }
-            if (split and piece < to and m < Text.max_selections) {
+            if (mode == .split and piece < to and m < Text.max_selections) {
                 out[m] = .{ .anchor = piece, .head = to };
                 m += 1;
             }
@@ -542,7 +564,7 @@ fn executeNormalAction(p: *Pardes, t: *Text, semantic: modal.Normal.Action) void
         },
         // s, S and | answer for the text they are pressed in; `/` searches
         // the body wherever it is pressed, as acme's Look from a tag does.
-        .select_regex => |split| return startSelRegex(p, pane, t, split),
+        .select_regex => |mode| return startSelRegex(p, pane, t, mode),
         .edit => |op| switch (op.kind) {
             .delete => return edit.normalDelete(p, t, true),
             .delete_noyank => return edit.normalDelete(p, t, false),
@@ -795,20 +817,20 @@ test "s and S search a multi-line selection as addr does: ^ and $ per line, . wi
     defer p.deinit();
     const text = "alpha x\nbeta alpha\nalphabet\n";
     const pane = try p.setTestFile(text);
-    const Case = struct { pat: []const u8, split: bool, want: []const [2]usize };
+    const Case = struct { pat: []const u8, mode: modal.Normal.RegexMode, want: []const [2]usize };
     for ([_]Case{
         // ^ at each line's start, not only the selection's
-        .{ .pat = "^alpha", .split = false, .want = &.{ .{ 0, 5 }, .{ 19, 24 } } },
+        .{ .pat = "^alpha", .mode = .select, .want = &.{ .{ 0, 5 }, .{ 19, 24 } } },
         // $ at each line's end
-        .{ .pat = "alpha$", .split = false, .want = &.{.{ 13, 18 }} },
+        .{ .pat = "alpha$", .mode = .select, .want = &.{.{ 13, 18 }} },
         // . stops at the newline: one selection per line, not one for all
-        .{ .pat = "a.*", .split = false, .want = &.{ .{ 0, 7 }, .{ 11, 18 }, .{ 19, 27 } } },
+        .{ .pat = "a.*", .mode = .select, .want = &.{ .{ 0, 7 }, .{ 11, 18 }, .{ 19, 27 } } },
         // S splits on a line's end
-        .{ .pat = "$", .split = true, .want = &.{ .{ 0, 7 }, .{ 7, 18 }, .{ 18, 27 }, .{ 27, 28 } } },
+        .{ .pat = "$", .mode = .split, .want = &.{ .{ 0, 7 }, .{ 7, 18 }, .{ 18, 27 }, .{ 27, 28 } } },
     }) |c| {
         pane.sel_snap[0] = .{ .anchor = 0, .head = text.len };
         pane.nsel_snap = 1;
-        applySelRegex(p, pane, &pane.body, c.pat, c.split);
+        applySelRegex(p, pane, &pane.body, c.pat, c.mode);
         var out: [Text.max_selections]modal.Selection = undefined;
         const got = pane.body.ranges(text, 0, &out);
         try std.testing.expectEqual(c.want.len, got.n);
diff --git a/src/pardes.zig b/src/pardes.zig
index a7bcb195..d43b38b1 100644
--- a/src/pardes.zig
+++ b/src/pardes.zig
@@ -5270,7 +5270,7 @@ pub const Pardes = struct {
                     .search => if (submit)
                         look.submitSearch(p, p.active)
                     else if (normal.selRegexArmed(pane)) |_| if (target) |answered|
-                        normal.applySelRegex(p, pane, answered, "", false),
+                        normal.applySelRegex(p, pane, answered, "", .select),
                     .none, .del_side, .repl_choice, .name => unreachable,
                 }
                 pane.closePrompt();
@@ -5281,7 +5281,7 @@ pub const Pardes = struct {
                 return;
             }
             edit.handleInsert(p, &pane.input, key);
-            if (normal.selRegexArmed(pane)) |a| if (p.promptTarget(pane)) |answered| normal.applySelRegex(p, pane, answered, a.pat, a.split);
+            if (normal.selRegexArmed(pane)) |a| if (p.promptTarget(pane)) |answered| normal.applySelRegex(p, pane, answered, a.pat, a.mode);
             return;
         }
         if (t.mode == .normal and p.macro.replaying == 0 and (hit(key, config.look_key) or hit(key, config.exec_key))) {
diff --git a/test/hxcases/cases.jsonl b/test/hxcases/cases.jsonl
index 7aeb12e8..43cbbf11 100644
--- a/test/hxcases/cases.jsonl
+++ b/test/hxcases/cases.jsonl
@@ -432,6 +432,14 @@
 {"name": "msel-rotate-contents-lines", "pane": "file", "text": "aa\nbbb\n", "keys": "%<A-s><A-)>"}
 {"name": "sel-many-ranges", "pane": "file", "text": "w w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\n", "keys": "%sw<ret>"}
 {"name": "sel-many-ranges-edit", "pane": "file", "text": "w w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\n", "keys": "%sw<ret>cxy<esc>"}
+{"name": "keep-regex", "pane": "file", "text": "foo bar baz\n", "keys": "%s\\w+<ret>Kba<ret>"}
+{"name": "remove-regex", "pane": "file", "text": "foo bar baz\n", "keys": "%s\\w+<ret><A-K>ba<ret>"}
+{"name": "keep-regex-none", "pane": "file", "text": "foo bar\n", "keys": "%s\\w+<ret>Kzz<ret>"}
+{"name": "keep-regex-primary", "pane": "file", "text": "a1 b2 a3\n", "keys": "%s\\w+<ret>))Ka<ret>"}
+{"name": "keep-regex-esc", "pane": "file", "text": "foo bar\n", "keys": "%s\\w+<ret>Kfo<esc>"}
+{"name": "keep-regex-lines", "pane": "file", "text": "foo\nbar\nbaz\n", "keys": "%<A-s>K^b<ret>"}
+{"name": "ensure-forward", "pane": "file", "text": "ab cd\n", "keys": "%s\\w+<ret><A-;><A-:>"}
+{"name": "ensure-forward-one", "pane": "file", "text": "abc\n", "keys": "vll<A-;><A-:>"}
 {"name": "msel-align-basic", "pane": "file", "text": "a=1\nbbb=2\n", "keys": "%s=<ret>&"}
 {"name": "msel-align-columns", "pane": "file", "text": "a,b,c\nccc,d,e\n", "keys": "%s,<ret>&"}
 {"name": "msel-align-uneven", "pane": "file", "text": "a,b\nccc,d,eee,f\n", "keys": "%s,<ret>&"}
diff --git a/test/hxcases/goldens.jsonl b/test/hxcases/goldens.jsonl
index b8221c4c..9839335a 100644
--- a/test/hxcases/goldens.jsonl
+++ b/test/hxcases/goldens.jsonl
@@ -432,6 +432,14 @@
 {"name":"msel-rotate-contents-lines","text":"bbb\naa\n","mode":"normal","cursor":{"row":1,"col":1},"anchor":{"row":1,"col":0},"sels":[{"cursor":{"row":0,"col":2},"anchor":{"row":0,"col":0}},{"cursor":{"row":1,"col":1},"anchor":{"row":1,"col":0}}],"primary":1}
 {"name":"sel-many-ranges","text":"w w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\nw w w w w w w w w w w w w w w w w w w w\n","mode":"normal","cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0},"sels":[{"cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0}},{"cursor":{"row":0,"col":2},"anchor":{"row":0,"col":2}},{"cursor":{"row":0,"col":4},"anchor":{"row":0,"col":4}},{"cursor":{"row":0,"col":6},"anchor":{"row":0,"col":6}},{"cursor":{"row":0,"col":8},"anchor":{"row":0,"col":8}},{"cursor":{"row":0,"col":10},"anchor":{"row":0,"col":10}},{"cursor":{"row":0,"col":12},"anchor":{"row":0,"col":12}},{"cursor":{"row":0,"col":14},"anchor":{"row":0,"col":14}},{"cursor":{"row":0,"col":16},"anchor":{"row":0,"col":16}},{"cursor":{"row":0,"col":18},"anchor":{"row":0,"col":18}},{"cursor":{"row":0,"col":20},"anchor":{"row":0,"col":20}},{"cursor":{"row":0,"col":22},"anchor":{"row":0,"col":22}},{"cursor":{"row":0,"col":24},"anchor":{"row":0,"col":24}},{"cursor":{"row":0,"col":26},"anchor":{"row":0,"col":26}},{"cursor":{"row":0,"col":28},"anchor":{"row":0,"col":28}},{"cursor":{"row":0,"col":30},"anchor":{"row":0,"col":30}},{"cursor":{"row":0,"col":32},"anchor":{"row":0,"col":32}},{"cursor":{"row":0,"col":34},"anchor":{"row":0,"col":34}},{"cursor":{"row":0,"col":36},"anchor":{"row":0,"col":36}},{"cursor":{"row":0,"col":38},"anchor":{"row":0,"col":38}},{"cursor":{"row":1,"col":0},"anchor":{"row":1,"col":0}},{"cursor":{"row":1,"col":2},"anchor":{"row":1,"col":2}},{"cursor":{"row":1,"col":4},"anchor":{"row":1,"col":4}},{"cursor":{"row":1,"col":6},"anchor":{"row":1,"col":6}},{"cursor":{"row":1,"col":8},"anchor":{"row":1,"col":8}},{"cursor":{"row":1,"col":10},"anchor":{"row":1,"col":10}},{"cursor":{"row":1,"col":12},"anchor":{"row":1,"col":12}},{"cursor":{"row":1,"col":14},"anchor":{"row":1,"col":14}},{"cursor":{"row":1,"col":16},"anchor":{"row":1,"col":16}},{"cursor":{"row":1,"col":18},"anchor":{"row":1,"col":18}},{"cursor":{"row":1,"col":20},"anchor":{"row":1,"col":20}},{"cursor":{"row":1,"col":22},"anchor":{"row":1,"col":22}},{"cursor":{"row":1,"col":24},"anchor":{"row":1,"col":24}},{"cursor":{"row":1,"col":26},"anchor":{"row":1,"col":26}},{"cursor":{"row":1,"col":28},"anchor":{"row":1,"col":28}},{"cursor":{"row":1,"col":30},"anchor":{"row":1,"col":30}},{"cursor":{"row":1,"col":32},"anchor":{"row":1,"col":32}},{"cursor":{"row":1,"col":34},"anchor":{"row":1,"col":34}},{"cursor":{"row":1,"col":36},"anchor":{"row":1,"col":36}},{"cursor":{"row":1,"col":38},"anchor":{"row":1,"col":38}},{"cursor":{"row":2,"col":0},"anchor":{"row":2,"col":0}},{"cursor":{"row":2,"col":2},"anchor":{"row":2,"col":2}},{"cursor":{"row":2,"col":4},"anchor":{"row":2,"col":4}},{"cursor":{"row":2,"col":6},"anchor":{"row":2,"col":6}},{"cursor":{"row":2,"col":8},"anchor":{"row":2,"col":8}},{"cursor":{"row":2,"col":10},"anchor":{"row":2,"col":10}},{"cursor":{"row":2,"col":12},"anchor":{"row":2,"col":12}},{"cursor":{"row":2,"col":14},"anchor":{"row":2,"col":14}},{"cursor":{"row":2,"col":16},"anchor":{"row":2,"col":16}},{"cursor":{"row":2,"col":18},"anchor":{"row":2,"col":18}},{"cursor":{"row":2,"col":20},"anchor":{"row":2,"col":20}},{"cursor":{"row":2,"col":22},"anchor":{"row":2,"col":22}},{"cursor":{"row":2,"col":24},"anchor":{"row":2,"col":24}},{"cursor":{"row":2,"col":26},"anchor":{"row":2,"col":26}},{"cursor":{"row":2,"col":28},"anchor":{"row":2,"col":28}},{"cursor":{"row":2,"col":30},"anchor":{"row":2,"col":30}},{"cursor":{"row":2,"col":32},"anchor":{"row":2,"col":32}},{"cursor":{"row":2,"col":34},"anchor":{"row":2,"col":34}},{"cursor":{"row":2,"col":36},"anchor":{"row":2,"col":36}},{"cursor":{"row":2,"col":38},"anchor":{"row":2,"col":38}},{"cursor":{"row":3,"col":0},"anchor":{"row":3,"col":0}},{"cursor":{"row":3,"col":2},"anchor":{"row":3,"col":2}},{"cursor":{"row":3,"col":4},"anchor":{"row":3,"col":4}},{"cursor":{"row":3,"col":6},"anchor":{"row":3,"col":6}},{"cursor":{"row":3,"col":8},"anchor":{"row":3,"col":8}},{"cursor":{"row":3,"col":10},"anchor":{"row":3,"col":10}},{"cursor":{"row":3,"col":12},"anchor":{"row":3,"col":12}},{"cursor":{"row":3,"col":14},"anchor":{"row":3,"col":14}},{"cursor":{"row":3,"col":16},"anchor":{"row":3,"col":16}},{"cursor":{"row":3,"col":18},"anchor":{"row":3,"col":18}},{"cursor":{"row":3,"col":20},"anchor":{"row":3,"col":20}},{"cursor":{"row":3,"col":22},"anchor":{"row":3,"col":22}},{"cursor":{"row":3,"col":24},"anchor":{"row":3,"col":24}},{"cursor":{"row":3,"col":26},"anchor":{"row":3,"col":26}},{"cursor":{"row":3,"col":28},"anchor":{"row":3,"col":28}},{"cursor":{"row":3,"col":30},"anchor":{"row":3,"col":30}},{"cursor":{"row":3,"col":32},"anchor":{"row":3,"col":32}},{"cursor":{"row":3,"col":34},"anchor":{"row":3,"col":34}},{"cursor":{"row":3,"col":36},"anchor":{"row":3,"col":36}},{"cursor":{"row":3,"col":38},"anchor":{"row":3,"col":38}},{"cursor":{"row":4,"col":0},"anchor":{"row":4,"col":0}},{"cursor":{"row":4,"col":2},"anchor":{"row":4,"col":2}},{"cursor":{"row":4,"col":4},"anchor":{"row":4,"col":4}},{"cursor":{"row":4,"col":6},"anchor":{"row":4,"col":6}},{"cursor":{"row":4,"col":8},"anchor":{"row":4,"col":8}},{"cursor":{"row":4,"col":10},"anchor":{"row":4,"col":10}},{"cursor":{"row":4,"col":12},"anchor":{"row":4,"col":12}},{"cursor":{"row":4,"col":14},"anchor":{"row":4,"col":14}},{"cursor":{"row":4,"col":16},"anchor":{"row":4,"col":16}},{"cursor":{"row":4,"col":18},"anchor":{"row":4,"col":18}},{"cursor":{"row":4,"col":20},"anchor":{"row":4,"col":20}},{"cursor":{"row":4,"col":22},"anchor":{"row":4,"col":22}},{"cursor":{"row":4,"col":24},"anchor":{"row":4,"col":24}},{"cursor":{"row":4,"col":26},"anchor":{"row":4,"col":26}},{"cursor":{"row":4,"col":28},"anchor":{"row":4,"col":28}},{"cursor":{"row":4,"col":30},"anchor":{"row":4,"col":30}},{"cursor":{"row":4,"col":32},"anchor":{"row":4,"col":32}},{"cursor":{"row":4,"col":34},"anchor":{"row":4,"col":34}},{"cursor":{"row":4,"col":36},"anchor":{"row":4,"col":36}},{"cursor":{"row":4,"col":38},"anchor":{"row":4,"col":38}},{"cursor":{"row":5,"col":0},"anchor":{"row":5,"col":0}},{"cursor":{"row":5,"col":2},"anchor":{"row":5,"col":2}},{"cursor":{"row":5,"col":4},"anchor":{"row":5,"col":4}},{"cursor":{"row":5,"col":6},"anchor":{"row":5,"col":6}},{"cursor":{"row":5,"col":8},"anchor":{"row":5,"col":8}},{"cursor":{"row":5,"col":10},"anchor":{"row":5,"col":10}},{"cursor":{"row":5,"col":12},"anchor":{"row":5,"col":12}},{"cursor":{"row":5,"col":14},"anchor":{"row":5,"col":14}},{"cursor":{"row":5,"col":16},"anchor":{"row":5,"col":16}},{"cursor":{"row":5,"col":18},"anchor":{"row":5,"col":18}},{"cursor":{"row":5,"col":20},"anchor":{"row":5,"col":20}},{"cursor":{"row":5,"col":22},"anchor":{"row":5,"col":22}},{"cursor":{"row":5,"col":24},"anchor":{"row":5,"col":24}},{"cursor":{"row":5,"col":26},"anchor":{"row":5,"col":26}},{"cursor":{"row":5,"col":28},"anchor":{"row":5,"col":28}},{"cursor":{"row":5,"col":30},"anchor":{"row":5,"col":30}},{"cursor":{"row":5,"col":32},"anchor":{"row":5,"col":32}},{"cursor":{"row":5,"col":34},"anchor":{"row":5,"col":34}},{"cursor":{"row":5,"col":36},"anchor":{"row":5,"col":36}},{"cursor":{"row":5,"col":38},"anchor":{"row":5,"col":38}},{"cursor":{"row":6,"col":0},"anchor":{"row":6,"col":0}},{"cursor":{"row":6,"col":2},"anchor":{"row":6,"col":2}},{"cursor":{"row":6,"col":4},"anchor":{"row":6,"col":4}},{"cursor":{"row":6,"col":6},"anchor":{"row":6,"col":6}},{"cursor":{"row":6,"col":8},"anchor":{"row":6,"col":8}},{"cursor":{"row":6,"col":10},"anchor":{"row":6,"col":10}},{"cursor":{"row":6,"col":12},"anchor":{"row":6,"col":12}},{"cursor":{"row":6,"col":14},"anchor":{"row":6,"col":14}},{"cursor":{"row":6,"col":16},"anchor":{"row":6,"col":16}},{"cursor":{"row":6,"col":18},"anchor":{"row":6,"col":18}},{"cursor":{"row":6,"col":20},"anchor":{"row":6,"col":20}},{"cursor":{"row":6,"col":22},"anchor":{"row":6,"col":22}},{"cursor":{"row":6,"col":24},"anchor":{"row":6,"col":24}},{"cursor":{"row":6,"col":26},"anchor":{"row":6,"col":26}},{"cursor":{"row":6,"col":28},"anchor":{"row":6,"col":28}},{"cursor":{"row":6,"col":30},"anchor":{"row":6,"col":30}},{"cursor":{"row":6,"col":32},"anchor":{"row":6,"col":32}},{"cursor":{"row":6,"col":34},"anchor":{"row":6,"col":34}},{"cursor":{"row":6,"col":36},"anchor":{"row":6,"col":36}},{"cursor":{"row":6,"col":38},"anchor":{"row":6,"col":38}},{"cursor":{"row":7,"col":0},"anchor":{"row":7,"col":0}},{"cursor":{"row":7,"col":2},"anchor":{"row":7,"col":2}},{"cursor":{"row":7,"col":4},"anchor":{"row":7,"col":4}},{"cursor":{"row":7,"col":6},"anchor":{"row":7,"col":6}},{"cursor":{"row":7,"col":8},"anchor":{"row":7,"col":8}},{"cursor":{"row":7,"col":10},"anchor":{"row":7,"col":10}},{"cursor":{"row":7,"col":12},"anchor":{"row":7,"col":12}},{"cursor":{"row":7,"col":14},"anchor":{"row":7,"col":14}},{"cursor":{"row":7,"col":16},"anchor":{"row":7,"col":16}},{"cursor":{"row":7,"col":18},"anchor":{"row":7,"col":18}},{"cursor":{"row":7,"col":20},"anchor":{"row":7,"col":20}},{"cursor":{"row":7,"col":22},"anchor":{"row":7,"col":22}},{"cursor":{"row":7,"col":24},"anchor":{"row":7,"col":24}},{"cursor":{"row":7,"col":26},"anchor":{"row":7,"col":26}},{"cursor":{"row":7,"col":28},"anchor":{"row":7,"col":28}},{"cursor":{"row":7,"col":30},"anchor":{"row":7,"col":30}},{"cursor":{"row":7,"col":32},"anchor":{"row":7,"col":32}},{"cursor":{"row":7,"col":34},"anchor":{"row":7,"col":34}},{"cursor":{"row":7,"col":36},"anchor":{"row":7,"col":36}},{"cursor":{"row":7,"col":38},"anchor":{"row":7,"col":38}},{"cursor":{"row":8,"col":0},"anchor":{"row":8,"col":0}},{"cursor":{"row":8,"col":2},"anchor":{"row":8,"col":2}},{"cursor":{"row":8,"col":4},"anchor":{"row":8,"col":4}},{"cursor":{"row":8,"col":6},"anchor":{"row":8,"col":6}},{"cursor":{"row":8,"col":8},"anchor":{"row":8,"col":8}},{"cursor":{"row":8,"col":10},"anchor":{"row":8,"col":10}},{"cursor":{"row":8,"col":12},"anchor":{"row":8,"col":12}},{"cursor":{"row":8,"col":14},"anchor":{"row":8,"col":14}},{"cursor":{"row":8,"col":16},"anchor":{"row":8,"col":16}},{"cursor":{"row":8,"col":18},"anchor":{"row":8,"col":18}},{"cursor":{"row":8,"col":20},"anchor":{"row":8,"col":20}},{"cursor":{"row":8,"col":22},"anchor":{"row":8,"col":22}},{"cursor":{"row":8,"col":24},"anchor":{"row":8,"col":24}},{"cursor":{"row":8,"col":26},"anchor":{"row":8,"col":26}},{"cursor":{"row":8,"col":28},"anchor":{"row":8,"col":28}},{"cursor":{"row":8,"col":30},"anchor":{"row":8,"col":30}},{"cursor":{"row":8,"col":32},"anchor":{"row":8,"col":32}},{"cursor":{"row":8,"col":34},"anchor":{"row":8,"col":34}},{"cursor":{"row":8,"col":36},"anchor":{"row":8,"col":36}},{"cursor":{"row":8,"col":38},"anchor":{"row":8,"col":38}},{"cursor":{"row":9,"col":0},"anchor":{"row":9,"col":0}},{"cursor":{"row":9,"col":2},"anchor":{"row":9,"col":2}},{"cursor":{"row":9,"col":4},"anchor":{"row":9,"col":4}},{"cursor":{"row":9,"col":6},"anchor":{"row":9,"col":6}},{"cursor":{"row":9,"col":8},"anchor":{"row":9,"col":8}},{"cursor":{"row":9,"col":10},"anchor":{"row":9,"col":10}},{"cursor":{"row":9,"col":12},"anchor":{"row":9,"col":12}},{"cursor":{"row":9,"col":14},"anchor":{"row":9,"col":14}},{"cursor":{"row":9,"col":16},"anchor":{"row":9,"col":16}},{"cursor":{"row":9,"col":18},"anchor":{"row":9,"col":18}},{"cursor":{"row":9,"col":20},"anchor":{"row":9,"col":20}},{"cursor":{"row":9,"col":22},"anchor":{"row":9,"col":22}},{"cursor":{"row":9,"col":24},"anchor":{"row":9,"col":24}},{"cursor":{"row":9,"col":26},"anchor":{"row":9,"col":26}},{"cursor":{"row":9,"col":28},"anchor":{"row":9,"col":28}},{"cursor":{"row":9,"col":30},"anchor":{"row":9,"col":30}},{"cursor":{"row":9,"col":32},"anchor":{"row":9,"col":32}},{"cursor":{"row":9,"col":34},"anchor":{"row":9,"col":34}},{"cursor":{"row":9,"col":36},"anchor":{"row":9,"col":36}},{"cursor":{"row":9,"col":38},"anchor":{"row":9,"col":38}}],"primary":0}
 {"name":"sel-many-ranges-edit","text":"xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy\nxy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy\nxy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy\nxy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy\nxy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy\nxy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy\nxy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy\nxy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy\nxy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy\nxy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy xy\n","mode":"normal","cursor":{"row":0,"col":2},"anchor":{"row":0,"col":2},"sels":[{"cursor":{"row":0,"col":2},"anchor":{"row":0,"col":2}},{"cursor":{"row":0,"col":5},"anchor":{"row":0,"col":5}},{"cursor":{"row":0,"col":8},"anchor":{"row":0,"col":8}},{"cursor":{"row":0,"col":11},"anchor":{"row":0,"col":11}},{"cursor":{"row":0,"col":14},"anchor":{"row":0,"col":14}},{"cursor":{"row":0,"col":17},"anchor":{"row":0,"col":17}},{"cursor":{"row":0,"col":20},"anchor":{"row":0,"col":20}},{"cursor":{"row":0,"col":23},"anchor":{"row":0,"col":23}},{"cursor":{"row":0,"col":26},"anchor":{"row":0,"col":26}},{"cursor":{"row":0,"col":29},"anchor":{"row":0,"col":29}},{"cursor":{"row":0,"col":32},"anchor":{"row":0,"col":32}},{"cursor":{"row":0,"col":35},"anchor":{"row":0,"col":35}},{"cursor":{"row":0,"col":38},"anchor":{"row":0,"col":38}},{"cursor":{"row":0,"col":41},"anchor":{"row":0,"col":41}},{"cursor":{"row":0,"col":44},"anchor":{"row":0,"col":44}},{"cursor":{"row":0,"col":47},"anchor":{"row":0,"col":47}},{"cursor":{"row":0,"col":50},"anchor":{"row":0,"col":50}},{"cursor":{"row":0,"col":53},"anchor":{"row":0,"col":53}},{"cursor":{"row":0,"col":56},"anchor":{"row":0,"col":56}},{"cursor":{"row":0,"col":59},"anchor":{"row":0,"col":59}},{"cursor":{"row":1,"col":2},"anchor":{"row":1,"col":2}},{"cursor":{"row":1,"col":5},"anchor":{"row":1,"col":5}},{"cursor":{"row":1,"col":8},"anchor":{"row":1,"col":8}},{"cursor":{"row":1,"col":11},"anchor":{"row":1,"col":11}},{"cursor":{"row":1,"col":14},"anchor":{"row":1,"col":14}},{"cursor":{"row":1,"col":17},"anchor":{"row":1,"col":17}},{"cursor":{"row":1,"col":20},"anchor":{"row":1,"col":20}},{"cursor":{"row":1,"col":23},"anchor":{"row":1,"col":23}},{"cursor":{"row":1,"col":26},"anchor":{"row":1,"col":26}},{"cursor":{"row":1,"col":29},"anchor":{"row":1,"col":29}},{"cursor":{"row":1,"col":32},"anchor":{"row":1,"col":32}},{"cursor":{"row":1,"col":35},"anchor":{"row":1,"col":35}},{"cursor":{"row":1,"col":38},"anchor":{"row":1,"col":38}},{"cursor":{"row":1,"col":41},"anchor":{"row":1,"col":41}},{"cursor":{"row":1,"col":44},"anchor":{"row":1,"col":44}},{"cursor":{"row":1,"col":47},"anchor":{"row":1,"col":47}},{"cursor":{"row":1,"col":50},"anchor":{"row":1,"col":50}},{"cursor":{"row":1,"col":53},"anchor":{"row":1,"col":53}},{"cursor":{"row":1,"col":56},"anchor":{"row":1,"col":56}},{"cursor":{"row":1,"col":59},"anchor":{"row":1,"col":59}},{"cursor":{"row":2,"col":2},"anchor":{"row":2,"col":2}},{"cursor":{"row":2,"col":5},"anchor":{"row":2,"col":5}},{"cursor":{"row":2,"col":8},"anchor":{"row":2,"col":8}},{"cursor":{"row":2,"col":11},"anchor":{"row":2,"col":11}},{"cursor":{"row":2,"col":14},"anchor":{"row":2,"col":14}},{"cursor":{"row":2,"col":17},"anchor":{"row":2,"col":17}},{"cursor":{"row":2,"col":20},"anchor":{"row":2,"col":20}},{"cursor":{"row":2,"col":23},"anchor":{"row":2,"col":23}},{"cursor":{"row":2,"col":26},"anchor":{"row":2,"col":26}},{"cursor":{"row":2,"col":29},"anchor":{"row":2,"col":29}},{"cursor":{"row":2,"col":32},"anchor":{"row":2,"col":32}},{"cursor":{"row":2,"col":35},"anchor":{"row":2,"col":35}},{"cursor":{"row":2,"col":38},"anchor":{"row":2,"col":38}},{"cursor":{"row":2,"col":41},"anchor":{"row":2,"col":41}},{"cursor":{"row":2,"col":44},"anchor":{"row":2,"col":44}},{"cursor":{"row":2,"col":47},"anchor":{"row":2,"col":47}},{"cursor":{"row":2,"col":50},"anchor":{"row":2,"col":50}},{"cursor":{"row":2,"col":53},"anchor":{"row":2,"col":53}},{"cursor":{"row":2,"col":56},"anchor":{"row":2,"col":56}},{"cursor":{"row":2,"col":59},"anchor":{"row":2,"col":59}},{"cursor":{"row":3,"col":2},"anchor":{"row":3,"col":2}},{"cursor":{"row":3,"col":5},"anchor":{"row":3,"col":5}},{"cursor":{"row":3,"col":8},"anchor":{"row":3,"col":8}},{"cursor":{"row":3,"col":11},"anchor":{"row":3,"col":11}},{"cursor":{"row":3,"col":14},"anchor":{"row":3,"col":14}},{"cursor":{"row":3,"col":17},"anchor":{"row":3,"col":17}},{"cursor":{"row":3,"col":20},"anchor":{"row":3,"col":20}},{"cursor":{"row":3,"col":23},"anchor":{"row":3,"col":23}},{"cursor":{"row":3,"col":26},"anchor":{"row":3,"col":26}},{"cursor":{"row":3,"col":29},"anchor":{"row":3,"col":29}},{"cursor":{"row":3,"col":32},"anchor":{"row":3,"col":32}},{"cursor":{"row":3,"col":35},"anchor":{"row":3,"col":35}},{"cursor":{"row":3,"col":38},"anchor":{"row":3,"col":38}},{"cursor":{"row":3,"col":41},"anchor":{"row":3,"col":41}},{"cursor":{"row":3,"col":44},"anchor":{"row":3,"col":44}},{"cursor":{"row":3,"col":47},"anchor":{"row":3,"col":47}},{"cursor":{"row":3,"col":50},"anchor":{"row":3,"col":50}},{"cursor":{"row":3,"col":53},"anchor":{"row":3,"col":53}},{"cursor":{"row":3,"col":56},"anchor":{"row":3,"col":56}},{"cursor":{"row":3,"col":59},"anchor":{"row":3,"col":59}},{"cursor":{"row":4,"col":2},"anchor":{"row":4,"col":2}},{"cursor":{"row":4,"col":5},"anchor":{"row":4,"col":5}},{"cursor":{"row":4,"col":8},"anchor":{"row":4,"col":8}},{"cursor":{"row":4,"col":11},"anchor":{"row":4,"col":11}},{"cursor":{"row":4,"col":14},"anchor":{"row":4,"col":14}},{"cursor":{"row":4,"col":17},"anchor":{"row":4,"col":17}},{"cursor":{"row":4,"col":20},"anchor":{"row":4,"col":20}},{"cursor":{"row":4,"col":23},"anchor":{"row":4,"col":23}},{"cursor":{"row":4,"col":26},"anchor":{"row":4,"col":26}},{"cursor":{"row":4,"col":29},"anchor":{"row":4,"col":29}},{"cursor":{"row":4,"col":32},"anchor":{"row":4,"col":32}},{"cursor":{"row":4,"col":35},"anchor":{"row":4,"col":35}},{"cursor":{"row":4,"col":38},"anchor":{"row":4,"col":38}},{"cursor":{"row":4,"col":41},"anchor":{"row":4,"col":41}},{"cursor":{"row":4,"col":44},"anchor":{"row":4,"col":44}},{"cursor":{"row":4,"col":47},"anchor":{"row":4,"col":47}},{"cursor":{"row":4,"col":50},"anchor":{"row":4,"col":50}},{"cursor":{"row":4,"col":53},"anchor":{"row":4,"col":53}},{"cursor":{"row":4,"col":56},"anchor":{"row":4,"col":56}},{"cursor":{"row":4,"col":59},"anchor":{"row":4,"col":59}},{"cursor":{"row":5,"col":2},"anchor":{"row":5,"col":2}},{"cursor":{"row":5,"col":5},"anchor":{"row":5,"col":5}},{"cursor":{"row":5,"col":8},"anchor":{"row":5,"col":8}},{"cursor":{"row":5,"col":11},"anchor":{"row":5,"col":11}},{"cursor":{"row":5,"col":14},"anchor":{"row":5,"col":14}},{"cursor":{"row":5,"col":17},"anchor":{"row":5,"col":17}},{"cursor":{"row":5,"col":20},"anchor":{"row":5,"col":20}},{"cursor":{"row":5,"col":23},"anchor":{"row":5,"col":23}},{"cursor":{"row":5,"col":26},"anchor":{"row":5,"col":26}},{"cursor":{"row":5,"col":29},"anchor":{"row":5,"col":29}},{"cursor":{"row":5,"col":32},"anchor":{"row":5,"col":32}},{"cursor":{"row":5,"col":35},"anchor":{"row":5,"col":35}},{"cursor":{"row":5,"col":38},"anchor":{"row":5,"col":38}},{"cursor":{"row":5,"col":41},"anchor":{"row":5,"col":41}},{"cursor":{"row":5,"col":44},"anchor":{"row":5,"col":44}},{"cursor":{"row":5,"col":47},"anchor":{"row":5,"col":47}},{"cursor":{"row":5,"col":50},"anchor":{"row":5,"col":50}},{"cursor":{"row":5,"col":53},"anchor":{"row":5,"col":53}},{"cursor":{"row":5,"col":56},"anchor":{"row":5,"col":56}},{"cursor":{"row":5,"col":59},"anchor":{"row":5,"col":59}},{"cursor":{"row":6,"col":2},"anchor":{"row":6,"col":2}},{"cursor":{"row":6,"col":5},"anchor":{"row":6,"col":5}},{"cursor":{"row":6,"col":8},"anchor":{"row":6,"col":8}},{"cursor":{"row":6,"col":11},"anchor":{"row":6,"col":11}},{"cursor":{"row":6,"col":14},"anchor":{"row":6,"col":14}},{"cursor":{"row":6,"col":17},"anchor":{"row":6,"col":17}},{"cursor":{"row":6,"col":20},"anchor":{"row":6,"col":20}},{"cursor":{"row":6,"col":23},"anchor":{"row":6,"col":23}},{"cursor":{"row":6,"col":26},"anchor":{"row":6,"col":26}},{"cursor":{"row":6,"col":29},"anchor":{"row":6,"col":29}},{"cursor":{"row":6,"col":32},"anchor":{"row":6,"col":32}},{"cursor":{"row":6,"col":35},"anchor":{"row":6,"col":35}},{"cursor":{"row":6,"col":38},"anchor":{"row":6,"col":38}},{"cursor":{"row":6,"col":41},"anchor":{"row":6,"col":41}},{"cursor":{"row":6,"col":44},"anchor":{"row":6,"col":44}},{"cursor":{"row":6,"col":47},"anchor":{"row":6,"col":47}},{"cursor":{"row":6,"col":50},"anchor":{"row":6,"col":50}},{"cursor":{"row":6,"col":53},"anchor":{"row":6,"col":53}},{"cursor":{"row":6,"col":56},"anchor":{"row":6,"col":56}},{"cursor":{"row":6,"col":59},"anchor":{"row":6,"col":59}},{"cursor":{"row":7,"col":2},"anchor":{"row":7,"col":2}},{"cursor":{"row":7,"col":5},"anchor":{"row":7,"col":5}},{"cursor":{"row":7,"col":8},"anchor":{"row":7,"col":8}},{"cursor":{"row":7,"col":11},"anchor":{"row":7,"col":11}},{"cursor":{"row":7,"col":14},"anchor":{"row":7,"col":14}},{"cursor":{"row":7,"col":17},"anchor":{"row":7,"col":17}},{"cursor":{"row":7,"col":20},"anchor":{"row":7,"col":20}},{"cursor":{"row":7,"col":23},"anchor":{"row":7,"col":23}},{"cursor":{"row":7,"col":26},"anchor":{"row":7,"col":26}},{"cursor":{"row":7,"col":29},"anchor":{"row":7,"col":29}},{"cursor":{"row":7,"col":32},"anchor":{"row":7,"col":32}},{"cursor":{"row":7,"col":35},"anchor":{"row":7,"col":35}},{"cursor":{"row":7,"col":38},"anchor":{"row":7,"col":38}},{"cursor":{"row":7,"col":41},"anchor":{"row":7,"col":41}},{"cursor":{"row":7,"col":44},"anchor":{"row":7,"col":44}},{"cursor":{"row":7,"col":47},"anchor":{"row":7,"col":47}},{"cursor":{"row":7,"col":50},"anchor":{"row":7,"col":50}},{"cursor":{"row":7,"col":53},"anchor":{"row":7,"col":53}},{"cursor":{"row":7,"col":56},"anchor":{"row":7,"col":56}},{"cursor":{"row":7,"col":59},"anchor":{"row":7,"col":59}},{"cursor":{"row":8,"col":2},"anchor":{"row":8,"col":2}},{"cursor":{"row":8,"col":5},"anchor":{"row":8,"col":5}},{"cursor":{"row":8,"col":8},"anchor":{"row":8,"col":8}},{"cursor":{"row":8,"col":11},"anchor":{"row":8,"col":11}},{"cursor":{"row":8,"col":14},"anchor":{"row":8,"col":14}},{"cursor":{"row":8,"col":17},"anchor":{"row":8,"col":17}},{"cursor":{"row":8,"col":20},"anchor":{"row":8,"col":20}},{"cursor":{"row":8,"col":23},"anchor":{"row":8,"col":23}},{"cursor":{"row":8,"col":26},"anchor":{"row":8,"col":26}},{"cursor":{"row":8,"col":29},"anchor":{"row":8,"col":29}},{"cursor":{"row":8,"col":32},"anchor":{"row":8,"col":32}},{"cursor":{"row":8,"col":35},"anchor":{"row":8,"col":35}},{"cursor":{"row":8,"col":38},"anchor":{"row":8,"col":38}},{"cursor":{"row":8,"col":41},"anchor":{"row":8,"col":41}},{"cursor":{"row":8,"col":44},"anchor":{"row":8,"col":44}},{"cursor":{"row":8,"col":47},"anchor":{"row":8,"col":47}},{"cursor":{"row":8,"col":50},"anchor":{"row":8,"col":50}},{"cursor":{"row":8,"col":53},"anchor":{"row":8,"col":53}},{"cursor":{"row":8,"col":56},"anchor":{"row":8,"col":56}},{"cursor":{"row":8,"col":59},"anchor":{"row":8,"col":59}},{"cursor":{"row":9,"col":2},"anchor":{"row":9,"col":2}},{"cursor":{"row":9,"col":5},"anchor":{"row":9,"col":5}},{"cursor":{"row":9,"col":8},"anchor":{"row":9,"col":8}},{"cursor":{"row":9,"col":11},"anchor":{"row":9,"col":11}},{"cursor":{"row":9,"col":14},"anchor":{"row":9,"col":14}},{"cursor":{"row":9,"col":17},"anchor":{"row":9,"col":17}},{"cursor":{"row":9,"col":20},"anchor":{"row":9,"col":20}},{"cursor":{"row":9,"col":23},"anchor":{"row":9,"col":23}},{"cursor":{"row":9,"col":26},"anchor":{"row":9,"col":26}},{"cursor":{"row":9,"col":29},"anchor":{"row":9,"col":29}},{"cursor":{"row":9,"col":32},"anchor":{"row":9,"col":32}},{"cursor":{"row":9,"col":35},"anchor":{"row":9,"col":35}},{"cursor":{"row":9,"col":38},"anchor":{"row":9,"col":38}},{"cursor":{"row":9,"col":41},"anchor":{"row":9,"col":41}},{"cursor":{"row":9,"col":44},"anchor":{"row":9,"col":44}},{"cursor":{"row":9,"col":47},"anchor":{"row":9,"col":47}},{"cursor":{"row":9,"col":50},"anchor":{"row":9,"col":50}},{"cursor":{"row":9,"col":53},"anchor":{"row":9,"col":53}},{"cursor":{"row":9,"col":56},"anchor":{"row":9,"col":56}},{"cursor":{"row":9,"col":59},"anchor":{"row":9,"col":59}}],"primary":0}
+{"name":"keep-regex","text":"foo bar baz\n","mode":"normal","cursor":{"row":0,"col":6},"anchor":{"row":0,"col":4},"sels":[{"cursor":{"row":0,"col":6},"anchor":{"row":0,"col":4}},{"cursor":{"row":0,"col":10},"anchor":{"row":0,"col":8}}],"primary":0}
+{"name":"remove-regex","text":"foo bar baz\n","mode":"normal","cursor":{"row":0,"col":2},"anchor":{"row":0,"col":0}}
+{"name":"keep-regex-none","text":"foo bar\n","mode":"normal","cursor":{"row":0,"col":2},"anchor":{"row":0,"col":0},"sels":[{"cursor":{"row":0,"col":2},"anchor":{"row":0,"col":0}},{"cursor":{"row":0,"col":6},"anchor":{"row":0,"col":4}}],"primary":0}
+{"name":"keep-regex-primary","text":"a1 b2 a3\n","mode":"normal","cursor":{"row":0,"col":1},"anchor":{"row":0,"col":0},"sels":[{"cursor":{"row":0,"col":1},"anchor":{"row":0,"col":0}},{"cursor":{"row":0,"col":7},"anchor":{"row":0,"col":6}}],"primary":0}
+{"name":"keep-regex-esc","text":"foo bar\n","mode":"normal","cursor":{"row":0,"col":2},"anchor":{"row":0,"col":0},"sels":[{"cursor":{"row":0,"col":2},"anchor":{"row":0,"col":0}},{"cursor":{"row":0,"col":6},"anchor":{"row":0,"col":4}}],"primary":0}
+{"name":"keep-regex-lines","text":"foo\nbar\nbaz\n","mode":"normal","cursor":{"row":1,"col":2},"anchor":{"row":1,"col":0},"sels":[{"cursor":{"row":1,"col":2},"anchor":{"row":1,"col":0}},{"cursor":{"row":2,"col":2},"anchor":{"row":2,"col":0}}],"primary":0}
+{"name":"ensure-forward","text":"ab cd\n","mode":"normal","cursor":{"row":0,"col":1},"anchor":{"row":0,"col":0},"sels":[{"cursor":{"row":0,"col":1},"anchor":{"row":0,"col":0}},{"cursor":{"row":0,"col":4},"anchor":{"row":0,"col":3}}],"primary":0}
+{"name":"ensure-forward-one","text":"abc\n","mode":"select","cursor":{"row":0,"col":2},"anchor":{"row":0,"col":0}}
 {"name":"msel-align-basic","text":"a  =1\nbbb=2\n","mode":"normal","cursor":{"row":0,"col":3},"anchor":{"row":0,"col":3},"sels":[{"cursor":{"row":0,"col":3},"anchor":{"row":0,"col":3}},{"cursor":{"row":1,"col":3},"anchor":{"row":1,"col":3}}],"primary":0}
 {"name":"msel-align-columns","text":"a  ,b,c\nccc,d,e\n","mode":"normal","cursor":{"row":0,"col":3},"anchor":{"row":0,"col":3},"sels":[{"cursor":{"row":0,"col":3},"anchor":{"row":0,"col":3}},{"cursor":{"row":0,"col":5},"anchor":{"row":0,"col":5}},{"cursor":{"row":1,"col":3},"anchor":{"row":1,"col":3}},{"cursor":{"row":1,"col":5},"anchor":{"row":1,"col":5}}],"primary":0}
 {"name":"msel-align-uneven","text":"a  ,b\nccc,d,eee,f\n","mode":"normal","cursor":{"row":0,"col":3},"anchor":{"row":0,"col":3},"sels":[{"cursor":{"row":0,"col":3},"anchor":{"row":0,"col":3}},{"cursor":{"row":1,"col":3},"anchor":{"row":1,"col":3}},{"cursor":{"row":1,"col":5},"anchor":{"row":1,"col":5}},{"cursor":{"row":1,"col":9},"anchor":{"row":1,"col":9}}],"primary":0}
-- 
cgit v1.3


From bdbab17204efdb785b6ab3cc2022484485c0ded2 Mon Sep 17 00:00:00 2001
From: Gabriel Schneider <gbrls@0x4200.cafe>
Date: Mon, 28 Sep 2026 16:38:06 -0300
Subject: g. goes to where the last edit ended

helix goto_last_modification: every range moves to the end of the last
change (the start of a deletion, the end of an insertion), extending in
select mode. The position is kept on the Text in surface rows, set where
setEditText hands a body its new text, so a terminal's typed text has one
too and moves with its scrollback.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 docs/helix-keys.md         | 2 +-
 src/Terminal.zig           | 6 +++++-
 src/Text.zig               | 3 +++
 src/config.zig             | 1 +
 src/edit.zig               | 7 +++++++
 src/modal.zig              | 3 +++
 src/normal.zig             | 4 ++++
 test/hxcases/cases.jsonl   | 5 +++++
 test/hxcases/goldens.jsonl | 5 +++++
 9 files changed, 34 insertions(+), 2 deletions(-)

(limited to 'src/Text.zig')

diff --git a/docs/helix-keys.md b/docs/helix-keys.md
index f2901b92..2928d78e 100644
--- a/docs/helix-keys.md
+++ b/docs/helix-keys.md
@@ -184,6 +184,7 @@ found. Pure text math in `modal.zig`: `findChar`, `matchBracket`,
 | `Alt-.` | repeat last `f`/`t`/`F`/`T` motion (`Pane.find_op`/`find_ch`), takes a count | decision: repeats ONLY the find family, not `m`/`[`/`]` (helix extends it there; marginal) | helix-verified (phase 5) |
 | `g|`, `<n>g|` | goto column n (1 = line start), clamped to the line | | helix-verified (phase 5) |
 | `gs` | goto first non-whitespace | alias of the `^` handler | helix-verified (phase 5) |
+| `g.` | go to where the last edit ended (a deletion's start, an insertion's end), every range there, extending in select mode | helix `goto_last_modification`. The position is `Text.last_edit`, set by `edit.setEditText` from where the old and new texts part; helix's is the last history revision's, so with nothing edited yet pardes stays put where the harness's helix goes to the end of its setup text | helix-verified |
 | `gt` / `gc` / `gb` | goto screen top / center / bottom | view-relative (`pane.scroll()` + `pane.rows`), column kept (clamped) | helix-verified (phase 5) |
 | `gj` / `gk` | VISUAL line down / up (+ count) | follows the wrapped body's own breaks (`file_pane.visualRow`, the same walk `fillBody` renders), keeping the goal column INSIDE the row; the last row of a line steps into the next line's first. Wrap off = one row per line, and this IS `j`/`k`. helix assigns the pair the other way round (its `j` is the visual one) | pardes-specific |
 | `PageUp` / `PageDown` | FULL page (was half) | `Ctrl-u`/`Ctrl-d` stay the half-page pair | helix-verified (phase 5) |
@@ -351,7 +352,6 @@ text.
 | Picker table (all rows), Prompt table (all rows) | picker / prompt internals | pickers — pardes' tag line is its own one-line editor |
 | `gn` `gp` `ga` `gm` | next/prev/alternate buffer | buffer nav — pardes panes aren't a buffer list |
 | `gw` | word-label jump | label-jump overlay machinery, not core editing |
-| `g.` | goto last modification | jumplist/history position tracking |
 | Window mode table: `Ctrl-w` + `w v s t f F h j k l q o H J K L ns nv` (+ Ctrl variants) | splits/window management | window mode — pardes has its own Ctrl-w focus + Alt-n/Alt-c + mouse layout drags |
 | `]f [f ]t [t ]a [a ]c [c ]e [e ]T [T ]x [x` | TS unimpaired jumps | tree-sitter |
 | `]g [g ]G [G` | git change jumps | needs VCS diff state |
diff --git a/src/Terminal.zig b/src/Terminal.zig
index 1ff561b1..4c29e151 100644
--- a/src/Terminal.zig
+++ b/src/Terminal.zig
@@ -720,7 +720,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.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
@@ -846,6 +846,10 @@ fn ingestWithPositions(pane: *Pane, bytes: []const u8) void {
         extra[nextra + 1] = &selection.arow;
         nextra += 2;
     }
+    if (pane.body.last_edit) |*at| {
+        extra[nextra] = &at.row;
+        nextra += 1;
+    }
     if (pane.look_at) |*at| {
         extra[nextra] = &at.row;
         nextra += 1;
diff --git a/src/Text.zig b/src/Text.zig
index 411c2ec8..70ec5369 100644
--- a/src/Text.zig
+++ b/src/Text.zig
@@ -69,6 +69,9 @@ sticky_col: i32 = -1,
 /// The insert session began with `a`: on Esc every range gives back the
 /// one character it was stretched by (helix restore_cursor).
 restore_cursor: bool = false,
+/// Where the last edit ended, a deletion's start or an insertion's end, in
+/// surface rows: for `g.` (helix last_edit_pos).
+last_edit: ?struct { row: i32, col: i32 } = null,
 /// insert `Ctrl-r` was pressed: the next key names the register to insert
 reg_wait: bool = false,
 normal: modal.Normal.State = .{},
diff --git a/src/config.zig b/src/config.zig
index 959f4c4a..993b6fe0 100644
--- a/src/config.zig
+++ b/src/config.zig
@@ -487,6 +487,7 @@ pub const goto_column: []const Chord = &.{.{ .cp = '|' }};
 pub const goto_view_top: []const Chord = &.{.{ .cp = 't' }};
 pub const goto_view_center: []const Chord = &.{.{ .cp = 'c' }};
 pub const goto_view_bottom: []const Chord = &.{.{ .cp = 'b' }};
+pub const goto_last_modification: []const Chord = &.{.{ .cp = '.' }};
 pub const goto_definition: []const Chord = &.{.{ .cp = 'd' }};
 pub const goto_declaration: []const Chord = &.{.{ .cp = 'D' }};
 pub const goto_type_definition: []const Chord = &.{.{ .cp = 'y' }};
diff --git a/src/edit.zig b/src/edit.zig
index 5e0d20a4..9398674a 100644
--- a/src/edit.zig
+++ b/src/edit.zig
@@ -484,6 +484,13 @@ pub fn setEditText(p: *Pardes, t: *Text, new: []u8) void {
         return;
     }
     const pane = t.pane() orelse return retireEditText(p, new);
+    // what changed ended where the texts agree again from their ends
+    const old: []const u8, const row0: i32 = if (pane.file) |f| .{ f.content, 0 } else if (pane.ovl) |o| .{ o.text, o.row } else .{ "", 0 };
+    const front = std.mem.indexOfDiff(u8, old, new) orelse @min(old.len, new.len);
+    var back: usize = 0;
+    while (back < @min(old.len, new.len) - front and old[old.len - 1 - back] == new[new.len - 1 - back]) back += 1;
+    const end = modal.positionAt(new, new.len - back);
+    t.last_edit = .{ .row = @as(i32, @intCast(end.row)) + row0, .col = @intCast(end.col) };
     if (pane.file) |*f| return panes.File.setContent(p, f, new);
     panes.Terminal.setEditText(p, pane, new);
 }
diff --git a/src/modal.zig b/src/modal.zig
index ae008f60..0171da93 100644
--- a/src/modal.zig
+++ b/src/modal.zig
@@ -28,6 +28,7 @@ pub const Normal = struct {
         goto_view_top,
         goto_view_center,
         goto_view_bottom,
+        goto_last_modification,
         goto_definition,
         goto_declaration,
         goto_type_definition,
@@ -251,6 +252,7 @@ pub const Normal = struct {
         view_top,
         view_center,
         view_bottom,
+        last_modification,
     };
     pub const View = enum { top, center, bottom, scroll_down, scroll_up };
     pub const Find = enum { forward, backward, till_forward, till_backward };
@@ -437,6 +439,7 @@ pub const Normal = struct {
                 if (key.has(.goto_view_top)) return resultAction(.{ .goto = .{ .target = .view_top, .count = count, .explicit_count = counted.explicit } });
                 if (key.has(.goto_view_center)) return resultAction(.{ .goto = .{ .target = .view_center, .count = count, .explicit_count = counted.explicit } });
                 if (key.has(.goto_view_bottom)) return resultAction(.{ .goto = .{ .target = .view_bottom, .count = count, .explicit_count = counted.explicit } });
+                if (key.has(.goto_last_modification)) return resultAction(.{ .goto = .{ .target = .last_modification, .count = count, .explicit_count = counted.explicit } });
                 if (key.has(.goto_definition)) return resultAction(.{ .lsp = .definition });
                 if (key.has(.goto_declaration)) return resultAction(.{ .lsp = .declaration });
                 if (key.has(.goto_type_definition)) return resultAction(.{ .lsp = .type_definition });
diff --git a/src/normal.zig b/src/normal.zig
index bc450581..228c9c39 100644
--- a/src/normal.zig
+++ b/src/normal.zig
@@ -460,6 +460,10 @@ fn executeNormalAction(p: *Pardes, t: *Text, semantic: modal.Normal.Action) void
             .view_top => return t.gotoWindow(text, range, .top, go.count),
             .view_center => return t.gotoWindow(text, range, .center, go.count),
             .view_bottom => return t.gotoWindow(text, range, .bottom, go.count),
+            .last_modification => {
+                const at = t.last_edit orelse return;
+                return t.pointMove(text, range, modal.offsetAt(text, .{ .row = @intCast(@max(0, at.row)), .col = @intCast(@max(0, at.col)) }));
+            },
         },
         .view => |view| if (t.what == .body) switch (view) {
             .top => {
diff --git a/test/hxcases/cases.jsonl b/test/hxcases/cases.jsonl
index 8a8f8a94..03b20ff5 100644
--- a/test/hxcases/cases.jsonl
+++ b/test/hxcases/cases.jsonl
@@ -441,6 +441,11 @@
 {"name": "ensure-forward", "pane": "file", "text": "ab cd\n", "keys": "%s\\w+<ret><A-;><A-:>"}
 {"name": "ensure-forward-one", "pane": "file", "text": "abc\n", "keys": "vll<A-;><A-:>"}
 {"name": "node-keys-plain-text", "pane": "file", "text": "ab cd\n", "keys": "w<A-o><A-i><A-p><A-right><A-a><A-I><A-e><A-b>"}
+{"name": "goto-last-mod", "pane": "file", "text": "ab\ncd\nef\n", "keys": "jliXY<esc>gg"}
+{"name": "goto-last-mod-go", "pane": "file", "text": "ab\ncd\nef\n", "keys": "jliXY<esc>ggg."}
+{"name": "goto-last-mod-delete", "pane": "file", "text": "abc\ndef\n", "keys": "jlxdgg"}
+{"name": "goto-last-mod-delete-go", "pane": "file", "text": "abc\ndef\n", "keys": "jldggg."}
+{"name": "goto-last-mod-select", "pane": "file", "text": "ab\ncd\nef\n", "keys": "jjiX<esc>ggvg."}
 {"name": "msel-align-basic", "pane": "file", "text": "a=1\nbbb=2\n", "keys": "%s=<ret>&"}
 {"name": "msel-align-columns", "pane": "file", "text": "a,b,c\nccc,d,e\n", "keys": "%s,<ret>&"}
 {"name": "msel-align-uneven", "pane": "file", "text": "a,b\nccc,d,eee,f\n", "keys": "%s,<ret>&"}
diff --git a/test/hxcases/goldens.jsonl b/test/hxcases/goldens.jsonl
index f1df5c0a..8e642073 100644
--- a/test/hxcases/goldens.jsonl
+++ b/test/hxcases/goldens.jsonl
@@ -441,6 +441,11 @@
 {"name":"ensure-forward","text":"ab cd\n","mode":"normal","cursor":{"row":0,"col":1},"anchor":{"row":0,"col":0},"sels":[{"cursor":{"row":0,"col":1},"anchor":{"row":0,"col":0}},{"cursor":{"row":0,"col":4},"anchor":{"row":0,"col":3}}],"primary":0}
 {"name":"ensure-forward-one","text":"abc\n","mode":"select","cursor":{"row":0,"col":2},"anchor":{"row":0,"col":0}}
 {"name":"node-keys-plain-text","text":"ab cd\n","mode":"normal","cursor":{"row":0,"col":2},"anchor":{"row":0,"col":0}}
+{"name":"goto-last-mod","text":"ab\ncXYd\nef\n","mode":"normal","cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0}}
+{"name":"goto-last-mod-go","text":"ab\ncXYd\nef\n","mode":"normal","cursor":{"row":1,"col":3},"anchor":{"row":1,"col":3}}
+{"name":"goto-last-mod-delete","text":"abc\n","mode":"normal","cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0}}
+{"name":"goto-last-mod-delete-go","text":"abc\ndf\n","mode":"normal","cursor":{"row":1,"col":1},"anchor":{"row":1,"col":1}}
+{"name":"goto-last-mod-select","text":"ab\ncd\nXef\n","mode":"select","cursor":{"row":2,"col":1},"anchor":{"row":0,"col":0}}
 {"name":"msel-align-basic","text":"a  =1\nbbb=2\n","mode":"normal","cursor":{"row":0,"col":3},"anchor":{"row":0,"col":3},"sels":[{"cursor":{"row":0,"col":3},"anchor":{"row":0,"col":3}},{"cursor":{"row":1,"col":3},"anchor":{"row":1,"col":3}}],"primary":0}
 {"name":"msel-align-columns","text":"a  ,b,c\nccc,d,e\n","mode":"normal","cursor":{"row":0,"col":3},"anchor":{"row":0,"col":3},"sels":[{"cursor":{"row":0,"col":3},"anchor":{"row":0,"col":3}},{"cursor":{"row":0,"col":5},"anchor":{"row":0,"col":5}},{"cursor":{"row":1,"col":3},"anchor":{"row":1,"col":3}},{"cursor":{"row":1,"col":5},"anchor":{"row":1,"col":5}}],"primary":0}
 {"name":"msel-align-uneven","text":"a  ,b\nccc,d,eee,f\n","mode":"normal","cursor":{"row":0,"col":3},"anchor":{"row":0,"col":3},"sels":[{"cursor":{"row":0,"col":3},"anchor":{"row":0,"col":3}},{"cursor":{"row":1,"col":3},"anchor":{"row":1,"col":3}},{"cursor":{"row":1,"col":5},"anchor":{"row":1,"col":5}},{"cursor":{"row":1,"col":9},"anchor":{"row":1,"col":9}}],"primary":0}
-- 
cgit v1.3


From 68e30f560e46bb9a30433eb23b4edb1b93d69f46 Mon Sep 17 00:00:00 2001
From: Gabriel Schneider <gbrls@0x4200.cafe>
Date: Mon, 28 Sep 2026 16:57:01 -0300
Subject: A selection's other ranges live out of line, made at the second range
 and freed at one

The ranges beside the primary were an inline array in every Text, which at
1024 grew each pane by about 60 KiB. They are now allocated when a second
range appears (Text.reserveSels) and given back when the selection is one
range again (Text.dropSels); a column's or the workspace's tag allocates from
Text.gpa, any other text from its pane's. A refused tag edit restores them by
copy. The Pane size budget is back to 128 KiB, and a test holds that a single
cursor allocates nothing for them.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 docs/helix-keys.md |  2 +-
 docs/selections.md |  5 ++++-
 src/Terminal.zig   |  5 +----
 src/Text.zig       | 42 +++++++++++++++++++++++++++++++++++++++---
 src/edit.zig       | 10 ++++++++--
 src/layout.zig     |  6 +++---
 src/normal.zig     | 28 ++++++++++++++++++++++++----
 src/pardes.zig     | 10 ++++++++--
 test/panes.zig     |  1 +
 9 files changed, 89 insertions(+), 20 deletions(-)

(limited to 'src/Text.zig')

diff --git a/docs/helix-keys.md b/docs/helix-keys.md
index 88aca887..1fb1c67a 100644
--- a/docs/helix-keys.md
+++ b/docs/helix-keys.md
@@ -282,7 +282,7 @@ keeps the matches it found so far.
 | an all-lowercase pattern | matches case-blind | helix's smart-case. mvzr has no such flag, so the surface is lowercased instead (ASCII folding is byte-for-byte, so the offsets are identical) | helix-verified |
 | `^` and `$` | hold at every line's start and end | helix compiles with `multi_line(true)`; pardes gets the same by searching each line as its own haystack (`src/regexp.zig`) | helix-verified |
 | `.` | never matches a newline | as the Rust regex crate: a pattern without `\n` searches line by line, and one that names `\n` has its `.`s made `[^\n]` (`src/regexp.zig`) | helix-verified |
-| many matches | up to `memory.limits.selections` ranges: 1024 on the desktop, 64 on the board; matches past it are dropped | helix has no limit. The ranges are held inline in every `Text` (about 20 KiB each on the desktop) | helix-verified up to the limit |
+| many matches | up to `memory.limits.selections` ranges: 1024 on the desktop, 64 on the board; matches past it are dropped | helix has no limit. The room for them is allocated when a second range appears and given back at one range, so a single cursor costs nothing | helix-verified up to the limit |
 | `K<pat>` / `Alt-K<pat>` Enter | keep only the ranges a match starts inside / only those none does; primary 0, and keeping none leaves the selection alone | helix `keep_selections` / `remove_selections`, on the same prompt as `s`/`S` (markers `Keep /`, `Remove /`). The range is searched as `s` searches it, line by line with its lines' context, where helix matches the range's text alone: a `^` right at a range that starts mid-line matches in helix and not here | helix-verified |
 
 ### `Ctrl-c` — toggle comments
diff --git a/docs/selections.md b/docs/selections.md
index 203cf1de..5cc1df1a 100644
--- a/docs/selections.md
+++ b/docs/selections.md
@@ -17,7 +17,10 @@ desktop, 64 on the board).
   head, `vsel.row`/`vsel.col` the anchor while `vsel.active`, and a bare
   cursor (inactive `vsel`) is the one-character range under it. `msel` is
   the older whole-line form (`r0`..`r1`), kept for search-result highlights.
-- The others are `sels[0..nsel]`, each a `SelRange` of head and anchor plus
+- The others are `sels[0..nsel]`, in room allocated when a second range
+  appears and given back when the selection is one range again (a column's
+  or the workspace's tag allocates from `Text.gpa`, any other text from its
+  pane's), each a `SelRange` of head and anchor plus
   its own `j`/`k` goal column, in document order. The primary is not in the
   list; `Text.ranges` slots it in and returns its index.
 - Ends are CELLS, the characters a block cursor sits on, where helix's are
diff --git a/src/Terminal.zig b/src/Terminal.zig
index 4c29e151..ba156ada 100644
--- a/src/Terminal.zig
+++ b/src/Terminal.zig
@@ -545,10 +545,7 @@ test "replay ownership is terminal-only and construction rolls back on allocatio
             try std.testing.expectEqual(terminal and enabled, pane.terminal != null);
         }
     };
-    // Most of it is the three texts' selections, limits.selections ranges
-    // each held inline (about 20 KiB a text on the desktop), and the regex
-    // prompt's snapshot of them.
-    try std.testing.expect(@sizeOf(Pane) < 160 * 1024);
+    try std.testing.expect(@sizeOf(Pane) < 128 * 1024);
     try std.testing.checkAllAllocationFailures(std.testing.allocator, Case.run, .{false});
     try std.testing.checkAllAllocationFailures(std.testing.allocator, Case.run, .{true});
 }
diff --git a/src/Text.zig b/src/Text.zig
index 70ec5369..a44241ca 100644
--- a/src/Text.zig
+++ b/src/Text.zig
@@ -60,8 +60,14 @@ cur_row: i32 = 0,
 cur_col: i32 = 0,
 msel: LineSel = .{},
 vsel: CharSel = .{},
-sels: [max_selections - 1]SelRange = undefined,
+/// The ranges beside the primary, `nsel` of them: room for max_selections - 1
+/// made when a second range appears and given back when the selection is one
+/// range again, so a single cursor holds nothing here.
+sels: []SelRange = &.{},
 nsel: u16 = 0,
+/// What a column's or the workspace's tag allocates its ranges from; a text
+/// with a pane uses the pane's.
+gpa: ?std.mem.Allocator = null,
 select: bool = false,
 /// sticky goal column for j/k runs (helix old_visual_position): any
 /// non-vertical range write resets it to -1.
@@ -101,10 +107,39 @@ pub fn pane(t: *Text) ?*Pane {
 
 /// Free what a text owns: its characters and the buffers its undo keeps.
 pub fn deinit(t: *Text, gpa: std.mem.Allocator) void {
+    if (t.sels.len > 0) gpa.free(t.sels);
     if (t.own) |own| gpa.free(own);
     for (t.ed_undo[0..t.ed_undo_len]) |item| if (item.ovl) |overlay| gpa.free(overlay.text);
     for (t.ed_redo[0..t.ed_redo_len]) |item| if (item.ovl) |overlay| gpa.free(overlay.text);
-    t.* = .{ .what = t.what };
+    t.* = .{ .what = t.what, .gpa = t.gpa };
+}
+
+fn allocator(t: *Text) ?std.mem.Allocator {
+    return if (t.pane()) |w| w.gpa else t.gpa;
+}
+
+/// Room for the ranges beside the primary; false when there is none to be had.
+pub fn reserveSels(t: *Text) bool {
+    if (t.sels.len > 0) return true;
+    const gpa = t.allocator() orelse return false;
+    t.sels = gpa.alloc(SelRange, max_selections - 1) catch return false;
+    return true;
+}
+
+/// The ranges beside the primary as they were (a refused edit's undoing).
+pub fn restoreSels(t: *Text, kept: []const SelRange) void {
+    if (kept.len == 0) return t.dropSels();
+    if (!t.reserveSels()) return;
+    @memcpy(t.sels[0..kept.len], kept);
+    t.nsel = @intCast(kept.len);
+}
+
+/// Back to one range: the room for the others goes.
+pub fn dropSels(t: *Text) void {
+    t.nsel = 0;
+    if (t.sels.len == 0) return;
+    if (t.allocator()) |gpa| gpa.free(t.sels);
+    t.sels = &.{};
 }
 
 /// Bring the cursor into view (acme's textshow). Only a body scrolls to it;
@@ -185,7 +220,7 @@ pub fn setRange(t: *Text, text: []const u8, row0: i32, r0: modal.Selection, expl
         .explicit = explicit or t.select,
     };
     t.msel.active = false;
-    t.nsel = 0; // writing ONE range means the selection IS that range
+    t.dropSels(); // writing ONE range means the selection IS that range
     t.cur_pinned = true;
     t.sticky_col = -1;
     t.normal.clear();
@@ -262,6 +297,7 @@ pub fn setRanges(t: *Text, text: []const u8, in: []const modal.Selection, sticky
     }
     n = k + 1;
     setRange(t, text, 0, r[pri], explicit);
+    if (n > 1 and !t.reserveSels()) return; // no room: the primary alone
     t.sticky_col = st[pri];
     var w: usize = 0;
     for (r[0..n], 0..) |x, idx| {
diff --git a/src/edit.zig b/src/edit.zig
index 01b34237..5437a67d 100644
--- a/src/edit.zig
+++ b/src/edit.zig
@@ -167,10 +167,16 @@ fn pasteInto(p: *Pardes, t: *Text, bytes: []const u8) void {
     if (bytes.len == 0) return;
     const typed: pardes.Key = .{ .cp = bytes[0], .text = bytes };
     if (t.what == .tag and t.mode == .insert) if (t.pane()) |pane| if (tagline.typedIntoName(p, pane, typed)) return;
-    const kept = .{ t.cur_row, t.cur_col, t.vsel, t.msel, t.sels, t.nsel };
+    const kept = .{ t.cur_row, t.cur_col, t.vsel, t.msel };
+    var kept_sels: [Text.max_selections - 1]Text.SelRange = undefined;
+    const kept_n = t.nsel;
+    @memcpy(kept_sels[0..kept_n], t.sels[0..kept_n]);
     t.refused = false;
     if (t.mode == .insert) insertKey(p, t, typed) else pasteText(p, t, bytes, false, 1);
-    if (t.refused) t.cur_row, t.cur_col, t.vsel, t.msel, t.sels, t.nsel = kept;
+    if (t.refused) {
+        t.cur_row, t.cur_col, t.vsel, t.msel = kept;
+        t.restoreSels(kept_sels[0..kept_n]);
+    }
 }
 
 pub fn clipYank(p: *Pardes, pane: *Pane, main_only: bool) void {
diff --git a/src/layout.zig b/src/layout.zig
index 8e44f1d9..be8bad67 100644
--- a/src/layout.zig
+++ b/src/layout.zig
@@ -947,7 +947,7 @@ pub fn removePane(p: *Pardes, id: usize) void {
             p.col_serial[j] = p.col_serial[j + 1];
         }
         p.ncol -= 1;
-        p.col_tags[p.ncol] = .{ .what = .column };
+        p.col_tags[p.ncol] = .{ .what = .column, .gpa = p.gpa };
         p.col_serial[p.ncol] = 0;
     }
 }
@@ -971,7 +971,7 @@ pub fn joinCol(p: *Pardes) void {
         p.col_serial[j] = p.col_serial[j + 1];
     }
     p.ncol -= 1;
-    p.col_tags[p.ncol] = .{ .what = .column };
+    p.col_tags[p.ncol] = .{ .what = .column, .gpa = p.gpa };
     p.col_serial[p.ncol] = 0;
 }
 
@@ -1021,7 +1021,7 @@ pub fn splitColumn(p: *Pardes, source_id: usize, id: usize, before: bool) bool {
         p.col_serial[j] = p.col_serial[j - 1];
     }
     p.col_weight[c] = new_weight;
-    p.col_tags[c] = .{ .what = .column };
+    p.col_tags[c] = .{ .what = .column, .gpa = p.gpa };
     p.col_serial[c] = 0;
     p.col_panes[c][0] = id;
     p.col_n[c] = 1;
diff --git a/src/normal.zig b/src/normal.zig
index 4459ab53..2aea2e54 100644
--- a/src/normal.zig
+++ b/src/normal.zig
@@ -686,10 +686,7 @@ fn executeNormalAction(p: *Pardes, t: *Text, semantic: modal.Normal.Action) void
             .all => return t.setRange(text, 0, .{ .anchor = 0, .head = text.len }, false),
         },
         .multi => |multi| {
-            if (multi.kind == .keep_primary) {
-                t.nsel = 0;
-                return;
-            }
+            if (multi.kind == .keep_primary) return t.dropSels();
             return t.multiSelAction(text, multi.kind, multi.count);
         },
         // s, S and | answer for the text they are pressed in; `/` searches
@@ -922,6 +919,7 @@ test "flat text movement and selection replay need no scratch rows" {
     pane.body.cur_row = 1024;
     pane.body.cur_col = 0;
     pane.body.nsel = 1;
+    _ = pane.body.reserveSels();
     pane.body.sels[0] = .{ .row = 3072, .col = 0, .arow = 3072, .acol = 0 };
     handleNormal(p, &pane.body, .{ .cp = 'l' });
     handleNormal(p, &pane.body, .{ .cp = 'j' });
@@ -1021,3 +1019,25 @@ test "tree-sitter selection keys do in a JSON file what hx 25.07.1 does" {
         };
     }
 }
+
+test "one cursor holds no room for other ranges; a second range makes it and one again gives it back" {
+    const gpa = std.testing.allocator;
+    const p = try Pardes.init(gpa, .{ .tty_only = true, .cols = 60, .rows = 12 });
+    defer p.deinit();
+    const pane = try p.setTestFile("alpha beta\nalpha beta\n");
+    for ("wxe%;gg") |cp| handleNormal(p, &pane.body, .{ .cp = cp });
+    try std.testing.expectEqual(@as(usize, 0), pane.body.sels.len);
+    handleNormal(p, &pane.body, .{ .cp = 'C' });
+    try std.testing.expectEqual(@as(u16, 1), pane.body.nsel);
+    try std.testing.expect(pane.body.sels.len > 0);
+    handleNormal(p, &pane.body, .{ .cp = 'l' }); // replayed at both, still two
+    try std.testing.expectEqual(@as(u16, 1), pane.body.nsel);
+    handleNormal(p, &pane.body, .{ .cp = ',' });
+    try std.testing.expectEqual(@as(usize, 0), pane.body.sels.len);
+    handleNormal(p, &pane.body, .{ .cp = 'C' });
+    handleNormal(p, &pane.body, .{ .cp = ';' });
+    handleNormal(p, &pane.body, .{ .cp = 'x' }); // x at both: still two lines
+    handleNormal(p, &pane.body, .{ .cp = '_', .alt = true }); // merged to one
+    try std.testing.expectEqual(@as(u16, 0), pane.body.nsel);
+    try std.testing.expectEqual(@as(usize, 0), pane.body.sels.len);
+}
diff --git a/src/pardes.zig b/src/pardes.zig
index 6b397017..187f3ed3 100644
--- a/src/pardes.zig
+++ b/src/pardes.zig
@@ -4146,6 +4146,8 @@ pub const Pardes = struct {
             .pdf_gpa = pdf_gpa,
             .tree_sitter_gpa = tree_sitter_gpa,
             .opts = opts,
+            .col_tags = @splat(.{ .what = .column, .gpa = gpa }),
+            .global_tag = .{ .what = .workspace, .gpa = gpa },
             .fs = .{},
             .screen_w = opts.cols,
             .screen_h = opts.rows,
@@ -5335,10 +5337,14 @@ pub const Pardes = struct {
         if (t.what == .tag and t.mode == .insert and tagline.typedIntoName(p, pane, key)) return;
         // A tag's prefix is read-only: a key whose edit reached into it
         // changes nothing, not even where the cursor is.
-        const kept = .{ t.cur_row, t.cur_col, t.vsel, t.msel, t.sels, t.nsel };
+        const kept = .{ t.cur_row, t.cur_col, t.vsel, t.msel };
+        var kept_sels: [Text.max_selections - 1]Text.SelRange = undefined;
+        const kept_n = t.nsel;
+        @memcpy(kept_sels[0..kept_n], t.sels[0..kept_n]);
         t.refused = false;
         defer if (t.refused) {
-            t.cur_row, t.cur_col, t.vsel, t.msel, t.sels, t.nsel = kept;
+            t.cur_row, t.cur_col, t.vsel, t.msel = kept;
+            t.restoreSels(kept_sels[0..kept_n]);
         };
         const was = t.mode;
         switch (t.mode) {
diff --git a/test/panes.zig b/test/panes.zig
index a56c07bf..181317ca 100644
--- a/test/panes.zig
+++ b/test/panes.zig
@@ -4560,6 +4560,7 @@ const LookResetTests = struct {
         pane.body.cur_col = 3;
         pane.body.vsel = .{ .active = true, .explicit = true, .row = 0, .col = 0 };
         pane.body.msel = .{ .active = true, .r0 = 0, .r1 = 1 };
+        _ = pane.body.reserveSels();
         pane.body.sels[0] = .{ .row = 1, .col = 2, .arow = 0, .acol = 1 };
         pane.body.nsel = 1;
         pane.body.select = true;
-- 
cgit v1.3


From 2663a4d1b3170cb2a4dca5e6f1f3535f44b30e44 Mon Sep 17 00:00:00 2001
From: Gabriel Schneider <gbrls@0x4200.cafe>
Date: Mon, 28 Sep 2026 16:47:26 -0300
Subject: No panic from a notice wider than its band, or from the rest of its
 class

The showcase GUI died in joinNotice on a long shader-error notice: with
the tagline narrower than the body, the band hides more columns (skip) than
a long message has padding (pad), and `skip..@min(pad, ..)` ran backwards.
An audit of draw.zig, Layer.zig, Presentation.zig and animation.zig found
the same class elsewhere, all fixed:
- a multi-row pane tag or header scrolled for its caret's line sliced a
  shorter row past its end (paintPaneTag, renderHeaderLayer);
- a zero-width column tag kept an earlier frame's viewport, and a column
  move's clip took it below zero (now saturating, and the early return
  resets the viewport and caret);
- a tag line past 65535 columns overflowed tag_scroll's u16;
- a hover left over from a bigger window dashed past the grid;
- a border drag over a column that went away, a move preview past a
  shrunken grid, a column-move rail at zero columns;
- Layer.pointAt cast a host's unchecked float metrics (web) to u16;
- Text.insertVerticalCursor read past its lines for a cursor whose text
  changed under it.

Regressions: a test of a notice wider than its band through Msg and
through setMessage (the Post.zig compile-error path), which panics without
the fix; and a monkey over the core at a gui's metrics (random resizes to
a cell, long notices, prompts, multi-row tags, clicks, keys), 400 steps in
the suite, PARDES_FUZZ_SEED/STEPS for longer runs; 60 seeds x 3000 steps
clean.

Shared files touched: none of the list (draw.zig, Layer.zig, Text.zig).
---
 src/Layer.zig |   9 ++--
 src/Text.zig  |   3 +-
 src/draw.zig  | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 133 insertions(+), 16 deletions(-)

(limited to 'src/Text.zig')

diff --git a/src/Layer.zig b/src/Layer.zig
index e979eab7..a9827304 100644
--- a/src/Layer.zig
+++ b/src/Layer.zig
@@ -106,9 +106,12 @@ const Point = struct { index: u16, col: u16, metrics: Metrics };
 fn pointAt(layer: *const Layer, x: f32, y: f32, body_w: f32, body_h: f32, tagline_w: f32, tagline_h: f32) ?Point {
     if (layer.rows == 0 or !std.math.isFinite(x) or !std.math.isFinite(y)) return null;
     // A band's hit is refused outright on metrics no host could have; a
-    // body's has always been floored to a pixel instead.
-    if (layer.kind != .body) for ([_]f32{ body_w, body_h, tagline_w, tagline_h }) |metric|
-        if (!std.math.isFinite(metric) or metric < 1 or metric > std.math.maxInt(u16)) return null;
+    // body's has always been floored to a pixel instead, and both refuse
+    // what is no number or past a u16 (a host's floats: web's exports).
+    for ([_]f32{ body_w, body_h, tagline_w, tagline_h }) |metric| {
+        if (!std.math.isFinite(metric) or metric > std.math.maxInt(u16)) return null;
+        if (layer.kind != .body and metric < 1) return null;
+    }
     const bw = @max(1, body_w);
     const bh = @max(1, body_h);
     const tw = std.math.clamp(tagline_w, 1, bw);
diff --git a/src/Text.zig b/src/Text.zig
index 43dd8a95..f6780935 100644
--- a/src/Text.zig
+++ b/src/Text.zig
@@ -118,7 +118,8 @@ pub fn fromModalCursor(t: *Text, c: modal.Cursor) void {
 
 pub fn insertVerticalCursor(lines: []const []const u8, c: modal.Cursor, down: bool) modal.Cursor {
     if (lines.len == 0) return c;
-    const row = if (down) @min(c.row + 1, lines.len - 1) else c.row -| 1;
+    // A cursor past the lines (its text changed under it) moves from the last.
+    const row = if (down) @min(c.row + 1, lines.len - 1) else @min(c.row, lines.len) -| 1;
     const target = lines[row];
     if (target.len == 0) return .{ .row = row, .col = 0 };
     const source = if (c.row < lines.len) lines[c.row] else "";
diff --git a/src/draw.zig b/src/draw.zig
index 3798bf59..0dbf5bae 100644
--- a/src/draw.zig
+++ b/src/draw.zig
@@ -219,13 +219,16 @@ pub fn render(p: *Pardes, arena: std.mem.Allocator) !*Surface {
                 if (col > first) s.addRegion(.{ .kind = .guide, .rect = .{ .x = first, .y = d.cur_y, .w = col - first, .h = 1 } });
             };
         },
-        .border_h => |d| if (d.cur_y < s.rows) {
+        // A column that went away mid-drag has nothing to guide.
+        .border_h => |d| if (d.cur_y < s.rows and d.col < p.ncol and p.col_x[d.col] < s.cols) {
+            const end = @min(s.cols, p.col_x[d.col] + p.col_w[d.col]);
             var col = p.col_x[d.col];
-            while (col < p.col_x[d.col] + p.col_w[d.col]) : (col += 1) s.overlayDash(col, d.cur_y, "╌");
-            s.addRegion(.{ .kind = .guide, .rect = .{ .x = p.col_x[d.col], .y = d.cur_y, .w = p.col_w[d.col], .h = 1 } });
+            while (col < end) : (col += 1) s.overlayDash(col, d.cur_y, "╌");
+            s.addRegion(.{ .kind = .guide, .rect = .{ .x = p.col_x[d.col], .y = d.cur_y, .w = end - p.col_x[d.col], .h = 1 } });
         },
         .column_move => |d| rail: {
             const source = layout.columnBySerial(p, d.serial) orelse break :rail;
+            if (s.cols == 0) break :rail;
             // Where the column's left edge would land, reordered or not.
             const edge: u16 = switch (layout.columnDrop(p, source, d.cur_x, d.grab)) {
                 .stay => break :rail,
@@ -258,7 +261,7 @@ pub fn render(p: *Pardes, arena: std.mem.Allocator) !*Surface {
             if (row > run) s.addRegion(.{ .kind = .guide, .rect = .{ .x = x, .y = run, .w = 1, .h = row - run } });
         },
         .move => |d| if (d.cur_x < s.cols) {
-            if (layout.movePlacement(p, d.id, d.cur_x, d.cur_y)) |placement| {
+            if (layout.movePlacement(p, d.id, d.cur_x, d.cur_y)) |placement| if (placement.row < s.rows and p.col_x[placement.preview_col] + p.col_w[placement.preview_col] <= s.cols) {
                 var col: u16 = p.col_x[placement.preview_col];
                 while (col < p.col_x[placement.preview_col] + p.col_w[placement.preview_col]) : (col += 1) {
                     s.set(col, placement.row, "╌", .{ .fg = .{ .rgb = chrome.lineno } });
@@ -266,9 +269,10 @@ pub fn render(p: *Pardes, arena: std.mem.Allocator) !*Surface {
                 s.set(d.cur_x, placement.row, "▌", .{ .fg = .{ .rgb = chrome.lineno } });
                 s.addRegion(.{ .kind = .guide, .rect = .{ .x = p.col_x[placement.preview_col], .y = placement.row, .w = p.col_w[placement.preview_col], .h = 1 } });
                 s.addRegion(.{ .kind = .guide, .rect = .{ .x = d.cur_x, .y = placement.row, .w = 1, .h = 1 } });
-            }
+            };
         },
-        .none, .select => if (p.pointer_inside) {
+        // A hover left over from a bigger window points past this one.
+        .none, .select => if (p.pointer_inside and p.hover_row < s.rows and p.hover_col < s.cols) {
             // hover hints on a pane's own trailing edge
             var c: usize = 0;
             while (c + 1 < p.ncol) : (c += 1) {
@@ -554,7 +558,7 @@ pub fn paintHeaders(p: *Pardes, s: *Surface, arena: std.mem.Allocator) !void {
         try renderHeaderLayer(p, arena, layer, .column, @intCast(c), region.rect, tagline.columnTag(p, c), top, bg, fg);
         if (p.col_x[c] < s.cols) joinHeaderRows(s, layer, fg);
         // Laid out at its full width; only shown short of the rail.
-        layer.viewport.w -= region.clip;
+        layer.viewport.w -|= region.clip;
     };
 }
 
@@ -623,7 +627,10 @@ fn tagTintRange(pane: *const Pane, tag: []const u8, prefix_len: usize) ?struct {
 fn renderHeaderLayer(p: *Pardes, arena: std.mem.Allocator, layer: *pardes.Layer, kind: TagKind, id: u16, viewport: Rect, text: []const u8, top: usize, bg: [3]u8, fg: [3]u8) !void {
     _ = arena;
     if (viewport.w == 0 or viewport.h == 0) {
+        // No layer, and nothing of an earlier frame's left in it.
         layer.rows = 0;
+        layer.viewport = viewport;
+        layer.cursor = null;
         return;
     }
     var widest: usize = 0;
@@ -656,7 +663,8 @@ fn renderHeaderLayer(p: *Pardes, arena: std.mem.Allocator, layer: *pardes.Layer,
         const shown = modal.lineSlice(text, index + top);
         var surface: Surface = .{ .cols = columns, .rows = 1, .cells = layer.cells[index * columns ..][0..columns] };
         surface.fill(0, 0, columns, 1, .{ .bg = .{ .rgb = bg }, .font_role = .tagline });
-        _ = surface.print(0, 0, columns, shown[panes.File.rawAtDisplay(shown, scroll)..], .{ .fg = .{ .rgb = fg }, .bg = .{ .rgb = bg }, .font_role = .tagline });
+        // The scroll is the caret's line's: a shorter line shows nothing.
+        _ = surface.print(0, 0, columns, shown[@min(shown.len, panes.File.rawAtDisplay(shown, scroll))..], .{ .fg = .{ .rgb = fg }, .bg = .{ .rgb = bg }, .font_role = .tagline });
         // The word under the pointer, a Look or Exec target: on a header even
         // while it is edited, on a notice, and on the grid's copy of either
         // (joined from this); not on a column a carried column's pointer is
@@ -811,12 +819,13 @@ fn joinNotice(p: *Pardes, s: *Surface, arena: std.mem.Allocator, region: Region)
     joinCells(s, region.rect.x, region.rect.y, layer.cells[0..layer.cols], skip, chip, .{ .rgb = fg });
     // The band's padding before the text is the chip's fill, which carries
     // no ink of its own (the layer prints it as spaces in the band's ink).
-    for (skip..@min(pad, skip + chip)) |col| s.at(region.rect.x + @as(u16, @intCast(col - skip)), region.rect.y).style.fg = .default;
+    // A notice wider than its band has less padding than the band hides.
+    for (skip..@max(skip, @min(pad, skip + chip))) |col| s.at(region.rect.x + @as(u16, @intCast(col - skip)), region.rect.y).style.fg = .default;
     if (layer.cursor) |caret| {
         if (caret.x >= skip) s.cursor = .{ .x = region.rect.x + caret.x - @as(u16, @intCast(skip)), .y = region.rect.y, .bar = caret.bar };
     }
     // Laid out at its full width; only shown short of the rail.
-    layer.viewport.w -= region.clip;
+    layer.viewport.w -|= region.clip;
 }
 
 pub fn paintPaneTag(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pane, r: Rect, id: usize, active: bool, capacity: u16) !void {
@@ -873,10 +882,12 @@ pub fn paintPaneTag(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pa
             raw = modal.nextGrapheme(line, raw);
             scroll = panes.File.rawDisplayCol(line, raw);
         }
-        pane.tag_scroll = @intCast(scroll);
+        // A line past a u16 of columns keeps its caret off the band.
+        pane.tag_scroll = @intCast(@min(scroll, std.math.maxInt(u16)));
     } else if (pane.focus != .tag) pane.tag_scroll = 0;
     for (lines[0..rows], 0..) |line, row| {
-        const start = panes.File.rawAtDisplay(line, pane.tag_scroll);
+        // The scroll is the caret's line's: a shorter row shows nothing.
+        const start = @min(line.len, panes.File.rawAtDisplay(line, pane.tag_scroll));
         _ = s.print(tx, tag_y + @as(u16, @intCast(row)), tw, line[start..], tag_style);
     }
     const tag = lines[0];
@@ -1064,6 +1075,108 @@ test "the word under the pointer on a notice is lit in its layer and in the grid
     try std.testing.expect(lit_in_layer);
 }
 
+test "a notice wider than its band, as a shader's compile error is, draws its end and nothing past it" {
+    const p = try Pardes.init(std.testing.allocator, .{ .cols = 80, .rows = 20 });
+    defer p.deinit();
+    // A gui-shaped core: its tagline is narrower than the body, so a notice's
+    // band holds more columns than its chip has cells.
+    p.update(.{ .resize = .{ .cols = 80, .rows = 20, .row_metrics = .{ .body_w = 10, .body_h = 20, .tagline_w = 6, .tagline_h = 12 } } });
+    _ = try p.setTestFile("text\n");
+    var arena: std.heap.ArenaAllocator = .init(std.testing.allocator);
+    defer arena.deinit();
+    const long = "Shader /home/someone/shaders/test_shadertoy_invalid.glsl: error: Linking fragment stage: No function definition (body) found: " ** 3;
+    for ([_][]const u8{ "Msg " ++ long, "" }) |line| {
+        // The Msg builtin, and the path a failed compile takes (Post.zig).
+        if (line.len > 0) try std.testing.expect(p.executeBuiltinLine(p.active, line)) else p.setMessage(p.active, long);
+        p.sync();
+        for (0..30) |_| p.update(.tick);
+        _ = arena.reset(.retain_capacity);
+        const s = try p.render(arena.allocator());
+        const notice = for (s.regionList()) |region| {
+            if (region.kind == .notice) break region;
+        } else return error.TestExpectedNotice;
+        // Text up to the chip's blank last cell, and no padding ink.
+        const row = s.cells[@as(usize, notice.rect.y) * s.cols ..][notice.rect.x..][0..notice.rect.w];
+        try std.testing.expectEqualStrings(" ", row[row.len - 1].grapheme());
+        try std.testing.expect(!std.mem.eql(u8, " ", row[row.len - 2].grapheme()));
+    }
+}
+
+test "a monkey over notices, prompts, tags and tiny panes at a gui's metrics never panics" {
+    // The snapshot harness runs the tty, whose tagline pitch is the body's,
+    // so it never reaches what a narrower tagline does to a notice's band:
+    // this drives the core at a gui's metrics instead. PARDES_FUZZ_STEPS
+    // runs it longer (the suite's run is short).
+    const steps: usize = if (std.c.getenv("PARDES_FUZZ_STEPS")) |v| std.fmt.parseInt(usize, std.mem.span(v), 10) catch 400 else 400;
+    const seed: u64 = if (std.c.getenv("PARDES_FUZZ_SEED")) |v| std.fmt.parseInt(u64, std.mem.span(v), 10) catch 7 else 7;
+    var prng = std.Random.DefaultPrng.init(seed);
+    const random = prng.random();
+    const p = try Pardes.init(std.testing.allocator, .{ .cols = 80, .rows = 24 });
+    defer p.deinit();
+    _ = try p.setTestFile("fuzz\n\u{754c}\u{754c} wide\n" ** 20);
+    var arena: std.heap.ArenaAllocator = .init(std.testing.allocator);
+    defer arena.deinit();
+    const words = [_][]const u8{ "error:", "\u{754c}", "x", "Shader /tmp/a.glsl:", "e\u{301}", "\t", "long-" ** 20, " " };
+    const commands = [_][]const u8{ "New", "Newcol", "Collapse", "Tagbottom", "ColumnTags", "TreeContext", "Wrap", "Find", "Del", "FocusTint", "Debug" };
+    var text: std.ArrayListUnmanaged(u8) = .empty;
+    defer text.deinit(std.testing.allocator);
+    for (0..steps) |_| {
+        switch (random.uintLessThan(u8, 8)) {
+            // A resize, down to a cell, at a gui's metrics: a tagline no
+            // wider and no taller than the body's cell, often narrower.
+            0 => {
+                const body_w = random.intRangeAtMost(u16, 6, 12);
+                const body_h = random.intRangeAtMost(u16, 12, 24);
+                const cols = if (random.boolean()) random.intRangeAtMost(u16, 1, 12) else random.intRangeAtMost(u16, 13, 140);
+                const rows = if (random.boolean()) random.intRangeAtMost(u16, 1, 6) else random.intRangeAtMost(u16, 7, 50);
+                p.update(.{ .resize = .{ .cols = cols, .rows = rows, .row_metrics = .{ .body_w = body_w, .body_h = body_h, .tagline_w = random.intRangeAtMost(u16, 2, body_w), .tagline_h = random.intRangeAtMost(u16, 6, body_h) } } });
+            },
+            // A message, as long as a compile error or longer.
+            1, 2 => {
+                text.clearRetainingCapacity();
+                for (0..random.uintAtMost(usize, 60)) |_| try text.appendSlice(std.testing.allocator, words[random.uintLessThan(usize, words.len)]);
+                if (random.boolean()) p.setMessage(p.active, text.items) else {
+                    const line = try std.fmt.allocPrint(arena.allocator(), "Msg {s}", .{text.items});
+                    _ = p.executeBuiltinLine(p.active, line);
+                }
+            },
+            3 => _ = p.executeBuiltinLine(p.active, commands[random.uintLessThan(usize, commands.len)]),
+            // Typing, escaping and entering, into a prompt when one is up.
+            4 => p.update(.{ .key = .{ .cp = switch (random.uintLessThan(u8, 9)) {
+                0 => pardes.Key.escape,
+                1 => pardes.Key.enter,
+                2 => 0x754c,
+                3 => pardes.Key.end,
+                4 => pardes.Key.home,
+                5 => pardes.Key.up,
+                6 => pardes.Key.down,
+                else => 'a' + random.uintLessThan(u21, 26),
+            } } }),
+            // A tag of several rows.
+            5 => if (p.panes[p.active]) |pane| {
+                text.clearRetainingCapacity();
+                for (0..random.uintAtMost(usize, 5)) |_| try text.appendSlice(std.testing.allocator, if (random.boolean()) " Look\nmore \u{754c}" else "\n" ++ "x" ** 150);
+                if (pane.tag.own) |own| std.testing.allocator.free(own);
+                pane.tag.own = try std.testing.allocator.dupe(u8, text.items);
+            },
+            // Hover, and clicks: into a tag, a header, a body, a grip.
+            6 => {
+                const col = random.uintAtMost(u16, p.screen_w);
+                const row = random.uintAtMost(u16, p.screen_h);
+                if (random.boolean()) p.update(.{ .mouse = .{ .button = .none, .kind = .motion, .col = col, .row = row } }) else {
+                    p.update(.{ .mouse = .{ .button = .left, .kind = .press, .col = col, .row = row } });
+                    p.update(.{ .mouse = .{ .button = .left, .kind = .release, .col = col, .row = row } });
+                }
+            },
+            else => for (0..random.uintAtMost(usize, 20)) |_| p.update(.tick),
+        }
+        p.sync();
+        _ = arena.reset(.retain_capacity);
+        const s = try p.render(arena.allocator());
+        p.acknowledgePanelPresentation(s.panelTracks());
+    }
+}
+
 test "a wide glyph cut by a tag's or a notice's edge is joined into the grid as blank, never half drawn" {
     const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 41, .rows = 12 });
     defer p.deinit();
-- 
cgit v1.3