Make ctrl-alt-h a synonym of ctrl-alt-backspace on non-Windows environment

2026-05-16 05:28:41 +08:00 · 2025-11-15 10:43:33 +09:00
97 changed files with 2101 additions and 7892 deletions
@@ -1,6 +1,6 @@
 root = true

-[*.{sh,bash,fish}]
+[*.{sh,bash}]
 indent_style       = space
 indent_size        = 2
 simplify           = true
@@ -1 +0,0 @@
-* @junegunn
@@ -1,17 +0,0 @@
-## Contribution Policy
-
-We do not accept pull requests generated primarily by AI without genuine understanding or real-world usage context.
-
-All contributions are expected to demonstrate:
- A clear understanding of the codebase
- Alignment with product direction
- Thoughtful reasoning behind changes
- Evidence of real-world usage or hands-on experience with the problem
-
-If these expectations are not met, we would prefer to implement the changes ourselves rather than spend time reviewing low-effort submissions.
-
---
-
-## Acknowledgement
-
- [ ] I confirm that this PR meets the above expectations and reflects my own understanding and real-world context.
@@ -1,64 +0,0 @@
-go:
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/**
-          - main.go
-          - go.mod
-          - go.sum
-
-shell:
-  - changed-files:
-      - any-glob-to-any-file:
-          - shell/**
-
-bash:
-  - changed-files:
-      - any-glob-to-any-file:
-          - shell/**/*.bash
-
-zsh:
-  - changed-files:
-      - any-glob-to-any-file:
-          - shell/**/*.zsh
-
-fish:
-  - changed-files:
-      - any-glob-to-any-file:
-          - shell/**/*.fish
-
-vim:
-  - changed-files:
-      - any-glob-to-any-file:
-          - plugin/**
-
-docs:
-  - changed-files:
-      - any-glob-to-any-file:
-          - '*.md'
-          - doc/**
-          - man/**
-
-ci:
-  - changed-files:
-      - any-glob-to-any-file:
-          - .github/**
-
-build:
-  - changed-files:
-      - any-glob-to-any-file:
-          - Makefile
-          - .goreleaser.yml
-          - Dockerfile
-
-test:
-  - changed-files:
-      - any-glob-to-any-file:
-          - test/**
-          - src/**/*_test.go
-
-install:
-  - changed-files:
-      - any-glob-to-any-file:
-          - install
-          - install.ps1
-          - uninstall
@@ -1,17 +0,0 @@
-name: Label PRs
-
-on:
-  pull_request_target:
-    types: [opened, synchronize, reopened]
-
-permissions:
-  contents: read
-  pull-requests: write
-
-jobs:
-  label:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/labeler@v6
-        with:
-          configuration-path: .github/labeler.yml
@@ -5,7 +5,7 @@ on:
  push:
    branches: [ master, devel ]
  pull_request:
-    branches: [ master, devel ]
+    branches: [ master ]
  workflow_dispatch:

 permissions:
@@ -28,7 +28,7 @@ jobs:
        go-version: "1.23"

    - name: Setup Ruby
-      uses: ruby/setup-ruby@3ff19f5e2baf30647122352b96108b1fbe250c64 # v1
+      uses: ruby/setup-ruby@v1
      with:
        ruby-version: 3.4.6

@@ -44,10 +44,5 @@ jobs:
    - name: Unit test
      run: make test

-    - name: Fuzz test
-      run: |
-        go test ./src/algo/ -fuzz=FuzzIndexByteTwo -fuzztime=5s
-        go test ./src/algo/ -fuzz=FuzzLastIndexByteTwo -fuzztime=5s
-
    - name: Integration test
      run: make install && ./install --all && tmux new-session -d && ruby test/runner.rb --verbose
@@ -25,7 +25,7 @@ jobs:
        go-version: "1.23"

    - name: Setup Ruby
-      uses: ruby/setup-ruby@3ff19f5e2baf30647122352b96108b1fbe250c64 # v1
+      uses: ruby/setup-ruby@v1
      with:
        ruby-version: 3.0.0

@@ -0,0 +1,24 @@
+---
+name: Generate Sponsors README
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: 0 0 * * 0
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v5
+
+      - name: Generate Sponsors 💖
+        uses: JamesIves/github-sponsors-readme-action@v1
+        with:
+          token: ${{ secrets.SPONSORS_TOKEN }}
+          file: 'README.md'
+
+      - name: Deploy to GitHub Pages 🚀
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          branch: master
+          folder: '.'
@@ -7,4 +7,4 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - uses: actions/checkout@v5
-    - uses: crate-ci/typos@685eb3d55be2f85191e8c84acb9f44d7756f84ab # v1.29.4
+    - uses: crate-ci/typos@v1.29.4
@@ -7,7 +7,7 @@ jobs:
  publish:
    runs-on: ubuntu-latest
    steps:
-      - uses: vedantmgoyal2009/winget-releaser@4ffc7888bffd451b357355dc214d43bb9f23917e # v2
+      - uses: vedantmgoyal2009/winget-releaser@v2
        with:
          identifier: junegunn.fzf
          installers-regex: '-windows_(armv7|arm64|amd64)\.zip$'
@@ -22,7 +22,6 @@ builds:
      - loong64
      - ppc64le
      - s390x
-      - riscv64
    goarm:
      - "5"
      - "6"
@@ -40,8 +39,6 @@ builds:
        goarch: arm64
      - goos: openbsd
        goarch: arm64
-      - goos: openbsd
-        goarch: riscv64
      - goos: android
        goarch: amd64
      - goos: android
@@ -85,14 +82,12 @@ notarize:

 archives:
  - name_template: "{{ .ProjectName }}-{{ .Version }}-{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
-    ids:
+    builds:
      - fzf
-    formats:
-      - tar.gz
+    format: tar.gz
    format_overrides:
      - goos: windows
-        formats:
-          - zip
+        format: zip
    files:
      - non-existent*

@@ -104,7 +99,7 @@ release:
  name_template: '{{ .Version }}'

 snapshot:
-  version_template: "{{ .Version }}-devel"
+  name_template: "{{ .Version }}-devel"

 changelog:
  sort: asc
@@ -309,16 +309,16 @@ I know it's a lot to digest, let's try to break down the code.
  available color options.
 - The value of `--preview-window` option consists of 5 components delimited
  by `,`
-    1. `up` -- Position of the preview window
-    1. `60%` -- Size of the preview window
-    1. `border-bottom` -- Preview window border only on the bottom side
-    1. `+{2}+3/3` -- Scroll offset of the preview contents
-    1. `~3` -- Fixed header
+    1. `up` — Position of the preview window
+    1. `60%` — Size of the preview window
+    1. `border-bottom` — Preview window border only on the bottom side
+    1. `+{2}+3/3` — Scroll offset of the preview contents
+    1. `~3` — Fixed header
 - Let's break down the latter two. We want to display the bat output in the
  preview window with a certain scroll offset so that the matching line is
  positioned near the center of the preview window.
-    - `+{2}` -- The base offset is extracted from the second token
-    - `+3` -- We add 3 lines to the base offset to compensate for the header
+    - `+{2}` — The base offset is extracted from the second token
+    - `+3` — We add 3 lines to the base offset to compensate for the header
      part of `bat` output
        - ```
          ───────┬──────────────────────────────────────────────────────────
@@ -363,7 +363,7 @@ projects, and it will free up memory as you narrow down the results.
 RG_PREFIX="rg --column --line-number --no-heading --color=always --smart-case "
 INITIAL_QUERY="${*:-}"
 fzf --ansi --disabled --query "$INITIAL_QUERY" \
-    --bind "start:reload:$RG_PREFIX {q} || true" \
+    --bind "start:reload:$RG_PREFIX {q}" \
    --bind "change:reload:sleep 0.1; $RG_PREFIX {q} || true" \
    --delimiter : \
    --preview 'bat --color=always {1} --highlight-line {2}' \
@@ -1,163 +1,6 @@
 CHANGELOG
 =========

-0.72.0
------
- `--header-border`, `--header-lines-border`, and `--footer-border` now accept a new `inline` style that embeds the section inside the list frame, separated from the list content by a horizontal line. When the list border has side segments, the separator joins them as T-junctions.
-    - Requires a `--list-border` shape that has both top and bottom segments (`rounded`, `sharp`, `bold`, `double`, `block`, `thinblock`, or `horizontal`); falls back to `line` otherwise. `horizontal` has no side borders, so the separator is drawn without T-junction endpoints.
-    - Sections stack. Example combining all three:
-      ```sh
-      ps -ef | fzf --reverse --style full:double \
-          --header 'Select a process' --header-lines 1 \
-          --bind 'load:transform-footer:echo $FZF_TOTAL_COUNT processes' \
-          --header-border=inline --header-lines-border=inline \
-          --footer-border=inline
-      ```
-    - `--header-label` and `--footer-label` render on their respective separator row.
-    - The separator inherits `--color list-border` when the section's own border color is not explicitly set.
-    - `--header-first` is not compatible with `--header-border=inline` or `--header-lines-border=inline`; `--header-border=inline` requires `--header-lines-border` to be `inline` or unset.
-
-0.71.0
------
-_Release highlights: https://junegunn.github.io/fzf/releases/0.71.0/_
-
- Added `--popup` as a new name for `--tmux` with Zellij support
-    - `--popup` starts fzf in a tmux popup or a Zellij floating pane
-    - `--tmux` is now an alias for `--popup`
-    - Requires tmux 3.3+ or Zellij 0.44+
- Cross-reload item identity with `--id-nth`
-    - Added `--id-nth=NTH` to define item identity fields for cross-reload operations
-    - When a `reload` is triggered with tracking enabled, fzf searches for the tracked item by its identity fields in the new list.
-        - `--track --id-nth ..` tracks by the entire line
-        - `--track --id-nth 1` tracks by the first field
-        - `--track` without `--id-nth` retains the existing index-based tracking behavior
-        - The UI is temporarily blocked (prompt dimmed, input disabled) until the item is found or loading completes.
-            - Press `Escape` or `Ctrl-C` to cancel the blocked state without quitting
-            - Info line shows `+T*` / `+t*` while searching
-    - With `--multi`, selected items are preserved across `reload-sync` by matching their identity fields
- Performance improvements
-    - The search performance now scales linearly with the number of CPU cores, as we dropped static partitioning to allow better load balancing across threads.
-      ```
-      === query: 'linux' ===
-        [all]   baseline:    21.95ms  current:    17.47ms  (1.26x)  matches: 179966 (12.79%)
-        [1T]    baseline:   179.63ms  current:   180.53ms  (1.00x)  matches: 179966 (12.79%)
-        [2T]    baseline:    97.38ms  current:    90.05ms  (1.08x)  matches: 179966 (12.79%)
-        [4T]    baseline:    53.83ms  current:    44.77ms  (1.20x)  matches: 179966 (12.79%)
-        [8T]    baseline:    41.66ms  current:    22.58ms  (1.84x)  matches: 179966 (12.79%)
-      ```
-    - Improved the cache structure, reducing memory footprint per entry by 86x.
-        - With the reduced per-entry cost, the cache now has broader coverage.
- Shell integration improvements
-    - bash: CTRL-R now supports multi-select and `shift-delete` to delete history entries (#4715)
-    - fish:
-        - Improved command history (CTRL-R) (#4703) (@bitraid)
-        - Rewrite completion script (SHIFT-TAB) (#4731) (@bitraid)
-        - Increase minimum fish version requirement to 3.4.0 (#4731) (@bitraid)
- `GET /` HTTP endpoint now includes `positions` field in each match entry, providing the indices of matched characters for external highlighting (#4726)
- Allow adaptive height with negative value (`--height=~-HEIGHT`) (#4682)
- Bug fixes
-    - `--walker=follow` no longer follows symlinks whose target is an ancestor of the walker root, avoiding severe resource exhaustion when a symlink points outside the tree (e.g. Wine's `z:` → `/`) (#4710)
-    - Fixed AWK tokenizer not treating a new line character as whitespace
-    - Fixed `--{accept,with}-nth` removing trailing whitespaces with a non-default `--delimiter`
-    - Fixed OSC8 hyperlinks being mangled when the URL contains unicode characters (#4707)
-    - Fixed `--with-shell` not handling quoted arguments correctly (#4709)
-    - Fixed child processes not being terminated on Windows (#4723) (@pjeby)
-    - Fixed preview scrollbar not rendered after `toggle-preview`
-    - Fixed preview follow/scroll with long wrapped lines
-    - Fixed tab width when `--frozen-left` is used
-    - Fixed preview mouse events being processed when no preview window exists
-    - zsh: Fixed history widget when `sh_glob` option is on (#4714) (@EvanHahn)
-
-0.70.0
------
- Added `change-with-nth` action for dynamically changing the `--with-nth` option.
-    - Requires `--with-nth` to be set initially.
-    - Multiple options separated by `|` can be given to cycle through.
-  ```sh
-  echo -e "a b c\nd e f\ng h i" | fzf --with-nth .. \
-    --bind 'space:change-with-nth(1|2|3|1,3|2,3|)'
-  ```
- Added `change-header-lines` action for dynamically changing the `--header-lines` option
- Performance improvements (1.3x to 1.9x faster filtering depending on query)
-  ```
-  === query: 'l' ===
-    [all]   baseline:   168.87ms  current:    95.21ms  (1.77x)  matches: 5069891 (94.78%)
-    [1T]    baseline:  1652.22ms  current:   841.40ms  (1.96x)  matches: 5069891 (94.78%)
-
-  === query: 'lin' ===
-    [all]   baseline:   343.27ms  current:   252.59ms  (1.36x)  matches: 3516507 (65.74%)
-    [1T]    baseline:  3199.89ms  current:  2230.64ms  (1.43x)  matches: 3516507 (65.74%)
-
-  === query: 'linux' ===
-    [all]   baseline:    85.47ms  current:    63.72ms  (1.34x)  matches: 307229 (5.74%)
-    [1T]    baseline:   774.64ms  current:   589.32ms  (1.31x)  matches: 307229 (5.74%)
-
-  === query: 'linuxlinux' ===
-    [all]   baseline:    55.13ms  current:    35.67ms  (1.55x)  matches: 12230 (0.23%)
-    [1T]    baseline:   461.99ms  current:   332.38ms  (1.39x)  matches: 12230 (0.23%)
-
-  === query: 'linuxlinuxlinux' ===
-    [all]   baseline:    51.77ms  current:    32.53ms  (1.59x)  matches: 865 (0.02%)
-    [1T]    baseline:   409.99ms  current:   296.33ms  (1.38x)  matches: 865 (0.02%)
-  ```
- Fixed `nth` attribute merge order to respect precedence hierarchy (#4697)
- bash: Replaced `printf` with builtin `printf` to bypass local indirections (#4684) (@DarrenBishop)
-
-0.68.0
------
- Implemented word wrapping in the list section
-    - Added `--wrap=word` (or `--wrap-word`) option and `toggle-wrap-word` action for word-level line wrapping in the list section
-    - Changed default binding of `ctrl-/` and `alt-/` from `toggle-wrap` to `toggle-wrap-word`
-  ```sh
-  fzf --wrap=word
-  ```
- Implemented word wrapping in the preview window
-    - Added `wrap-word` flag for `--preview-window` to enable word-level wrapping
-    - Added `toggle-preview-wrap-word` action
-  ```sh
-  fzf --preview 'bat --style=plain --color=always {}' \
-      --preview-window wrap-word \
-      --bind space:toggle-preview-wrap-word
-  ```
- Added support for underline style variants in `--color`: `underline-double`, `underline-curly`, `underline-dotted`, `underline-dashed`
-  ```sh
-  fzf --color 'fg:underline-curly,current-fg:underline-dashed'
-  ```
- Added support for underline styles (`4:N`) and underline colors (SGR 58/59)
-  ```sh
-  # In the list section
-  printf '\e[4:3;58;2;255;0;0mRed curly underline\e[0m\n' | fzf --ansi
-
-  # In the preview window
-  fzf --preview "printf '\e[4:3;58;2;255;0;0mRed curly underline\e[0m\n'"
-  ```
- Added `--preview-wrap-sign` to set a different wrap indicator for the preview window
- Added `alt-gutter` color option (#4602) (@hedgieinsocks)
- Added `$FZF_WRAP` environment variable to child processes (`char` or `word` when wrapping is enabled) (#4672) (@bitraid)
- fish: Improved command history (CTRL-R) (#4672) (@bitraid)
-    - Enabled syntax highlighting in the list on fish 4.3.3+
-    - Added syntax-highlighted preview window that auto-shows for long or multi-line commands
-    - Added `ALT-ENTER` to reformat and insert selected commands
-    - Improved handling of bulk deletion of selected history entries (`SHIFT-DELETE`)
- Added fish completion support (#4605) (@lalvarezt)
- zsh: Handle multi-line history selection (#4595) (@LangLangBart)
- Bug fixes
-    - Fixed `_fzf_compgen_{path,dir}` to respect `FZF_COMPLETION_{PATH,DIR}_OPTS` (#4592) (@shtse8, @LangLangBart)
-    - Fixed `--preview-window follow` not working correctly with wrapping (#3243, #4258)
-    - Fixed symlinks to directories being returned as files (#4676) (@skk64)
-    - Fixed SIGHUP signal handling (#4668) (@LangLangBart)
-    - Fixed preview process not killed on exit (#4667)
-    - Fixed coloring of items with zero-width characters (#4620)
-    - Fixed `track-current` unset after a combined movement action (#4649)
-    - Fixed `--accept-nth` being ignored in filter mode (#4636) (@charemma)
-    - Fixed display width calculation with `maxWidth` (#4596) (@LangLangBart)
-    - Fixed clearing of the rest of the current line on start (#4652)
-    - Fixed `x-api-key` header not required for GET requests (#4627)
-    - Fixed key reading not cancelled when `execute` triggered via a server request (#4653)
-    - Fixed rebind of readline command `redraw-current-line` (#4635) (@jameslazo)
-    - Fixed `fzf-tmux` `TERM` quoting and added `mktemp` usage (#4664) (@Goofygiraffe06)
-    - Do not allow very long queries in `FuzzyMatchV2` (#4608)
-
 0.67.0
 ------
 - Added `--freeze-left=N` option to keep the leftmost N columns always visible.
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2013-2026 Junegunn Choi
+Copyright (c) 2013-2025 Junegunn Choi

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1,5 +1,4 @@
 GO             ?= go
-DOCKER         ?= docker
 GOOS           ?= $(shell $(GO) env GOOS)

 MAKEFILE       := $(realpath $(lastword $(MAKEFILE_LIST)))
@@ -53,8 +52,6 @@ ifeq ($(UNAME_M),x86_64)
 	BINARY := $(BINARY64)
 else ifeq ($(UNAME_M),amd64)
 	BINARY := $(BINARY64)
-else ifeq ($(UNAME_M),i86pc)
-	BINARY := $(BINARY64)
 else ifeq ($(UNAME_M),s390x)
 	BINARY := $(BINARYS390)
 else ifeq ($(UNAME_M),i686)
@@ -195,12 +192,12 @@ bin/fzf: target/$(BINARY) | bin
 	cp -f target/$(BINARY) bin/fzf

 docker:
-	$(DOCKER) build -t fzf-ubuntu .
-	$(DOCKER) run -it fzf-ubuntu tmux
+	docker build -t fzf-ubuntu .
+	docker run -it fzf-ubuntu tmux

 docker-test:
-	$(DOCKER) build -t fzf-ubuntu .
-	$(DOCKER) run -it fzf-ubuntu
+	docker build -t fzf-ubuntu .
+	docker run -it fzf-ubuntu

 update:
 	$(GO) get -u
@@ -493,4 +493,4 @@ autocmd  FileType fzf set laststatus=0 noshowmode noruler

 The MIT License (MIT)

-Copyright (c) 2013-2026 Junegunn Choi
+Copyright (c) 2013-2025 Junegunn Choi
@@ -159,11 +159,11 @@ fi
 set -e

 # Clean up named pipes on exit
-tmpdir=$(mktemp -d "${TMPDIR:-/tmp}/fzf-tmux-XXXXXX")
-argsf="$tmpdir/args"
-fifo1="$tmpdir/fifo1"
-fifo2="$tmpdir/fifo2"
-fifo3="$tmpdir/fifo3"
+id=$RANDOM
+argsf="${TMPDIR:-/tmp}/fzf-args-$id"
+fifo1="${TMPDIR:-/tmp}/fzf-fifo1-$id"
+fifo2="${TMPDIR:-/tmp}/fzf-fifo2-$id"
+fifo3="${TMPDIR:-/tmp}/fzf-fifo3-$id"
 if tmux_win_opts=$(tmux show-options -p remain-on-exit \; show-options -p synchronize-panes 2> /dev/null); then
  tmux_win_opts=($(sed '/ off/d; s/synchronize-panes/set-option -p synchronize-panes/; s/remain-on-exit/set-option -p remain-on-exit/; s/$/ \\;/' <<< "$tmux_win_opts"))
  tmux_off_opts='; set-option -p synchronize-panes off ; set-option -p remain-on-exit off'
@@ -172,7 +172,8 @@ else
  tmux_off_opts='; set-window-option synchronize-panes off ; set-window-option remain-on-exit off'
 fi
 cleanup() {
-  \rm -rf "$tmpdir"
+  \rm -f $argsf $fifo1 $fifo2 $fifo3
+
  # Restore tmux window options
  if [[ ${#tmux_win_opts[@]} -gt 1 ]]; then
    eval "tmux ${tmux_win_opts[*]}"
@@ -195,7 +196,7 @@ cleanup() {
 trap 'cleanup 1' SIGUSR1
 trap 'cleanup' EXIT

-envs="export TERM=$(printf %q "$TERM") "
+envs="export TERM=$TERM "
 if [[ $opt =~ "-E" ]]; then
  if [[ $tmux_version == 3.2 ]]; then
    FZF_DEFAULT_OPTS="--margin 0,1 $FZF_DEFAULT_OPTS"
@@ -112,7 +112,7 @@ the whole if we start off with `:FZF` command.
    " Bang version starts fzf in fullscreen mode
    :FZF!
 <
-Similarly to {ctrlp.vim}{3}, use Enter key, CTRL-T, CTRL-X or CTRL-V to open
+Similarly to {ctrlp.vim}{3}, use enter key, CTRL-T, CTRL-X or CTRL-V to open
 selected files in the current window, in new tabs, in horizontal splits, or in
 vertical splits respectively.

@@ -218,6 +218,7 @@ list:
  `fg`   /  `bg`   /  `hl`         | Item (foreground / background / highlight)
  `fg+`  /  `bg+`  /  `hl+`        | Current item (foreground / background / highlight)
  `preview-fg`  /  `preview-bg`  | Preview window text and background
+  `hl`   /  `hl+`                | Highlighted substrings (normal / current)
  `gutter`                     | Background of the gutter on the left
  `pointer`                    | Pointer to the current line ( `>` )
  `marker`                     | Multi-select marker ( `>` )
@@ -228,6 +229,7 @@ list:
  `query`                      | Query string
  `disabled`                   | Query string when search is disabled
  `prompt`                     | Prompt before query ( `> ` )
+  `pointer`                    | Pointer to the current line ( `>` )
 ----------------------------+------------------------------------------------------
 - `component` specifies the component (`fg` / `bg`) from which to extract the
   color when considering each of the following highlight groups
@@ -243,7 +245,7 @@ if it exists, - otherwise use the `fg` attribute of the `Comment` highlight
 group if it exists, - otherwise fall back to the default color settings for
 the prompt.

-You can examine the color option generated according to the setting by printing
+You can examine the color option generated according the setting by printing
 the result of `fzf#wrap()` function like so:
 >
    :echo fzf#wrap()
@@ -501,7 +503,7 @@ LICENSE                                                            *fzf-license*

 The MIT License (MIT)

-Copyright (c) 2013-2026 Junegunn Choi
+Copyright (c) 2013-2025 Junegunn Choi

 ==============================================================================
 vim:tw=78:sw=2:ts=2:ft=help:norl:nowrap:
@@ -2,7 +2,7 @@

 set -u

-version=0.71.0
+version=0.66.1
 auto_completion=
 key_bindings=
 update_config=2
@@ -112,15 +112,10 @@ link_fzf_in_path() {
  return 1
 }

-tar_opts="-xzf -"
-if tar --no-same-owner -tf /dev/null 2> /dev/null; then
-  tar_opts="--no-same-owner $tar_opts"
-fi
-
 try_curl() {
  command -v curl > /dev/null &&
    if [[ $1 =~ tar.gz$ ]]; then
-      curl -fL $1 | tar $tar_opts
+      curl -fL $1 | tar --no-same-owner -xzf -
    else
      local temp=${TMPDIR:-/tmp}/fzf.zip
      curl -fLo "$temp" $1 && unzip -o "$temp" && rm -f "$temp"
@@ -130,7 +125,7 @@ try_curl() {
 try_wget() {
  command -v wget > /dev/null &&
    if [[ $1 =~ tar.gz$ ]]; then
-      wget -O - $1 | tar $tar_opts
+      wget -O - $1 | tar --no-same-owner -xzf -
    else
      local temp=${TMPDIR:-/tmp}/fzf.zip
      wget -O "$temp" $1 && unzip -o "$temp" && rm -f "$temp"
@@ -182,7 +177,6 @@ case "$archi" in
  Linux\ aarch64\ Android) download fzf-$version-android_arm64.tar.gz ;;
  Linux\ aarch64*) download fzf-$version-linux_arm64.tar.gz ;;
  Linux\ loongarch64*) download fzf-$version-linux_loong64.tar.gz ;;
-  Linux\ riscv64*) download fzf-$version-linux_riscv64.tar.gz ;;
  Linux\ ppc64le*) download fzf-$version-linux_ppc64le.tar.gz ;;
  Linux\ *64*) download fzf-$version-linux_amd64.tar.gz ;;
  Linux\ s390x*) download fzf-$version-linux_s390x.tar.gz ;;
@@ -248,16 +242,16 @@ fi

 echo
 for shell in $shells; do
-  fzf_completion="source \"$fzf_base/shell/completion.${shell}\""
-  fzf_key_bindings="source \"$fzf_base/shell/key-bindings.${shell}\""
  [[ $shell == fish ]] && continue
  src=${prefix_expand}.${shell}
  echo -n "Generate $src ... "

+  fzf_completion="source \"$fzf_base/shell/completion.${shell}\""
  if [ $auto_completion -eq 0 ]; then
    fzf_completion="# $fzf_completion"
  fi

+  fzf_key_bindings="source \"$fzf_base/shell/key-bindings.${shell}\""
  if [ $key_bindings -eq 0 ]; then
    fzf_key_bindings="# $fzf_key_bindings"
  fi
@@ -307,16 +301,15 @@ append_line() {
  line="$2"
  file="$3"
  pat="${4:-}"
-  at_lno="${5:-}"
  lines=""

  echo "Update $file:"
  echo "  - $line"
  if [ -f "$file" ]; then
-    if [[ -n $pat ]]; then
-      lines=$(\grep -nF "$pat" "$file")
+    if [ $# -lt 4 ]; then
+      lines=$(\grep -nF "$line" "$file")
    else
-      lines=$(\grep -nF "${line#"${line%%[![:space:]]*}"}" "$file")
+      lines=$(\grep -nF "$pat" "$file")
    fi
  fi

@@ -334,12 +327,8 @@ append_line() {

  set -e
  if [ "$update" -eq 1 ]; then
-    if [[ -z $at_lno ]]; then
-      [ -f "$file" ] && echo >> "$file"
-      echo "$line" >> "$file"
-    else
-      sed -i.~fzf_bak "${at_lno}a\\"$'\n'"$line" "$file" && rm "$file.~fzf_bak"
-    fi
+    [ -f "$file" ] && echo >> "$file"
+    echo "$line" >> "$file"
    echo "    + Added"
  else
    echo "    ~ Skipped"
@@ -372,66 +361,25 @@ for shell in $shells; do
  append_line $update_config "[ -f ${prefix}.${shell} ] && source ${prefix}.${shell}" "$dest" "${prefix}.${shell}"
 done

-if [[ $shells =~ fish ]]; then
+if [ $key_bindings -eq 1 ] && [[ $shells =~ fish ]]; then
  bind_file="${fish_dir}/functions/fish_user_key_bindings.fish"
  if [ ! -e "$bind_file" ]; then
-    if [[ $key_bindings -eq 1 || $auto_completion -eq 1 ]]; then
-      mkdir -p "${fish_dir}/functions"
-      if [[ $key_bindings -eq 1 && $auto_completion -eq 1 ]]; then
-        create_file "$bind_file" \
-          'function fish_user_key_bindings' \
-          '  fzf --fish | source' \
-          'end'
-      elif [[ $key_bindings -eq 1 ]]; then
-        create_file "$bind_file" \
-          'function fish_user_key_bindings' \
-          "  $fzf_key_bindings" \
-          'end'
-      elif [[ $auto_completion -eq 1 ]]; then
-        create_file "$bind_file" \
-          'function fish_user_key_bindings' \
-          "  $fzf_completion" \
-          'end'
-      fi
-      lno_func=$(\grep -nF "function fish_user_key_bindings" "$bind_file" | sed 's/:.*//' | tr '\n' ' ')
-    else
-      lno_func=0
-    fi
+    mkdir -p "${fish_dir}/functions"
+    create_file "$bind_file" \
+      'function fish_user_key_bindings' \
+      '  fzf --fish | source' \
+      'end'
  else
    echo "Check $bind_file:"
-    lno_func=$(\grep -nF "function fish_user_key_bindings" "$bind_file" | sed 's/:.*//' | tr '\n' ' ')
-    if [[ -z $lno_func ]]; then
-      echo -e "function fish_user_key_bindings\nend" >> "$bind_file"
-      lno_func=$(\grep -nF "function fish_user_key_bindings" "$bind_file" | sed 's/:.*//' | tr '\n' ' ')
-    fi
-    lno_keys=$(\grep -nF "fzf_key_bindings" "$bind_file" | sed 's/:.*//' | tr '\n' ' ')
-    if [[ -n $lno_keys ]]; then
-      echo "  ** Found 'fzf_key_bindings' in line #$lno_keys"
-      if [[ $key_bindings -eq 1 && $auto_completion -eq 1 ]]; then
-        echo "  ** You have to replace the line to 'fzf --fish | source'"
-      elif [[ $key_bindings -eq 1 ]]; then
-        echo "  ** You have to replace the line to '$fzf_key_bindings'"
-      else
-        echo "  ** You have to remove the line"
-      fi
+    lno=$(\grep -nF "fzf_key_bindings" "$bind_file" | sed 's/:.*//' | tr '\n' ' ')
+    if [[ -n $lno ]]; then
+      echo "  ** Found 'fzf_key_bindings' in line #$lno"
+      echo "  ** You have to replace the line to 'fzf --fish | source'"
      echo
    else
      echo "  - Clear"
      echo
-      if [[ $key_bindings -eq 1 && $auto_completion -eq 1 ]]; then
-        sed -i.~fzf_bak "\#$fzf_completion#d" "$bind_file" && rm "$bind_file.~fzf_bak"
-        sed -i.~fzf_bak "\#$fzf_key_bindings#d" "$bind_file" && rm "$bind_file.~fzf_bak"
-        append_line $update_config "  fzf --fish | source" "$bind_file" "" "$lno_func"
-      else
-        sed -i.~fzf_bak '/fzf --fish \| source/d' "$bind_file" && rm "$bind_file.~fzf_bak"
-        if [[ $key_bindings -eq 1 ]]; then
-          sed -i.~fzf_bak "\#$fzf_completion#d" "$bind_file" && rm "$bind_file.~fzf_bak"
-          append_line $update_config "  $fzf_key_bindings" "$bind_file" "" "$lno_func"
-        elif [[ $auto_completion -eq 1 ]]; then
-          sed -i.~fzf_bak "\#$fzf_key_bindings#d" "$bind_file" && rm "$bind_file.~fzf_bak"
-          append_line $update_config "  $fzf_completion" "$bind_file" "" "$lno_func"
-        fi
-      fi
+      append_line $update_config "fzf --fish | source" "$bind_file"
    fi
  fi
 fi
@@ -444,7 +392,7 @@ if [ $update_config -eq 1 ]; then
    echo
  fi
  [[ $shells =~ zsh ]] && echo "   source ${ZDOTDIR:-~}/.zshrc   # zsh"
-  [[ $shells =~ fish && $lno_func -ne 0 ]] && echo '   fish_user_key_bindings  # fish'
+  [[ $shells =~ fish ]] && [ $key_bindings -eq 1 ] && echo '   fzf_key_bindings  # fish'
  echo
  echo 'Use uninstall script to remove fzf.'
  echo
@@ -1,4 +1,4 @@
-$version="0.71.0"
+$version="0.66.1"

 $fzf_base=Split-Path -Parent $MyInvocation.MyCommand.Definition

@@ -11,7 +11,7 @@ import (
 	"github.com/junegunn/fzf/src/protector"
 )

-var version = "0.71"
+var version = "0.66"
 var revision = "devel"

 //go:embed shell/key-bindings.bash
@@ -29,9 +29,6 @@ var zshCompletion []byte
 //go:embed shell/key-bindings.fish
 var fishKeyBindings []byte

-//go:embed shell/completion.fish
-var fishCompletion []byte
-
 //go:embed man/man1/fzf.1
 var manPage []byte

@@ -68,7 +65,7 @@ func main() {
 	}
 	if options.Fish {
 		printScript("key-bindings.fish", fishKeyBindings)
-		printScript("completion.fish", fishCompletion)
+		fmt.Println("fzf_key_bindings")
 		return
 	}
 	if options.Help {
@@ -1,7 +1,7 @@
 .ig
 The MIT License (MIT)

-Copyright (c) 2013-2026 Junegunn Choi
+Copyright (c) 2013-2025 Junegunn Choi

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ..
-.TH fzf\-tmux 1 "Apr 2026" "fzf 0.71.0" "fzf\-tmux - open fzf in tmux split pane"
+.TH fzf\-tmux 1 "Oct 2025" "fzf 0.66.1" "fzf\-tmux - open fzf in tmux split pane"

 .SH NAME
 fzf\-tmux - open fzf in tmux split pane
@@ -1,7 +1,7 @@
 .ig
 The MIT License (MIT)

-Copyright (c) 2013-2026 Junegunn Choi
+Copyright (c) 2013-2025 Junegunn Choi

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ..
-.TH fzf 1 "Apr 2026" "fzf 0.71.0" "fzf - a command-line fuzzy finder"
+.TH fzf 1 "Oct 2025" "fzf 0.66.1" "fzf - a command-line fuzzy finder"

 .SH NAME
 fzf - a command-line fuzzy finder
@@ -134,14 +134,6 @@ e.g.
     # Use template to rearrange fields
     echo foo,bar,baz | fzf --delimiter , --with-nth '{n},{1},{3},{2},{1..2}'
 .RE
-.RS
-
-\fBchange\-with\-nth\fR action is only available when \fB\-\-with\-nth\fR is set.
-When \fB\-\-with\-nth\fR is used, fzf retains the original input lines in memory
-so they can be re\-transformed on the fly (e.g. \fB\-\-with\-nth ..\fR to keep
-the original presentation). This increases memory usage, so only use
-\fB\-\-with\-nth\fR when you actually need field transformation.
-.RE
 .TP
 .BI "\-\-accept\-nth=" "N[,..] or TEMPLATE"
 Define which fields to print on accept. The last delimiter is stripped from the
@@ -280,7 +272,6 @@ color mappings. Each entry is separated by a comma and/or whitespaces.
      \fBgutter              \fRGutter on the left
    \fBcurrent\-hl (hl+)      \fRHighlighted substrings (current line)
    \fBalt\-bg                \fRAlternate background color to create striped lines
-    \fBalt\-gutter            \fRAlternate gutter color to create the striped pattern
    \fBquery (input\-fg)      \fRQuery string
      \fBghost               \fRGhost text (\fB\-\-ghost\fR, \fBdim\fR applied by default)
      \fBdisabled            \fRQuery string when search is disabled (\fB\-\-disabled\fR)
@@ -334,14 +325,10 @@ color mappings. Each entry is separated by a comma and/or whitespaces.
    \fB#rrggbb    \fR24-bit colors

 .B ANSI ATTRIBUTES: (Only applies to foreground colors)
-    \fBregular           \fRClear previously set attributes; should precede the other ones
-    \fBstrip             \fRRemove colors
+    \fBregular        \fRClear previously set attributes; should precede the other ones
+    \fBstrip          \fRRemove colors
    \fBbold\fR
    \fBunderline\fR
-    \fBunderline-double\fR
-    \fBunderline-curly\fR
-    \fBunderline-dotted\fR
-    \fBunderline-dashed\fR
    \fBreverse\fR
    \fBdim\fR
    \fBitalic\fR
@@ -384,7 +371,7 @@ Use black background

 .SS DISPLAY MODE
 .TP
-.BI "\-\-height=" "[~][\-]HEIGHT[%]"
+.BI "\-\-height=" "[~]HEIGHT[%]"
 Display fzf window below the cursor with the given height instead of using
 the full screen.

@@ -394,19 +381,17 @@ height minus the given value.
  fzf \-\-height=\-1

 When prefixed with \fB~\fR, fzf will automatically determine the height in the
-range according to the input size. You can combine \fB~\fR with a negative
-value.
+range according to the input size.

  # Will not take up 100% of the screen
  seq 5 | fzf \-\-height=~100%

-  # Adapt to input size, up to terminal height minus 1
-  seq 5 | fzf \-\-height=~\-1
-
 Adaptive height has the following limitations:
 .br
 * Cannot be used with top/bottom margin and padding given in percent size
 .br
+* Negative value is not allowed
+.br
 * It will not find the right size when there are multi-line items

 .TP
@@ -417,26 +402,25 @@ layout options so that the specified number of items are visible in the list
 section (default: \fB10+\fR).
 Ignored when \fB\-\-height\fR is not specified or set as an absolute value.
 .TP
-.BI "\-\-popup" "[=[center|top|bottom|left|right][,SIZE[%]][,SIZE[%]][,border-native]]"
-Start fzf in a tmux popup or in a Zellij floating pane (default
-\fBcenter,50%\fR). Requires tmux 3.3+ or Zellij 0.44+. This option is ignored if you
-are not running fzf inside tmux or Zellij. \fB\-\-tmux\fR is an alias for this option.
+.BI "\-\-tmux" "[=[center|top|bottom|left|right][,SIZE[%]][,SIZE[%]][,border-native]]"
+Start fzf in a tmux popup (default \fBcenter,50%\fR). Requires tmux 3.3 or
+later. This option is ignored if you are not running fzf inside tmux.

 e.g.
  \fB# Popup in the center with 70% width and height
-  fzf \-\-popup 70%
+  fzf \-\-tmux 70%

  # Popup on the left with 40% width and 100% height
-  fzf \-\-popup right,40%
+  fzf \-\-tmux right,40%

  # Popup on the bottom with 100% width and 30% height
-  fzf \-\-popup bottom,30%
+  fzf \-\-tmux bottom,30%

  # Popup on the top with 80% width and 40% height
-  fzf \-\-popup top,80%,40%
+  fzf \-\-tmux top,80%,40%

-  # Popup with a native tmux or Zellij border in the center with 80% width and height
-  fzf \-\-popup center,80%,border\-native\fR
+  # Popup with a native tmux border in the center with 80% width and height
+  fzf \-\-tmux center,80%,border\-native\fR

 .SS LAYOUT
 .TP
@@ -604,11 +588,8 @@ Highlight the whole current line
 .B "\-\-cycle"
 Enable cyclic scroll
 .TP
-.BI "\-\-wrap" "[=MODE]"
-Enable line wrap. \fIMODE\fR can be \fBchar\fR (default) or \fBword\fR.
-\fBword\fR mode wraps lines at word boundaries (spaces and tabs) instead of
-at arbitrary character positions. \fB\-\-wrap\-word\fR is a synonym for
-\fB\-\-wrap=word\fR.
+.B "\-\-wrap"
+Enable line wrap
 .TP
 .BI "\-\-wrap\-sign" "=INDICATOR"
 Indicator for wrapped lines. The default is '↳ ' or '> ' depending on
@@ -620,53 +601,17 @@ Disable multi-line display of items when using \fB\-\-read0\fR
 .B "\-\-raw"
 Enable raw mode where non-matching items are also displayed in a dimmed color.
 .TP
-.BI "\-\-track"
+.B "\-\-track"
 Make fzf track the current selection when the result list is updated.
 This can be useful when browsing logs using fzf with sorting disabled. It is
 not recommended to use this option with \fB\-\-tac\fR as the resulting behavior
-can be confusing.
-
-When \fB\-\-id\-nth\fR is also set, fzf enables field\-based tracking across
-\fBreload\fRs. See \fB\-\-id\-nth\fR for details.
-
-Without \fB\-\-id\-nth\fR, \fB\-\-track\fR uses index\-based tracking that
-does not persist across reloads.
+can be confusing. Also, consider using \fBtrack\fR action instead of this
+option.

 .RS
 e.g.
-     \fB# Index\-based tracking (does not persist across reloads)
-     git log \-\-oneline \-\-graph \-\-color=always | nl |
+     \fBgit log \-\-oneline \-\-graph \-\-color=always | nl |
         fzf \-\-ansi \-\-track \-\-no\-sort \-\-layout=reverse\-list\fR
-
-     \fB# Track by first field (e.g. pod name) across reloads
-     kubectl get pods | fzf \-\-track \-\-id\-nth 1 \-\-header\-lines=1 \\
-         \-\-bind 'ctrl\-r:reload:kubectl get pods'\fR
-.RE
-.TP
-.BI "\-\-id\-nth=" "N[,..]"
-Define item identity fields for cross\-reload operations. When set, fzf
-uses the specified fields to identify items across \fBreload\fR and
-\fBreload\-sync\fR.
-
-With \fB\-\-track\fR, fzf extracts the tracking key from the current item
-using the nth expression and searches for a matching item in the reloaded list.
-While searching, the UI is blocked (query input and cursor movement are
-disabled, and the prompt is dimmed). With \fBreload\fR, the blocked state
-clears as soon as the match is found in the stream. With \fBreload\-sync\fR,
-the blocked state persists until the entire stream is complete. Press
-\fBEscape\fR or \fBCtrl\-C\fR to cancel the blocked state without quitting fzf.
-
-The info line shows \fB+T*\fR (or \fB+t*\fR for one\-off tracking) while
-the search is in progress.
-
-With \fB\-\-multi\fR, selected items are preserved across \fBreload\-sync\fR
-by matching their identity fields in the reloaded list.
-
-.RS
-e.g.
-     \fB# Track and preserve selections by pod name across reloads
-     kubectl get pods | fzf \-\-multi \-\-track \-\-id\-nth 1 \-\-header\-lines=1 \\
-         \-\-bind 'ctrl\-r:reload\-sync:kubectl get pods'\fR
 .RE
 .TP
 .B "\-\-tac"
@@ -795,7 +740,7 @@ ENVIRONMENT VARIABLES EXPORTED TO CHILD PROCESSES.

 e.g.
     \fB# Prepend the current cursor position in yellow
-     fzf \-\-info\-command='printf "\\x1b[33;1m$FZF_POS\\x1b[m/$FZF_INFO 💛"'\fR
+     fzf \-\-info\-command='echo \-e "\\x1b[33;1m$FZF_POS\\x1b[m/$FZF_INFO 💛"'\fR

 .TP
 .B "\-\-no\-info"
@@ -895,9 +840,6 @@ e.g.
     # This won't work properly without 'f' flag due to ARG_MAX limit.
     seq 100000 | fzf \-\-preview "awk '{sum+=\\$1} END {print sum}' {*f}"\fR

-     \fB# Use {+f} to get the selected items as a line-separated list
-     seq 100 | fzf \-\-multi \-\-bind 'enter:become:cat {+f}'\fR
-
 Also,

 * \fB{q}\fR is replaced to the current query string
@@ -966,11 +908,6 @@ Should be used with one of the following \fB\-\-preview\-window\fR options.
 .B * border\-bottom
 .br

-.TP
-.BI "\-\-preview\-wrap\-sign" =INDICATOR
-Indicator for wrapped lines in the preview window. If not set, the value of
-\fB\-\-wrap\-sign\fR is used.
-
 .TP
 .BI "\-\-preview\-label\-pos" [=N[:top|bottom]]
 Position of the border label on the border line of the preview window. Specify
@@ -981,7 +918,7 @@ default value 0 (or \fBcenter\fR) will put the label at the center of the
 border line.

 .TP
-.BI "\-\-preview\-window=" "[POSITION][,SIZE[%]][,border\-STYLE][,[no]wrap][,wrap\-word][,[no]follow][,[no]cycle][,[no]info][,[no]hidden][,+SCROLL[OFFSETS][/DENOM]][,~HEADER_LINES][,default][,<SIZE_THRESHOLD(ALTERNATIVE_LAYOUT)]"
+.BI "\-\-preview\-window=" "[POSITION][,SIZE[%]][,border\-STYLE][,[no]wrap][,[no]follow][,[no]cycle][,[no]info][,[no]hidden][,+SCROLL[OFFSETS][/DENOM]][,~HEADER_LINES][,default][,<SIZE_THRESHOLD(ALTERNATIVE_LAYOUT)]"

 .RS
 .B POSITION: (default: right)
@@ -999,8 +936,7 @@ default until \fBtoggle\-preview\fR action is triggered.
 execute the command in the background.

 * Long lines are truncated by default. Line wrap can be enabled with
-\fBwrap\fR flag. \fBwrap\-word\fR flag enables word-level wrapping, which
-breaks lines at word boundaries instead of mid-word.
+\fBwrap\fR flag.

 * Preview window will automatically scroll to the bottom when \fBfollow\fR
 flag is set, similarly to how \fBtail \-f\fR works.
@@ -1100,17 +1036,7 @@ Print header before the prompt line. When both normal header and header lines
 .TP
 .BI "\-\-header\-border" [=STYLE]
 Draw border around the header section. \fBline\fR style draws a single
-separator line between the header window and the list section. \fBinline\fR
-style embeds the header inside the list border frame, joined to the list
-section by a horizontal separator; it requires a \fB\-\-list\-border\fR
-shape that has both top and bottom segments (rounded / sharp / bold /
-double / block / thinblock / horizontal) and falls back to \fBline\fR
-otherwise. When the list border also has side segments, the separator
-joins them with T-junctions; \fBhorizontal\fR has no side borders, so the
-separator is drawn without T-junction endpoints. Takes precedence over
-\fB\-\-header\-first\fR (the section stays inside the list frame), and
-when \fB\-\-header\-lines\fR is also set \fB\-\-header\-lines\-border\fR
-must also be \fBinline\fR.
+separator line between the header window and the list section.

 .TP
 .BI "\-\-header\-label" [=LABEL]
@@ -1126,10 +1052,6 @@ Display header from \fB--header\-lines\fR with a separate border. Pass
 \fBnone\fR to still separate the header lines but without a border. To combine
 two headers, use \fB\-\-no\-header\-lines\-border\fR. \fBline\fR style draws
 a single separator line between the header lines and the list section.
-\fBinline\fR style embeds the header lines inside the list border frame
-with a horizontal separator; it requires a \fB\-\-list\-border\fR shape
-that has both top and bottom segments, falls back to \fBline\fR
-otherwise.

 .SS FOOTER

@@ -1143,10 +1065,7 @@ are not affected by \fB\-\-with\-nth\fR. ANSI color codes are processed even whe
 .TP
 .BI "\-\-footer\-border" [=STYLE]
 Draw border around the footer section. \fBline\fR style draws a single
-separator line between the footer and the list section. \fBinline\fR style
-embeds the footer inside the list border frame with a horizontal separator;
-it requires a \fB\-\-list\-border\fR shape that has both top and bottom
-segments and falls back to \fBline\fR otherwise.
+separator line between the footer and the list section.

 .TP
 .BI "\-\-footer\-label" [=LABEL]
@@ -1293,18 +1212,6 @@ Here is an example script that uses a Unix socket instead of a TCP port.
    curl --unix-socket /tmp/fzf.sock http -d up
    \fR

-.TP
-.BI "\-\-threads=" "N"
-Number of matcher threads to use. The default value is
-\fBmin(8 * NUM_CPU, 32)\fR.
-.TP
-.BI "\-\-bench=" "DURATION"
-Repeatedly run \fB\-\-filter\fR for the given duration and print timing
-statistics. Must be used with \fB\-\-filter\fR.
-
-e.g.
-     \fBcat /usr/share/dict/words | fzf \-\-filter abc \-\-bench 10s\fR
-
 .SS DIRECTORY TRAVERSAL
 .TP
 .B "\-\-walker=[file][,dir][,follow][,hidden]"
@@ -1466,16 +1373,12 @@ fzf exports the following environment variables to its child processes.
 .br
 .BR FZF_POS "             Vertical position of the cursor in the list starting from 1"
 .br
-.BR FZF_WRAP "            The line wrapping mode (char, word) when enabled"
-.br
 .BR FZF_QUERY "           Current query string"
 .br
 .BR FZF_INPUT_STATE "     Current input state (enabled, disabled, hidden)"
 .br
 .BR FZF_NTH "             Current \-\-nth option"
 .br
-.BR FZF_WITH_NTH "        Current \-\-with\-nth option"
-.br
 .BR FZF_PROMPT "          Prompt string"
 .br
 .BR FZF_GHOST "           Ghost string"
@@ -1592,7 +1495,7 @@ e.g.
 .br
 \fIctrl\-/\fR         (\fIctrl\-_\fR)
 .br
-\fIctrl\-alt\-[a\-z]\fR (\fIctrl\-alt\-h\fR is \fIctrl\-alt\-backspace\fR on non-Windows)
+\fIctrl\-alt\-[a\-z]\fR
 .br
 \fIalt\-[*]\fR        (Any case-sensitive single character is allowed)
 .br
@@ -1722,7 +1625,7 @@ e.g.
 .br
 \fIctrl\-alt\-end\fR
 .br
-\fIctrl\-alt\-backspace\fR  (\fIctrl\-alt\-bspace\fR \fIctrl\-alt\-bs\fR) (\fIctrl\-alt\-h\fR (non-Windows))
+\fIctrl\-alt\-backspace\fR  (\fIctrl\-alt\-bspace\fR \fIctrl\-alt\-bs\fR)
 .br
 \fIctrl\-alt\-delete\fR
 .br
@@ -1959,14 +1862,12 @@ A key or an event can be bound to one or more of the following actions.
    \fBchange\-border\-label(...)\fR     (change \fB\-\-border\-label\fR to the given string)
    \fBchange\-ghost(...)\fR            (change ghost text to the given string)
    \fBchange\-header(...)\fR           (change header to the given string; doesn't affect \fB\-\-header\-lines\fR)
-    \fBchange\-header\-lines(N)\fR       (change the number of \fB\-\-header\-lines\fR)
    \fBchange\-header\-label(...)\fR     (change \fB\-\-header\-label\fR to the given string)
    \fBchange\-input\-label(...)\fR      (change \fB\-\-input\-label\fR to the given string)
    \fBchange\-list\-label(...)\fR       (change \fB\-\-list\-label\fR to the given string)
    \fBchange\-multi\fR                 (enable multi-select mode with no limit)
    \fBchange\-multi(...)\fR            (enable multi-select mode with a limit or disable it with 0)
    \fBchange\-nth(...)\fR              (change \fB\-\-nth\fR option; rotate through the multiple options separated by '|')
-    \fBchange\-with\-nth(...)\fR         (change \fB\-\-with\-nth\fR option; rotate through the multiple options separated by '|')
    \fBchange\-pointer(...)\fR          (change \fB\-\-pointer\fR option)
    \fBchange\-preview(...)\fR          (change \fB\-\-preview\fR option)
    \fBchange\-preview\-label(...)\fR    (change \fB\-\-preview\-label\fR to the given string)
@@ -2052,14 +1953,12 @@ A key or an event can be bound to one or more of the following actions.
    \fBtoggle\-multi\-line\fR
    \fBtoggle\-preview\fR
    \fBtoggle\-preview\-wrap\fR
-    \fBtoggle\-preview\-wrap\-word\fR
    \fBtoggle\-raw\fR                   (toggle raw mode for displaying non-matching items)
    \fBtoggle\-search\fR                (toggle search functionality)
    \fBtoggle\-sort\fR
    \fBtoggle\-track\fR                 (toggle global tracking option (\fB\-\-track\fR))
    \fBtoggle\-track\-current\fR         (toggle tracking of the current item)
-    \fBtoggle\-wrap\fR
-    \fBtoggle\-wrap\-word\fR             \fIctrl\-/\fR  \fIalt\-/\fR
+    \fBtoggle\-wrap\fR                  \fIctrl\-/\fR  \fIalt\-/\fR
    \fBtoggle+down\fR                  \fIctrl\-i  (tab)\fR
    \fBtoggle+up\fR                    \fIbtab    (shift\-tab)\fR
    \fBtrack\-current\fR                (track the current item; automatically disabled if focus changes)
@@ -2067,12 +1966,10 @@ A key or an event can be bound to one or more of the following actions.
    \fBtransform\-border\-label(...)\fR  (transform border label using an external command)
    \fBtransform\-ghost(...)\fR         (transform ghost text using an external command)
    \fBtransform\-header(...)\fR        (transform header using an external command)
-    \fBtransform\-header\-lines(...)\fR  (transform the number of \fB\-\-header\-lines\fR using an external command)
    \fBtransform\-header\-label(...)\fR  (transform header label using an external command)
    \fBtransform\-input\-label(...)\fR   (transform input label using an external command)
    \fBtransform\-list\-label(...)\fR    (transform list label using an external command)
    \fBtransform\-nth(...)\fR           (transform nth using an external command)
-    \fBtransform\-with\-nth(...)\fR      (transform with-nth using an external command)
    \fBtransform\-pointer(...)\fR       (transform pointer using an external command)
    \fBtransform\-preview\-label(...)\fR (transform preview label using an external command)
    \fBtransform\-prompt(...)\fR        (transform prompt string using an external command)
@@ -2208,7 +2105,7 @@ payload of HTTP POST request to the \fB\-\-listen\fR server.

 e.g.
    \fB# Disallow selecting an empty line
-    printf "1. Hello\\n2. Goodbye\\n\\n3. Exit" |
+    echo \-e "1. Hello\\n2. Goodbye\\n\\n3. Exit" |
      fzf \-\-height '~100%' \-\-reverse \-\-header 'Select one' \\
          \-\-bind 'enter:transform:[[ \-n {} ]] &&
                    echo accept ||
@@ -1,4 +1,4 @@
-" Copyright (c) 2013-2026 Junegunn Choi
+" Copyright (c) 2013-2025 Junegunn Choi
 "
 " MIT License
 "
@@ -1,9 +1,9 @@
 __fzf_defaults() {
  # $1: Prepend to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS
  # $2: Append to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS
-  builtin printf '%s\n' "--height ${FZF_TMUX_HEIGHT:-40%} --min-height 20+ --bind=ctrl-z:ignore $1"
+  printf '%s\n' "--height ${FZF_TMUX_HEIGHT:-40%} --min-height 20+ --bind=ctrl-z:ignore $1"
  command cat "${FZF_DEFAULT_OPTS_FILE-}" 2> /dev/null
-  builtin printf '%s\n' "${FZF_DEFAULT_OPTS-} $2"
+  printf '%s\n' "${FZF_DEFAULT_OPTS-} $2"
 }

 __fzf_exec_awk() {
@@ -4,6 +4,8 @@
 #  / __/ / /_/ __/
 # /_/   /___/_/ completion.bash
 #
+# - $FZF_TMUX                 (default: 0)
+# - $FZF_TMUX_OPTS            (default: empty)
 # - $FZF_COMPLETION_TRIGGER   (default: '**')
 # - $FZF_COMPLETION_OPTS      (default: empty)
 # - $FZF_COMPLETION_PATH_OPTS (default: empty)
@@ -36,9 +38,9 @@ if [[ $- =~ i ]]; then
 # the changes. See code comments in "common.sh" for the implementation details.

 __fzf_defaults() {
-  builtin printf '%s\n' "--height ${FZF_TMUX_HEIGHT:-40%} --min-height 20+ --bind=ctrl-z:ignore $1"
+  printf '%s\n' "--height ${FZF_TMUX_HEIGHT:-40%} --min-height 20+ --bind=ctrl-z:ignore $1"
  command cat "${FZF_DEFAULT_OPTS_FILE-}" 2> /dev/null
-  builtin printf '%s\n' "${FZF_DEFAULT_OPTS-} $2"
+  printf '%s\n' "${FZF_DEFAULT_OPTS-} $2"
 }

 __fzf_exec_awk() {
@@ -79,7 +81,7 @@ __fzf_orig_completion() {
      f="${BASH_REMATCH[2]}"
      cmd="${BASH_REMATCH[3]}"
      [[ $f == _fzf_* ]] && continue
-      builtin printf -v "_fzf_orig_completion_${cmd//[^A-Za-z0-9_]/_}" "%s" "${comp} %s ${cmd} #${f}"
+      printf -v "_fzf_orig_completion_${cmd//[^A-Za-z0-9_]/_}" "%s" "${comp} %s ${cmd} #${f}"
      if [[ $l == *" -o nospace "* ]] && [[ ${__fzf_nospace_commands-} != *" $cmd "* ]]; then
        __fzf_nospace_commands="${__fzf_nospace_commands-} $cmd "
      fi
@@ -109,7 +111,7 @@ __fzf_orig_completion_instantiate() {
  orig="${!orig_var-}"
  orig="${orig%#*}"
  [[ $orig == *' %s '* ]] || return 1
-  builtin printf -v REPLY "$orig" "$func"
+  printf -v REPLY "$orig" "$func"
 }

 _fzf_opts_completion() {
@@ -122,7 +124,6 @@ _fzf_opts_completion() {
    +i --no-ignore-case
    +s --no-sort
    +x --no-extended
-    --accept-nth
    --ansi
    --bash
    --bind
@@ -136,89 +137,56 @@ _fzf_opts_completion() {
    --expect
    --filepath-word
    --fish
-    --footer
-    --footer-border
-    --footer-label
-    --footer-label-pos
-    --freeze-left
-    --freeze-right
-    --gap
-    --gap-line
-    --ghost
-    --gutter
-    --gutter-raw
    --header
-    --header-border
    --header-first
-    --header-label
-    --header-label-pos
    --header-lines
-    --header-lines-border
    --height
    --highlight-line
    --history
    --history-size
    --hscroll-off
-    --id-nth
    --info
-    --info-command
-    --input-border
-    --input-label
-    --input-label-pos
    --jump-labels
    --keep-right
    --layout
    --listen
    --listen-unsafe
-    --list-border
-    --list-label
-    --list-label-pos
    --literal
    --man
    --margin
    --marker
-    --marker-multi-line
    --min-height
    --no-bold
+    --no-clear
    --no-hscroll
-    --no-input
-    --no-multi-line
+    --no-mouse
    --no-scrollbar
    --no-separator
+    --no-unicode
    --padding
    --pointer
    --preview
-    --preview-border
    --preview-label
    --preview-label-pos
    --preview-window
    --print-query
    --print0
    --prompt
-    --raw
    --read0
+    --reverse
    --scheme
    --scroll-off
-    --scrollbar
    --separator
-    --smart-case
-    --style
    --sync
    --tabstop
    --tac
-    --tail
    --tiebreak
    --tmux
    --track
    --version
-    --walker
-    --walker-root
-    --walker-skip
    --with-nth
    --with-shell
    --wrap
-    --wrap-sign
-    --preview-wrap-sign
    --zsh
    -0 --exit-0
    -1 --select-1
@@ -238,11 +206,11 @@ _fzf_opts_completion() {
      return 0
      ;;
    --tiebreak)
-      COMPREPLY=($(compgen -W "length chunk pathname begin end index" -- "$cur"))
+      COMPREPLY=($(compgen -W "length chunk begin end index" -- "$cur"))
      return 0
      ;;
    --color)
-      COMPREPLY=($(compgen -W "dark light base16 16 bw no" -- "$cur"))
+      COMPREPLY=($(compgen -W "dark light 16 bw no" -- "$cur"))
      return 0
      ;;
    --layout)
@@ -253,21 +221,12 @@ _fzf_opts_completion() {
      COMPREPLY=($(compgen -W "default right hidden inline inline-right" -- "$cur"))
      return 0
      ;;
-    --wrap)
-      COMPREPLY=($(compgen -W "char word" -- "$cur"))
-      return 0
-      ;;
-    --style)
-      COMPREPLY=($(compgen -W "default minimal full" -- "$cur"))
-      return 0
-      ;;
    --preview-window)
      COMPREPLY=($(compgen -W "
      default
      hidden
      nohidden
      wrap
-      wrap-word
      nowrap
      cycle
      nocycle
@@ -276,7 +235,6 @@ _fzf_opts_completion() {
      left
      right
      rounded border border-rounded
-      border-line
      sharp border-sharp
      border-bold
      border-block
@@ -290,16 +248,14 @@ _fzf_opts_completion() {
      border-left
      border-right
      follow
-      nofollow
-      info
-      noinfo" -- "$cur"))
+      nofollow" -- "$cur"))
      return 0
      ;;
-    --border | --list-border | --header-border | --header-lines-border | --footer-border | --input-border | --preview-border)
-      COMPREPLY=($(compgen -W "line rounded sharp bold block thinblock double horizontal vertical top bottom left right none" -- "$cur"))
+    --border)
+      COMPREPLY=($(compgen -W "rounded sharp bold block thinblock double horizontal vertical top bottom left right none" -- "$cur"))
      return 0
      ;;
-    --border-label-pos | --preview-label-pos | --list-label-pos | --header-label-pos | --footer-label-pos | --input-label-pos)
+    --border-label-pos | --preview-label-pos)
      COMPREPLY=($(compgen -W "center bottom top" -- "$cur"))
      return 0
      ;;
@@ -369,22 +325,19 @@ __fzf_generic_path_completion() {
        matches=$(
          export FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse --scheme=path" "${FZF_COMPLETION_OPTS-} $2")
          unset FZF_DEFAULT_COMMAND FZF_DEFAULT_OPTS_FILE
-          if [[ $1 =~ dir ]]; then
-            eval "rest=(${FZF_COMPLETION_DIR_OPTS-})"
-          else
-            eval "rest=(${FZF_COMPLETION_PATH_OPTS-})"
-          fi
          if declare -F "$1" > /dev/null; then
-            eval "$1 $(builtin printf %q "$dir")" | __fzf_comprun "$4" -q "$leftover" "${rest[@]}"
+            eval "$1 $(printf %q "$dir")" | __fzf_comprun "$4" -q "$leftover"
          else
            if [[ $1 =~ dir ]]; then
              walker=dir,follow
+              eval "rest=(${FZF_COMPLETION_DIR_OPTS-})"
            else
              walker=file,dir,follow,hidden
+              eval "rest=(${FZF_COMPLETION_PATH_OPTS-})"
            fi
            __fzf_comprun "$4" -q "$leftover" --walker "$walker" --walker-root="$dir" "${rest[@]}"
          fi | while read -r item; do
-            builtin printf "%q " "${item%$3}$3"
+            printf "%q " "${item%$3}$3"
          done
        )
        matches=${matches% }
@@ -394,9 +347,9 @@ __fzf_generic_path_completion() {
        else
          COMPREPLY=("$cur")
        fi
-        # To redraw line after fzf closes (builtin printf '\e[5n')
+        # To redraw line after fzf closes (printf '\e[5n')
        bind '"\e[0n": redraw-current-line' 2> /dev/null
-        builtin printf '\e[5n'
+        printf '\e[5n'
        return 0
      fi
      dir=$(command dirname "$dir")
@@ -454,7 +407,7 @@ _fzf_complete() {
      COMPREPLY=("$cur")
    fi
    bind '"\e[0n": redraw-current-line' 2> /dev/null
-    builtin printf '\e[5n'
+    printf '\e[5n'
    return 0
  else
    _fzf_handle_dynamic_completion "$cmd" "${rest[@]}"
@@ -526,7 +479,7 @@ _fzf_proc_completion_post() {
 #     # Set the local attribute for any non-local variable that is set by _known_hosts_real()
 #     local COMPREPLY=()
 #     _known_hosts_real ''
-#     builtin printf '%s\n' "${COMPREPLY[@]}" | command sort -u --version-sort
+#     printf '%s\n' "${COMPREPLY[@]}" | command sort -u --version-sort
 #   }
 if ! declare -F __fzf_list_hosts > /dev/null; then
  __fzf_list_hosts() {
@@ -1,169 +0,0 @@
-#     ____      ____
-#    / __/___  / __/
-#   / /_/_  / / /_
-#  / __/ / /_/ __/
-# /_/   /___/_/ completion.fish
-#
-# - $FZF_COMPLETION_OPTS
-# - $FZF_EXPANSION_OPTS
-
-# The oldest supported fish version is 3.4.0. For this message being able to be
-# displayed on older versions, the command substitution syntax $() should not
-# be used anywhere in the script, otherwise the source command will fail.
-if string match -qr -- '^[12]\\.|^3\\.[0-3]' $version
-  echo "fzf completion script requires fish version 3.4.0 or newer." >&2
-  return 1
-else if not command -q fzf
-  echo "fzf was not found in path." >&2
-  return 1
-end
-
-function fzf_complete -w fzf -d 'fzf command completion and wildcard expansion search'
-  # Restore the default shift-tab behavior on tab completions
-  if commandline --paging-mode
-    commandline -f complete-and-search
-    return
-  end
-
-  # Remove any trailing unescaped backslash from token and update command line
-  set -l -- token (string replace -r -- '(?<!\\\\)(?:\\\\\\\\)*\\K\\\\$' '' (commandline -t | string collect) | string collect)
-  commandline -rt -- $token
-
-  # Remove any line breaks from token
-  set -- token (string replace -ra -- '\\\\\\n' '' $token | string collect)
-
-  # regex: Match token with unescaped/unquoted glob character
-  set -l -- r_glob '^(?:[^\'"\\\\*]|\\\\[\\S\\s]|\'(?:\\\\[\\S\\s]|[^\'\\\\])*\'|"(?:\\\\[\\S\\s]|[^"\\\\])*")*\\*[\\S\\s]*$'
-
-  # regex: Match any unbalanced quote character
-  set -l -- r_quote '^(?>(?:\\\\[\\s\\S]|"(?:[^"\\\\]|\\\\[\\s\\S])*"|\'(?:[^\'\\\\]|\\\\[\\s\\S])*\'|[^\'"\\\\]+)*)\\K[\'"]'
-
-  # The expansion pattern is the token with any open quote closed, or is empty.
-  set -l -- glob_pattern (string match -r -- $r_glob $token | string collect)(string match -r -- $r_quote $token | string collect -a)
-
-  set -l -- cl_tokenize_opt '--tokens-expanded'
-  string match -q -- '3.*' $version
-  and set -- cl_tokenize_opt '--tokenize'
-
-  # Set command line tokens without any leading variable definitions or launcher
-  # commands (including their options, but not any option arguments).
-  set -l -- r_cmd '^(?:(?:builtin|command|doas|env|sudo|\\w+=\\S*|-\\S+)\\s+)*\\K[\\s\\S]+'
-  set -l -- cmd (commandline $cl_tokenize_opt --input=(commandline -pc | string match -r $r_cmd))
-  test -z "$token"
-  and set -a -- cmd ''
-
-  # Set fzf options
-  test -z "$FZF_TMUX_HEIGHT"
-  and set -l -- FZF_TMUX_HEIGHT 40%
-
-  set -lax -- FZF_DEFAULT_OPTS \
-    "--height=$FZF_TMUX_HEIGHT --min-height=20+ --bind=ctrl-z:ignore" \
-    (test -r "$FZF_DEFAULT_OPTS_FILE"; and string join -- ' ' <$FZF_DEFAULT_OPTS_FILE) \
-    $FZF_DEFAULT_OPTS '--bind=alt-r:toggle-raw --multi --wrap=word --reverse' \
-    (if test -n "$glob_pattern"; string collect -- $FZF_EXPANSION_OPTS; else;
-      string collect -- $FZF_COMPLETION_OPTS; end; string escape -n -- $argv) \
-    --with-shell=(status fish-path)\\ -c
-
-  set -lx FZF_DEFAULT_OPTS_FILE
-
-  set -l -- fzf_cmd fzf
-  test "$FZF_TMUX" = 1
-  and set -- fzf_cmd fzf-tmux $FZF_TMUX_OPTS -d$FZF_TMUX_HEIGHT --
-
-  set -l result
-
-  # Get the completion list from stdin when it's not a tty
-  if not isatty stdin
-    set -l -- custom_post_func _fzf_post_complete_$cmd[1]
-    functions -q $custom_post_func
-    or set -- custom_post_func _fzf_complete_$cmd[1]_post
-
-    if functions -q $custom_post_func
-      $fzf_cmd | $custom_post_func $cmd | while read -l r; set -a -- result $r; end
-    else if string match -q -- '*--print0*' "$FZF_DEFAULT_OPTS"
-      $fzf_cmd | while read -lz r; set -a -- result $r; end
-    else
-      $fzf_cmd | while read -l r; set -a -- result $r; end
-    end
-
-  # Wildcard expansion
-  else if test -n "$glob_pattern"
-    # Set the command to be run by fzf, so there is a visual indicator and an
-    # easy way to abort on long recursive searches.
-    set -lx -- FZF_DEFAULT_COMMAND "for i in $glob_pattern;" \
-      'test -d "$i"; and string match -qv -- "*/" $i; and set -- i $i/;' \
-      'string join0 -- $i; end'
-
-    set -- result (string escape -n -- ($fzf_cmd --read0 --print0 --scheme=path --no-multi-line | string split0))
-
-  # Command completion
-  else
-    # Call custom function if defined
-    set -l -- custom_func _fzf_complete_$cmd[1]
-    if functions -q $custom_func; and not set -q __fzf_no_custom_complete
-      set -lx __fzf_no_custom_complete
-      $custom_func $cmd
-      return
-    end
-
-    # Workaround for complete not having newlines in results
-    if string match -qr -- '\\n' $token
-      set -- token (string replace -ra -- '(?<!\\\\)(?:\\\\\\\\)*\\K\\\\\$' '\\\\\\\\\$' $token | string collect)
-      set -- token (string unescape -- $token | string collect)
-      set -- token (string replace -ra -- '\\n' '\\\\n' $token | string collect)
-    end
-
-    set -- list (complete -C --escape -- (string join -- ' ' (commandline -pc $cl_tokenize_opt) $token | string collect))
-    if test -n "$list"
-      # Get the initial tabstop value
-      if set -l -- tabstop (string match -rga -- '--tabstop[= ](?:0*)([1-9]\\d+|[4-9])' "$FZF_DEFAULT_OPTS")[-1]
-        set -- tabstop (math $tabstop - 4)
-      else
-        set -- tabstop 4
-      end
-
-      # Determine the tabstop length for description alignment
-      set -l -- max_columns (math $COLUMNS - 40)
-      for i in $list[1..500]
-        set -l -- item (string split -f 1 -- \t $i)
-        and set -l -- len (string length -V -- $item)
-        and test "$len" -gt "$tabstop" -a "$len" -lt "$max_columns"
-        and set -- tabstop $len
-      end
-      set -- tabstop (math $tabstop + 4)
-
-      set -- result (string collect -- $list | $fzf_cmd --delimiter="\t" --tabstop=$tabstop --wrap-sign=\t"↳ " --accept-nth=1)
-    end
-  end
-
-  # Update command line
-  if test -n "$result"
-    # No extra space after single selection that ends with path separator
-    set -l -- tail ' '
-    test (count $result) -eq 1
-    and string match -q -- '*/' "$result"
-    and set -- tail ''
-
-    commandline -rt -- (string join -- ' ' $result)$tail
-  end
-
-  commandline -f repaint
-end
-
-function _fzf_complete
-  set -l fzf_args
-  for i in $argv
-    string match -q -- '--' $i; and break
-    set -a -- fzf_args $i
-  end
-  fzf_complete $fzf_args
-end
-
-# Bind to shift-tab
-if string match -qr -- '^\\d\\d+|^[4-9]' $version
-  bind shift-tab fzf_complete
-  bind -M insert shift-tab fzf_complete
-else
-  bind -k btab fzf_complete
-  bind -M insert -k btab fzf_complete
-end
@@ -4,6 +4,8 @@
 #  / __/ / /_/ __/
 # /_/   /___/_/ completion.zsh
 #
+# - $FZF_TMUX                 (default: 0)
+# - $FZF_TMUX_OPTS            (default: empty)
 # - $FZF_COMPLETION_TRIGGER   (default: '**')
 # - $FZF_COMPLETION_OPTS      (default: empty)
 # - $FZF_COMPLETION_PATH_OPTS (default: empty)
@@ -100,9 +102,9 @@ if [[ -o interactive ]]; then
 # the changes. See code comments in "common.sh" for the implementation details.

 __fzf_defaults() {
-  builtin printf '%s\n' "--height ${FZF_TMUX_HEIGHT:-40%} --min-height 20+ --bind=ctrl-z:ignore $1"
+  printf '%s\n' "--height ${FZF_TMUX_HEIGHT:-40%} --min-height 20+ --bind=ctrl-z:ignore $1"
  command cat "${FZF_DEFAULT_OPTS_FILE-}" 2> /dev/null
-  builtin printf '%s\n' "${FZF_DEFAULT_OPTS-} $2"
+  printf '%s\n' "${FZF_DEFAULT_OPTS-} $2"
 }

 __fzf_exec_awk() {
@@ -172,18 +174,15 @@ __fzf_generic_path_completion() {
        export FZF_DEFAULT_OPTS
        FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse --scheme=path" "${FZF_COMPLETION_OPTS-}")
        unset FZF_DEFAULT_COMMAND FZF_DEFAULT_OPTS_FILE
-        if [[ $compgen =~ dir ]]; then
-          rest=${FZF_COMPLETION_DIR_OPTS-}
-        else
-          rest=${FZF_COMPLETION_PATH_OPTS-}
-        fi
        if declare -f "$compgen" > /dev/null; then
-          eval "$compgen $(printf %q "$dir")" | __fzf_comprun "$cmd_word" ${(Q)${(Z+n+)fzf_opts}} -q "$leftover" ${(Q)${(Z+n+)rest}}
+          eval "$compgen $(printf %q "$dir")" | __fzf_comprun "$cmd_word" ${(Q)${(Z+n+)fzf_opts}} -q "$leftover"
        else
          if [[ $compgen =~ dir ]]; then
            walker=dir,follow
+            rest=${FZF_COMPLETION_DIR_OPTS-}
          else
            walker=file,dir,follow,hidden
+            rest=${FZF_COMPLETION_PATH_OPTS-}
          fi
          __fzf_comprun "$cmd_word" ${(Q)${(Z+n+)fzf_opts}} -q "$leftover" --walker "$walker" --walker-root="$dir" ${(Q)${(Z+n+)rest}} < /dev/tty
        fi | while read -r item; do
@@ -4,6 +4,7 @@
 #  / __/ / /_/ __/
 # /_/   /___/_/ key-bindings.bash
 #
+# - $FZF_TMUX_OPTS
 # - $FZF_CTRL_T_COMMAND
 # - $FZF_CTRL_T_OPTS
 # - $FZF_CTRL_R_COMMAND
@@ -24,9 +25,9 @@ if [[ $- =~ i ]]; then
 # the changes. See code comments in "common.sh" for the implementation details.

 __fzf_defaults() {
-  builtin printf '%s\n' "--height ${FZF_TMUX_HEIGHT:-40%} --min-height 20+ --bind=ctrl-z:ignore $1"
+  printf '%s\n' "--height ${FZF_TMUX_HEIGHT:-40%} --min-height 20+ --bind=ctrl-z:ignore $1"
  command cat "${FZF_DEFAULT_OPTS_FILE-}" 2> /dev/null
-  builtin printf '%s\n' "${FZF_DEFAULT_OPTS-} $2"
+  printf '%s\n' "${FZF_DEFAULT_OPTS-} $2"
 }

 __fzf_exec_awk() {
@@ -76,35 +77,17 @@ __fzf_cd__() {
  ) && printf 'builtin cd -- %q' "$(builtin unset CDPATH && builtin cd -- "$dir" && builtin pwd)"
 }

-__fzf_history_delete() {
-  [[ -s $1 ]] || return
-
-  local offsets
-  offsets=($(sort -rnu "$1"))
-  for offset in "${offsets[@]}"; do
-    builtin history -d "$offset"
-  done
-
-  if [[ ${#offsets[@]} -gt 0 ]] && shopt -q histappend; then
-    builtin history -w
-  fi
-}
-
 if command -v perl > /dev/null; then
  __fzf_history__() {
-    local output script deletefile
-    deletefile=$(mktemp)
+    local output script
    script='BEGIN { getc; $/ = "\n\t"; $HISTCOUNT = $ENV{last_hist} + 1 } s/^[ *]//; s/\n/\n\t/gm; print $HISTCOUNT - $. . "\t$_" if !$seen{$_}++'
    output=$(
      set +o pipefail
      builtin fc -lnr -2147483648 |
        last_hist=$(HISTTIMEFORMAT='' builtin history 1) command perl -n -l0 -e "$script" |
-        FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort,alt-r:toggle-raw --wrap-sign '"$'\t'"↳ ' --highlight-line --bind 'shift-delete:execute-silent(cat {+f1} >> \"$deletefile\")+exclude-multi' --multi ${FZF_CTRL_R_OPTS-} --read0") \
+        FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort,alt-r:toggle-raw --wrap-sign '"$'\t'"↳ ' --highlight-line ${FZF_CTRL_R_OPTS-} +m --read0") \
        FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd) --query "$READLINE_LINE"
-    )
-    __fzf_history_delete "$deletefile"
-    command rm -f "$deletefile"
-    [[ -n $output ]] || return
+    ) || return
    READLINE_LINE=$(command perl -pe 's/^\d*\t//' <<< "$output")
    if [[ -z $READLINE_POINT ]]; then
      echo "$READLINE_LINE"
@@ -114,8 +97,7 @@ if command -v perl > /dev/null; then
  }
 else # awk - fallback for POSIX systems
  __fzf_history__() {
-    local output script deletefile
-    deletefile=$(mktemp)
+    local output script
    [[ $(HISTTIMEFORMAT='' builtin history 1) =~ [[:digit:]]+ ]] # how many history entries
    script='function P(b) { ++n; sub(/^[ *]/, "", b); if (!seen[b]++) { printf "%d\t%s%c", '$((BASH_REMATCH + 1))' - n, b, 0 } }
    NR==1 { b = substr($0, 2); next }
@@ -126,12 +108,9 @@ else # awk - fallback for POSIX systems
      set +o pipefail
      builtin fc -lnr -2147483648 2> /dev/null | # ( $'\t '<lines>$'\n' )* ; <lines> ::= [^\n]* ( $'\n'<lines> )*
        __fzf_exec_awk "$script" |               # ( <counter>$'\t'<lines>$'\000' )*
-        FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort,alt-r:toggle-raw --wrap-sign '"$'\t'"↳ ' --highlight-line --bind 'shift-delete:execute-silent(cat {+f1} >> \"$deletefile\")+exclude-multi' --multi ${FZF_CTRL_R_OPTS-} --read0") \
+        FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort,alt-r:toggle-raw --wrap-sign '"$'\t'"↳ ' --highlight-line ${FZF_CTRL_R_OPTS-} +m --read0") \
        FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd) --query "$READLINE_LINE"
-    )
-    __fzf_history_delete "$deletefile"
-    command rm -f "$deletefile"
-    [[ -n $output ]] || return
+    ) || return
    READLINE_LINE=${output#*$'\t'}
    if [[ -z $READLINE_POINT ]]; then
      echo "$READLINE_LINE"
@@ -142,7 +121,7 @@ else # awk - fallback for POSIX systems
 fi

 # Required to refresh the prompt after fzf
-bind -m emacs-standard '"\C-\e(": redraw-current-line'
+bind -m emacs-standard '"\er": redraw-current-line'

 bind -m vi-command '"\C-z": emacs-editing-mode'
 bind -m vi-insert '"\C-z": emacs-editing-mode'
@@ -151,7 +130,7 @@ bind -m emacs-standard '"\C-z": vi-editing-mode'
 if ((BASH_VERSINFO[0] < 4)); then
  # CTRL-T - Paste the selected file path into the command line
  if [[ ${FZF_CTRL_T_COMMAND-x} != "" ]]; then
-    bind -m emacs-standard '"\C-t": " \C-b\C-k \C-u`__fzf_select__`\e\C-e\C-\e(\C-a\C-y\C-h\C-e\e \C-y\ey\C-x\C-x\C-f\C-y\ey\C-_"'
+    bind -m emacs-standard '"\C-t": " \C-b\C-k \C-u`__fzf_select__`\e\C-e\er\C-a\C-y\C-h\C-e\e \C-y\ey\C-x\C-x\C-f\C-y\ey\C-_"'
    bind -m vi-command '"\C-t": "\C-z\C-t\C-z"'
    bind -m vi-insert '"\C-t": "\C-z\C-t\C-z"'
  fi
@@ -161,7 +140,7 @@ if ((BASH_VERSINFO[0] < 4)); then
    if [[ -n ${FZF_CTRL_R_COMMAND-} ]]; then
      echo "warning: FZF_CTRL_R_COMMAND is set to a custom command, but custom commands are not yet supported for CTRL-R" >&2
    fi
-    bind -m emacs-standard '"\C-r": "\C-e \C-u\C-y\ey\C-u`__fzf_history__`\e\C-e\C-\e("'
+    bind -m emacs-standard '"\C-r": "\C-e \C-u\C-y\ey\C-u`__fzf_history__`\e\C-e\er"'
    bind -m vi-command '"\C-r": "\C-z\C-r\C-z"'
    bind -m vi-insert '"\C-r": "\C-z\C-r\C-z"'
  fi
@@ -186,7 +165,7 @@ fi

 # ALT-C - cd into the selected directory
 if [[ ${FZF_ALT_C_COMMAND-x} != "" ]]; then
-  bind -m emacs-standard '"\ec": " \C-b\C-k \C-u`__fzf_cd__`\e\C-e\C-\e(\C-m\C-y\C-h\e \C-y\ey\C-x\C-x\C-d\C-y\ey\C-_"'
+  bind -m emacs-standard '"\ec": " \C-b\C-k \C-u`__fzf_cd__`\e\C-e\er\C-m\C-y\C-h\e \C-y\ey\C-x\C-x\C-d\C-y\ey\C-_"'
  bind -m vi-command '"\ec": "\C-z\ec\C-z"'
  bind -m vi-insert '"\ec": "\C-z\ec\C-z"'
 fi
@@ -4,6 +4,7 @@
 #  / __/ / /_/ __/
 # /_/   /___/_/ key-bindings.fish
 #
+# - $FZF_TMUX_OPTS
 # - $FZF_CTRL_T_COMMAND
 # - $FZF_CTRL_T_OPTS
 # - $FZF_CTRL_R_COMMAND
@@ -11,17 +12,20 @@
 # - $FZF_ALT_C_COMMAND
 # - $FZF_ALT_C_OPTS

+
 # Key bindings
 # ------------
+# The oldest supported fish version is 3.1b1. To maintain compatibility, the
+# command substitution syntax $(cmd) should never be used, even behind a version
+# check, otherwise the source command will fail on fish versions older than 3.4.0.
 function fzf_key_bindings

-  # The oldest supported fish version is 3.4.0. For this message being able to be
-  # displayed on older versions, the command substitution syntax $() should not
-  # be used anywhere in the script, otherwise the source command will fail.
-  if string match -qr -- '^[12]\\.|^3\\.[0-3]' $version
-    echo "fzf key bindings script requires fish version 3.4.0 or newer." >&2
+  # Check fish version
+  set -l fish_ver (string match -r '^(\d+).(\d+)' $version 2> /dev/null; or echo 0\n0\n0)
+  if test \( "$fish_ver[2]" -lt 3 \) -o \( "$fish_ver[2]" -eq 3 -a "$fish_ver[3]" -lt 1 \)
+    echo "This script requires fish version 3.1b1 or newer." >&2
    return 1
-  else if not command -q fzf
+  else if not type -q fzf
    echo "fzf was not found in path." >&2
    return 1
  end
@@ -33,7 +37,7 @@ function fzf_key_bindings
    string join ' ' -- \
      "--height $FZF_TMUX_HEIGHT --min-height=20+ --bind=ctrl-z:ignore" $argv[1] \
      (test -r "$FZF_DEFAULT_OPTS_FILE"; and string join -- ' ' <$FZF_DEFAULT_OPTS_FILE) \
-      $FZF_DEFAULT_OPTS $argv[2..]
+      $FZF_DEFAULT_OPTS $argv[2..-1]
  end

  function __fzfcmd
@@ -52,25 +56,38 @@ function fzf_key_bindings
    set -l prefix ''
    set -l dir '.'

-    set -l -- match_regex '(?<fzf_query>[\\s\\S]*?(?=\\n?$)$)'
-    set -l -- prefix_regex '^-[^\\s=]+=|^-(?!-)\\S'
+    # Set variables containing the major and minor fish version numbers, using
+    # a method compatible with all supported fish versions.
+    set -l -- fish_major (string match -r -- '^\d+' $version)
+    set -l -- fish_minor (string match -r -- '^\d+\.(\d+)' $version)[2]

-    # Don't use option prefix if " -- " is preceded.
-    string match -qv -- '* -- *' (string sub -l (commandline -Cp) -- (commandline -p))
-    and set -- match_regex "(?<prefix>$prefix_regex)?$match_regex"
+    # fish v3.3.0 and newer: Don't use option prefix if " -- " is preceded.
+    set -l -- match_regex '(?<fzf_query>[\s\S]*?(?=\n?$)$)'
+    set -l -- prefix_regex '^-[^\s=]+=|^-(?!-)\S'
+    if test "$fish_major" -eq 3 -a "$fish_minor" -lt 3
+    or string match -q -v -- '* -- *' (string sub -l (commandline -Cp) -- (commandline -p))
+      set -- match_regex "(?<prefix>$prefix_regex)?$match_regex"
+    end

    # Set $prefix and expanded $fzf_query with preserved trailing newlines.
-    if string match -qr -- '^\\d\\d+|^[4-9]' $version
+    if test "$fish_major" -ge 4
      # fish v4.0.0 and newer
      string match -q -r -- $match_regex (commandline --current-token --tokens-expanded | string collect -N)
-    else
+    else if test "$fish_major" -eq 3 -a "$fish_minor" -ge 2
+      # fish v3.2.0 - v3.7.1 (last v3)
      string match -q -r -- $match_regex (commandline --current-token --tokenize | string collect -N)
-      eval set -- fzf_query (string escape -n -- $fzf_query | string replace -r -a '^\\\\(?=~)|\\\\(?=\\$\\w)' '')
+      eval set -- fzf_query (string escape -n -- $fzf_query | string replace -r -a '^\\\(?=~)|\\\(?=\$\w)' '')
+    else
+      # fish older than v3.2.0 (v3.1b1 - v3.1.2)
+      set -l -- cl_token (commandline --current-token --tokenize | string collect -N)
+      set -- prefix (string match -r -- $prefix_regex $cl_token)
+      set -- fzf_query (string replace -- "$prefix" '' $cl_token | string collect -N)
+      eval set -- fzf_query (string escape -n -- $fzf_query | string replace -r -a '^\\\(?=~)|\\\(?=\$\w)|\\\n\\\n$' '')
    end

    if test -n "$fzf_query"
      # Normalize path in $fzf_query, set $dir to the longest existing directory.
-      if string match -qr -- '^\\d\\d+|^4|^3\\.[5-9]' $version
+      if test \( "$fish_major" -ge 4 \) -o \( "$fish_major" -eq 3 -a "$fish_minor" -ge 5 \)
        # fish v3.5.0 and newer
        set -- fzf_query (path normalize -- $fzf_query)
        set -- dir $fzf_query
@@ -78,22 +95,35 @@ function fzf_key_bindings
          set -- dir (path dirname $dir)
        end
      else
-        string match -q -r -- '(?<fzf_query>^[\\s\\S]*?(?=\\n?$)$)' \
-          (string replace -r -a -- '(?<=/)/|(?<!^)/+(?!\\n)$' '' $fzf_query | string collect -N)
+        # fish older than v3.5.0 (v3.1b1 - v3.4.1)
+        if test "$fish_major" -eq 3 -a "$fish_minor" -ge 2
+          # fish v3.2.0 - v3.4.1
+          string match -q -r -- '(?<fzf_query>^[\s\S]*?(?=\n?$)$)' \
+            (string replace -r -a -- '(?<=/)/|(?<!^)/+(?!\n)$' '' $fzf_query | string collect -N)
+        else
+          # fish v3.1b1 - v3.1.2
+          set -- fzf_query (string replace -r -a -- '(?<=/)/|(?<!^)/+(?!\n)$' '' $fzf_query | string collect -N)
+          eval set -- fzf_query (string escape -n -- $fzf_query | string replace -r '\\\n$' '')
+        end
        set -- dir $fzf_query
        while not test -d "$dir"
          set -- dir (dirname -z -- "$dir" | string split0)
        end
      end

-      if not string match -q -- '.' $dir; or string match -qr -- '^\\.(/|$)' $fzf_query
+      if not string match -q -- '.' $dir; or string match -q -r -- '^\./|^\.$' $fzf_query
        # Strip $dir from $fzf_query - preserve trailing newlines.
-        if string match -qr -- '^\\d\\d+|^[4-9]' $version
+        if test "$fish_major" -ge 4
          # fish v4.0.0 and newer
-          string match -q -r -- '^'(string escape --style=regex -- $dir)'/?(?<fzf_query>[\\s\\S]*)' $fzf_query
-        else
-          string match -q -r -- '^/?(?<fzf_query>[\\s\\S]*?(?=\\n?$)$)' \
+          string match -q -r -- '^'(string escape --style=regex -- $dir)'/?(?<fzf_query>[\s\S]*)' $fzf_query
+        else if test "$fish_major" -eq 3 -a "$fish_minor" -ge 2
+          # fish v3.2.0 - v3.7.1 (last v3)
+          string match -q -r -- '^/?(?<fzf_query>[\s\S]*?(?=\n?$)$)' \
            (string replace -- "$dir" '' $fzf_query | string collect -N)
+        else
+          # fish older than v3.2.0 (v3.1b1 - v3.1.2)
+          set -- fzf_query (string replace -- "$dir" '' $fzf_query | string collect -N)
+          eval set -- fzf_query (string escape -n -- $fzf_query | string replace -r -a '^/?|\\\n$' '')
        end
      end
    end
@@ -110,13 +140,13 @@ function fzf_key_bindings

    set -lx FZF_DEFAULT_OPTS (__fzf_defaults \
      "--reverse --walker=file,dir,follow,hidden --scheme=path" \
-      "--multi $FZF_CTRL_T_OPTS --print0")
+      "$FZF_CTRL_T_OPTS --multi --print0")

    set -lx FZF_DEFAULT_COMMAND "$FZF_CTRL_T_COMMAND"
    set -lx FZF_DEFAULT_OPTS_FILE

    set -l result (eval (__fzfcmd) --walker-root=$dir --query=$fzf_query | string split0)
-    and commandline -rt -- (string join -- ' ' $prefix(string escape -n -- $result))' '
+    and commandline -rt -- (string join -- ' ' $prefix(string escape -- $result))' '

    commandline -f repaint
  end
@@ -127,34 +157,24 @@ function fzf_key_bindings
    set -l -- total_lines (count $command_line)
    set -l -- fzf_query (string escape -- $command_line[$current_line])

-    set -lx -- FZF_DEFAULT_OPTS (__fzf_defaults '' \
-      '--with-nth=2.. --nth=2..,.. --scheme=history --multi --no-multi-line' \
-      '--no-wrap --wrap-sign="\t\t\t↳ " --preview-wrap-sign="↳ " --freeze-left=1' \
-      '--bind="alt-enter:become(set -g fzf_temp {+sf3..}; string join0 -- (string split0 -- <$fzf_temp | fish_indent -i); unlink $fzf_temp &>/dev/null)"' \
-      '--bind="alt-t:change-with-nth(1,3..|3..|2..)"' \
-      '--bind="shift-delete:execute-silent(eval builtin history delete -Ce -- (string escape -n -- (string split0 -- <{+sf3..})))+reload(eval $FZF_DEFAULT_COMMAND)"' \
+    set -lx FZF_DEFAULT_OPTS (__fzf_defaults '' \
+      '--nth=2..,.. --scheme=history --multi --wrap-sign="\t↳ "' \
+      '--bind=\'shift-delete:execute-silent(eval history delete --exact --case-sensitive -- (string escape -n -- {+} | string replace -r -a "^\d*\\\\\\t|(?<=\\\\\\n)\\\\\\t" ""))+reload(eval $FZF_DEFAULT_COMMAND)\'' \
      "--bind=ctrl-r:toggle-sort,alt-r:toggle-raw --highlight-line $FZF_CTRL_R_OPTS" \
-      '--accept-nth=3.. --delimiter="\t" --tabstop=4 --read0 --print0 --with-shell='(status fish-path)\\ -c)
-
-    # Add dynamic preview options if preview command isn't already set by user
-    if string match -qvr -- '--preview[= ]' "$FZF_DEFAULT_OPTS"
-      # Prepend the options to allow user overrides
-      set -p -- FZF_DEFAULT_OPTS \
-        '--bind="focus,multi,resize:bg-transform:if test \\"$FZF_COLUMNS\\" -gt 100 -a \\\\( \\"$FZF_SELECT_COUNT\\" -gt 0 -o \\\\( -z \\"$FZF_WRAP\\" -a (string join0 -- <{f3..} | string length) -gt (math $FZF_COLUMNS - (switch $FZF_WITH_NTH; case 2..; echo 13; case 1,3..; echo 25; case 3..; echo 1; end)) \\\\) -o (string split0 -- <{sf3..} | fish_indent | count) -gt 1 \\\\); echo show-preview; else; echo hide-preview; end"' \
-        '--preview="test \\"$FZF_SELECT_COUNT\\" -gt 0; and string split0 -- <{+sf3..} | fish_indent (string match -q -- 3.\\\\* $version; or echo -- --only-indent) --ansi; and echo -n \\\\n; string collect -- \\\\#\\\\ {1} (string split0 -- <{sf3..}) | fish_indent --ansi"' \
-        '--preview-window="right,50%,wrap-word,follow,info,hidden"'
-    end
+      '--accept-nth=2.. --read0 --print0 --with-shell='(status fish-path)\\ -c)

    set -lx FZF_DEFAULT_OPTS_FILE
+    set -lx FZF_DEFAULT_COMMAND

-    set -lx -- FZF_DEFAULT_COMMAND 'builtin history -z'
-
-    # Enable syntax highlighting colors on fish v4.3.3 and newer
-    if string match -qr -- '^\\d\\d+|^4\\.[4-9]|^4\\.3\\.[3-9]' $version
-      set -a -- FZF_DEFAULT_OPTS '--ansi'
-      set -a -- FZF_DEFAULT_COMMAND '--color=always --show-time=(set_color $fish_color_comment)"%F %a %T%t%s%t"(set_color $fish_color_normal)'
+    if type -q perl
+      set -a FZF_DEFAULT_OPTS '--tac'
+      set FZF_DEFAULT_COMMAND 'builtin history -z --reverse | command perl -0 -pe \'s/^/$.\t/g; s/\n/\n\t/gm\''
    else
-      set -a -- FZF_DEFAULT_COMMAND '--show-time="%F %a %T%t%s%t"'
+      set FZF_DEFAULT_COMMAND \
+        'set -l h (builtin history -z --reverse | string split0);' \
+        'for i in (seq (count $h) -1 1);' \
+        'string join0 -- $i\t(string replace -a -- \n \n\t $h[$i] | string collect);' \
+        'end'
    end

    # Merge history from other sessions before searching
@@ -162,11 +182,11 @@ function fzf_key_bindings

    if set -l result (eval $FZF_DEFAULT_COMMAND \| (__fzfcmd) --query=$fzf_query | string split0)
      if test "$total_lines" -eq 1
-        commandline -- $result
+        commandline -- (string replace -a -- \n\t \n $result)
      else
        set -l a (math $current_line - 1)
        set -l b (math $current_line + 1)
-        commandline -- $command_line[1..$a] $result
+        commandline -- $command_line[1..$a] (string replace -a -- \n\t \n $result)
        commandline -a -- '' $command_line[$b..-1]
      end
    end
@@ -214,6 +234,3 @@ function fzf_key_bindings
  end

 end
-
-# Run setup
-fzf_key_bindings
@@ -4,6 +4,7 @@
 #  / __/ / /_/ __/
 # /_/   /___/_/ key-bindings.zsh
 #
+# - $FZF_TMUX_OPTS
 # - $FZF_CTRL_T_COMMAND
 # - $FZF_CTRL_T_OPTS
 # - $FZF_CTRL_R_COMMAND
@@ -44,9 +45,9 @@ if [[ -o interactive ]]; then
 # the changes. See code comments in "common.sh" for the implementation details.

 __fzf_defaults() {
-  builtin printf '%s\n' "--height ${FZF_TMUX_HEIGHT:-40%} --min-height 20+ --bind=ctrl-z:ignore $1"
+  printf '%s\n' "--height ${FZF_TMUX_HEIGHT:-40%} --min-height 20+ --bind=ctrl-z:ignore $1"
  command cat "${FZF_DEFAULT_OPTS_FILE-}" 2> /dev/null
-  builtin printf '%s\n' "${FZF_DEFAULT_OPTS-} $2"
+  printf '%s\n' "${FZF_DEFAULT_OPTS-} $2"
 }

 __fzf_exec_awk() {
@@ -127,52 +128,25 @@ fi

 # CTRL-R - Paste the selected command from history into the command line
 fzf-history-widget() {
-  local selected extracted_with_perl=0
-  setopt localoptions noglobsubst noposixbuiltins pipefail no_aliases no_glob no_sh_glob no_ksharrays extendedglob 2> /dev/null
+  local selected
+  setopt localoptions noglobsubst noposixbuiltins pipefail no_aliases noglob nobash_rematch 2> /dev/null
  # Ensure the module is loaded if not already, and the required features, such
  # as the associative 'history' array, which maps event numbers to full history
  # lines, are set. Also, make sure Perl is installed for multi-line output.
  if zmodload -F zsh/parameter p:{commands,history} 2>/dev/null && (( ${+commands[perl]} )); then
    selected="$(printf '%s\t%s\000' "${(kv)history[@]}" |
      perl -0 -ne 'if (!$seen{(/^\s*[0-9]+\**\t(.*)/s, $1)}++) { s/\n/\n\t/g; print; }' |
-      FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort,alt-r:toggle-raw --wrap-sign '\t↳ ' --highlight-line --multi ${FZF_CTRL_R_OPTS-} --query=${(qqq)LBUFFER} --read0") \
+      FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort,alt-r:toggle-raw --wrap-sign '\t↳ ' --highlight-line ${FZF_CTRL_R_OPTS-} --query=${(qqq)LBUFFER} +m --read0") \
      FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd))"
-      extracted_with_perl=1
  else
    selected="$(fc -rl 1 | __fzf_exec_awk '{ cmd=$0; sub(/^[ \t]*[0-9]+\**[ \t]+/, "", cmd); if (!seen[cmd]++) print $0 }' |
-      FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort,alt-r:toggle-raw --wrap-sign '\t↳ ' --highlight-line --multi ${FZF_CTRL_R_OPTS-} --query=${(qqq)LBUFFER}") \
+      FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort,alt-r:toggle-raw --wrap-sign '\t↳ ' --highlight-line ${FZF_CTRL_R_OPTS-} --query=${(qqq)LBUFFER} +m") \
      FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd))"
  fi
  local ret=$?
-  local -a cmds
-  # Avoid leaking auto assigned values when using backreferences '(#b)'
-  local -a mbegin mend match
  if [ -n "$selected" ]; then
-    # Heuristic to check if the selected value is from history or a custom query
-    if ((( extracted_with_perl )) && [[ $selected == <->$'\t'* ]]) ||
-    ((( ! extracted_with_perl )) && [[ $selected == [[:blank:]]#<->(  |\* )* ]]); then
-      # Split at newlines
-      for line in ${(ps:\n:)selected}; do
-        if (( extracted_with_perl )); then
-          if [[ $line == (#b)(<->)(#B)$'\t'* ]]; then
-            (( ${+history[${match[1]}]} )) && cmds+=("${history[${match[1]}]}")
-          fi
-        elif [[ $line == [[:blank:]]#(#b)(<->)(#B)(  |\* )* ]]; then
-          # Avoid $history array: lags behind 'fc' on foreign commands (*)
-          # https://zsh.org/mla/users/2024/msg00692.html
-          # Push BUFFER onto stack; fetch and save history entry from BUFFER; restore
-          zle .push-line
-          zle vi-fetch-history -n ${match[1]}
-          (( ${#BUFFER} )) && cmds+=("${BUFFER}")
-          BUFFER=""
-          zle .get-line
-        fi
-      done
-      if (( ${#cmds[@]} )); then
-        # Join by newline after stripping trailing newlines from each command
-        BUFFER="${(pj:\n:)${(@)cmds%%$'\n'#}}"
-        CURSOR=${#BUFFER}
-      fi
+    if [[ $(__fzf_exec_awk '{print $1; exit}' <<< "$selected") =~ ^[1-9][0-9]* ]]; then
+      zle vi-fetch-history -n $MATCH
    else # selected is a custom query, not from history
      LBUFFER="$selected"
    fi
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2013-2026 Junegunn Choi
+Copyright (c) 2013-2025 Junegunn Choi

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -30,167 +30,159 @@ func _() {
 	_ = x[actChangeBorderLabel-19]
 	_ = x[actChangeGhost-20]
 	_ = x[actChangeHeader-21]
-	_ = x[actChangeHeaderLines-22]
-	_ = x[actChangeFooter-23]
-	_ = x[actChangeHeaderLabel-24]
-	_ = x[actChangeFooterLabel-25]
-	_ = x[actChangeInputLabel-26]
-	_ = x[actChangeListLabel-27]
-	_ = x[actChangeMulti-28]
-	_ = x[actChangeNth-29]
-	_ = x[actChangeWithNth-30]
-	_ = x[actChangePointer-31]
-	_ = x[actChangePreview-32]
-	_ = x[actChangePreviewLabel-33]
-	_ = x[actChangePreviewWindow-34]
-	_ = x[actChangePrompt-35]
-	_ = x[actChangeQuery-36]
-	_ = x[actClearScreen-37]
-	_ = x[actClearQuery-38]
-	_ = x[actClearSelection-39]
-	_ = x[actClose-40]
-	_ = x[actDeleteChar-41]
-	_ = x[actDeleteCharEof-42]
-	_ = x[actEndOfLine-43]
-	_ = x[actFatal-44]
-	_ = x[actForwardChar-45]
-	_ = x[actForwardWord-46]
-	_ = x[actForwardSubWord-47]
-	_ = x[actKillLine-48]
-	_ = x[actKillWord-49]
-	_ = x[actKillSubWord-50]
-	_ = x[actUnixLineDiscard-51]
-	_ = x[actUnixWordRubout-52]
-	_ = x[actYank-53]
-	_ = x[actBackwardKillWord-54]
-	_ = x[actBackwardKillSubWord-55]
-	_ = x[actSelectAll-56]
-	_ = x[actDeselectAll-57]
-	_ = x[actToggle-58]
-	_ = x[actToggleSearch-59]
-	_ = x[actToggleAll-60]
-	_ = x[actToggleDown-61]
-	_ = x[actToggleUp-62]
-	_ = x[actToggleIn-63]
-	_ = x[actToggleOut-64]
-	_ = x[actToggleTrack-65]
-	_ = x[actToggleTrackCurrent-66]
-	_ = x[actToggleHeader-67]
-	_ = x[actToggleWrap-68]
-	_ = x[actToggleWrapWord-69]
-	_ = x[actToggleMultiLine-70]
-	_ = x[actToggleHscroll-71]
-	_ = x[actToggleRaw-72]
-	_ = x[actEnableRaw-73]
-	_ = x[actDisableRaw-74]
-	_ = x[actTrackCurrent-75]
-	_ = x[actToggleInput-76]
-	_ = x[actHideInput-77]
-	_ = x[actShowInput-78]
-	_ = x[actUntrackCurrent-79]
-	_ = x[actDown-80]
-	_ = x[actDownMatch-81]
-	_ = x[actUp-82]
-	_ = x[actUpMatch-83]
-	_ = x[actPageUp-84]
-	_ = x[actPageDown-85]
-	_ = x[actPosition-86]
-	_ = x[actHalfPageUp-87]
-	_ = x[actHalfPageDown-88]
-	_ = x[actOffsetUp-89]
-	_ = x[actOffsetDown-90]
-	_ = x[actOffsetMiddle-91]
-	_ = x[actJump-92]
-	_ = x[actJumpAccept-93]
-	_ = x[actPrintQuery-94]
-	_ = x[actRefreshPreview-95]
-	_ = x[actReplaceQuery-96]
-	_ = x[actToggleSort-97]
-	_ = x[actShowPreview-98]
-	_ = x[actHidePreview-99]
-	_ = x[actTogglePreview-100]
-	_ = x[actTogglePreviewWrap-101]
-	_ = x[actTogglePreviewWrapWord-102]
-	_ = x[actTransform-103]
-	_ = x[actTransformBorderLabel-104]
-	_ = x[actTransformGhost-105]
-	_ = x[actTransformHeader-106]
-	_ = x[actTransformHeaderLines-107]
-	_ = x[actTransformFooter-108]
-	_ = x[actTransformHeaderLabel-109]
-	_ = x[actTransformFooterLabel-110]
-	_ = x[actTransformInputLabel-111]
-	_ = x[actTransformListLabel-112]
-	_ = x[actTransformNth-113]
-	_ = x[actTransformWithNth-114]
-	_ = x[actTransformPointer-115]
-	_ = x[actTransformPreviewLabel-116]
-	_ = x[actTransformPrompt-117]
-	_ = x[actTransformQuery-118]
-	_ = x[actTransformSearch-119]
-	_ = x[actTrigger-120]
-	_ = x[actBgTransform-121]
-	_ = x[actBgTransformBorderLabel-122]
-	_ = x[actBgTransformGhost-123]
-	_ = x[actBgTransformHeader-124]
-	_ = x[actBgTransformHeaderLines-125]
-	_ = x[actBgTransformFooter-126]
-	_ = x[actBgTransformHeaderLabel-127]
-	_ = x[actBgTransformFooterLabel-128]
-	_ = x[actBgTransformInputLabel-129]
-	_ = x[actBgTransformListLabel-130]
-	_ = x[actBgTransformNth-131]
-	_ = x[actBgTransformWithNth-132]
-	_ = x[actBgTransformPointer-133]
-	_ = x[actBgTransformPreviewLabel-134]
-	_ = x[actBgTransformPrompt-135]
-	_ = x[actBgTransformQuery-136]
-	_ = x[actBgTransformSearch-137]
-	_ = x[actBgCancel-138]
-	_ = x[actSearch-139]
-	_ = x[actPreview-140]
-	_ = x[actPreviewTop-141]
-	_ = x[actPreviewBottom-142]
-	_ = x[actPreviewUp-143]
-	_ = x[actPreviewDown-144]
-	_ = x[actPreviewPageUp-145]
-	_ = x[actPreviewPageDown-146]
-	_ = x[actPreviewHalfPageUp-147]
-	_ = x[actPreviewHalfPageDown-148]
-	_ = x[actPrevHistory-149]
-	_ = x[actPrevSelected-150]
-	_ = x[actPrint-151]
-	_ = x[actPut-152]
-	_ = x[actNextHistory-153]
-	_ = x[actNextSelected-154]
-	_ = x[actExecute-155]
-	_ = x[actExecuteSilent-156]
-	_ = x[actExecuteMulti-157]
-	_ = x[actSigStop-158]
-	_ = x[actBest-159]
-	_ = x[actFirst-160]
-	_ = x[actLast-161]
-	_ = x[actReload-162]
-	_ = x[actReloadSync-163]
-	_ = x[actDisableSearch-164]
-	_ = x[actEnableSearch-165]
-	_ = x[actSelect-166]
-	_ = x[actDeselect-167]
-	_ = x[actUnbind-168]
-	_ = x[actRebind-169]
-	_ = x[actToggleBind-170]
-	_ = x[actBecome-171]
-	_ = x[actShowHeader-172]
-	_ = x[actHideHeader-173]
-	_ = x[actBell-174]
-	_ = x[actExclude-175]
-	_ = x[actExcludeMulti-176]
-	_ = x[actAsync-177]
+	_ = x[actChangeFooter-22]
+	_ = x[actChangeHeaderLabel-23]
+	_ = x[actChangeFooterLabel-24]
+	_ = x[actChangeInputLabel-25]
+	_ = x[actChangeListLabel-26]
+	_ = x[actChangeMulti-27]
+	_ = x[actChangeNth-28]
+	_ = x[actChangePointer-29]
+	_ = x[actChangePreview-30]
+	_ = x[actChangePreviewLabel-31]
+	_ = x[actChangePreviewWindow-32]
+	_ = x[actChangePrompt-33]
+	_ = x[actChangeQuery-34]
+	_ = x[actClearScreen-35]
+	_ = x[actClearQuery-36]
+	_ = x[actClearSelection-37]
+	_ = x[actClose-38]
+	_ = x[actDeleteChar-39]
+	_ = x[actDeleteCharEof-40]
+	_ = x[actEndOfLine-41]
+	_ = x[actFatal-42]
+	_ = x[actForwardChar-43]
+	_ = x[actForwardWord-44]
+	_ = x[actForwardSubWord-45]
+	_ = x[actKillLine-46]
+	_ = x[actKillWord-47]
+	_ = x[actKillSubWord-48]
+	_ = x[actUnixLineDiscard-49]
+	_ = x[actUnixWordRubout-50]
+	_ = x[actYank-51]
+	_ = x[actBackwardKillWord-52]
+	_ = x[actBackwardKillSubWord-53]
+	_ = x[actSelectAll-54]
+	_ = x[actDeselectAll-55]
+	_ = x[actToggle-56]
+	_ = x[actToggleSearch-57]
+	_ = x[actToggleAll-58]
+	_ = x[actToggleDown-59]
+	_ = x[actToggleUp-60]
+	_ = x[actToggleIn-61]
+	_ = x[actToggleOut-62]
+	_ = x[actToggleTrack-63]
+	_ = x[actToggleTrackCurrent-64]
+	_ = x[actToggleHeader-65]
+	_ = x[actToggleWrap-66]
+	_ = x[actToggleMultiLine-67]
+	_ = x[actToggleHscroll-68]
+	_ = x[actToggleRaw-69]
+	_ = x[actEnableRaw-70]
+	_ = x[actDisableRaw-71]
+	_ = x[actTrackCurrent-72]
+	_ = x[actToggleInput-73]
+	_ = x[actHideInput-74]
+	_ = x[actShowInput-75]
+	_ = x[actUntrackCurrent-76]
+	_ = x[actDown-77]
+	_ = x[actDownMatch-78]
+	_ = x[actUp-79]
+	_ = x[actUpMatch-80]
+	_ = x[actPageUp-81]
+	_ = x[actPageDown-82]
+	_ = x[actPosition-83]
+	_ = x[actHalfPageUp-84]
+	_ = x[actHalfPageDown-85]
+	_ = x[actOffsetUp-86]
+	_ = x[actOffsetDown-87]
+	_ = x[actOffsetMiddle-88]
+	_ = x[actJump-89]
+	_ = x[actJumpAccept-90]
+	_ = x[actPrintQuery-91]
+	_ = x[actRefreshPreview-92]
+	_ = x[actReplaceQuery-93]
+	_ = x[actToggleSort-94]
+	_ = x[actShowPreview-95]
+	_ = x[actHidePreview-96]
+	_ = x[actTogglePreview-97]
+	_ = x[actTogglePreviewWrap-98]
+	_ = x[actTransform-99]
+	_ = x[actTransformBorderLabel-100]
+	_ = x[actTransformGhost-101]
+	_ = x[actTransformHeader-102]
+	_ = x[actTransformFooter-103]
+	_ = x[actTransformHeaderLabel-104]
+	_ = x[actTransformFooterLabel-105]
+	_ = x[actTransformInputLabel-106]
+	_ = x[actTransformListLabel-107]
+	_ = x[actTransformNth-108]
+	_ = x[actTransformPointer-109]
+	_ = x[actTransformPreviewLabel-110]
+	_ = x[actTransformPrompt-111]
+	_ = x[actTransformQuery-112]
+	_ = x[actTransformSearch-113]
+	_ = x[actTrigger-114]
+	_ = x[actBgTransform-115]
+	_ = x[actBgTransformBorderLabel-116]
+	_ = x[actBgTransformGhost-117]
+	_ = x[actBgTransformHeader-118]
+	_ = x[actBgTransformFooter-119]
+	_ = x[actBgTransformHeaderLabel-120]
+	_ = x[actBgTransformFooterLabel-121]
+	_ = x[actBgTransformInputLabel-122]
+	_ = x[actBgTransformListLabel-123]
+	_ = x[actBgTransformNth-124]
+	_ = x[actBgTransformPointer-125]
+	_ = x[actBgTransformPreviewLabel-126]
+	_ = x[actBgTransformPrompt-127]
+	_ = x[actBgTransformQuery-128]
+	_ = x[actBgTransformSearch-129]
+	_ = x[actBgCancel-130]
+	_ = x[actSearch-131]
+	_ = x[actPreview-132]
+	_ = x[actPreviewTop-133]
+	_ = x[actPreviewBottom-134]
+	_ = x[actPreviewUp-135]
+	_ = x[actPreviewDown-136]
+	_ = x[actPreviewPageUp-137]
+	_ = x[actPreviewPageDown-138]
+	_ = x[actPreviewHalfPageUp-139]
+	_ = x[actPreviewHalfPageDown-140]
+	_ = x[actPrevHistory-141]
+	_ = x[actPrevSelected-142]
+	_ = x[actPrint-143]
+	_ = x[actPut-144]
+	_ = x[actNextHistory-145]
+	_ = x[actNextSelected-146]
+	_ = x[actExecute-147]
+	_ = x[actExecuteSilent-148]
+	_ = x[actExecuteMulti-149]
+	_ = x[actSigStop-150]
+	_ = x[actBest-151]
+	_ = x[actFirst-152]
+	_ = x[actLast-153]
+	_ = x[actReload-154]
+	_ = x[actReloadSync-155]
+	_ = x[actDisableSearch-156]
+	_ = x[actEnableSearch-157]
+	_ = x[actSelect-158]
+	_ = x[actDeselect-159]
+	_ = x[actUnbind-160]
+	_ = x[actRebind-161]
+	_ = x[actToggleBind-162]
+	_ = x[actBecome-163]
+	_ = x[actShowHeader-164]
+	_ = x[actHideHeader-165]
+	_ = x[actBell-166]
+	_ = x[actExclude-167]
+	_ = x[actExcludeMulti-168]
+	_ = x[actAsync-169]
 }

-const _actionType_name = "actIgnoreactStartactClickactInvalidactBracketedPasteBeginactBracketedPasteEndactCharactMouseactBeginningOfLineactAbortactAcceptactAcceptNonEmptyactAcceptOrPrintQueryactBackwardCharactBackwardDeleteCharactBackwardDeleteCharEofactBackwardWordactBackwardSubWordactCancelactChangeBorderLabelactChangeGhostactChangeHeaderactChangeHeaderLinesactChangeFooteractChangeHeaderLabelactChangeFooterLabelactChangeInputLabelactChangeListLabelactChangeMultiactChangeNthactChangeWithNthactChangePointeractChangePreviewactChangePreviewLabelactChangePreviewWindowactChangePromptactChangeQueryactClearScreenactClearQueryactClearSelectionactCloseactDeleteCharactDeleteCharEofactEndOfLineactFatalactForwardCharactForwardWordactForwardSubWordactKillLineactKillWordactKillSubWordactUnixLineDiscardactUnixWordRuboutactYankactBackwardKillWordactBackwardKillSubWordactSelectAllactDeselectAllactToggleactToggleSearchactToggleAllactToggleDownactToggleUpactToggleInactToggleOutactToggleTrackactToggleTrackCurrentactToggleHeaderactToggleWrapactToggleWrapWordactToggleMultiLineactToggleHscrollactToggleRawactEnableRawactDisableRawactTrackCurrentactToggleInputactHideInputactShowInputactUntrackCurrentactDownactDownMatchactUpactUpMatchactPageUpactPageDownactPositionactHalfPageUpactHalfPageDownactOffsetUpactOffsetDownactOffsetMiddleactJumpactJumpAcceptactPrintQueryactRefreshPreviewactReplaceQueryactToggleSortactShowPreviewactHidePreviewactTogglePreviewactTogglePreviewWrapactTogglePreviewWrapWordactTransformactTransformBorderLabelactTransformGhostactTransformHeaderactTransformHeaderLinesactTransformFooteractTransformHeaderLabelactTransformFooterLabelactTransformInputLabelactTransformListLabelactTransformNthactTransformWithNthactTransformPointeractTransformPreviewLabelactTransformPromptactTransformQueryactTransformSearchactTriggeractBgTransformactBgTransformBorderLabelactBgTransformGhostactBgTransformHeaderactBgTransformHeaderLinesactBgTransformFooteractBgTransformHeaderLabelactBgTransformFooterLabelactBgTransformInputLabelactBgTransformListLabelactBgTransformNthactBgTransformWithNthactBgTransformPointeractBgTransformPreviewLabelactBgTransformPromptactBgTransformQueryactBgTransformSearchactBgCancelactSearchactPreviewactPreviewTopactPreviewBottomactPreviewUpactPreviewDownactPreviewPageUpactPreviewPageDownactPreviewHalfPageUpactPreviewHalfPageDownactPrevHistoryactPrevSelectedactPrintactPutactNextHistoryactNextSelectedactExecuteactExecuteSilentactExecuteMultiactSigStopactBestactFirstactLastactReloadactReloadSyncactDisableSearchactEnableSearchactSelectactDeselectactUnbindactRebindactToggleBindactBecomeactShowHeaderactHideHeaderactBellactExcludeactExcludeMultiactAsync"
+const _actionType_name = "actIgnoreactStartactClickactInvalidactBracketedPasteBeginactBracketedPasteEndactCharactMouseactBeginningOfLineactAbortactAcceptactAcceptNonEmptyactAcceptOrPrintQueryactBackwardCharactBackwardDeleteCharactBackwardDeleteCharEofactBackwardWordactBackwardSubWordactCancelactChangeBorderLabelactChangeGhostactChangeHeaderactChangeFooteractChangeHeaderLabelactChangeFooterLabelactChangeInputLabelactChangeListLabelactChangeMultiactChangeNthactChangePointeractChangePreviewactChangePreviewLabelactChangePreviewWindowactChangePromptactChangeQueryactClearScreenactClearQueryactClearSelectionactCloseactDeleteCharactDeleteCharEofactEndOfLineactFatalactForwardCharactForwardWordactForwardSubWordactKillLineactKillWordactKillSubWordactUnixLineDiscardactUnixWordRuboutactYankactBackwardKillWordactBackwardKillSubWordactSelectAllactDeselectAllactToggleactToggleSearchactToggleAllactToggleDownactToggleUpactToggleInactToggleOutactToggleTrackactToggleTrackCurrentactToggleHeaderactToggleWrapactToggleMultiLineactToggleHscrollactToggleRawactEnableRawactDisableRawactTrackCurrentactToggleInputactHideInputactShowInputactUntrackCurrentactDownactDownMatchactUpactUpMatchactPageUpactPageDownactPositionactHalfPageUpactHalfPageDownactOffsetUpactOffsetDownactOffsetMiddleactJumpactJumpAcceptactPrintQueryactRefreshPreviewactReplaceQueryactToggleSortactShowPreviewactHidePreviewactTogglePreviewactTogglePreviewWrapactTransformactTransformBorderLabelactTransformGhostactTransformHeaderactTransformFooteractTransformHeaderLabelactTransformFooterLabelactTransformInputLabelactTransformListLabelactTransformNthactTransformPointeractTransformPreviewLabelactTransformPromptactTransformQueryactTransformSearchactTriggeractBgTransformactBgTransformBorderLabelactBgTransformGhostactBgTransformHeaderactBgTransformFooteractBgTransformHeaderLabelactBgTransformFooterLabelactBgTransformInputLabelactBgTransformListLabelactBgTransformNthactBgTransformPointeractBgTransformPreviewLabelactBgTransformPromptactBgTransformQueryactBgTransformSearchactBgCancelactSearchactPreviewactPreviewTopactPreviewBottomactPreviewUpactPreviewDownactPreviewPageUpactPreviewPageDownactPreviewHalfPageUpactPreviewHalfPageDownactPrevHistoryactPrevSelectedactPrintactPutactNextHistoryactNextSelectedactExecuteactExecuteSilentactExecuteMultiactSigStopactBestactFirstactLastactReloadactReloadSyncactDisableSearchactEnableSearchactSelectactDeselectactUnbindactRebindactToggleBindactBecomeactShowHeaderactHideHeaderactBellactExcludeactExcludeMultiactAsync"

-var _actionType_index = [...]uint16{0, 9, 17, 25, 35, 57, 77, 84, 92, 110, 118, 127, 144, 165, 180, 201, 225, 240, 258, 267, 287, 301, 316, 336, 351, 371, 391, 410, 428, 442, 454, 470, 486, 502, 523, 545, 560, 574, 588, 601, 618, 626, 639, 655, 667, 675, 689, 703, 720, 731, 742, 756, 774, 791, 798, 817, 839, 851, 865, 874, 889, 901, 914, 925, 936, 948, 962, 983, 998, 1011, 1028, 1046, 1062, 1074, 1086, 1099, 1114, 1128, 1140, 1152, 1169, 1176, 1188, 1193, 1203, 1212, 1223, 1234, 1247, 1262, 1273, 1286, 1301, 1308, 1321, 1334, 1351, 1366, 1379, 1393, 1407, 1423, 1443, 1467, 1479, 1502, 1519, 1537, 1560, 1578, 1601, 1624, 1646, 1667, 1682, 1701, 1720, 1744, 1762, 1779, 1797, 1807, 1821, 1846, 1865, 1885, 1910, 1930, 1955, 1980, 2004, 2027, 2044, 2065, 2086, 2112, 2132, 2151, 2171, 2182, 2191, 2201, 2214, 2230, 2242, 2256, 2272, 2290, 2310, 2332, 2346, 2361, 2369, 2375, 2389, 2404, 2414, 2430, 2445, 2455, 2462, 2470, 2477, 2486, 2499, 2515, 2530, 2539, 2550, 2559, 2568, 2581, 2590, 2603, 2616, 2623, 2633, 2648, 2656}
+var _actionType_index = [...]uint16{0, 9, 17, 25, 35, 57, 77, 84, 92, 110, 118, 127, 144, 165, 180, 201, 225, 240, 258, 267, 287, 301, 316, 331, 351, 371, 390, 408, 422, 434, 450, 466, 487, 509, 524, 538, 552, 565, 582, 590, 603, 619, 631, 639, 653, 667, 684, 695, 706, 720, 738, 755, 762, 781, 803, 815, 829, 838, 853, 865, 878, 889, 900, 912, 926, 947, 962, 975, 993, 1009, 1021, 1033, 1046, 1061, 1075, 1087, 1099, 1116, 1123, 1135, 1140, 1150, 1159, 1170, 1181, 1194, 1209, 1220, 1233, 1248, 1255, 1268, 1281, 1298, 1313, 1326, 1340, 1354, 1370, 1390, 1402, 1425, 1442, 1460, 1478, 1501, 1524, 1546, 1567, 1582, 1601, 1625, 1643, 1660, 1678, 1688, 1702, 1727, 1746, 1766, 1786, 1811, 1836, 1860, 1883, 1900, 1921, 1947, 1967, 1986, 2006, 2017, 2026, 2036, 2049, 2065, 2077, 2091, 2107, 2125, 2145, 2167, 2181, 2196, 2204, 2210, 2224, 2239, 2249, 2265, 2280, 2290, 2297, 2305, 2312, 2321, 2334, 2350, 2365, 2374, 2385, 2394, 2403, 2416, 2425, 2438, 2451, 2458, 2468, 2483, 2491}

 func (i actionType) String() string {
 	if i < 0 || i >= actionType(len(_actionType_index)-1) {
@@ -1,99 +0,0 @@
-# SIMD byte search: `indexByteTwo` / `lastIndexByteTwo`
-
-## What these functions do
-
-`indexByteTwo(s []byte, b1, b2 byte) int` -- returns the index of the
-**first** occurrence of `b1` or `b2` in `s`, or `-1`.
-
-`lastIndexByteTwo(s []byte, b1, b2 byte) int` -- returns the index of the
-**last** occurrence of `b1` or `b2` in `s`, or `-1`.
-
-They are used by the fuzzy matching algorithm (`algo.go`) to skip ahead
-during case-insensitive search. Instead of calling `bytes.IndexByte` twice
-(once for lowercase, once for uppercase), a single SIMD pass finds both at
-once.
-
-## File layout
-
-| File                  | Purpose                                                           |
-| ------                | ---------                                                         |
-| `indexbyte2_arm64.go` | Go declarations (`//go:noescape`) for ARM64                       |
-| `indexbyte2_arm64.s`  | ARM64 NEON assembly (32-byte aligned blocks, syndrome extraction) |
-| `indexbyte2_amd64.go` | Go declarations + AVX2 runtime detection for AMD64                |
-| `indexbyte2_amd64.s`  | AMD64 AVX2/SSE2 assembly with CPUID dispatch                      |
-| `indexbyte2_other.go` | Pure Go fallback for all other architectures                      |
-| `indexbyte2_test.go`  | Unit tests, exhaustive tests, fuzz tests, and benchmarks          |
-
-## How the SIMD implementations work
-
-**ARM64 (NEON):**
- Broadcasts both needle bytes into NEON registers (`VMOV`).
- Processes 32-byte aligned chunks. For each chunk, compares all bytes
-  against both needles (`VCMEQ`), ORs the results (`VORR`), and builds a
-  64-bit syndrome with 2 bits per byte.
- `indexByteTwo` uses `RBIT` + `CLZ` to find the lowest set bit (first match).
- `lastIndexByteTwo` scans backward and uses `CLZ` on the raw syndrome to
-  find the highest set bit (last match).
- Handles alignment and partial first/last blocks with bit masking.
- Adapted from Go's `internal/bytealg/indexbyte_arm64.s`.
-
-**AMD64 (AVX2 with SSE2 fallback):**
- At init time, `cpuHasAVX2()` checks CPUID + XGETBV for AVX2 and OS YMM
-  support. The result is cached in `_useAVX2`.
- **AVX2 path** (inputs >= 32 bytes, when available):
-  - Broadcasts both needles via `VPBROADCASTB`.
-  - Processes 32-byte blocks: `VPCMPEQB` against both needles, `VPOR`, then
-    `VPMOVMSKB` to get a 32-bit mask.
-  - 5 instructions per loop iteration (vs 7 for SSE2) at 2x the throughput.
-  - `VZEROUPPER` before every return to avoid SSE/AVX transition penalties.
- **SSE2 fallback** (inputs < 32 bytes, or CPUs without AVX2):
-  - Broadcasts via `PUNPCKLBW` + `PSHUFL`.
-  - Processes 16-byte blocks: `PCMPEQB`, `POR`, `PMOVMSKB`.
-  - Small inputs (<16 bytes) are handled with page-boundary-safe loads.
- Both paths use `BSFL` (forward) / `BSRL` (reverse) for bit scanning.
- Adapted from Go's `internal/bytealg/indexbyte_amd64.s`.
-
-**Fallback (other platforms):**
- `indexByteTwo` uses two `bytes.IndexByte` calls with scope-limiting
-  (search `b1` first, then limit the `b2` search to `s[:i1]`).
- `lastIndexByteTwo` uses a simple backward for loop.
-
-## Running tests
-
-```bash
-# Unit + exhaustive tests
-go test ./src/algo/ -run 'TestIndexByteTwo|TestLastIndexByteTwo' -v
-
-# Fuzz tests (run for 10 seconds each)
-go test ./src/algo/ -run '^$' -fuzz FuzzIndexByteTwo -fuzztime 10s
-go test ./src/algo/ -run '^$' -fuzz FuzzLastIndexByteTwo -fuzztime 10s
-
-# Cross-architecture: test amd64 on an arm64 Mac (via Rosetta)
-GOARCH=amd64 go test ./src/algo/ -run 'TestIndexByteTwo|TestLastIndexByteTwo' -v
-GOARCH=amd64 go test ./src/algo/ -run '^$' -fuzz FuzzIndexByteTwo -fuzztime 10s
-GOARCH=amd64 go test ./src/algo/ -run '^$' -fuzz FuzzLastIndexByteTwo -fuzztime 10s
-```
-
-## Running micro-benchmarks
-
-```bash
-# All indexByteTwo / lastIndexByteTwo benchmarks
-go test ./src/algo/ -bench 'IndexByteTwo' -benchmem
-
-# Specific size
-go test ./src/algo/ -bench 'IndexByteTwo_1000'
-```
-
-Each benchmark compares the SIMD `asm` implementation against reference
-implementations (`2xIndexByte` using `bytes.IndexByte`, and a simple `loop`).
-
-## Correctness verification
-
-The assembly is verified by three layers of testing:
-
-1. **Table-driven tests** -- known inputs with expected outputs.
-2. **Exhaustive tests** -- all lengths 0–256, every match position, no-match
-   cases, and both-bytes-present cases, compared against a simple loop
-   reference.
-3. **Fuzz tests** -- randomized inputs via `testing.F`, compared against the
-   same loop reference.
@@ -321,15 +321,22 @@ type Algo func(caseSensitive bool, normalize bool, forward bool, input *util.Cha

 func trySkip(input *util.Chars, caseSensitive bool, b byte, from int) int {
 	byteArray := input.Bytes()[from:]
-	// For case-insensitive search of a letter, search for both cases in one pass
-	if !caseSensitive && b >= 'a' && b <= 'z' {
-		idx := IndexByteTwo(byteArray, b, b-32)
-		if idx < 0 {
-			return -1
-		}
-		return from + idx
-	}
 	idx := bytes.IndexByte(byteArray, b)
+	if idx == 0 {
+		// Can't skip any further
+		return from
+	}
+	// We may need to search for the uppercase letter again. We don't have to
+	// consider normalization as we can be sure that this is an ASCII string.
+	if !caseSensitive && b >= 'a' && b <= 'z' {
+		if idx > 0 {
+			byteArray = byteArray[:idx]
+		}
+		uidx := bytes.IndexByte(byteArray, b-32)
+		if uidx >= 0 {
+			idx = uidx
+		}
+	}
 	if idx < 0 {
 		return -1
 	}
@@ -373,17 +380,14 @@ func asciiFuzzyIndex(input *util.Chars, pattern []rune, caseSensitive bool) (int
 	}

 	// Find the last appearance of the last character of the pattern to limit the search scope
+	bu := b
+	if !caseSensitive && b >= 'a' && b <= 'z' {
+		bu = b - 32
+	}
 	scope := input.Bytes()[lastIdx:]
-	if len(scope) > 1 {
-		tail := scope[1:]
-		var end int
-		if !caseSensitive && b >= 'a' && b <= 'z' {
-			end = lastIndexByteTwo(tail, b, b-32)
-		} else {
-			end = bytes.LastIndexByte(tail, b)
-		}
-		if end >= 0 {
-			return firstIdx, lastIdx + 1 + end + 1
+	for offset := len(scope) - 1; offset > 0; offset-- {
+		if scope[offset] == b || scope[offset] == bu {
+			return firstIdx, lastIdx + offset + 1
 		}
 	}
 	return firstIdx, lastIdx + 1
@@ -441,9 +445,7 @@ func FuzzyMatchV2(caseSensitive bool, normalize bool, forward bool, input *util.

 	// Since O(nm) algorithm can be prohibitively expensive for large input,
 	// we fall back to the greedy algorithm.
-	// Also, we should not allow a very long pattern to avoid 16-bit integer
-	// overflow in the score matrix. 1000 is a safe limit.
-	if slab != nil && N*M > cap(slab.I16) || M > 1000 {
+	if slab != nil && N*M > cap(slab.I16) {
 		return FuzzyMatchV1(caseSensitive, normalize, forward, input, pattern, withPos, slab)
 	}

@@ -499,7 +501,7 @@ func FuzzyMatchV2(caseSensitive bool, normalize bool, forward bool, input *util.
 			if pidx < M {
 				F[pidx] = int32(off)
 				pidx++
-				pchar = pattern[min(pidx, M-1)]
+				pchar = pattern[util.Min(pidx, M-1)]
 			}
 			lastIdx = off
 		}
@@ -517,9 +519,9 @@ func FuzzyMatchV2(caseSensitive bool, normalize bool, forward bool, input *util.
 			inGap = false
 		} else {
 			if inGap {
-				H0[off] = max(prevH0+scoreGapExtension, 0)
+				H0[off] = util.Max16(prevH0+scoreGapExtension, 0)
 			} else {
-				H0[off] = max(prevH0+scoreGapStart, 0)
+				H0[off] = util.Max16(prevH0+scoreGapStart, 0)
 			}
 			C0[off] = 0
 			inGap = true
@@ -585,7 +587,7 @@ func FuzzyMatchV2(caseSensitive bool, normalize bool, forward bool, input *util.
 					if b >= bonusBoundary && b > fb {
 						consecutive = 1
 					} else {
-						b = max(b, bonusConsecutive, fb)
+						b = util.Max16(b, util.Max16(bonusConsecutive, fb))
 					}
 				}
 				if s1+b < s2 {
@@ -598,7 +600,7 @@ func FuzzyMatchV2(caseSensitive bool, normalize bool, forward bool, input *util.
 			Csub[off] = consecutive

 			inGap = s1 < s2
-			score := max(s1, s2, 0)
+			score := util.Max16(util.Max16(s1, s2), 0)
 			if pidx == M-1 && (forward && score > maxScore || !forward && score >= maxScore) {
 				maxScore, maxScorePos = score, col
 			}
@@ -682,7 +684,7 @@ func calculateScore(caseSensitive bool, normalize bool, text *util.Chars, patter
 				if bonus >= bonusBoundary && bonus > firstBonus {
 					firstBonus = bonus
 				}
-				bonus = max(bonus, firstBonus, bonusConsecutive)
+				bonus = util.Max16(util.Max16(bonus, firstBonus), bonusConsecutive)
 			}
 			if pidx == 0 {
 				score += int(bonus * bonusFirstCharMultiplier)
@@ -86,7 +86,7 @@ func TestFuzzyMatch(t *testing.T) {
 					scoreGapStart*2+scoreGapExtension*2)
 			assertMatch(t, fn, true, forward, "FooBar Baz", "FooB", 0, 4,
 				scoreMatch*4+int(bonusBoundaryWhite)*bonusFirstCharMultiplier+int(bonusBoundaryWhite)*2+
-					max(bonusCamel123, int(bonusBoundaryWhite)))
+					util.Max(bonusCamel123, int(bonusBoundaryWhite)))

 			// Consecutive bonus updated
 			assertMatch(t, fn, true, forward, "foo-bar", "o-ba", 2, 6,
@@ -1,24 +0,0 @@
-//go:build amd64
-
-package algo
-
-var _useAVX2 bool
-
-func init() {
-	_useAVX2 = cpuHasAVX2()
-}
-
-//go:noescape
-func cpuHasAVX2() bool
-
-// indexByteTwo returns the index of the first occurrence of b1 or b2 in s,
-// or -1 if neither is present. Uses AVX2 when available, SSE2 otherwise.
-//
-//go:noescape
-func IndexByteTwo(s []byte, b1, b2 byte) int
-
-// lastIndexByteTwo returns the index of the last occurrence of b1 or b2 in s,
-// or -1 if neither is present. Uses AVX2 when available, SSE2 otherwise.
-//
-//go:noescape
-func lastIndexByteTwo(s []byte, b1, b2 byte) int
@@ -1,377 +0,0 @@
-#include "textflag.h"
-
-// func cpuHasAVX2() bool
-//
-// Checks CPUID and XGETBV for AVX2 + OS YMM support.
-TEXT ·cpuHasAVX2(SB),NOSPLIT,$0-1
-	MOVQ	BX, R8          // save BX (callee-saved, clobbered by CPUID)
-
-	// Check max CPUID leaf >= 7
-	MOVL	$0, AX
-	CPUID
-	CMPL	AX, $7
-	JL	cpuid_no
-
-	// Check OSXSAVE (CPUID.1:ECX bit 27)
-	MOVL	$1, AX
-	CPUID
-	TESTL	$(1<<27), CX
-	JZ	cpuid_no
-
-	// Check AVX2 (CPUID.7.0:EBX bit 5)
-	MOVL	$7, AX
-	MOVL	$0, CX
-	CPUID
-	TESTL	$(1<<5), BX
-	JZ	cpuid_no
-
-	// Check OS YMM state support via XGETBV
-	MOVL	$0, CX
-	BYTE	$0x0F; BYTE $0x01; BYTE $0xD0  // XGETBV → EDX:EAX
-	ANDL	$6, AX          // bits 1 (XMM) and 2 (YMM)
-	CMPL	AX, $6
-	JNE	cpuid_no
-
-	MOVQ	R8, BX          // restore BX
-	MOVB	$1, ret+0(FP)
-	RET
-
-cpuid_no:
-	MOVQ	R8, BX
-	MOVB	$0, ret+0(FP)
-	RET
-
-// func IndexByteTwo(s []byte, b1, b2 byte) int
-//
-// Returns the index of the first occurrence of b1 or b2 in s, or -1.
-// Uses AVX2 (32 bytes/iter) when available, SSE2 (16 bytes/iter) otherwise.
-TEXT ·IndexByteTwo(SB),NOSPLIT,$0-40
-	MOVQ	s_base+0(FP), SI
-	MOVQ	s_len+8(FP), BX
-	MOVBLZX	b1+24(FP), AX
-	MOVBLZX	b2+25(FP), CX
-	LEAQ	ret+32(FP), R8
-
-	TESTQ	BX, BX
-	JEQ	fwd_failure
-
-	// Try AVX2 for inputs >= 32 bytes
-	CMPQ	BX, $32
-	JLT	fwd_sse2
-	CMPB	·_useAVX2(SB), $1
-	JNE	fwd_sse2
-
-	// ====== AVX2 forward search ======
-	MOVD	AX, X0
-	VPBROADCASTB	X0, Y0       // Y0 = splat(b1)
-	MOVD	CX, X1
-	VPBROADCASTB	X1, Y1       // Y1 = splat(b2)
-
-	MOVQ	SI, DI
-	LEAQ	-32(SI)(BX*1), AX    // AX = last valid 32-byte chunk
-	JMP	fwd_avx2_entry
-
-fwd_avx2_loop:
-	VMOVDQU	(DI), Y2
-	VPCMPEQB	Y0, Y2, Y3
-	VPCMPEQB	Y1, Y2, Y4
-	VPOR	Y3, Y4, Y3
-	VPMOVMSKB	Y3, DX
-	BSFL	DX, DX
-	JNZ	fwd_avx2_success
-	ADDQ	$32, DI
-
-fwd_avx2_entry:
-	CMPQ	DI, AX
-	JB	fwd_avx2_loop
-
-	// Last 32-byte chunk (may overlap with previous)
-	MOVQ	AX, DI
-	VMOVDQU	(AX), Y2
-	VPCMPEQB	Y0, Y2, Y3
-	VPCMPEQB	Y1, Y2, Y4
-	VPOR	Y3, Y4, Y3
-	VPMOVMSKB	Y3, DX
-	BSFL	DX, DX
-	JNZ	fwd_avx2_success
-
-	MOVQ	$-1, (R8)
-	VZEROUPPER
-	RET
-
-fwd_avx2_success:
-	SUBQ	SI, DI
-	ADDQ	DX, DI
-	MOVQ	DI, (R8)
-	VZEROUPPER
-	RET
-
-	// ====== SSE2 forward search (< 32 bytes or no AVX2) ======
-
-fwd_sse2:
-	// Broadcast b1 into X0
-	MOVD	AX, X0
-	PUNPCKLBW	X0, X0
-	PUNPCKLBW	X0, X0
-	PSHUFL	$0, X0, X0
-
-	// Broadcast b2 into X4
-	MOVD	CX, X4
-	PUNPCKLBW	X4, X4
-	PUNPCKLBW	X4, X4
-	PSHUFL	$0, X4, X4
-
-	CMPQ	BX, $16
-	JLT	fwd_small
-
-	MOVQ	SI, DI
-	LEAQ	-16(SI)(BX*1), AX
-	JMP	fwd_sseloopentry
-
-fwd_sseloop:
-	MOVOU	(DI), X1
-	MOVOU	X1, X2
-	PCMPEQB	X0, X1
-	PCMPEQB	X4, X2
-	POR	X2, X1
-	PMOVMSKB	X1, DX
-	BSFL	DX, DX
-	JNZ	fwd_ssesuccess
-	ADDQ	$16, DI
-
-fwd_sseloopentry:
-	CMPQ	DI, AX
-	JB	fwd_sseloop
-
-	// Search the last 16-byte chunk (may overlap)
-	MOVQ	AX, DI
-	MOVOU	(AX), X1
-	MOVOU	X1, X2
-	PCMPEQB	X0, X1
-	PCMPEQB	X4, X2
-	POR	X2, X1
-	PMOVMSKB	X1, DX
-	BSFL	DX, DX
-	JNZ	fwd_ssesuccess
-
-fwd_failure:
-	MOVQ	$-1, (R8)
-	RET
-
-fwd_ssesuccess:
-	SUBQ	SI, DI
-	ADDQ	DX, DI
-	MOVQ	DI, (R8)
-	RET
-
-fwd_small:
-	// Check if loading 16 bytes from SI would cross a page boundary
-	LEAQ	16(SI), AX
-	TESTW	$0xff0, AX
-	JEQ	fwd_endofpage
-
-	MOVOU	(SI), X1
-	MOVOU	X1, X2
-	PCMPEQB	X0, X1
-	PCMPEQB	X4, X2
-	POR	X2, X1
-	PMOVMSKB	X1, DX
-	BSFL	DX, DX
-	JZ	fwd_failure
-	CMPL	DX, BX
-	JAE	fwd_failure
-	MOVQ	DX, (R8)
-	RET
-
-fwd_endofpage:
-	MOVOU	-16(SI)(BX*1), X1
-	MOVOU	X1, X2
-	PCMPEQB	X0, X1
-	PCMPEQB	X4, X2
-	POR	X2, X1
-	PMOVMSKB	X1, DX
-	MOVL	BX, CX
-	SHLL	CX, DX
-	SHRL	$16, DX
-	BSFL	DX, DX
-	JZ	fwd_failure
-	MOVQ	DX, (R8)
-	RET
-
-// func lastIndexByteTwo(s []byte, b1, b2 byte) int
-//
-// Returns the index of the last occurrence of b1 or b2 in s, or -1.
-// Uses AVX2 (32 bytes/iter) when available, SSE2 (16 bytes/iter) otherwise.
-TEXT ·lastIndexByteTwo(SB),NOSPLIT,$0-40
-	MOVQ	s_base+0(FP), SI
-	MOVQ	s_len+8(FP), BX
-	MOVBLZX	b1+24(FP), AX
-	MOVBLZX	b2+25(FP), CX
-	LEAQ	ret+32(FP), R8
-
-	TESTQ	BX, BX
-	JEQ	back_failure
-
-	// Try AVX2 for inputs >= 32 bytes
-	CMPQ	BX, $32
-	JLT	back_sse2
-	CMPB	·_useAVX2(SB), $1
-	JNE	back_sse2
-
-	// ====== AVX2 backward search ======
-	MOVD	AX, X0
-	VPBROADCASTB	X0, Y0
-	MOVD	CX, X1
-	VPBROADCASTB	X1, Y1
-
-	// DI = start of last 32-byte chunk
-	LEAQ	-32(SI)(BX*1), DI
-
-back_avx2_loop:
-	CMPQ	DI, SI
-	JBE	back_avx2_first
-
-	VMOVDQU	(DI), Y2
-	VPCMPEQB	Y0, Y2, Y3
-	VPCMPEQB	Y1, Y2, Y4
-	VPOR	Y3, Y4, Y3
-	VPMOVMSKB	Y3, DX
-	BSRL	DX, DX
-	JNZ	back_avx2_success
-	SUBQ	$32, DI
-	JMP	back_avx2_loop
-
-back_avx2_first:
-	// First 32 bytes (DI <= SI, load from SI)
-	VMOVDQU	(SI), Y2
-	VPCMPEQB	Y0, Y2, Y3
-	VPCMPEQB	Y1, Y2, Y4
-	VPOR	Y3, Y4, Y3
-	VPMOVMSKB	Y3, DX
-	BSRL	DX, DX
-	JNZ	back_avx2_firstsuccess
-
-	MOVQ	$-1, (R8)
-	VZEROUPPER
-	RET
-
-back_avx2_success:
-	SUBQ	SI, DI
-	ADDQ	DX, DI
-	MOVQ	DI, (R8)
-	VZEROUPPER
-	RET
-
-back_avx2_firstsuccess:
-	MOVQ	DX, (R8)
-	VZEROUPPER
-	RET
-
-	// ====== SSE2 backward search (< 32 bytes or no AVX2) ======
-
-back_sse2:
-	// Broadcast b1 into X0
-	MOVD	AX, X0
-	PUNPCKLBW	X0, X0
-	PUNPCKLBW	X0, X0
-	PSHUFL	$0, X0, X0
-
-	// Broadcast b2 into X4
-	MOVD	CX, X4
-	PUNPCKLBW	X4, X4
-	PUNPCKLBW	X4, X4
-	PSHUFL	$0, X4, X4
-
-	CMPQ	BX, $16
-	JLT	back_small
-
-	// DI = start of last 16-byte chunk
-	LEAQ	-16(SI)(BX*1), DI
-
-back_sseloop:
-	CMPQ	DI, SI
-	JBE	back_ssefirst
-
-	MOVOU	(DI), X1
-	MOVOU	X1, X2
-	PCMPEQB	X0, X1
-	PCMPEQB	X4, X2
-	POR	X2, X1
-	PMOVMSKB	X1, DX
-	BSRL	DX, DX
-	JNZ	back_ssesuccess
-	SUBQ	$16, DI
-	JMP	back_sseloop
-
-back_ssefirst:
-	// First 16 bytes (DI <= SI, load from SI)
-	MOVOU	(SI), X1
-	MOVOU	X1, X2
-	PCMPEQB	X0, X1
-	PCMPEQB	X4, X2
-	POR	X2, X1
-	PMOVMSKB	X1, DX
-	BSRL	DX, DX
-	JNZ	back_ssefirstsuccess
-
-back_failure:
-	MOVQ	$-1, (R8)
-	RET
-
-back_ssesuccess:
-	SUBQ	SI, DI
-	ADDQ	DX, DI
-	MOVQ	DI, (R8)
-	RET
-
-back_ssefirstsuccess:
-	// DX = byte offset from base
-	MOVQ	DX, (R8)
-	RET
-
-back_small:
-	// Check page boundary
-	LEAQ	16(SI), AX
-	TESTW	$0xff0, AX
-	JEQ	back_endofpage
-
-	MOVOU	(SI), X1
-	MOVOU	X1, X2
-	PCMPEQB	X0, X1
-	PCMPEQB	X4, X2
-	POR	X2, X1
-	PMOVMSKB	X1, DX
-	// Mask to first BX bytes: keep bits 0..BX-1
-	MOVL	$1, AX
-	MOVL	BX, CX
-	SHLL	CX, AX
-	DECL	AX
-	ANDL	AX, DX
-	BSRL	DX, DX
-	JZ	back_failure
-	MOVQ	DX, (R8)
-	RET
-
-back_endofpage:
-	// Load 16 bytes ending at base+n
-	MOVOU	-16(SI)(BX*1), X1
-	MOVOU	X1, X2
-	PCMPEQB	X0, X1
-	PCMPEQB	X4, X2
-	POR	X2, X1
-	PMOVMSKB	X1, DX
-	// Bits correspond to bytes [base+n-16, base+n).
-	// We want original bytes [0, n), which are bits [16-n, 16).
-	// Mask: keep bits (16-n) through 15.
-	MOVL	$16, CX
-	SUBL	BX, CX
-	SHRL	CX, DX
-	SHLL	CX, DX
-	BSRL	DX, DX
-	JZ	back_failure
-	// DX is the bit position in the loaded chunk.
-	// Original byte index = DX - (16 - n) = DX + n - 16
-	ADDL	BX, DX
-	SUBL	$16, DX
-	MOVQ	DX, (R8)
-	RET
@@ -1,17 +0,0 @@
-//go:build arm64
-
-package algo
-
-// indexByteTwo returns the index of the first occurrence of b1 or b2 in s,
-// or -1 if neither is present. Implemented in assembly using ARM64 NEON
-// to search for both bytes in a single pass.
-//
-//go:noescape
-func IndexByteTwo(s []byte, b1, b2 byte) int
-
-// lastIndexByteTwo returns the index of the last occurrence of b1 or b2 in s,
-// or -1 if neither is present. Implemented in assembly using ARM64 NEON,
-// scanning backward.
-//
-//go:noescape
-func lastIndexByteTwo(s []byte, b1, b2 byte) int
@@ -1,249 +0,0 @@
-#include "textflag.h"
-
-// func IndexByteTwo(s []byte, b1, b2 byte) int
-//
-// Returns the index of the first occurrence of b1 or b2 in s, or -1.
-// Uses ARM64 NEON to search for both bytes in a single pass over the data.
-// Adapted from Go's internal/bytealg/indexbyte_arm64.s (single-byte version).
-TEXT ·IndexByteTwo(SB),NOSPLIT,$0-40
-	MOVD	s_base+0(FP), R0
-	MOVD	s_len+8(FP), R2
-	MOVBU	b1+24(FP), R1
-	MOVBU	b2+25(FP), R7
-	MOVD	$ret+32(FP), R8
-
-	// Core algorithm:
-	// For each 32-byte chunk we calculate a 64-bit syndrome value,
-	// with two bits per byte. We compare against both b1 and b2,
-	// OR the results, then use the same syndrome extraction as
-	// Go's IndexByte.
-
-	CBZ	R2, fail
-	MOVD	R0, R11
-	// Magic constant 0x40100401 allows us to identify which lane matches.
-	// Each byte in the group of 4 gets a distinct bit: 1, 4, 16, 64.
-	MOVD	$0x40100401, R5
-	VMOV	R1, V0.B16    // V0 = splat(b1)
-	VMOV	R7, V7.B16    // V7 = splat(b2)
-	// Work with aligned 32-byte chunks
-	BIC	$0x1f, R0, R3
-	VMOV	R5, V5.S4
-	ANDS	$0x1f, R0, R9
-	AND	$0x1f, R2, R10
-	BEQ	loop
-
-	// Input string is not 32-byte aligned. Process the first
-	// aligned 32-byte block and mask off bytes before our start.
-	VLD1.P	(R3), [V1.B16, V2.B16]
-	SUB	$0x20, R9, R4
-	ADDS	R4, R2, R2
-	// Compare against both needles
-	VCMEQ	V0.B16, V1.B16, V3.B16  // b1 vs first 16 bytes
-	VCMEQ	V7.B16, V1.B16, V8.B16  // b2 vs first 16 bytes
-	VORR	V8.B16, V3.B16, V3.B16  // combine
-	VCMEQ	V0.B16, V2.B16, V4.B16  // b1 vs second 16 bytes
-	VCMEQ	V7.B16, V2.B16, V9.B16  // b2 vs second 16 bytes
-	VORR	V9.B16, V4.B16, V4.B16  // combine
-	// Build syndrome
-	VAND	V5.B16, V3.B16, V3.B16
-	VAND	V5.B16, V4.B16, V4.B16
-	VADDP	V4.B16, V3.B16, V6.B16
-	VADDP	V6.B16, V6.B16, V6.B16
-	VMOV	V6.D[0], R6
-	// Clear the irrelevant lower bits
-	LSL	$1, R9, R4
-	LSR	R4, R6, R6
-	LSL	R4, R6, R6
-	// The first block can also be the last
-	BLS	masklast
-	// Have we found something already?
-	CBNZ	R6, tail
-
-loop:
-	VLD1.P	(R3), [V1.B16, V2.B16]
-	SUBS	$0x20, R2, R2
-	// Compare against both needles, OR results
-	VCMEQ	V0.B16, V1.B16, V3.B16
-	VCMEQ	V7.B16, V1.B16, V8.B16
-	VORR	V8.B16, V3.B16, V3.B16
-	VCMEQ	V0.B16, V2.B16, V4.B16
-	VCMEQ	V7.B16, V2.B16, V9.B16
-	VORR	V9.B16, V4.B16, V4.B16
-	// If we're out of data we finish regardless of the result
-	BLS	end
-	// Fast check: OR both halves and check for any match
-	VORR	V4.B16, V3.B16, V6.B16
-	VADDP	V6.D2, V6.D2, V6.D2
-	VMOV	V6.D[0], R6
-	CBZ	R6, loop
-
-end:
-	// Found something or out of data, build full syndrome
-	VAND	V5.B16, V3.B16, V3.B16
-	VAND	V5.B16, V4.B16, V4.B16
-	VADDP	V4.B16, V3.B16, V6.B16
-	VADDP	V6.B16, V6.B16, V6.B16
-	VMOV	V6.D[0], R6
-	// Only mask for the last block
-	BHS	tail
-
-masklast:
-	// Clear irrelevant upper bits
-	ADD	R9, R10, R4
-	AND	$0x1f, R4, R4
-	SUB	$0x20, R4, R4
-	NEG	R4<<1, R4
-	LSL	R4, R6, R6
-	LSR	R4, R6, R6
-
-tail:
-	CBZ	R6, fail
-	RBIT	R6, R6
-	SUB	$0x20, R3, R3
-	CLZ	R6, R6
-	ADD	R6>>1, R3, R0
-	SUB	R11, R0, R0
-	MOVD	R0, (R8)
-	RET
-
-fail:
-	MOVD	$-1, R0
-	MOVD	R0, (R8)
-	RET
-
-// func lastIndexByteTwo(s []byte, b1, b2 byte) int
-//
-// Returns the index of the last occurrence of b1 or b2 in s, or -1.
-// Scans backward using ARM64 NEON.
-TEXT ·lastIndexByteTwo(SB),NOSPLIT,$0-40
-	MOVD	s_base+0(FP), R0
-	MOVD	s_len+8(FP), R2
-	MOVBU	b1+24(FP), R1
-	MOVBU	b2+25(FP), R7
-	MOVD	$ret+32(FP), R8
-
-	CBZ	R2, lfail
-	MOVD	R0, R11          // save base
-	ADD	R0, R2, R12      // R12 = end = base + len
-	MOVD	$0x40100401, R5
-	VMOV	R1, V0.B16       // V0 = splat(b1)
-	VMOV	R7, V7.B16       // V7 = splat(b2)
-	VMOV	R5, V5.S4
-
-	// Align: find the aligned block containing the last byte
-	SUB	$1, R12, R3
-	BIC	$0x1f, R3, R3    // R3 = start of aligned block containing last byte
-
-	// --- Process tail block ---
-	VLD1	(R3), [V1.B16, V2.B16]
-	VCMEQ	V0.B16, V1.B16, V3.B16
-	VCMEQ	V7.B16, V1.B16, V8.B16
-	VORR	V8.B16, V3.B16, V3.B16
-	VCMEQ	V0.B16, V2.B16, V4.B16
-	VCMEQ	V7.B16, V2.B16, V9.B16
-	VORR	V9.B16, V4.B16, V4.B16
-	VAND	V5.B16, V3.B16, V3.B16
-	VAND	V5.B16, V4.B16, V4.B16
-	VADDP	V4.B16, V3.B16, V6.B16
-	VADDP	V6.B16, V6.B16, V6.B16
-	VMOV	V6.D[0], R6
-
-	// Mask upper bits (bytes past end of slice)
-	// tail_bytes = end - R3 (1..32)
-	SUB	R3, R12, R10     // R10 = tail_bytes
-	MOVD	$64, R4
-	SUB	R10<<1, R4, R4   // R4 = 64 - 2*tail_bytes
-	LSL	R4, R6, R6
-	LSR	R4, R6, R6
-
-	// Is this also the head block?
-	CMP	R11, R3          // R3 - R11
-	BLO	lmaskfirst       // R3 < base: head+tail in same block
-	BEQ	ltailonly         // R3 == base: single aligned block
-
-	// R3 > base: more blocks before this one
-	CBNZ	R6, llast
-	B	lbacksetup
-
-ltailonly:
-	// Single block, already masked upper bits
-	CBNZ	R6, llast
-	B	lfail
-
-lmaskfirst:
-	// Mask lower bits (bytes before start of slice)
-	SUB	R3, R11, R4      // R4 = base - R3
-	LSL	$1, R4, R4
-	LSR	R4, R6, R6
-	LSL	R4, R6, R6
-	CBNZ	R6, llast
-	B	lfail
-
-lbacksetup:
-	SUB	$0x20, R3
-
-lbackloop:
-	VLD1	(R3), [V1.B16, V2.B16]
-	VCMEQ	V0.B16, V1.B16, V3.B16
-	VCMEQ	V7.B16, V1.B16, V8.B16
-	VORR	V8.B16, V3.B16, V3.B16
-	VCMEQ	V0.B16, V2.B16, V4.B16
-	VCMEQ	V7.B16, V2.B16, V9.B16
-	VORR	V9.B16, V4.B16, V4.B16
-	// Quick check: any match in this block?
-	VORR	V4.B16, V3.B16, V6.B16
-	VADDP	V6.D2, V6.D2, V6.D2
-	VMOV	V6.D[0], R6
-
-	// Is this a head block? (R3 < base)
-	CMP	R11, R3
-	BLO	lheadblock
-
-	// Full block (R3 >= base)
-	CBNZ	R6, lbackfound
-	// More blocks?
-	BEQ	lfail            // R3 == base, no more
-	SUB	$0x20, R3
-	B	lbackloop
-
-lbackfound:
-	// Build full syndrome
-	VAND	V5.B16, V3.B16, V3.B16
-	VAND	V5.B16, V4.B16, V4.B16
-	VADDP	V4.B16, V3.B16, V6.B16
-	VADDP	V6.B16, V6.B16, V6.B16
-	VMOV	V6.D[0], R6
-	B	llast
-
-lheadblock:
-	// R3 < base. Build full syndrome if quick check had a match.
-	CBZ	R6, lfail
-	VAND	V5.B16, V3.B16, V3.B16
-	VAND	V5.B16, V4.B16, V4.B16
-	VADDP	V4.B16, V3.B16, V6.B16
-	VADDP	V6.B16, V6.B16, V6.B16
-	VMOV	V6.D[0], R6
-	// Mask lower bits
-	SUB	R3, R11, R4      // R4 = base - R3
-	LSL	$1, R4, R4
-	LSR	R4, R6, R6
-	LSL	R4, R6, R6
-	CBZ	R6, lfail
-
-llast:
-	// Find last match: highest set bit in syndrome
-	// Syndrome has bit 2i set for matching byte i.
-	// CLZ gives leading zeros; byte_offset = (63 - CLZ) / 2.
-	CLZ	R6, R6
-	MOVD	$63, R4
-	SUB	R6, R4, R6       // R6 = 63 - CLZ = bit position
-	LSR	$1, R6            // R6 = byte offset within block
-	ADD	R3, R6, R0        // R0 = absolute address
-	SUB	R11, R0, R0       // R0 = slice index
-	MOVD	R0, (R8)
-	RET
-
-lfail:
-	MOVD	$-1, R0
-	MOVD	R0, (R8)
-	RET
@@ -1,33 +0,0 @@
-//go:build !arm64 && !amd64
-
-package algo
-
-import "bytes"
-
-// indexByteTwo returns the index of the first occurrence of b1 or b2 in s,
-// or -1 if neither is present.
-func IndexByteTwo(s []byte, b1, b2 byte) int {
-	i1 := bytes.IndexByte(s, b1)
-	if i1 == 0 {
-		return 0
-	}
-	scope := s
-	if i1 > 0 {
-		scope = s[:i1]
-	}
-	if i2 := bytes.IndexByte(scope, b2); i2 >= 0 {
-		return i2
-	}
-	return i1
-}
-
-// lastIndexByteTwo returns the index of the last occurrence of b1 or b2 in s,
-// or -1 if neither is present.
-func lastIndexByteTwo(s []byte, b1, b2 byte) int {
-	for i := len(s) - 1; i >= 0; i-- {
-		if s[i] == b1 || s[i] == b2 {
-			return i
-		}
-	}
-	return -1
-}
@@ -1,259 +0,0 @@
-package algo
-
-import (
-	"bytes"
-	"testing"
-)
-
-func TestIndexByteTwo(t *testing.T) {
-	tests := []struct {
-		name string
-		s    string
-		b1   byte
-		b2   byte
-		want int
-	}{
-		{"empty", "", 'a', 'b', -1},
-		{"single_b1", "a", 'a', 'b', 0},
-		{"single_b2", "b", 'a', 'b', 0},
-		{"single_none", "c", 'a', 'b', -1},
-		{"b1_first", "xaxb", 'a', 'b', 1},
-		{"b2_first", "xbxa", 'a', 'b', 1},
-		{"same_byte", "xxa", 'a', 'a', 2},
-		{"at_end", "xxxxa", 'a', 'b', 4},
-		{"not_found", "xxxxxxxx", 'a', 'b', -1},
-		{"long_b1_at_3000", string(make([]byte, 3000)) + "a" + string(make([]byte, 1000)), 'a', 'b', 3000},
-		{"long_b2_at_3000", string(make([]byte, 3000)) + "b" + string(make([]byte, 1000)), 'a', 'b', 3000},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := IndexByteTwo([]byte(tt.s), tt.b1, tt.b2)
-			if got != tt.want {
-				t.Errorf("IndexByteTwo(%q, %c, %c) = %d, want %d", tt.s[:min(len(tt.s), 40)], tt.b1, tt.b2, got, tt.want)
-			}
-		})
-	}
-
-	// Exhaustive test: compare against loop reference for various lengths,
-	// including sizes around SIMD block boundaries (16, 32, 64).
-	for n := 0; n <= 256; n++ {
-		data := make([]byte, n)
-		for i := range data {
-			data[i] = byte('c' + (i % 20))
-		}
-		// Test with match at every position
-		for pos := 0; pos < n; pos++ {
-			for _, b := range []byte{'A', 'B'} {
-				data[pos] = b
-				got := IndexByteTwo(data, 'A', 'B')
-				want := loopIndexByteTwo(data, 'A', 'B')
-				if got != want {
-					t.Fatalf("IndexByteTwo(len=%d, match=%c@%d) = %d, want %d", n, b, pos, got, want)
-				}
-				data[pos] = byte('c' + (pos % 20))
-			}
-		}
-		// Test with no match
-		got := IndexByteTwo(data, 'A', 'B')
-		if got != -1 {
-			t.Fatalf("IndexByteTwo(len=%d, no match) = %d, want -1", n, got)
-		}
-		// Test with both bytes present
-		if n >= 2 {
-			data[n/3] = 'A'
-			data[n*2/3] = 'B'
-			got := IndexByteTwo(data, 'A', 'B')
-			want := loopIndexByteTwo(data, 'A', 'B')
-			if got != want {
-				t.Fatalf("IndexByteTwo(len=%d, both@%d,%d) = %d, want %d", n, n/3, n*2/3, got, want)
-			}
-			data[n/3] = byte('c' + ((n / 3) % 20))
-			data[n*2/3] = byte('c' + ((n * 2 / 3) % 20))
-		}
-	}
-}
-
-func TestLastIndexByteTwo(t *testing.T) {
-	tests := []struct {
-		name string
-		s    string
-		b1   byte
-		b2   byte
-		want int
-	}{
-		{"empty", "", 'a', 'b', -1},
-		{"single_b1", "a", 'a', 'b', 0},
-		{"single_b2", "b", 'a', 'b', 0},
-		{"single_none", "c", 'a', 'b', -1},
-		{"b1_last", "xbxa", 'a', 'b', 3},
-		{"b2_last", "xaxb", 'a', 'b', 3},
-		{"same_byte", "axx", 'a', 'a', 0},
-		{"at_start", "axxxx", 'a', 'b', 0},
-		{"both_present", "axbx", 'a', 'b', 2},
-		{"not_found", "xxxxxxxx", 'a', 'b', -1},
-		{"long_b1_at_3000", string(make([]byte, 3000)) + "a" + string(make([]byte, 1000)), 'a', 'b', 3000},
-		{"long_b2_at_end", string(make([]byte, 4000)) + "b", 'a', 'b', 4000},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := lastIndexByteTwo([]byte(tt.s), tt.b1, tt.b2)
-			if got != tt.want {
-				t.Errorf("lastIndexByteTwo(%q, %c, %c) = %d, want %d", tt.s[:min(len(tt.s), 40)], tt.b1, tt.b2, got, tt.want)
-			}
-		})
-	}
-
-	// Exhaustive test against loop reference
-	for n := 0; n <= 256; n++ {
-		data := make([]byte, n)
-		for i := range data {
-			data[i] = byte('c' + (i % 20))
-		}
-		for pos := 0; pos < n; pos++ {
-			for _, b := range []byte{'A', 'B'} {
-				data[pos] = b
-				got := lastIndexByteTwo(data, 'A', 'B')
-				want := refLastIndexByteTwo(data, 'A', 'B')
-				if got != want {
-					t.Fatalf("lastIndexByteTwo(len=%d, match=%c@%d) = %d, want %d", n, b, pos, got, want)
-				}
-				data[pos] = byte('c' + (pos % 20))
-			}
-		}
-		// No match
-		got := lastIndexByteTwo(data, 'A', 'B')
-		if got != -1 {
-			t.Fatalf("lastIndexByteTwo(len=%d, no match) = %d, want -1", n, got)
-		}
-		// Both bytes present
-		if n >= 2 {
-			data[n/3] = 'A'
-			data[n*2/3] = 'B'
-			got := lastIndexByteTwo(data, 'A', 'B')
-			want := refLastIndexByteTwo(data, 'A', 'B')
-			if got != want {
-				t.Fatalf("lastIndexByteTwo(len=%d, both@%d,%d) = %d, want %d", n, n/3, n*2/3, got, want)
-			}
-			data[n/3] = byte('c' + ((n / 3) % 20))
-			data[n*2/3] = byte('c' + ((n * 2 / 3) % 20))
-		}
-	}
-}
-
-func FuzzIndexByteTwo(f *testing.F) {
-	f.Add([]byte("hello world"), byte('o'), byte('l'))
-	f.Add([]byte(""), byte('a'), byte('b'))
-	f.Add([]byte("aaa"), byte('a'), byte('a'))
-	f.Fuzz(func(t *testing.T, data []byte, b1, b2 byte) {
-		got := IndexByteTwo(data, b1, b2)
-		want := loopIndexByteTwo(data, b1, b2)
-		if got != want {
-			t.Errorf("IndexByteTwo(len=%d, b1=%d, b2=%d) = %d, want %d", len(data), b1, b2, got, want)
-		}
-	})
-}
-
-func FuzzLastIndexByteTwo(f *testing.F) {
-	f.Add([]byte("hello world"), byte('o'), byte('l'))
-	f.Add([]byte(""), byte('a'), byte('b'))
-	f.Add([]byte("aaa"), byte('a'), byte('a'))
-	f.Fuzz(func(t *testing.T, data []byte, b1, b2 byte) {
-		got := lastIndexByteTwo(data, b1, b2)
-		want := refLastIndexByteTwo(data, b1, b2)
-		if got != want {
-			t.Errorf("lastIndexByteTwo(len=%d, b1=%d, b2=%d) = %d, want %d", len(data), b1, b2, got, want)
-		}
-	})
-}
-
-// Reference implementations for correctness checking
-func refIndexByteTwo(s []byte, b1, b2 byte) int {
-	i1 := bytes.IndexByte(s, b1)
-	if i1 == 0 {
-		return 0
-	}
-	scope := s
-	if i1 > 0 {
-		scope = s[:i1]
-	}
-	if i2 := bytes.IndexByte(scope, b2); i2 >= 0 {
-		return i2
-	}
-	return i1
-}
-
-func loopIndexByteTwo(s []byte, b1, b2 byte) int {
-	for i, b := range s {
-		if b == b1 || b == b2 {
-			return i
-		}
-	}
-	return -1
-}
-
-func refLastIndexByteTwo(s []byte, b1, b2 byte) int {
-	for i := len(s) - 1; i >= 0; i-- {
-		if s[i] == b1 || s[i] == b2 {
-			return i
-		}
-	}
-	return -1
-}
-
-func benchIndexByteTwo(b *testing.B, size int, pos int) {
-	data := make([]byte, size)
-	for i := range data {
-		data[i] = byte('a' + (i % 20))
-	}
-	data[pos] = 'Z'
-
-	type impl struct {
-		name string
-		fn   func([]byte, byte, byte) int
-	}
-	impls := []impl{
-		{"asm", IndexByteTwo},
-		{"2xIndexByte", refIndexByteTwo},
-		{"loop", loopIndexByteTwo},
-	}
-	for _, im := range impls {
-		b.Run(im.name, func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
-				im.fn(data, 'Z', 'z')
-			}
-		})
-	}
-}
-
-func benchLastIndexByteTwo(b *testing.B, size int, pos int) {
-	data := make([]byte, size)
-	for i := range data {
-		data[i] = byte('a' + (i % 20))
-	}
-	data[pos] = 'Z'
-
-	type impl struct {
-		name string
-		fn   func([]byte, byte, byte) int
-	}
-	impls := []impl{
-		{"asm", lastIndexByteTwo},
-		{"loop", refLastIndexByteTwo},
-	}
-	for _, im := range impls {
-		b.Run(im.name, func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
-				im.fn(data, 'Z', 'z')
-			}
-		})
-	}
-}
-
-func BenchmarkIndexByteTwo_10(b *testing.B)       { benchIndexByteTwo(b, 10, 8) }
-func BenchmarkIndexByteTwo_100(b *testing.B)      { benchIndexByteTwo(b, 100, 80) }
-func BenchmarkIndexByteTwo_1000(b *testing.B)     { benchIndexByteTwo(b, 1000, 800) }
-func BenchmarkLastIndexByteTwo_10(b *testing.B)   { benchLastIndexByteTwo(b, 10, 2) }
-func BenchmarkLastIndexByteTwo_100(b *testing.B)  { benchLastIndexByteTwo(b, 100, 20) }
-func BenchmarkLastIndexByteTwo_1000(b *testing.B) { benchLastIndexByteTwo(b, 1000, 200) }
@@ -6,7 +6,6 @@ import (
 	"strings"
 	"unicode/utf8"

-	"github.com/junegunn/fzf/src/algo"
 	"github.com/junegunn/fzf/src/tui"
 )

@@ -23,21 +22,20 @@ type url struct {
 type ansiState struct {
 	fg   tui.Color
 	bg   tui.Color
-	ul   tui.Color
 	attr tui.Attr
 	lbg  tui.Color
 	url  *url
 }

 func (s *ansiState) colored() bool {
-	return s.fg != -1 || s.bg != -1 || s.ul != -1 || s.attr > 0 || s.lbg >= 0 || s.url != nil
+	return s.fg != -1 || s.bg != -1 || s.attr > 0 || s.lbg >= 0 || s.url != nil
 }

 func (s *ansiState) equals(t *ansiState) bool {
 	if t == nil {
 		return !s.colored()
 	}
-	return s.fg == t.fg && s.bg == t.bg && s.ul == t.ul && s.attr == t.attr && s.lbg == t.lbg && s.url == t.url
+	return s.fg == t.fg && s.bg == t.bg && s.attr == t.attr && s.lbg == t.lbg && s.url == t.url
 }

 func (s *ansiState) ToString() string {
@@ -56,18 +54,7 @@ func (s *ansiState) ToString() string {
 		ret += "3;"
 	}
 	if s.attr&tui.Underline > 0 {
-		switch s.attr.UnderlineStyle() {
-		case tui.UlStyleDouble:
-			ret += "4:2;"
-		case tui.UlStyleCurly:
-			ret += "4:3;"
-		case tui.UlStyleDotted:
-			ret += "4:4;"
-		case tui.UlStyleDashed:
-			ret += "4:5;"
-		default:
-			ret += "4;"
-		}
+		ret += "4;"
 	}
 	if s.attr&tui.Blink > 0 {
 		ret += "5;"
@@ -79,9 +66,6 @@ func (s *ansiState) ToString() string {
 		ret += "9;"
 	}
 	ret += toAnsiString(s.fg, 30) + toAnsiString(s.bg, 40)
-	if s.ul != -1 {
-		ret += toAnsiStringUl(s.ul)
-	}

 	ret = "\x1b[" + strings.TrimSuffix(ret, ";") + "m"
 	if s.url != nil {
@@ -90,20 +74,6 @@ func (s *ansiState) ToString() string {
 	return ret
 }

-func toAnsiStringUl(color tui.Color) string {
-	col := int(color)
-	if col < 0 {
-		return ""
-	}
-	if col >= (1 << 24) {
-		r := strconv.Itoa((col >> 16) & 0xff)
-		g := strconv.Itoa((col >> 8) & 0xff)
-		b := strconv.Itoa(col & 0xff)
-		return "58;2;" + r + ";" + g + ";" + b + ";"
-	}
-	return "58;5;" + strconv.Itoa(col) + ";"
-}
-
 func toAnsiString(color tui.Color, offset int) string {
 	col := int(color)
 	ret := ""
@@ -124,31 +94,31 @@ func toAnsiString(color tui.Color, offset int) string {
 	return ret + ";"
 }

+func isPrint(c uint8) bool {
+	return '\x20' <= c && c <= '\x7e'
+}
+
 func matchOperatingSystemCommand(s string, start int) int {
 	// `\x1b][0-9][;:][[:print:]]+(?:\x1b\\\\|\x07)`
 	//                 ^ match starting here after the first printable character
 	//
 	i := start // prefix matched in nextAnsiEscapeSequence()
-
-	// Find the terminator: BEL (\x07) or ESC (\x1b) for ST (\x1b\\)
-	idx := algo.IndexByteTwo(stringBytes(s[i:]), '\x07', '\x1b')
-	if idx < 0 {
-		return -1
+	for ; i < len(s) && isPrint(s[i]); i++ {
 	}
-	i += idx
-
-	if s[i] == '\x07' {
-		return i + 1
-	}
-	// `\x1b]8;PARAMS;URI\x1b\\TITLE\x1b]8;;\x1b`
-	//                   ------
-	if i < len(s)-1 && s[i+1] == '\\' {
-		return i + 2
+	if i < len(s) {
+		if s[i] == '\x07' {
+			return i + 1
+		}
+		// `\x1b]8;PARAMS;URI\x1b\\TITLE\x1b]8;;\x1b`
+		//                   ------
+		if s[i] == '\x1b' && i < len(s)-1 && s[i+1] == '\\' {
+			return i + 2
+		}
 	}

 	// `\x1b]8;PARAMS;URI\x1b\\TITLE\x1b]8;;\x1b`
 	//                              ------------
-	if s[:i+1] == "\x1b]8;;\x1b" {
+	if i < len(s) && s[:i+1] == "\x1b]8;;\x1b" {
 		return i + 1
 	}

@@ -234,7 +204,7 @@ Loop:

 				// \x1b][0-9]+[;:][[:print:]]+(?:\x1b\\\\|\x07)
 				//            ---------------
-				if j > 2 && i+j+1 < len(s) && (s[i+j] == ';' || s[i+j] == ':') && s[i+j+1] >= '\x20' {
+				if j > 2 && i+j+1 < len(s) && (s[i+j] == ';' || s[i+j] == ':') && isPrint(s[i+j+1]) {
 					if k := matchOperatingSystemCommand(s[i:], j+2); k != -1 {
 						return i, i + k
 					}
@@ -368,19 +338,15 @@ func extractColor(str string, state *ansiState, proc func(string, *ansiState) bo
 	return trimmed, nil, state
 }

-func parseAnsiCode(s string) (int, byte, string) {
+func parseAnsiCode(s string) (int, string) {
 	var remaining string
-	var sep byte
-	// Find the first separator (either ; or :)
-	i := -1
-	for j := 0; j < len(s); j++ {
-		if s[j] == ';' || s[j] == ':' {
-			i = j
-			break
-		}
+	var i int
+	// Faster than strings.IndexAny(";:")
+	i = strings.IndexByte(s, ';')
+	if i < 0 {
+		i = strings.IndexByte(s, ':')
 	}
 	if i >= 0 {
-		sep = s[i]
 		remaining = s[i+1:]
 		s = s[:i]
 	}
@@ -392,14 +358,14 @@ func parseAnsiCode(s string) (int, byte, string) {
 		for _, ch := range stringBytes(s) {
 			ch -= '0'
 			if ch > 9 {
-				return -1, sep, remaining
+				return -1, remaining
 			}
 			code = code*10 + int(ch)
 		}
-		return code, sep, remaining
+		return code, remaining
 	}

-	return -1, sep, remaining
+	return -1, remaining
 }

 func interpretCode(ansiCode string, prevState *ansiState) ansiState {
@@ -407,14 +373,14 @@ func interpretCode(ansiCode string, prevState *ansiState) ansiState {
 		if prevState != nil {
 			return *prevState
 		}
-		return ansiState{-1, -1, -1, 0, -1, nil}
+		return ansiState{-1, -1, 0, -1, nil}
 	}

 	var state ansiState
 	if prevState == nil {
-		state = ansiState{-1, -1, -1, 0, -1, nil}
+		state = ansiState{-1, -1, 0, -1, nil}
 	} else {
-		state = ansiState{prevState.fg, prevState.bg, prevState.ul, prevState.attr, prevState.lbg, prevState.url}
+		state = ansiState{prevState.fg, prevState.bg, prevState.attr, prevState.lbg, prevState.url}
 	}
 	if ansiCode[0] != '\x1b' || ansiCode[1] != '[' || ansiCode[len(ansiCode)-1] != 'm' {
 		if prevState != nil && (strings.HasSuffix(ansiCode, "0K") || strings.HasSuffix(ansiCode, "[K")) {
@@ -439,7 +405,6 @@ func interpretCode(ansiCode string, prevState *ansiState) ansiState {
 	reset := func() {
 		state.fg = -1
 		state.bg = -1
-		state.ul = -1
 		state.attr = 0
 	}

@@ -455,8 +420,7 @@ func interpretCode(ansiCode string, prevState *ansiState) ansiState {
 	count := 0
 	for len(ansiCode) != 0 {
 		var num int
-		var sep byte
-		if num, sep, ansiCode = parseAnsiCode(ansiCode); num != -1 {
+		if num, ansiCode = parseAnsiCode(ansiCode); num != -1 {
 			count++
 			switch state256 {
 			case 0:
@@ -467,15 +431,10 @@ func interpretCode(ansiCode string, prevState *ansiState) ansiState {
 				case 48:
 					ptr = &state.bg
 					state256++
-				case 58:
-					ptr = &state.ul
-					state256++
 				case 39:
 					state.fg = -1
 				case 49:
 					state.bg = -1
-				case 59:
-					state.ul = -1
 				case 1:
 					state.attr = state.attr | tui.Bold
 				case 2:
@@ -483,30 +442,7 @@ func interpretCode(ansiCode string, prevState *ansiState) ansiState {
 				case 3:
 					state.attr = state.attr | tui.Italic
 				case 4:
-					if sep == ':' {
-						// SGR 4:N - underline style sub-parameter
-						var subNum int
-						subNum, _, ansiCode = parseAnsiCode(ansiCode)
-						state.attr = state.attr &^ tui.UnderlineStyleMask
-						switch subNum {
-						case 0:
-							state.attr = state.attr &^ tui.Underline
-						case 1:
-							state.attr = state.attr | tui.Underline
-						case 2:
-							state.attr = state.attr | tui.Underline | tui.UlStyleDouble
-						case 3:
-							state.attr = state.attr | tui.Underline | tui.UlStyleCurly
-						case 4:
-							state.attr = state.attr | tui.Underline | tui.UlStyleDotted
-						case 5:
-							state.attr = state.attr | tui.Underline | tui.UlStyleDashed
-						default:
-							state.attr = state.attr | tui.Underline
-						}
-					} else {
-						state.attr = state.attr | tui.Underline
-					}
+					state.attr = state.attr | tui.Underline
 				case 5:
 					state.attr = state.attr | tui.Blink
 				case 7:
@@ -520,7 +456,6 @@ func interpretCode(ansiCode string, prevState *ansiState) ansiState {
 					state.attr = state.attr &^ tui.Italic
 				case 24: // tput rmul
 					state.attr = state.attr &^ tui.Underline
-					state.attr = state.attr &^ tui.UnderlineStyleMask
 				case 25:
 					state.attr = state.attr &^ tui.Blink
 				case 27:
@@ -369,10 +369,10 @@ func TestAnsiCodeStringConversion(t *testing.T) {
 		}
 	}
 	assert("\x1b[m", nil, "")
-	assert("\x1b[m", &ansiState{attr: tui.Blink, ul: -1, lbg: -1}, "")
-	assert("\x1b[0m", &ansiState{fg: 4, bg: 4, ul: -1, lbg: -1}, "")
-	assert("\x1b[;m", &ansiState{fg: 4, bg: 4, ul: -1, lbg: -1}, "")
-	assert("\x1b[;;m", &ansiState{fg: 4, bg: 4, ul: -1, lbg: -1}, "")
+	assert("\x1b[m", &ansiState{attr: tui.Blink, lbg: -1}, "")
+	assert("\x1b[0m", &ansiState{fg: 4, bg: 4, lbg: -1}, "")
+	assert("\x1b[;m", &ansiState{fg: 4, bg: 4, lbg: -1}, "")
+	assert("\x1b[;;m", &ansiState{fg: 4, bg: 4, lbg: -1}, "")

 	assert("\x1b[31m", nil, "\x1b[31;49m")
 	assert("\x1b[41m", nil, "\x1b[39;41m")
@@ -380,142 +380,36 @@ func TestAnsiCodeStringConversion(t *testing.T) {
 	assert("\x1b[92m", nil, "\x1b[92;49m")
 	assert("\x1b[102m", nil, "\x1b[39;102m")

-	assert("\x1b[31m", &ansiState{fg: 4, bg: 4, ul: -1, lbg: -1}, "\x1b[31;44m")
-	assert("\x1b[1;2;31m", &ansiState{fg: 2, bg: -1, ul: -1, attr: tui.Reverse, lbg: -1}, "\x1b[1;2;7;31;49m")
+	assert("\x1b[31m", &ansiState{fg: 4, bg: 4, lbg: -1}, "\x1b[31;44m")
+	assert("\x1b[1;2;31m", &ansiState{fg: 2, bg: -1, attr: tui.Reverse, lbg: -1}, "\x1b[1;2;7;31;49m")
 	assert("\x1b[38;5;100;48;5;200m", nil, "\x1b[38;5;100;48;5;200m")
 	assert("\x1b[38:5:100:48:5:200m", nil, "\x1b[38;5;100;48;5;200m")
 	assert("\x1b[48;5;100;38;5;200m", nil, "\x1b[38;5;200;48;5;100m")
 	assert("\x1b[48;5;100;38;2;10;20;30;1m", nil, "\x1b[1;38;2;10;20;30;48;5;100m")
 	assert("\x1b[48;5;100;38;2;10;20;30;7m",
-		&ansiState{attr: tui.Dim | tui.Italic, fg: 1, bg: 1, ul: -1},
+		&ansiState{attr: tui.Dim | tui.Italic, fg: 1, bg: 1},
 		"\x1b[2;3;7;38;2;10;20;30;48;5;100m")
-
-	// Underline styles
-	assert("\x1b[4:3m", nil, "\x1b[4:3;39;49m")
-	assert("\x1b[4:2m", nil, "\x1b[4:2;39;49m")
-	assert("\x1b[4:4m", nil, "\x1b[4:4;39;49m")
-	assert("\x1b[4:5m", nil, "\x1b[4:5;39;49m")
-	assert("\x1b[4:1m", nil, "\x1b[4;39;49m")
-
-	// Underline color (256-color)
-	assert("\x1b[4;58;5;100m", nil, "\x1b[4;39;49;58;5;100m")
-	// Underline color (24-bit)
-	assert("\x1b[4;58;2;255;0;128m", nil, "\x1b[4;39;49;58;2;255;0;128m")
-	// Curly underline + underline color
-	assert("\x1b[4:3;58;2;255;0;0m", nil, "\x1b[4:3;39;49;58;2;255;0;0m")
-	// SGR 59 resets underline color
-	assert("\x1b[59m", &ansiState{fg: 1, bg: -1, ul: 100, lbg: -1}, "\x1b[31;49m")
 }

 func TestParseAnsiCode(t *testing.T) {
 	tests := []struct {
-		In  string
-		Exp string
-		N   int
-		Sep byte
+		In, Exp string
+		N       int
 	}{
-		{"123", "", 123, 0},
-		{"1a", "", -1, 0},
-		{"1a;12", "12", -1, ';'},
-		{"12;a", "a", 12, ';'},
-		{"-2", "", -1, 0},
-		// Colon sub-parameters: earliest separator wins (@shtse8)
-		{"4:3", "3", 4, ':'},
-		{"4:3;31", "3;31", 4, ':'},
-		{"38:2:255:0:0", "2:255:0:0", 38, ':'},
-		{"58:5:200", "5:200", 58, ':'},
-		// Semicolon before colon
-		{"4;38:2:0:0:0", "38:2:0:0:0", 4, ';'},
+		{"123", "", 123},
+		{"1a", "", -1},
+		{"1a;12", "12", -1},
+		{"12;a", "a", 12},
+		{"-2", "", -1},
 	}
 	for _, x := range tests {
-		n, sep, s := parseAnsiCode(x.In)
-		if n != x.N || s != x.Exp || sep != x.Sep {
-			t.Fatalf("%q: got: (%d %q %q) want: (%d %q %q)", x.In, n, s, string(sep), x.N, x.Exp, string(x.Sep))
+		n, s := parseAnsiCode(x.In)
+		if n != x.N || s != x.Exp {
+			t.Fatalf("%q: got: (%d %q) want: (%d %q)", x.In, n, s, x.N, x.Exp)
 		}
 	}
 }

-// Test cases adapted from @shtse8 (PR #4678)
-func TestInterpretCodeUnderlineStyles(t *testing.T) {
-	// 4:0 = no underline
-	state := interpretCode("\x1b[4:0m", nil)
-	if state.attr&tui.Underline != 0 {
-		t.Error("4:0 should not set underline")
-	}
-
-	// 4:1 = single underline
-	state = interpretCode("\x1b[4:1m", nil)
-	if state.attr&tui.Underline == 0 {
-		t.Error("4:1 should set underline")
-	}
-
-	// 4:3 = curly underline
-	state = interpretCode("\x1b[4:3m", nil)
-	if state.attr&tui.Underline == 0 {
-		t.Error("4:3 should set underline")
-	}
-	if state.attr.UnderlineStyle() != tui.UlStyleCurly {
-		t.Error("4:3 should set curly underline style")
-	}
-
-	// 4:3 should NOT set italic (3 is a sub-param, not SGR 3)
-	if state.attr&tui.Italic != 0 {
-		t.Error("4:3 should not set italic")
-	}
-
-	// 4:2;31 = double underline + red fg
-	state = interpretCode("\x1b[4:2;31m", nil)
-	if state.attr&tui.Underline == 0 {
-		t.Error("4:2;31 should set underline")
-	}
-	if state.fg != 1 {
-		t.Errorf("4:2;31 should set fg to red (1), got %d", state.fg)
-	}
-	if state.attr&tui.Dim != 0 {
-		t.Error("4:2;31 should not set dim")
-	}
-
-	// Plain 4 still works
-	state = interpretCode("\x1b[4m", nil)
-	if state.attr&tui.Underline == 0 {
-		t.Error("4 should set underline")
-	}
-
-	// 4;2 (semicolon) = underline + dim
-	state = interpretCode("\x1b[4;2m", nil)
-	if state.attr&tui.Underline == 0 {
-		t.Error("4;2 should set underline")
-	}
-	if state.attr&tui.Dim == 0 {
-		t.Error("4;2 should set dim")
-	}
-}
-
-// Test cases adapted from @shtse8 (PR #4678)
-func TestInterpretCodeUnderlineColor(t *testing.T) {
-	// 58:2:R:G:B should not affect fg or bg
-	state := interpretCode("\x1b[58:2:255:0:0m", nil)
-	if state.fg != -1 || state.bg != -1 {
-		t.Errorf("58:2:R:G:B should not affect fg/bg, got fg=%d bg=%d", state.fg, state.bg)
-	}
-
-	// 58:5:200 should not affect fg or bg
-	state = interpretCode("\x1b[58:5:200m", nil)
-	if state.fg != -1 || state.bg != -1 {
-		t.Errorf("58:5:N should not affect fg/bg, got fg=%d bg=%d", state.fg, state.bg)
-	}
-
-	// 58:2:R:G:B combined with 38:2:R:G:B should only set fg
-	state = interpretCode("\x1b[58:2:255:0:0;38:2:0:255:0m", nil)
-	expectedFg := tui.Color(1<<24 | 0<<16 | 255<<8 | 0)
-	if state.fg != expectedFg {
-		t.Errorf("expected fg=%d, got %d", expectedFg, state.fg)
-	}
-	if state.bg != -1 {
-		t.Errorf("bg should be -1, got %d", state.bg)
-	}
-}
-
 // kernel/bpf/preload/iterators/README
 const ansiBenchmarkString = "\x1b[38;5;81m\x1b[01;31m\x1b[Kkernel/\x1b[0m\x1b[38:5:81mbpf/" +
 	"\x1b[0m\x1b[38:5:81mpreload/\x1b[0m\x1b[38;5;81miterators/" +
@@ -2,13 +2,10 @@ package fzf

 import "sync"

-// ChunkBitmap is a bitmap with one bit per item in a chunk.
-type ChunkBitmap [chunkBitWords]uint64
+// queryCache associates strings to lists of items
+type queryCache map[string][]Result

-// queryCache associates query strings to bitmaps of matching items
-type queryCache map[string]ChunkBitmap
-
-// ChunkCache associates Chunk and query string to bitmaps
+// ChunkCache associates Chunk and query string to lists of items
 type ChunkCache struct {
 	mutex sync.Mutex
 	cache map[*Chunk]*queryCache
@@ -33,9 +30,9 @@ func (cc *ChunkCache) retire(chunk ...*Chunk) {
 	cc.mutex.Unlock()
 }

-// Add stores the bitmap for the given chunk and key
-func (cc *ChunkCache) Add(chunk *Chunk, key string, bitmap ChunkBitmap, matchCount int) {
-	if len(key) == 0 || !chunk.IsFull() || matchCount > queryCacheMax {
+// Add adds the list to the cache
+func (cc *ChunkCache) Add(chunk *Chunk, key string, list []Result) {
+	if len(key) == 0 || !chunk.IsFull() || len(list) > queryCacheMax {
 		return
 	}

@@ -47,11 +44,11 @@ func (cc *ChunkCache) Add(chunk *Chunk, key string, bitmap ChunkBitmap, matchCou
 		cc.cache[chunk] = &queryCache{}
 		qc = cc.cache[chunk]
 	}
-	(*qc)[key] = bitmap
+	(*qc)[key] = list
 }

-// Lookup returns the bitmap for the exact key
-func (cc *ChunkCache) Lookup(chunk *Chunk, key string) *ChunkBitmap {
+// Lookup is called to lookup ChunkCache
+func (cc *ChunkCache) Lookup(chunk *Chunk, key string) []Result {
 	if len(key) == 0 || !chunk.IsFull() {
 		return nil
 	}
@@ -61,15 +58,15 @@ func (cc *ChunkCache) Lookup(chunk *Chunk, key string) *ChunkBitmap {

 	qc, ok := cc.cache[chunk]
 	if ok {
-		if bm, ok := (*qc)[key]; ok {
-			return &bm
+		list, ok := (*qc)[key]
+		if ok {
+			return list
 		}
 	}
 	return nil
 }

-// Search finds the bitmap for the longest prefix or suffix of the key
-func (cc *ChunkCache) Search(chunk *Chunk, key string) *ChunkBitmap {
+func (cc *ChunkCache) Search(chunk *Chunk, key string) []Result {
 	if len(key) == 0 || !chunk.IsFull() {
 		return nil
 	}
@@ -89,8 +86,8 @@ func (cc *ChunkCache) Search(chunk *Chunk, key string) *ChunkBitmap {
 		prefix := key[:len(key)-idx]
 		suffix := key[idx:]
 		for _, substr := range [2]string{prefix, suffix} {
-			if bm, found := (*qc)[substr]; found {
-				return &bm
+			if cached, found := (*qc)[substr]; found {
+				return cached
 			}
 		}
 	}
@@ -6,34 +6,34 @@ func TestChunkCache(t *testing.T) {
 	cache := NewChunkCache()
 	chunk1p := &Chunk{}
 	chunk2p := &Chunk{count: chunkSize}
-	bm1 := ChunkBitmap{1}
-	bm2 := ChunkBitmap{1, 2}
-	cache.Add(chunk1p, "foo", bm1, 1)
-	cache.Add(chunk2p, "foo", bm1, 1)
-	cache.Add(chunk2p, "bar", bm2, 2)
+	items1 := []Result{{}}
+	items2 := []Result{{}, {}}
+	cache.Add(chunk1p, "foo", items1)
+	cache.Add(chunk2p, "foo", items1)
+	cache.Add(chunk2p, "bar", items2)

 	{ // chunk1 is not full
 		cached := cache.Lookup(chunk1p, "foo")
 		if cached != nil {
-			t.Error("Cached disabled for non-full chunks", cached)
+			t.Error("Cached disabled for non-empty chunks", cached)
 		}
 	}
 	{
 		cached := cache.Lookup(chunk2p, "foo")
-		if cached == nil || cached[0] != 1 {
-			t.Error("Expected bitmap cached", cached)
+		if cached == nil || len(cached) != 1 {
+			t.Error("Expected 1 item cached", cached)
 		}
 	}
 	{
 		cached := cache.Lookup(chunk2p, "bar")
-		if cached == nil || cached[1] != 2 {
-			t.Error("Expected bitmap cached", cached)
+		if cached == nil || len(cached) != 2 {
+			t.Error("Expected 2 items cached", cached)
 		}
 	}
 	{
 		cached := cache.Lookup(chunk1p, "foobar")
 		if cached != nil {
-			t.Error("Expected nil cached", cached)
+			t.Error("Expected 0 item cached", cached)
 		}
 	}
 }
@@ -52,20 +52,6 @@ func (cl *ChunkList) lastChunk() *Chunk {
 	return cl.chunks[len(cl.chunks)-1]
 }

-// GetItems returns the first n items from the given chunks
-func GetItems(chunks []*Chunk, n int) []Item {
-	items := make([]Item, 0, n)
-	for _, chunk := range chunks {
-		for i := 0; i < chunk.count && len(items) < n; i++ {
-			items = append(items, chunk.items[i])
-		}
-		if len(items) >= n {
-			break
-		}
-	}
-	return items
-}
-
 // CountItems returns the total number of Items
 func CountItems(cs []*Chunk) int {
 	if len(cs) == 0 {
@@ -99,21 +85,6 @@ func (cl *ChunkList) Clear() {
 	cl.mutex.Unlock()
 }

-// ForEachItem iterates all items and applies fn to each one.
-// The done callback runs under the lock to safely update shared state.
-func (cl *ChunkList) ForEachItem(fn func(*Item), done func()) {
-	cl.mutex.Lock()
-	for _, chunk := range cl.chunks {
-		for i := 0; i < chunk.count; i++ {
-			fn(&chunk.items[i])
-		}
-	}
-	if done != nil {
-		done()
-	}
-	cl.mutex.Unlock()
-}
-
 // Snapshot returns immutable snapshot of the ChunkList
 func (cl *ChunkList) Snapshot(tail int) ([]*Chunk, int, bool) {
 	cl.mutex.Lock()
@@ -34,18 +34,19 @@ const (
 	maxBgProcessesPerAction = 3

 	// Matcher
-	progressMinDuration = 200 * time.Millisecond
+	numPartitionsMultiplier = 8
+	maxPartitions           = 32
+	progressMinDuration     = 200 * time.Millisecond

 	// Capacity of each chunk
-	chunkSize     int = 1024
-	chunkBitWords     = (chunkSize + 63) / 64
+	chunkSize int = 100

 	// Pre-allocated memory slices to minimize GC
 	slab16Size int = 100 * 1024 // 200KB * 32 = 12.8MB
 	slab32Size int = 2048       // 8KB * 32 = 256KB

 	// Do not cache results of low selectivity queries
-	queryCacheMax int = chunkSize / 2
+	queryCacheMax int = chunkSize / 5

 	// Not to cache mergers with large lists
 	mergerCacheMax int = 100000
@@ -64,6 +65,7 @@ const (
 	EvtSearchNew
 	EvtSearchProgress
 	EvtSearchFin
+	EvtHeader
 	EvtReady
 	EvtQuit
 )
@@ -2,7 +2,6 @@
 package fzf

 import (
-	"fmt"
 	"maps"
 	"os"
 	"sync"
@@ -18,6 +17,7 @@ Reader   -> EvtReadNew        -> Matcher  (restart)
 Terminal -> EvtSearchNew:bool -> Matcher  (restart)
 Matcher  -> EvtSearchProgress -> Terminal (update info)
 Matcher  -> EvtSearchFin      -> Terminal (update list)
+Matcher  -> EvtHeader         -> Terminal (update header)
 */

 type revision struct {
@@ -38,27 +38,12 @@ func (r revision) compatible(other revision) bool {
 	return r.major == other.major
 }

-func buildItemTransformer(opts *Options) func(*Item) string {
-	if opts.AcceptNth != nil {
-		fn := opts.AcceptNth(opts.Delimiter)
-		return func(item *Item) string {
-			return item.acceptNth(opts.Ansi, opts.Delimiter, fn)
-		}
-	}
-	return func(item *Item) string {
-		return item.AsString(opts.Ansi)
-	}
-}
-
 // Run starts fzf
 func Run(opts *Options) (int, error) {
 	if opts.Filter == nil {
 		if opts.useTmux() {
 			return runTmux(os.Args, opts)
 		}
-		if opts.useZellij() {
-			return runZellij(os.Args, opts)
-		}

 		if needWinpty(opts) {
 			return runWinpty(os.Args, opts)
@@ -116,57 +101,57 @@ func Run(opts *Options) (int, error) {
 	cache := NewChunkCache()
 	var chunkList *ChunkList
 	var itemIndex int32
-	// transformItem applies with-nth transformation to an item's raw data.
-	// It handles ANSI token propagation using prevLineAnsiState for cross-line continuity.
-	transformItem := func(item *Item, data []byte, transformer func([]Token, int32) string, index int32) {
-		tokens := Tokenize(byteString(data), opts.Delimiter)
-		if opts.Ansi && len(tokens) > 1 {
-			var ansiState *ansiState
-			if prevLineAnsiState != nil {
-				ansiStateDup := *prevLineAnsiState
-				ansiState = &ansiStateDup
-			}
-			for _, token := range tokens {
-				prevAnsiState := ansiState
-				_, _, ansiState = extractColor(token.text.ToString(), ansiState, nil)
-				if prevAnsiState != nil {
-					token.text.Prepend("\x1b[m" + prevAnsiState.ToString())
-				} else {
-					token.text.Prepend("\x1b[m")
-				}
-			}
-		}
-		transformed := transformer(tokens, index)
-		item.text, item.colors = ansiProcessor(stringBytes(transformed))
-
-		// We should not trim trailing whitespaces with background colors
-		var maxColorOffset int32
-		if item.colors != nil {
-			for _, ansi := range *item.colors {
-				if ansi.color.bg >= 0 {
-					maxColorOffset = max(maxColorOffset, ansi.offset[1])
-				}
-			}
-		}
-		item.text.TrimTrailingWhitespaces(int(maxColorOffset))
-	}
-
-	var nthTransformer func([]Token, int32) string
+	header := make([]string, 0, opts.HeaderLines)
 	if opts.WithNth == nil {
 		chunkList = NewChunkList(cache, func(item *Item, data []byte) bool {
+			if len(header) < opts.HeaderLines {
+				header = append(header, byteString(data))
+				eventBox.Set(EvtHeader, header)
+				return false
+			}
 			item.text, item.colors = ansiProcessor(data)
 			item.text.Index = itemIndex
 			itemIndex++
 			return true
 		})
 	} else {
-		nthTransformer = opts.WithNth(opts.Delimiter)
+		nthTransformer := opts.WithNth(opts.Delimiter)
 		chunkList = NewChunkList(cache, func(item *Item, data []byte) bool {
-			if nthTransformer == nil {
-				item.text, item.colors = ansiProcessor(data)
-			} else {
-				transformItem(item, data, nthTransformer, itemIndex)
+			tokens := Tokenize(byteString(data), opts.Delimiter)
+			if opts.Ansi && len(tokens) > 1 {
+				var ansiState *ansiState
+				if prevLineAnsiState != nil {
+					ansiStateDup := *prevLineAnsiState
+					ansiState = &ansiStateDup
+				}
+				for _, token := range tokens {
+					prevAnsiState := ansiState
+					_, _, ansiState = extractColor(token.text.ToString(), ansiState, nil)
+					if prevAnsiState != nil {
+						token.text.Prepend("\x1b[m" + prevAnsiState.ToString())
+					} else {
+						token.text.Prepend("\x1b[m")
+					}
+				}
 			}
+			transformed := nthTransformer(tokens, itemIndex)
+			if len(header) < opts.HeaderLines {
+				header = append(header, transformed)
+				eventBox.Set(EvtHeader, header)
+				return false
+			}
+			item.text, item.colors = ansiProcessor(stringBytes(transformed))
+
+			// We should not trim trailing whitespaces with background colors
+			var maxColorOffset int32
+			if item.colors != nil {
+				for _, ansi := range *item.colors {
+					if ansi.color.bg >= 0 {
+						maxColorOffset = util.Max32(maxColorOffset, ansi.offset[1])
+					}
+				}
+			}
+			item.text.TrimTrailingWhitespaces(int(maxColorOffset))
 			item.text.Index = itemIndex
 			item.origText = &data
 			itemIndex++
@@ -196,15 +181,13 @@ func Run(opts *Options) (int, error) {
 	}

 	// Reader
-	streamingFilter := opts.Filter != nil && !sort && !opts.Tac && !opts.Sync && opts.Bench == 0
+	streamingFilter := opts.Filter != nil && !sort && !opts.Tac && !opts.Sync
 	var reader *Reader
-	var ingestionStart time.Time
 	if !streamingFilter {
 		reader = NewReader(func(data []byte) bool {
 			return chunkList.Push(data)
 		}, eventBox, executor, opts.ReadZero, opts.Filter == nil)

-		ingestionStart = time.Now()
 		readyChan := make(chan bool)
 		go reader.ReadSource(opts.Input, opts.WalkerRoot, opts.WalkerOpts, opts.WalkerSkip, initialReload, initialEnv, readyChan)
 		<-readyChan
@@ -241,17 +224,15 @@ func Run(opts *Options) (int, error) {
 		denylist = make(map[int32]struct{})
 		denyMutex.Unlock()
 	}
-	headerLines := int32(opts.HeaderLines)
-	headerUpdated := false
 	patternBuilder := func(runes []rune) *Pattern {
 		denyMutex.Lock()
 		denylistCopy := maps.Clone(denylist)
 		denyMutex.Unlock()
 		return BuildPattern(cache, patternCache,
 			opts.Fuzzy, opts.FuzzyAlgo, opts.Extended, opts.Case, opts.Normalize, forward, withPos,
-			opts.Filter == nil, nth, opts.Delimiter, inputRevision, runes, denylistCopy, headerLines)
+			opts.Filter == nil, nth, opts.Delimiter, inputRevision, runes, denylistCopy)
 	}
-	matcher := NewMatcher(cache, patternBuilder, sort, opts.Tac, eventBox, inputRevision, opts.Threads)
+	matcher := NewMatcher(cache, patternBuilder, sort, opts.Tac, eventBox, inputRevision)

 	// Filtering mode
 	if opts.Filter != nil {
@@ -262,8 +243,6 @@ func Run(opts *Options) (int, error) {
 		pattern := patternBuilder([]rune(*opts.Filter))
 		matcher.sort = pattern.sortable

-		transformer := buildItemTransformer(opts)
-
 		found := false
 		if streamingFilter {
 			slab := util.MakeSlab(slab16Size, slab32Size)
@@ -272,12 +251,9 @@ func Run(opts *Options) (int, error) {
 				func(runes []byte) bool {
 					item := Item{}
 					if chunkList.trans(&item, runes) {
-						if item.Index() < headerLines {
-							return false
-						}
 						mutex.Lock()
-						if result, _, _ := pattern.MatchItem(&item, false, slab); result.item != nil {
-							opts.Printer(transformer(&item))
+						if result, _, _ := pattern.MatchItem(&item, false, slab); result != nil {
+							opts.Printer(item.text.ToString())
 							found = true
 						}
 						mutex.Unlock()
@@ -288,56 +264,14 @@ func Run(opts *Options) (int, error) {
 		} else {
 			eventBox.Unwatch(EvtReadNew)
 			eventBox.WaitFor(EvtReadFin)
-			ingestionTime := time.Since(ingestionStart)

 			// NOTE: Streaming filter is inherently not compatible with --tail
 			snapshot, _, _ := chunkList.Snapshot(opts.Tail)
-
-			if opts.Bench > 0 {
-				// Benchmark mode: repeat scan for the given duration
-				totalItems := CountItems(snapshot)
-				var matchCount int
-				var times []time.Duration
-				deadline := time.Now().Add(opts.Bench)
-				for time.Now().Before(deadline) {
-					cache.Clear()
-					start := time.Now()
-					result := matcher.scan(MatchRequest{
-						chunks:  snapshot,
-						pattern: pattern})
-					times = append(times, time.Since(start))
-					matchCount = result.merger.Length()
-				}
-				// Print stats
-				var total time.Duration
-				minD, maxD := times[0], times[0]
-				for _, d := range times {
-					total += d
-					if d < minD {
-						minD = d
-					}
-					if d > maxD {
-						maxD = d
-					}
-				}
-				avg := total / time.Duration(len(times))
-				selectivity := float64(matchCount) / float64(totalItems) * 100
-				fmt.Printf("  %d iterations  avg: %.2fms  min: %.2fms  max: %.2fms  total: %.2fs  items: %d  matches: %d (%.2f%%)  ingestion: %.2fms\n",
-					len(times),
-					float64(avg.Microseconds())/1000,
-					float64(minD.Microseconds())/1000,
-					float64(maxD.Microseconds())/1000,
-					total.Seconds(),
-					totalItems, matchCount, selectivity,
-					float64(ingestionTime.Microseconds())/1000)
-				return ExitOk, nil
-			}
-
 			result := matcher.scan(MatchRequest{
 				chunks:  snapshot,
 				pattern: pattern})
 			for i := 0; i < result.merger.Length(); i++ {
-				opts.Printer(transformer(result.merger.Get(i).item))
+				opts.Printer(result.merger.Get(i).item.AsString(opts.Ansi))
 				found = true
 			}
 		}
@@ -382,11 +316,10 @@ func Run(opts *Options) (int, error) {
 	query := []rune{}
 	determine := func(final bool) {
 		if heightUnknown {
-			items := max(0, total-int(headerLines))
-			if items >= maxFit || final {
+			if total >= maxFit || final {
 				deferred = false
 				heightUnknown = false
-				terminal.startChan <- fitpad{min(items, maxFit), padHeight}
+				terminal.startChan <- fitpad{util.Min(total, maxFit), padHeight}
 			}
 		} else if deferred {
 			deferred = false
@@ -402,11 +335,11 @@ func Run(opts *Options) (int, error) {
 			clearDenylist()
 		}
 		reading = true
-		headerUpdated = false
 		startTick = ticks
 		chunkList.Clear()
 		itemIndex = 0
 		inputRevision.bumpMajor()
+		header = make([]string, 0, opts.HeaderLines)
 		readyChan := make(chan bool)
 		go reader.restart(command, environ, readyChan)
 		<-readyChan
@@ -464,24 +397,16 @@ func Run(opts *Options) (int, error) {
 						snapshotRevision = inputRevision
 					}
 					total = count
-					terminal.UpdateCount(max(0, total-int(headerLines)), !reading, value.(*string))
-					if headerLines > 0 && !headerUpdated {
-						terminal.UpdateHeader(GetItems(snapshot, int(headerLines)))
-						headerUpdated = int32(total) >= headerLines
-					}
+					terminal.UpdateCount(total, !reading, value.(*string))
 					if heightUnknown && !deferred {
 						determine(!reading)
 					}
-					if !useSnapshot || evt == EvtReadFin {
-						matcher.Reset(snapshot, input(), false, !reading, sort, snapshotRevision)
-					}
+					matcher.Reset(snapshot, input(), false, !reading, sort, snapshotRevision)

 				case EvtSearchNew:
 					var command *commandSpec
 					var environ []string
 					var changed bool
-					headerLinesChanged := false
-					withNthChanged := false
 					switch val := value.(type) {
 					case searchRequest:
 						sort = val.sort
@@ -502,40 +427,6 @@ func Run(opts *Options) (int, error) {
 							nth = *val.nth
 							bump = true
 						}
-						if val.headerLines != nil {
-							headerLines = int32(*val.headerLines)
-							headerUpdated = false
-							headerLinesChanged = true
-							bump = true
-						}
-						if val.withNth != nil {
-							newTransformer := val.withNth.fn
-							// Cancel any in-flight scan and block the terminal from reading
-							// items before mutating them in-place. Snapshot shares middle
-							// chunk pointers, so the matcher and terminal can race with us.
-							matcher.CancelScan()
-							terminal.PauseRendering()
-							// Reset cross-line ANSI state before re-processing all items
-							lineAnsiState = nil
-							prevLineAnsiState = nil
-							chunkList.ForEachItem(func(item *Item) {
-								origBytes := *item.origText
-								savedIndex := item.Index()
-								if newTransformer != nil {
-									transformItem(item, origBytes, newTransformer, savedIndex)
-								} else {
-									item.text, item.colors = ansiProcessor(origBytes)
-								}
-								item.text.Index = savedIndex
-								item.transformed = nil
-							}, func() {
-								nthTransformer = newTransformer
-							})
-							terminal.ResumeRendering()
-							matcher.ResumeScan()
-							withNthChanged = true
-							bump = true
-						}
 						if bump {
 							patternCache = make(map[string]*Pattern)
 							cache.Clear()
@@ -572,16 +463,6 @@ func Run(opts *Options) (int, error) {
 							snapshotRevision = inputRevision
 						}
 					}
-					if headerLinesChanged {
-						terminal.UpdateCount(max(0, total-int(headerLines)), !reading, nil)
-						if headerLines > 0 {
-							terminal.UpdateHeader(GetItems(snapshot, int(headerLines)))
-						} else {
-							terminal.UpdateHeader(nil)
-						}
-					} else if withNthChanged && headerLines > 0 {
-						terminal.UpdateHeader(GetItems(snapshot, int(headerLines)))
-					}
 					matcher.Reset(snapshot, input(), true, !reading, sort, snapshotRevision)
 					delay = false

@@ -591,6 +472,11 @@ func Run(opts *Options) (int, error) {
 						terminal.UpdateProgress(val)
 					}

+				case EvtHeader:
+					headerPadded := make([]string, opts.HeaderLines)
+					copy(headerPadded, value.([]string))
+					terminal.UpdateHeader(headerPadded)
+
 				case EvtSearchFin:
 					switch val := value.(type) {
 					case MatchResult:
@@ -607,7 +493,15 @@ func Run(opts *Options) (int, error) {
 									if len(opts.Expect) > 0 {
 										opts.Printer("")
 									}
-									transformer := buildItemTransformer(opts)
+									transformer := func(item *Item) string {
+										return item.AsString(opts.Ansi)
+									}
+									if opts.AcceptNth != nil {
+										fn := opts.AcceptNth(opts.Delimiter)
+										transformer = func(item *Item) string {
+											return item.acceptNth(opts.Ansi, opts.Delimiter, fn)
+										}
+									}
 									for i := range count {
 										opts.Printer(transformer(merger.Get(i).item))
 									}
@@ -630,7 +524,7 @@ func Run(opts *Options) (int, error) {
 			break
 		}
 		if delay && reading {
-			dur := util.Constrain(
+			dur := util.DurWithin(
 				time.Duration(ticks-startTick)*coordinatorDelayStep,
 				0, coordinatorDelayMax)
 			time.Sleep(dur)
@@ -3,8 +3,8 @@ package fzf
 import (
 	"fmt"
 	"runtime"
+	"sort"
 	"sync"
-	"sync/atomic"
 	"time"

 	"github.com/junegunn/fzf/src/util"
@@ -43,11 +43,8 @@ type Matcher struct {
 	reqBox         *util.EventBox
 	partitions     int
 	slab           []*util.Slab
-	sortBuf        [][]Result
 	mergerCache    map[string]MatchResult
 	revision       revision
-	scanMutex      sync.Mutex
-	cancelScan     *util.AtomicBool
 }

 const (
@@ -57,11 +54,8 @@ const (

 // NewMatcher returns a new Matcher
 func NewMatcher(cache *ChunkCache, patternBuilder func([]rune) *Pattern,
-	sort bool, tac bool, eventBox *util.EventBox, revision revision, threads int) *Matcher {
-	partitions := runtime.NumCPU()
-	if threads > 0 {
-		partitions = threads
-	}
+	sort bool, tac bool, eventBox *util.EventBox, revision revision) *Matcher {
+	partitions := util.Min(numPartitionsMultiplier*runtime.NumCPU(), maxPartitions)
 	return &Matcher{
 		cache:          cache,
 		patternBuilder: patternBuilder,
@@ -71,10 +65,8 @@ func NewMatcher(cache *ChunkCache, patternBuilder func([]rune) *Pattern,
 		reqBox:         util.NewEventBox(),
 		partitions:     partitions,
 		slab:           make([]*util.Slab, partitions),
-		sortBuf:        make([][]Result, partitions),
 		mergerCache:    make(map[string]MatchResult),
-		revision:       revision,
-		cancelScan:     util.NewAtomicBool(false)}
+		revision:       revision}
 }

 // Loop puts Matcher in action
@@ -134,9 +126,7 @@ func (m *Matcher) Loop() {
 		}

 		if result.merger == nil {
-			m.scanMutex.Lock()
 			result = m.scan(request)
-			m.scanMutex.Unlock()
 		}

 		if !result.cancelled {
@@ -149,6 +139,27 @@ func (m *Matcher) Loop() {
 	}
 }

+func (m *Matcher) sliceChunks(chunks []*Chunk) [][]*Chunk {
+	partitions := m.partitions
+	perSlice := len(chunks) / partitions
+
+	if perSlice == 0 {
+		partitions = len(chunks)
+		perSlice = 1
+	}
+
+	slices := make([][]*Chunk, partitions)
+	for i := 0; i < partitions; i++ {
+		start := i * perSlice
+		end := start + perSlice
+		if i == partitions-1 {
+			end = len(chunks)
+		}
+		slices[i] = chunks[start:end]
+	}
+	return slices
+}
+
 type partialResult struct {
 	index   int
 	matches []Result
@@ -163,7 +174,7 @@ func (m *Matcher) scan(request MatchRequest) MatchResult {
 		return MatchResult{m, m, false}
 	}
 	pattern := request.pattern
-	passMerger := PassMerger(&request.chunks, m.tac, request.revision, pattern.startIndex)
+	passMerger := PassMerger(&request.chunks, m.tac, request.revision)
 	if pattern.IsEmpty() {
 		return MatchResult{passMerger, passMerger, false}
 	}
@@ -172,37 +183,43 @@ func (m *Matcher) scan(request MatchRequest) MatchResult {
 	maxIndex := request.chunks[numChunks-1].lastIndex(minIndex)
 	cancelled := util.NewAtomicBool(false)

-	numWorkers := min(m.partitions, numChunks)
-	var nextChunk atomic.Int32
-	resultChan := make(chan partialResult, numWorkers)
+	slices := m.sliceChunks(request.chunks)
+	numSlices := len(slices)
+	resultChan := make(chan partialResult, numSlices)
 	countChan := make(chan int, numChunks)
 	waitGroup := sync.WaitGroup{}

-	for idx := range numWorkers {
+	for idx, chunks := range slices {
 		waitGroup.Add(1)
 		if m.slab[idx] == nil {
 			m.slab[idx] = util.MakeSlab(slab16Size, slab32Size)
 		}
-		go func(idx int, slab *util.Slab) {
-			defer waitGroup.Done()
-			var matches []Result
-			for {
-				ci := int(nextChunk.Add(1)) - 1
-				if ci >= numChunks {
-					break
-				}
-				chunkMatches := request.pattern.Match(request.chunks[ci], slab)
-				matches = append(matches, chunkMatches...)
+		go func(idx int, slab *util.Slab, chunks []*Chunk) {
+			defer func() { waitGroup.Done() }()
+			count := 0
+			allMatches := make([][]Result, len(chunks))
+			for idx, chunk := range chunks {
+				matches := request.pattern.Match(chunk, slab)
+				allMatches[idx] = matches
+				count += len(matches)
 				if cancelled.Get() {
 					return
 				}
-				countChan <- len(chunkMatches)
+				countChan <- len(matches)
+			}
+			sliceMatches := make([]Result, 0, count)
+			for _, matches := range allMatches {
+				sliceMatches = append(sliceMatches, matches...)
 			}
 			if m.sort && request.pattern.sortable {
-				m.sortBuf[idx] = radixSortResults(matches, m.tac, m.sortBuf[idx])
+				if m.tac {
+					sort.Sort(ByRelevanceTac(sliceMatches))
+				} else {
+					sort.Sort(ByRelevance(sliceMatches))
+				}
 			}
-			resultChan <- partialResult{idx, matches}
-		}(idx, m.slab[idx])
+			resultChan <- partialResult{idx, sliceMatches}
+		}(idx, m.slab[idx], chunks)
 	}

 	wait := func() bool {
@@ -221,7 +238,7 @@ func (m *Matcher) scan(request MatchRequest) MatchResult {
 			break
 		}

-		if m.cancelScan.Get() || m.reqBox.Peek(reqReset) {
+		if m.reqBox.Peek(reqReset) {
 			return MatchResult{nil, nil, wait()}
 		}

@@ -230,8 +247,8 @@ func (m *Matcher) scan(request MatchRequest) MatchResult {
 		}
 	}

-	partialResults := make([][]Result, numWorkers)
-	for range numWorkers {
+	partialResults := make([][]Result, numSlices)
+	for range slices {
 		partialResult := <-resultChan
 		partialResults[partialResult.index] = partialResult.matches
 	}
@@ -252,20 +269,6 @@ func (m *Matcher) Reset(chunks []*Chunk, patternRunes []rune, cancel bool, final
 	m.reqBox.Set(event, MatchRequest{chunks, pattern, final, sort, revision})
 }

-// CancelScan cancels any in-flight scan, waits for it to finish,
-// and prevents new scans from starting until ResumeScan is called.
-// This is used to safely mutate shared items (e.g., during with-nth changes).
-func (m *Matcher) CancelScan() {
-	m.cancelScan.Set(true)
-	m.scanMutex.Lock()
-	m.cancelScan.Set(false)
-}
-
-// ResumeScan allows scans to proceed again after CancelScan.
-func (m *Matcher) ResumeScan() {
-	m.scanMutex.Unlock()
-}
-
 func (m *Matcher) Stop() {
 	m.reqBox.Set(reqQuit, nil)
 }
@@ -10,46 +10,42 @@ func EmptyMerger(revision revision) *Merger {
 // Merger holds a set of locally sorted lists of items and provides the view of
 // a single, globally-sorted list
 type Merger struct {
-	pattern    *Pattern
-	lists      [][]Result
-	merged     []Result
-	chunks     *[]*Chunk
-	cursors    []int
-	sorted     bool
-	tac        bool
-	final      bool
-	count      int
-	pass       bool
-	startIndex int
-	revision   revision
-	minIndex   int32
-	maxIndex   int32
+	pattern  *Pattern
+	lists    [][]Result
+	merged   []Result
+	chunks   *[]*Chunk
+	cursors  []int
+	sorted   bool
+	tac      bool
+	final    bool
+	count    int
+	pass     bool
+	revision revision
+	minIndex int32
+	maxIndex int32
 }

 // PassMerger returns a new Merger that simply returns the items in the
-// original order. startIndex items are skipped from the beginning.
-func PassMerger(chunks *[]*Chunk, tac bool, revision revision, startIndex int32) *Merger {
+// original order
+func PassMerger(chunks *[]*Chunk, tac bool, revision revision) *Merger {
 	var minIndex, maxIndex int32
 	if len(*chunks) > 0 {
 		minIndex = (*chunks)[0].items[0].Index()
 		maxIndex = (*chunks)[len(*chunks)-1].lastIndex(minIndex)
 	}
-	si := int(startIndex)
 	mg := Merger{
-		pattern:    nil,
-		chunks:     chunks,
-		tac:        tac,
-		count:      0,
-		pass:       true,
-		startIndex: si,
-		revision:   revision,
-		minIndex:   minIndex + startIndex,
-		maxIndex:   maxIndex}
+		pattern:  nil,
+		chunks:   chunks,
+		tac:      tac,
+		count:    0,
+		pass:     true,
+		revision: revision,
+		minIndex: minIndex,
+		maxIndex: maxIndex}

 	for _, chunk := range *mg.chunks {
 		mg.count += chunk.count
 	}
-	mg.count = max(0, mg.count-si)
 	return &mg
 }

@@ -117,7 +113,6 @@ func (mg *Merger) Get(idx int) Result {
 		if mg.tac {
 			idx = mg.count - idx - 1
 		}
-		idx += mg.startIndex
 		firstChunk := (*mg.chunks)[0]
 		if firstChunk.count < chunkSize && idx >= firstChunk.count {
 			idx -= firstChunk.count
@@ -136,7 +131,14 @@ func (mg *Merger) Get(idx int) Result {
 	if mg.tac {
 		idx = mg.count - idx - 1
 	}
-	return mg.mergedGet(idx)
+	for _, list := range mg.lists {
+		numItems := len(list)
+		if idx < numItems {
+			return list[idx]
+		}
+		idx -= numItems
+	}
+	panic(fmt.Sprintf("Index out of bounds (unsorted, %d/%d)", idx, mg.count))
 }

 func (mg *Merger) ToMap() map[int32]Result {
@@ -164,7 +166,7 @@ func (mg *Merger) mergedGet(idx int) Result {
 			}
 			if cursor >= 0 {
 				rank := list[cursor]
-				if minIdx < 0 || mg.sorted && compareRanks(rank, minRank, mg.tac) || !mg.sorted && rank.item.Index() < minRank.item.Index() {
+				if minIdx < 0 || compareRanks(rank, minRank, mg.tac) {
 					minRank = rank
 					minIdx = listIdx
 				}
@@ -54,25 +54,10 @@ func buildLists(partiallySorted bool) ([][]Result, []Result) {
 }

 func TestMergerUnsorted(t *testing.T) {
-	lists, _ := buildLists(false)
-
-	// Sort each list by index to simulate real worker behavior
-	// (workers process chunks in ascending order via nextChunk.Add(1))
-	for _, list := range lists {
-		sort.Slice(list, func(i, j int) bool {
-			return list[i].item.Index() < list[j].item.Index()
-		})
-	}
-	items := []Result{}
-	for _, list := range lists {
-		items = append(items, list...)
-	}
-	sort.Slice(items, func(i, j int) bool {
-		return items[i].item.Index() < items[j].item.Index()
-	})
+	lists, items := buildLists(false)
 	cnt := len(items)

-	// Not sorted: items in ascending index order
+	// Not sorted: same order
 	mg := NewMerger(nil, lists, false, false, revision{}, 0, 0)
 	assert(t, cnt == mg.Length(), "Invalid Length")
 	for i := range cnt {
@@ -8,7 +8,6 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
-	"time"
 	"unicode"

 	"github.com/junegunn/fzf/src/algo"
@@ -66,7 +65,7 @@ Usage: fzf [options]
    --no-bold                Do not use bold text

  DISPLAY MODE
-    --height=[~][-]HEIGHT[%] Display fzf window below the cursor with the given
+    --height=[~]HEIGHT[%]    Display fzf window below the cursor with the given
                             height instead of using fullscreen.
                             A negative value is calculated as the terminal height
                             minus the given value.
@@ -75,10 +74,9 @@ Usage: fzf [options]
    --min-height=HEIGHT[+]   Minimum height when --height is given as a percentage.
                             Add '+' to automatically increase the value
                             according to the other layout options (default: 10+).
-    --popup[=OPTS]           Start fzf in a popup window (requires tmux 3.3+ or Zellij 0.44+)
+    --tmux[=OPTS]            Start fzf in a tmux popup (requires tmux 3.3+)
                             [center|top|bottom|left|right][,SIZE[%]][,SIZE[%]]
                             [,border-native] (default: center,50%)
-    --tmux[=OPTS]            Alias for --popup

  LAYOUT
    --layout=LAYOUT          Choose layout: [default|reverse|reverse-list]
@@ -97,12 +95,11 @@ Usage: fzf [options]
    -m, --multi[=MAX]        Enable multi-select with tab/shift-tab
    --highlight-line         Highlight the whole current line
    --cycle                  Enable cyclic scroll
-    --wrap[=MODE]            Enable line wrap (char|word, default: char)
+    --wrap                   Enable line wrap
    --wrap-sign=STR          Indicator for wrapped lines
    --no-multi-line          Disable multi-line display of items when using --read0
    --raw                    Enable raw mode (show non-matching items)
    --track                  Track the current selection when the result is updated
-    --id-nth=N[,..]          Define item identity fields for cross-reload operations
    --tac                    Reverse the order of the input
    --gap[=N]                Render empty lines between each item
    --gap-line[=STR]         Draw horizontal line on each gap using the string
@@ -160,7 +157,7 @@ Usage: fzf [options]
    --preview=COMMAND        Command to preview highlighted line ({})
    --preview-window=OPT     Preview window layout (default: right:50%)
                             [up|down|left|right][,SIZE[%]]
-                             [,[no]wrap[-word]][,[no]cycle][,[no]follow][,[no]info]
+                             [,[no]wrap][,[no]cycle][,[no]follow][,[no]info]
                             [,[no]hidden][,border-STYLE]
                             [,+SCROLL[OFFSETS][/DENOM]][,~HEADER_LINES]
                             [,default][,<SIZE_THRESHOLD(ALTERNATIVE_LAYOUT)]
@@ -170,7 +167,6 @@ Usage: fzf [options]
    --preview-label=LABEL
    --preview-label-pos=N    Same as --border-label and --border-label-pos,
                             but for preview window
-    --preview-wrap-sign=STR  Indicator for wrapped lines in the preview window

  HEADER
    --header=STR             String to print as header
@@ -178,11 +174,10 @@ Usage: fzf [options]
    --header-first           Print header before the prompt line
    --header-border[=STYLE]  Draw border around the header section
                             [rounded|sharp|bold|block|thinblock|double|horizontal|vertical|
-                              top|bottom|left|right|line|inline|none] (default: rounded)
+                              top|bottom|left|right|line|none] (default: rounded)
    --header-lines-border[=STYLE]
                             Display header from --header-lines with a separate border.
                             Pass 'none' to still separate it but without a border.
-                             Pass 'inline' to embed it inside the list frame.
    --header-label=LABEL     Label to print on the header border
    --header-label-pos=COL   Position of the header label
                             [POSITIVE_INTEGER: columns from left|
@@ -193,7 +188,7 @@ Usage: fzf [options]
    --footer=STR             String to print as footer
    --footer-border[=STYLE]  Draw border around the footer section
                             [rounded|sharp|bold|block|thinblock|double|horizontal|vertical|
-                              top|bottom|left|right|line|inline|none] (default: line)
+                              top|bottom|left|right|line|none] (default: line)
    --footer-label=LABEL     Label to print on the footer border
    --footer-label-pos=COL   Position of the footer label
                             [POSITIVE_INTEGER: columns from left|
@@ -297,32 +292,14 @@ func defaultMargin() [4]sizeSpec {
 	return [4]sizeSpec{}
 }

-type trackOption struct {
-	enabled bool
-	index   int32
-}
+type trackOption int

-var (
-	trackDisabled = trackOption{false, minItem.Index()}
-	trackEnabled  = trackOption{true, minItem.Index()}
+const (
+	trackDisabled trackOption = iota
+	trackEnabled
+	trackCurrent
 )

-func (t trackOption) Disabled() bool {
-	return !t.enabled
-}
-
-func (t trackOption) Global() bool {
-	return t.enabled && t.index == minItem.Index()
-}
-
-func (t trackOption) Current() bool {
-	return t.enabled && t.index != minItem.Index()
-}
-
-func trackCurrent(index int32) trackOption {
-	return trackOption{true, index}
-}
-
 type windowPosition int

 const (
@@ -372,7 +349,6 @@ type previewOpts struct {
 	scroll      string
 	hidden      bool
 	wrap        bool
-	wrapWord    bool
 	cycle       bool
 	follow      bool
 	info        bool
@@ -419,7 +395,7 @@ func parseTmuxOptions(arg string, index int) (*tmuxOptions, error) {
 	var err error
 	opts := defaultTmuxOptions(index)
 	tokens := splitRegexp.Split(arg, -1)
-	errorToReturn := errors.New("invalid popup option: " + arg + " (expected: [center|top|bottom|left|right][,SIZE[%]][,SIZE[%][,border-native]])")
+	errorToReturn := errors.New("invalid tmux option: " + arg + " (expected: [center|top|bottom|left|right][,SIZE[%]][,SIZE[%][,border-native]])")
 	if len(tokens) == 0 || len(tokens) > 4 {
 		return nil, errorToReturn
 	}
@@ -549,7 +525,7 @@ func (o *previewOpts) compare(active *previewOpts, b *previewOpts) previewOptsCo
 		return previewOptsDifferentLayout
 	}

-	if a.wrap == b.wrap && a.wrapWord == b.wrapWord && a.headerLines == b.headerLines && a.info == b.info && a.scroll == b.scroll {
+	if a.wrap == b.wrap && a.headerLines == b.headerLines && a.info == b.info && a.scroll == b.scroll {
 		return previewOptsSame
 	}

@@ -591,13 +567,11 @@ type Options struct {
 	FreezeLeft        int
 	FreezeRight       int
 	WithNth           func(Delimiter) func([]Token, int32) string
-	WithNthExpr       string
 	AcceptNth         func(Delimiter) func([]Token, int32) string
 	Delimiter         Delimiter
 	Sort              int
 	Raw               bool
 	Track             trackOption
-	IdNth             []Range
 	Tac               bool
 	Tail              int
 	Criteria          []criterion
@@ -613,9 +587,7 @@ type Options struct {
 	Layout            layoutType
 	Cycle             bool
 	Wrap              bool
-	WrapWord          bool
 	WrapSign          *string
-	PreviewWrapSign   *string
 	MultiLine         bool
 	CursorLine        bool
 	KeepRight         bool
@@ -683,8 +655,6 @@ type Options struct {
 	WalkerSkip        []string
 	Version           bool
 	Help              bool
-	Threads           int
-	Bench             time.Duration
 	CPUProfile        string
 	MEMProfile        string
 	BlockProfile      string
@@ -703,13 +673,7 @@ func filterNonEmpty(input []string) []string {
 }

 func defaultPreviewOpts(command string) previewOpts {
-	return previewOpts{
-		command:  command,
-		position: posRight,
-		size:     sizeSpec{50, true},
-		info:     true,
-		border:   defaultBorderShape,
-	}
+	return previewOpts{command, posRight, sizeSpec{50, true}, "", false, false, false, false, true, defaultBorderShape, 0, 0, nil}
 }

 func defaultOptions() *Options {
@@ -751,7 +715,6 @@ func defaultOptions() *Options {
 		Layout:       layoutDefault,
 		Cycle:        false,
 		Wrap:         false,
-		WrapWord:     false,
 		MultiLine:    true,
 		KeepRight:    false,
 		Hscroll:      true,
@@ -871,7 +834,7 @@ func nthTransformer(str string) (func(Delimiter) func([]Token, int32) string, er
 		nth   []Range
 	}

-	parts := make([]NthParts, 0, len(indexes))
+	parts := make([]NthParts, len(indexes))
 	idx := 0
 	for _, index := range indexes {
 		if idx < index[0] {
@@ -954,8 +917,6 @@ func parseBorder(str string, optional bool) (tui.BorderShape, error) {
 	switch str {
 	case "line":
 		return tui.BorderLine, nil
-	case "inline":
-		return tui.BorderInline, nil
 	case "rounded":
 		return tui.BorderRounded, nil
 	case "sharp":
@@ -986,7 +947,7 @@ func parseBorder(str string, optional bool) (tui.BorderShape, error) {
 	if optional && str == "" {
 		return defaultBorderShape, nil
 	}
-	return tui.BorderNone, errors.New("invalid border style (expected: rounded|sharp|bold|block|thinblock|double|horizontal|vertical|top|bottom|left|right|line|inline|none)")
+	return tui.BorderNone, errors.New("invalid border style (expected: rounded|sharp|bold|block|thinblock|double|horizontal|vertical|top|bottom|left|right|none)")
 }

 func parseKeyChords(str string, message string) (map[tui.Event]string, []tui.Event, error) {
@@ -1256,7 +1217,7 @@ func parseKeyChords(str string, message string) (map[tui.Event]string, []tui.Eve
 		default:
 			runes := []rune(key)
 			if len(key) == 10 && strings.HasPrefix(lkey, "ctrl-alt-") && isAlphabet(lkey[9]) {
-				r := rune(lkey[9])
+				r := rune(key[9])
 				evt := tui.CtrlAltKey(r)
 				if r == 'h' && !util.IsWindows() {
 					evt = tui.CtrlAltBackspace.AsEvent()
@@ -1264,12 +1225,7 @@ func parseKeyChords(str string, message string) (map[tui.Event]string, []tui.Eve
 				chords[evt] = key
 				list = append(list, evt)
 			} else if len(key) == 6 && strings.HasPrefix(lkey, "ctrl-") && isAlphabet(lkey[5]) {
-				evt := tui.EventType(tui.CtrlA.Int() + int(lkey[5]) - 'a')
-				r := rune(lkey[5])
-				if r == 'h' && !util.IsWindows() {
-					evt = tui.CtrlBackspace
-				}
-				add(evt)
+				add(tui.EventType(tui.CtrlA.Int() + int(lkey[5]) - 'a'))
 			} else if len(runes) == 5 && strings.HasPrefix(lkey, "alt-") {
 				r := runes[4]
 				switch r {
@@ -1428,14 +1384,6 @@ func parseTheme(defaultTheme *tui.ColorTheme, str string) (*tui.ColorTheme, *tui
 						cattr.Attr |= tui.Italic
 					case "underline":
 						cattr.Attr |= tui.Underline
-					case "underline-double":
-						cattr.Attr |= tui.Underline | tui.UlStyleDouble
-					case "underline-curly":
-						cattr.Attr |= tui.Underline | tui.UlStyleCurly
-					case "underline-dotted":
-						cattr.Attr |= tui.Underline | tui.UlStyleDotted
-					case "underline-dashed":
-						cattr.Attr |= tui.Underline | tui.UlStyleDashed
 					case "blink":
 						cattr.Attr |= tui.Blink
 					case "reverse":
@@ -1523,8 +1471,6 @@ func parseTheme(defaultTheme *tui.ColorTheme, str string) (*tui.ColorTheme, *tui
 				mergeAttr(&theme.Nomatch)
 			case "gutter":
 				mergeAttr(&theme.Gutter)
-			case "alt-gutter":
-				mergeAttr(&theme.AltGutter)
 			case "hl":
 				mergeAttr(&theme.Match)
 			case "current-hl", "hl+":
@@ -1616,7 +1562,7 @@ func parseWalkerOpts(str string) (walkerOpts, error) {
 }

 var (
-	argActionRegexp  *regexp.Regexp
+	executeRegexp    *regexp.Regexp
 	splitRegexp      *regexp.Regexp
 	actionNameRegexp *regexp.Regexp
 )
@@ -1635,8 +1581,8 @@ const (
 )

 func init() {
-	argActionRegexp = regexp.MustCompile(
-		`(?si)[:+](become|execute(?:-multi|-silent)?|reload(?:-sync)?|preview|(?:change|bg-transform|transform)-(?:query|prompt|(?:border|list|preview|input|header|footer)-label|header-lines|header|footer|search|with-nth|nth|pointer|ghost)|bg-transform|transform|change-(?:preview-window|preview|multi)|(?:re|un|toggle-)bind|pos|put|print|search|trigger)`)
+	executeRegexp = regexp.MustCompile(
+		`(?si)[:+](become|execute(?:-multi|-silent)?|reload(?:-sync)?|preview|(?:change|bg-transform|transform)-(?:query|prompt|(?:border|list|preview|input|header|footer)-label|header|footer|search|nth|pointer|ghost)|bg-transform|transform|change-(?:preview-window|preview|multi)|(?:re|un|toggle-)bind|pos|put|print|search|trigger)`)
 	splitRegexp = regexp.MustCompile("[,:]+")
 	actionNameRegexp = regexp.MustCompile("(?i)^[a-z-]+")
 }
@@ -1645,7 +1591,7 @@ func maskActionContents(action string) string {
 	masked := ""
 Loop:
 	for len(action) > 0 {
-		loc := argActionRegexp.FindStringIndex(action)
+		loc := executeRegexp.FindStringIndex(action)
 		if loc == nil {
 			masked += action
 			break
@@ -1700,7 +1646,7 @@ Loop:
 }

 func parseSingleActionList(str string) ([]*action, error) {
-	// We prepend a colon to satisfy argActionRegexp and remove it later
+	// We prepend a colon to satisfy executeRegexp and remove it later
 	masked := maskActionContents(":" + str)[1:]
 	return parseActionList(masked, str, []*action{}, false)
 }
@@ -1818,8 +1764,6 @@ func parseActionList(masked string, original string, prevActions []*action, putA
 			appendAction(actToggleHeader)
 		case "toggle-wrap":
 			appendAction(actToggleWrap)
-		case "toggle-wrap-word":
-			appendAction(actToggleWrapWord)
 		case "toggle-multi-line":
 			appendAction(actToggleMultiLine)
 		case "toggle-hscroll":
@@ -1886,8 +1830,6 @@ func parseActionList(masked string, original string, prevActions []*action, putA
 			appendAction(actTogglePreview)
 		case "toggle-preview-wrap":
 			appendAction(actTogglePreviewWrap)
-		case "toggle-preview-wrap-word":
-			appendAction(actTogglePreviewWrapWord)
 		case "toggle-sort":
 			appendAction(actToggleSort)
 		case "offset-up":
@@ -2047,8 +1989,6 @@ func isExecuteAction(str string) actionType {
 		return actPreview
 	case "change-header":
 		return actChangeHeader
-	case "change-header-lines":
-		return actChangeHeaderLines
 	case "change-footer":
 		return actChangeFooter
 	case "change-list-label":
@@ -2079,8 +2019,6 @@ func isExecuteAction(str string) actionType {
 		return actChangeMulti
 	case "change-nth":
 		return actChangeNth
-	case "change-with-nth":
-		return actChangeWithNth
 	case "pos":
 		return actPosition
 	case "execute":
@@ -2111,14 +2049,10 @@ func isExecuteAction(str string) actionType {
 		return actTransformFooter
 	case "transform-header":
 		return actTransformHeader
-	case "transform-header-lines":
-		return actTransformHeaderLines
 	case "transform-ghost":
 		return actTransformGhost
 	case "transform-nth":
 		return actTransformNth
-	case "transform-with-nth":
-		return actTransformWithNth
 	case "transform-pointer":
 		return actTransformPointer
 	case "transform-prompt":
@@ -2145,14 +2079,10 @@ func isExecuteAction(str string) actionType {
 		return actBgTransformFooter
 	case "bg-transform-header":
 		return actBgTransformHeader
-	case "bg-transform-header-lines":
-		return actBgTransformHeaderLines
 	case "bg-transform-ghost":
 		return actBgTransformGhost
 	case "bg-transform-nth":
 		return actBgTransformNth
-	case "bg-transform-with-nth":
-		return actBgTransformWithNth
 	case "bg-transform-pointer":
 		return actBgTransformPointer
 	case "bg-transform-prompt":
@@ -2225,6 +2155,9 @@ func parseHeight(str string, index int) (heightSpec, error) {
 		str = str[1:]
 	}
 	if strings.HasPrefix(str, "-") {
+		if heightSpec.auto {
+			return heightSpec, errors.New("negative(-) height is not compatible with adaptive(~) height")
+		}
 		heightSpec.inverse = true
 		str = str[1:]
 	}
@@ -2308,13 +2241,8 @@ func parsePreviewWindowImpl(opts *previewOpts, input string) error {
 			opts.hidden = false
 		case "wrap":
 			opts.wrap = true
-			opts.wrapWord = false
-		case "wrap-word":
-			opts.wrap = true
-			opts.wrapWord = true
 		case "nowrap":
 			opts.wrap = false
-			opts.wrapWord = false
 		case "cycle":
 			opts.cycle = true
 		case "nocycle":
@@ -2637,7 +2565,7 @@ func parseOptions(index *int, opts *Options, allArgs []string) error {
 			opts.Version = true
 		case "--no-winpty":
 			opts.NoWinpty = true
-		case "--tmux", "--popup":
+		case "--tmux":
 			given, str := optionalNextString()
 			if given {
 				if opts.Tmux, err = parseTmuxOptions(str, index); err != nil {
@@ -2646,7 +2574,7 @@ func parseOptions(index *int, opts *Options, allArgs []string) error {
 			} else {
 				opts.Tmux = defaultTmuxOptions(index)
 			}
-		case "--no-tmux", "--no-popup":
+		case "--no-tmux":
 			opts.Tmux = nil
 		case "--tty-default":
 			if opts.TtyDefault, err = nextString("tty device name required"); err != nil {
@@ -2791,7 +2719,6 @@ func parseOptions(index *int, opts *Options, allArgs []string) error {
 			if opts.WithNth, err = nthTransformer(str); err != nil {
 				return err
 			}
-			opts.WithNthExpr = str
 		case "--accept-nth":
 			str, err := nextString("nth expression required")
 			if err != nil {
@@ -2814,16 +2741,6 @@ func parseOptions(index *int, opts *Options, allArgs []string) error {
 			opts.Track = trackEnabled
 		case "--no-track":
 			opts.Track = trackDisabled
-		case "--id-nth":
-			str, err := nextString("nth expression required")
-			if err != nil {
-				return err
-			}
-			if opts.IdNth, err = splitNth(str); err != nil {
-				return err
-			}
-		case "--no-id-nth":
-			opts.IdNth = nil
 		case "--tac":
 			opts.Tac = true
 		case "--no-tac":
@@ -2889,29 +2806,9 @@ func parseOptions(index *int, opts *Options, allArgs []string) error {
 		case "--no-cycle":
 			opts.Cycle = false
 		case "--wrap":
-			given, str := optionalNextString()
-			if given {
-				switch str {
-				case "char":
-					opts.Wrap = true
-					opts.WrapWord = false
-				case "word":
-					opts.Wrap = true
-					opts.WrapWord = true
-				default:
-					return errors.New("invalid wrap mode: " + str + " (expected: char or word)")
-				}
-			} else {
-				opts.Wrap = true
-			}
+			opts.Wrap = true
 		case "--no-wrap":
 			opts.Wrap = false
-			opts.WrapWord = false
-		case "--wrap-word":
-			opts.Wrap = true
-			opts.WrapWord = true
-		case "--no-wrap-word":
-			opts.WrapWord = false
 		case "--wrap-sign":
 			str, err := nextString("wrap sign required")
 			if err != nil {
@@ -3145,14 +3042,8 @@ func parseOptions(index *int, opts *Options, allArgs []string) error {
 			if opts.Preview.border, err = parseBorder(arg, !hasArg); err != nil {
 				return err
 			}
-		case "--preview-wrap-sign":
-			str, err := nextString("preview wrap sign required")
-			if err != nil {
-				return err
-			}
-			opts.PreviewWrapSign = &str
 		case "--height":
-			str, err := nextString("height required: [~][-]HEIGHT[%]")
+			str, err := nextString("height required: [~]HEIGHT[%]")
 			if err != nil {
 				return err
 			}
@@ -3397,23 +3288,6 @@ func parseOptions(index *int, opts *Options, allArgs []string) error {
 				return err
 			}
 			opts.WalkerSkip = filterNonEmpty(strings.Split(str, ","))
-		case "--threads":
-			if opts.Threads, err = nextInt("number of threads required"); err != nil {
-				return err
-			}
-			if opts.Threads < 0 {
-				return errors.New("--threads must be a positive integer")
-			}
-		case "--bench":
-			str, err := nextString("duration required (e.g. 3s, 500ms)")
-			if err != nil {
-				return err
-			}
-			dur, err := time.ParseDuration(str)
-			if err != nil {
-				return errors.New("invalid duration for --bench: " + str)
-			}
-			opts.Bench = dur
 		case "--profile-cpu":
 			if opts.CPUProfile, err = nextString("file path required: cpu"); err != nil {
 				return err
@@ -3519,9 +3393,7 @@ func applyPreset(opts *Options, preset string) error {
 		opts.Preview.border = tui.BorderLine
 		opts.Preview.info = false
 		opts.InfoStyle = infoDefault
-		opts.Theme.Gutter = tui.NewColorAttr()
-		space := " "
-		opts.Gutter = &space
+		opts.Theme.Gutter = tui.ColorAttr{Color: -1, Attr: 0}
 		empty := ""
 		opts.Separator = &empty
 		opts.Scrollbar = &empty
@@ -3596,7 +3468,7 @@ func validateOptions(opts *Options) error {
 		}
 	}

-	if opts.Height.auto && (opts.Tmux == nil || opts.Tmux.index < opts.Height.index) {
+	if opts.Height.auto {
 		for _, s := range []sizeSpec{opts.Margin[0], opts.Margin[2]} {
 			if s.percent {
 				return errors.New("adaptive height is not compatible with top/bottom percent margin")
@@ -3613,19 +3485,6 @@ func validateOptions(opts *Options) error {
 		return errors.New("only ANSI attributes are allowed for 'nth' (regular, bold, underline, reverse, dim, italic, strikethrough)")
 	}

-	if opts.BorderShape == tui.BorderInline ||
-		opts.ListBorderShape == tui.BorderInline ||
-		opts.InputBorderShape == tui.BorderInline ||
-		opts.Preview.border == tui.BorderInline {
-		return errors.New("inline border is only supported for --header-border, --header-lines-border, and --footer-border")
-	}
-	if opts.HeaderBorderShape == tui.BorderInline &&
-		opts.HeaderLinesShape != tui.BorderInline &&
-		opts.HeaderLinesShape != tui.BorderUndefined &&
-		opts.HeaderLinesShape != tui.BorderNone {
-		return errors.New("--header-border=inline requires --header-lines-border to be inline or unset")
-	}
-
 	return nil
 }

@@ -3643,10 +3502,6 @@ func (opts *Options) useTmux() bool {
 	return opts.Tmux != nil && len(os.Getenv("TMUX")) > 0 && opts.Tmux.index >= opts.Height.index
 }

-func (opts *Options) useZellij() bool {
-	return opts.Tmux != nil && len(os.Getenv("ZELLIJ")) > 0 && opts.Tmux.index >= opts.Height.index
-}
-
 func (opts *Options) noSeparatorLine() bool {
 	if opts.Inputless {
 		return true
@@ -448,64 +448,6 @@ func TestPreviewOpts(t *testing.T) {
 		opts.Preview.size.size == 70) {
 		t.Error(opts.Preview)
 	}
-
-	// wrap-word tests
-	opts = optsFor("--preview-window=wrap-word")
-	if !(opts.Preview.wrap == true && opts.Preview.wrapWord == true) {
-		t.Errorf("wrap-word: wrap=%v, wrapWord=%v", opts.Preview.wrap, opts.Preview.wrapWord)
-	}
-	opts = optsFor("--preview-window=wrap-word,nowrap")
-	if !(opts.Preview.wrap == false && opts.Preview.wrapWord == false) {
-		t.Errorf("wrap-word,nowrap: wrap=%v, wrapWord=%v", opts.Preview.wrap, opts.Preview.wrapWord)
-	}
-	opts = optsFor("--preview-window=wrap-word,wrap")
-	if !(opts.Preview.wrap == true && opts.Preview.wrapWord == false) {
-		t.Errorf("wrap-word,wrap: wrap=%v, wrapWord=%v", opts.Preview.wrap, opts.Preview.wrapWord)
-	}
-}
-
-func TestPreviewWrapSign(t *testing.T) {
-	// Default: no preview wrap sign override
-	opts := optsFor()
-	if opts.PreviewWrapSign != nil {
-		t.Errorf("expected nil PreviewWrapSign, got %v", *opts.PreviewWrapSign)
-	}
-
-	// --preview-wrap-sign sets PreviewWrapSign
-	opts = optsFor("--preview-wrap-sign", ">> ")
-	if opts.PreviewWrapSign == nil || *opts.PreviewWrapSign != ">> " {
-		t.Errorf("expected '>> ', got %v", opts.PreviewWrapSign)
-	}
-
-	// --preview-wrap-sign is independent of --wrap-sign
-	opts = optsFor("--wrap-sign", "| ", "--preview-wrap-sign", ">> ")
-	if opts.WrapSign == nil || *opts.WrapSign != "| " {
-		t.Errorf("expected WrapSign '| ', got %v", opts.WrapSign)
-	}
-	if opts.PreviewWrapSign == nil || *opts.PreviewWrapSign != ">> " {
-		t.Errorf("expected PreviewWrapSign '>> ', got %v", opts.PreviewWrapSign)
-	}
-
-	// --preview-wrap-sign without --wrap-sign
-	opts = optsFor("--preview-wrap-sign", "→ ")
-	if opts.WrapSign != nil {
-		t.Errorf("expected nil WrapSign, got %v", *opts.WrapSign)
-	}
-	if opts.PreviewWrapSign == nil || *opts.PreviewWrapSign != "→ " {
-		t.Errorf("expected PreviewWrapSign '→ ', got %v", opts.PreviewWrapSign)
-	}
-
-	// Last --preview-wrap-sign wins
-	opts = optsFor("--preview-wrap-sign", "A ", "--preview-wrap-sign", "B ")
-	if opts.PreviewWrapSign == nil || *opts.PreviewWrapSign != "B " {
-		t.Errorf("expected PreviewWrapSign 'B ', got %v", opts.PreviewWrapSign)
-	}
-
-	// Empty string is allowed
-	opts = optsFor("--preview-wrap-sign", "")
-	if opts.PreviewWrapSign == nil || *opts.PreviewWrapSign != "" {
-		t.Errorf("expected empty PreviewWrapSign, got %v", opts.PreviewWrapSign)
-	}
 }

 func TestAdditiveExpect(t *testing.T) {
@@ -61,12 +61,9 @@ type Pattern struct {
 	delimiter     Delimiter
 	nth           []Range
 	revision      revision
-	procFun       [6]algo.Algo
+	procFun       map[termType]algo.Algo
 	cache         *ChunkCache
 	denylist      map[int32]struct{}
-	startIndex    int32
-	directAlgo    algo.Algo
-	directTerm    *term
 }

 var _splitRegex *regexp.Regexp
@@ -77,7 +74,7 @@ func init() {

 // BuildPattern builds Pattern object from the given arguments
 func BuildPattern(cache *ChunkCache, patternCache map[string]*Pattern, fuzzy bool, fuzzyAlgo algo.Algo, extended bool, caseMode Case, normalize bool, forward bool,
-	withPos bool, cacheable bool, nth []Range, delimiter Delimiter, revision revision, runes []rune, denylist map[int32]struct{}, startIndex int32) *Pattern {
+	withPos bool, cacheable bool, nth []Range, delimiter Delimiter, revision revision, runes []rune, denylist map[int32]struct{}) *Pattern {

 	var asString string
 	if extended {
@@ -149,11 +146,9 @@ func BuildPattern(cache *ChunkCache, patternCache map[string]*Pattern, fuzzy boo
 		delimiter:     delimiter,
 		cache:         cache,
 		denylist:      denylist,
-		startIndex:    startIndex,
-	}
+		procFun:       make(map[termType]algo.Algo)}

 	ptr.cacheKey = ptr.buildCacheKey()
-	ptr.directAlgo, ptr.directTerm = ptr.buildDirectAlgo(fuzzyAlgo)
 	ptr.procFun[termFuzzy] = fuzzyAlgo
 	ptr.procFun[termEqual] = algo.EqualMatch
 	ptr.procFun[termExact] = algo.ExactMatchNaive
@@ -277,22 +272,6 @@ func (p *Pattern) buildCacheKey() string {
 	return strings.Join(cacheableTerms, "\t")
 }

-// buildDirectAlgo returns the algo function and term for the direct fast path
-// in matchChunk. Returns (nil, nil) if the pattern is not suitable.
-// Requirements: extended mode, single term set with single non-inverse fuzzy term, no nth.
-func (p *Pattern) buildDirectAlgo(fuzzyAlgo algo.Algo) (algo.Algo, *term) {
-	if !p.extended || len(p.nth) > 0 {
-		return nil, nil
-	}
-	if len(p.termSets) == 1 && len(p.termSets[0]) == 1 {
-		t := &p.termSets[0][0]
-		if !t.inv && t.typ == termFuzzy {
-			return fuzzyAlgo, t
-		}
-	}
-	return nil, nil
-}
-
 // CacheKey is used to build string to be used as the key of result cache
 func (p *Pattern) CacheKey() string {
 	return p.cacheKey
@@ -300,104 +279,84 @@ func (p *Pattern) CacheKey() string {

 // Match returns the list of matches Items in the given Chunk
 func (p *Pattern) Match(chunk *Chunk, slab *util.Slab) []Result {
+	// ChunkCache: Exact match
 	cacheKey := p.CacheKey()
-
-	// Bitmap cache: exact match or prefix/suffix
-	var cachedBitmap *ChunkBitmap
 	if p.cacheable {
-		cachedBitmap = p.cache.Lookup(chunk, cacheKey)
-	}
-	if cachedBitmap == nil {
-		cachedBitmap = p.cache.Search(chunk, cacheKey)
+		if cached := p.cache.Lookup(chunk, cacheKey); cached != nil {
+			return cached
+		}
 	}

-	matches, bitmap := p.matchChunk(chunk, cachedBitmap, slab)
+	// Prefix/suffix cache
+	space := p.cache.Search(chunk, cacheKey)
+
+	matches := p.matchChunk(chunk, space, slab)

 	if p.cacheable {
-		p.cache.Add(chunk, cacheKey, bitmap, len(matches))
+		p.cache.Add(chunk, cacheKey, matches)
 	}
 	return matches
 }

-func (p *Pattern) matchChunk(chunk *Chunk, cachedBitmap *ChunkBitmap, slab *util.Slab) ([]Result, ChunkBitmap) {
+func (p *Pattern) matchChunk(chunk *Chunk, space []Result, slab *util.Slab) []Result {
 	matches := []Result{}
-	var bitmap ChunkBitmap
-
-	// Skip header items in chunks that contain them
-	startIdx := 0
-	if p.startIndex > 0 && chunk.count > 0 && chunk.items[0].Index() < p.startIndex {
-		startIdx = int(p.startIndex - chunk.items[0].Index())
-		if startIdx >= chunk.count {
-			return matches, bitmap
-		}
-	}
-
-	hasCachedBitmap := cachedBitmap != nil
-
-	// Fast path: single fuzzy term, no nth, no denylist.
-	// Calls the algo function directly, bypassing MatchItem/extendedMatch/iter
-	// and avoiding per-match []Offset heap allocation.
-	if p.directAlgo != nil && len(p.denylist) == 0 {
-		t := p.directTerm
-		for idx := startIdx; idx < chunk.count; idx++ {
-			if hasCachedBitmap && cachedBitmap[idx/64]&(uint64(1)<<(idx%64)) == 0 {
-				continue
-			}
-			res, _ := p.directAlgo(t.caseSensitive, t.normalize, p.forward,
-				&chunk.items[idx].text, t.text, p.withPos, slab)
-			if res.Start >= 0 {
-				bitmap[idx/64] |= uint64(1) << (idx % 64)
-				matches = append(matches, buildResultFromBounds(
-					&chunk.items[idx], res.Score,
-					int(res.Start), int(res.End), int(res.End), true))
-			}
-		}
-		return matches, bitmap
-	}

 	if len(p.denylist) == 0 {
-		for idx := startIdx; idx < chunk.count; idx++ {
-			if hasCachedBitmap && cachedBitmap[idx/64]&(uint64(1)<<(idx%64)) == 0 {
+		// Huge code duplication for minimizing unnecessary map lookups
+		if space == nil {
+			for idx := 0; idx < chunk.count; idx++ {
+				if match, _, _ := p.MatchItem(&chunk.items[idx], p.withPos, slab); match != nil {
+					matches = append(matches, *match)
+				}
+			}
+		} else {
+			for _, result := range space {
+				if match, _, _ := p.MatchItem(result.item, p.withPos, slab); match != nil {
+					matches = append(matches, *match)
+				}
+			}
+		}
+		return matches
+	}
+
+	if space == nil {
+		for idx := 0; idx < chunk.count; idx++ {
+			if _, prs := p.denylist[chunk.items[idx].Index()]; prs {
 				continue
 			}
-			if match, _, _ := p.MatchItem(&chunk.items[idx], p.withPos, slab); match.item != nil {
-				bitmap[idx/64] |= uint64(1) << (idx % 64)
-				matches = append(matches, match)
+			if match, _, _ := p.MatchItem(&chunk.items[idx], p.withPos, slab); match != nil {
+				matches = append(matches, *match)
 			}
 		}
-		return matches, bitmap
-	}
-
-	for idx := startIdx; idx < chunk.count; idx++ {
-		if hasCachedBitmap && cachedBitmap[idx/64]&(uint64(1)<<(idx%64)) == 0 {
-			continue
-		}
-		if _, prs := p.denylist[chunk.items[idx].Index()]; prs {
-			continue
-		}
-		if match, _, _ := p.MatchItem(&chunk.items[idx], p.withPos, slab); match.item != nil {
-			bitmap[idx/64] |= uint64(1) << (idx % 64)
-			matches = append(matches, match)
+	} else {
+		for _, result := range space {
+			if _, prs := p.denylist[result.item.Index()]; prs {
+				continue
+			}
+			if match, _, _ := p.MatchItem(result.item, p.withPos, slab); match != nil {
+				matches = append(matches, *match)
+			}
 		}
 	}
-	return matches, bitmap
+	return matches
 }

-// MatchItem returns the match result if the Item is a match.
-// A zero-value Result (with item == nil) indicates no match.
-func (p *Pattern) MatchItem(item *Item, withPos bool, slab *util.Slab) (Result, []Offset, *[]int) {
+// MatchItem returns true if the Item is a match
+func (p *Pattern) MatchItem(item *Item, withPos bool, slab *util.Slab) (*Result, []Offset, *[]int) {
 	if p.extended {
 		if offsets, bonus, pos := p.extendedMatch(item, withPos, slab); len(offsets) == len(p.termSets) {
-			return buildResult(item, offsets, bonus), offsets, pos
+			result := buildResult(item, offsets, bonus)
+			return &result, offsets, pos
 		}
-		return Result{}, nil, nil
+		return nil, nil, nil
 	}
 	offset, bonus, pos := p.basicMatch(item, withPos, slab)
 	if sidx := offset[0]; sidx >= 0 {
 		offsets := []Offset{offset}
-		return buildResult(item, offsets, bonus), offsets, pos
+		result := buildResult(item, offsets, bonus)
+		return &result, offsets, pos
 	}
-	return Result{}, nil, nil
+	return nil, nil, nil
 }

 func (p *Pattern) basicMatch(item *Item, withPos bool, slab *util.Slab) (Offset, int, *[]int) {
@@ -2,7 +2,6 @@ package fzf

 import (
 	"reflect"
-	"runtime"
 	"testing"

 	"github.com/junegunn/fzf/src/algo"
@@ -69,7 +68,7 @@ func buildPattern(fuzzy bool, fuzzyAlgo algo.Algo, extended bool, caseMode Case,
 	withPos bool, cacheable bool, nth []Range, delimiter Delimiter, runes []rune) *Pattern {
 	return BuildPattern(NewChunkCache(), make(map[string]*Pattern),
 		fuzzy, fuzzyAlgo, extended, caseMode, normalize, forward,
-		withPos, cacheable, nth, delimiter, revision{}, runes, nil, 0)
+		withPos, cacheable, nth, delimiter, revision{}, runes, nil)
 }

 func TestExact(t *testing.T) {
@@ -138,7 +137,7 @@ func TestOrigTextAndTransformed(t *testing.T) {
 			origText:    &origBytes,
 			transformed: &transformed{pattern.revision, trans}}
 		pattern.extended = extended
-		matches, _ := pattern.matchChunk(&chunk, nil, slab) // No cache
+		matches := pattern.matchChunk(&chunk, nil, slab) // No cache
 		if !(matches[0].item.text.ToString() == "junegunn" &&
 			string(*matches[0].item.origText) == "junegunn.choi" &&
 			reflect.DeepEqual((*matches[0].item.transformed).tokens, trans)) {
@@ -200,119 +199,3 @@ func TestCacheable(t *testing.T) {
 	test(false, "foo 'bar", "foo", false)
 	test(false, "foo !bar", "foo", false)
 }
-
-func buildChunks(numChunks int) []*Chunk {
-	chunks := make([]*Chunk, numChunks)
-	words := []string{
-		"src/main/java/com/example/service/UserService.java",
-		"src/test/java/com/example/service/UserServiceTest.java",
-		"docs/api/reference/endpoints.md",
-		"lib/internal/utils/string_helper.go",
-		"pkg/server/http/handler/auth.go",
-		"build/output/release/app.exe",
-		"config/production/database.yml",
-		"scripts/deploy/kubernetes/setup.sh",
-		"vendor/github.com/junegunn/fzf/src/core.go",
-		"node_modules/.cache/babel/transform.js",
-	}
-	for ci := range numChunks {
-		chunks[ci] = &Chunk{count: chunkSize}
-		for i := range chunkSize {
-			text := words[(ci*chunkSize+i)%len(words)]
-			chunks[ci].items[i] = Item{text: util.ToChars([]byte(text))}
-			chunks[ci].items[i].text.Index = int32(ci*chunkSize + i)
-		}
-	}
-	return chunks
-}
-
-func buildPatternWith(cache *ChunkCache, runes []rune) *Pattern {
-	return BuildPattern(cache, make(map[string]*Pattern),
-		true, algo.FuzzyMatchV2, true, CaseSmart, false, true,
-		false, true, []Range{}, Delimiter{}, revision{}, runes, nil, 0)
-}
-
-func TestBitmapCacheBenefit(t *testing.T) {
-	numChunks := 100
-	chunks := buildChunks(numChunks)
-	queries := []string{"s", "se", "ser", "serv", "servi"}
-
-	// 1. Run all queries with shared cache (simulates incremental typing)
-	cache := NewChunkCache()
-	for _, q := range queries {
-		pat := buildPatternWith(cache, []rune(q))
-		for _, chunk := range chunks {
-			pat.Match(chunk, slab)
-		}
-	}
-
-	// 2. GC and measure memory with cache populated
-	runtime.GC()
-	runtime.GC()
-	var memWith runtime.MemStats
-	runtime.ReadMemStats(&memWith)
-
-	// 3. Clear cache, GC, measure again
-	cache.Clear()
-	runtime.GC()
-	runtime.GC()
-	var memWithout runtime.MemStats
-	runtime.ReadMemStats(&memWithout)
-
-	cacheMem := int64(memWith.Alloc) - int64(memWithout.Alloc)
-	t.Logf("Chunks: %d, Queries: %d", numChunks, len(queries))
-	t.Logf("Cache memory: %d bytes (%.1f KB)", cacheMem, float64(cacheMem)/1024)
-	t.Logf("Per-chunk-per-query: %.0f bytes", float64(cacheMem)/float64(numChunks*len(queries)))
-
-	// 4. Verify correctness: cached vs uncached produce same results
-	cache2 := NewChunkCache()
-	for _, q := range queries {
-		pat := buildPatternWith(cache2, []rune(q))
-		for _, chunk := range chunks {
-			pat.Match(chunk, slab)
-		}
-	}
-	for _, q := range queries {
-		patCached := buildPatternWith(cache2, []rune(q))
-		patFresh := buildPatternWith(NewChunkCache(), []rune(q))
-		var countCached, countFresh int
-		for _, chunk := range chunks {
-			countCached += len(patCached.Match(chunk, slab))
-			countFresh += len(patFresh.Match(chunk, slab))
-		}
-		if countCached != countFresh {
-			t.Errorf("query=%q: cached=%d, fresh=%d", q, countCached, countFresh)
-		}
-		t.Logf("query=%q: matches=%d", q, countCached)
-	}
-}
-
-func BenchmarkWithCache(b *testing.B) {
-	numChunks := 100
-	chunks := buildChunks(numChunks)
-	queries := []string{"s", "se", "ser", "serv", "servi"}
-
-	b.Run("cached", func(b *testing.B) {
-		for range b.N {
-			cache := NewChunkCache()
-			for _, q := range queries {
-				pat := buildPatternWith(cache, []rune(q))
-				for _, chunk := range chunks {
-					pat.Match(chunk, slab)
-				}
-			}
-		}
-	})
-
-	b.Run("uncached", func(b *testing.B) {
-		for range b.N {
-			for _, q := range queries {
-				cache := NewChunkCache()
-				pat := buildPatternWith(cache, []rune(q))
-				for _, chunk := range chunks {
-					pat.Match(chunk, slab)
-				}
-			}
-		}
-	})
-}
@@ -6,5 +6,5 @@ import "golang.org/x/sys/unix"

 // Protect calls OS specific protections like pledge on OpenBSD
 func Protect() {
-	unix.PledgePromises("stdio cpath dpath wpath rpath inet fattr unix tty proc exec")
+	unix.PledgePromises("stdio dpath wpath rpath tty proc exec inet tmppath")
 }
@@ -23,32 +23,6 @@ func escapeSingleQuote(str string) string {
 	return "'" + strings.ReplaceAll(str, "'", "'\\''") + "'"
 }

-func popupArgStr(args []string, opts *Options) (string, string) {
-	fzf, rest := args[0], args[1:]
-	args = []string{"--bind=ctrl-z:ignore"}
-	if !opts.Tmux.border && (opts.BorderShape == tui.BorderUndefined || opts.BorderShape == tui.BorderLine) {
-		if tui.DefaultBorderShape == tui.BorderRounded {
-			rest = append(rest, "--border=rounded")
-		} else {
-			rest = append(rest, "--border=sharp")
-		}
-	}
-	if opts.Tmux.border && opts.Margin == defaultMargin() {
-		args = append(args, "--margin=0,1")
-	}
-	argStr := escapeSingleQuote(fzf)
-	for _, arg := range append(args, rest...) {
-		argStr += " " + escapeSingleQuote(arg)
-	}
-	argStr += ` --no-popup --no-height`
-
-	dir, err := os.Getwd()
-	if err != nil {
-		dir = "."
-	}
-	return argStr, dir
-}
-
 func fifo(name string) (string, error) {
 	ns := time.Now().UnixNano()
 	output := filepath.Join(os.TempDir(), fmt.Sprintf("fzf-%s-%d", name, ns))
@@ -178,7 +178,7 @@ func (r *Reader) feed(src io.Reader) {
 	var err error
 	for {
 		n := 0
-		scope := slab[:min(len(slab), readerBufferSize)]
+		scope := slab[:util.Min(len(slab), readerBufferSize)]
 		for range 100 {
 			n, err = src.Read(scope)
 			if n > 0 || err != nil {
@@ -274,24 +274,6 @@ func (r *Reader) readFiles(roots []string, opts walkerOpts, ignores []string) bo
 		ToSlash: fastwalk.DefaultToSlash(),
 		Sort:    fastwalk.SortFilesFirst,
 	}
-
-	// When following symlinks, precompute the absolute real paths of walker
-	// roots so we can skip symlinks that point to an ancestor. fastwalk's
-	// built-in loop detection (shouldTraverse) catches loops on the second
-	// pass, but a single pass through a symlink like z: -> / already
-	// traverses the entire root filesystem, causing severe resource
-	// exhaustion. Skipping ancestor symlinks prevents this entirely.
-	var absRoots []string
-	if opts.follow {
-		for _, root := range roots {
-			if real, err := filepath.EvalSymlinks(root); err == nil {
-				if abs, err := filepath.Abs(real); err == nil {
-					absRoots = append(absRoots, filepath.Clean(abs))
-				}
-			}
-		}
-	}
-
 	ignoresBase := []string{}
 	ignoresFull := []string{}
 	ignoresSuffix := []string{}
@@ -321,30 +303,8 @@ func (r *Reader) readFiles(roots []string, opts walkerOpts, ignores []string) bo
 		}
 		path = trimPath(path)
 		if path != "." {
-			isDirSymlink := isSymlinkToDir(path, de)
-			if isDirSymlink && !opts.follow {
-				return filepath.SkipDir
-			}
-			// Skip symlinks whose target is an ancestor of (or equal to)
-			// any walker root. Following such symlinks would traverse a
-			// superset of the tree we're already walking.
-			if isDirSymlink && len(absRoots) > 0 {
-				if target, err := filepath.EvalSymlinks(path); err == nil {
-					if abs, err := filepath.Abs(target); err == nil {
-						abs = filepath.Clean(abs)
-						if abs == string(os.PathSeparator) {
-							return filepath.SkipDir
-						}
-						for _, absRoot := range absRoots {
-							if absRoot == abs || strings.HasPrefix(absRoot, abs+string(os.PathSeparator)) {
-								return filepath.SkipDir
-							}
-						}
-					}
-				}
-			}
-			isDir := de.IsDir() || isDirSymlink
-			if isDir {
+			isDir := de.IsDir()
+			if isDir || opts.follow && isSymlinkToDir(path, de) {
 				base := filepath.Base(path)
 				if !opts.hidden && base[0] == '.' && base != ".." {
 					return filepath.SkipDir
@@ -2,7 +2,6 @@ package fzf

 import (
 	"math"
-	"slices"
 	"sort"
 	"unicode"

@@ -31,9 +30,11 @@ type Result struct {

 func buildResult(item *Item, offsets []Offset, score int) Result {
 	if len(offsets) > 1 {
-		slices.SortFunc(offsets, compareOffsets)
+		sort.Sort(ByOrder(offsets))
 	}

+	result := Result{item: item}
+	numChars := item.text.Length()
 	minBegin := math.MaxUint16
 	minEnd := math.MaxUint16
 	maxEnd := 0
@@ -41,21 +42,13 @@ func buildResult(item *Item, offsets []Offset, score int) Result {
 	for _, offset := range offsets {
 		b, e := int(offset[0]), int(offset[1])
 		if b < e {
-			minBegin = min(b, minBegin)
-			minEnd = min(e, minEnd)
-			maxEnd = max(e, maxEnd)
+			minBegin = util.Min(b, minBegin)
+			minEnd = util.Min(e, minEnd)
+			maxEnd = util.Max(e, maxEnd)
 			validOffsetFound = true
 		}
 	}

-	return buildResultFromBounds(item, score, minBegin, minEnd, maxEnd, validOffsetFound)
-}
-
-// buildResultFromBounds builds a Result from pre-computed offset bounds.
-func buildResultFromBounds(item *Item, score int, minBegin, minEnd, maxEnd int, validOffsetFound bool) Result {
-	result := Result{item: item}
-	numChars := item.text.Length()
-
 	for idx, criterion := range sortCriteria {
 		val := uint16(math.MaxUint16)
 		switch criterion {
@@ -82,6 +75,7 @@ func buildResultFromBounds(item *Item, score int, minBegin, minEnd, maxEnd int,
 			val = item.TrimLength()
 		case byPathname:
 			if validOffsetFound {
+				// lastDelim := strings.LastIndexByte(item.text.ToString(), '/')
 				lastDelim := -1
 				s := item.text.ToString()
 				for i := len(s) - 1; i >= 0; i-- {
@@ -129,7 +123,7 @@ func minRank() Result {
 	return Result{item: &minItem, points: [4]uint16{math.MaxUint16, 0, 0, 0}}
 }

-func (result *Result) colorOffsets(matchOffsets []Offset, nthOffsets []Offset, theme *tui.ColorTheme, colBase tui.ColorPair, colMatch tui.ColorPair, attrNth tui.Attr, nthOverlay tui.Attr, hidden bool) []colorOffset {
+func (result *Result) colorOffsets(matchOffsets []Offset, nthOffsets []Offset, theme *tui.ColorTheme, colBase tui.ColorPair, colMatch tui.ColorPair, attrNth tui.Attr, hidden bool) []colorOffset {
 	itemColors := result.item.Colors()

 	// No ANSI codes
@@ -188,7 +182,7 @@ func (result *Result) colorOffsets(matchOffsets []Offset, nthOffsets []Offset, t
 		}
 	}

-	// slices.SortFunc(offsets, compareOffsets)
+	// sort.Sort(ByOrder(offsets))

 	// Merge offsets
 	// ------------  ----  --  ----
@@ -212,12 +206,8 @@ func (result *Result) colorOffsets(matchOffsets []Offset, nthOffsets []Offset, t
 		if bg == -1 {
 			bg = colBase.Bg()
 		}
-		return tui.NewColorPair(fg, bg, ansi.color.attr).WithUl(ansi.color.ul).MergeAttr(base)
+		return tui.NewColorPair(fg, bg, ansi.color.attr).MergeAttr(base)
 	}
-	fgAttr := tui.ColNormal.Attr()
-	nthAttrFinal := fgAttr.Merge(attrNth).Merge(nthOverlay)
-	nthBase := colBase.WithNewAttr(nthAttrFinal)
-
 	var colors []colorOffset
 	add := func(idx int) {
 		if curr.fbg >= 0 {
@@ -231,7 +221,7 @@ func (result *Result) colorOffsets(matchOffsets []Offset, nthOffsets []Offset, t
 			if curr.match {
 				var color tui.ColorPair
 				if curr.nth {
-					color = nthBase.Merge(colMatch)
+					color = colBase.WithAttr(attrNth).Merge(colMatch)
 				} else {
 					color = colBase.Merge(colMatch)
 				}
@@ -251,7 +241,7 @@ func (result *Result) colorOffsets(matchOffsets []Offset, nthOffsets []Offset, t
 					if color.Fg().IsDefault() && origColor.HasBg() {
 						color = origColor
 						if curr.nth {
-							color = color.WithAttr((attrNth &^ tui.AttrRegular).Merge(nthOverlay))
+							color = color.WithAttr(attrNth &^ tui.AttrRegular)
 						}
 					} else {
 						color = origColor.MergeNonDefault(color)
@@ -263,7 +253,7 @@ func (result *Result) colorOffsets(matchOffsets []Offset, nthOffsets []Offset, t
 				ansi := itemColors[curr.index]
 				base := colBase
 				if curr.nth {
-					base = nthBase
+					base = base.WithAttr(attrNth)
 				}
 				if hidden {
 					base = base.WithFg(theme.Nomatch)
@@ -275,7 +265,7 @@ func (result *Result) colorOffsets(matchOffsets []Offset, nthOffsets []Offset, t
 					match:  false,
 					url:    ansi.color.url})
 			} else {
-				color := nthBase
+				color := colBase.WithAttr(attrNth)
 				if hidden {
 					color = color.WithFg(theme.Nomatch)
 				}
@@ -298,20 +288,21 @@ func (result *Result) colorOffsets(matchOffsets []Offset, nthOffsets []Offset, t
 	return colors
 }

-func compareOffsets(a, b Offset) int {
-	if a[0] < b[0] {
-		return -1
-	}
-	if a[0] > b[0] {
-		return 1
-	}
-	if a[1] < b[1] {
-		return -1
-	}
-	if a[1] > b[1] {
-		return 1
-	}
-	return 0
+// ByOrder is for sorting substring offsets
+type ByOrder []Offset
+
+func (a ByOrder) Len() int {
+	return len(a)
+}
+
+func (a ByOrder) Swap(i, j int) {
+	a[i], a[j] = a[j], a[i]
+}
+
+func (a ByOrder) Less(i, j int) bool {
+	ioff := a[i]
+	joff := a[j]
+	return (ioff[0] < joff[0]) || (ioff[0] == joff[0]) && (ioff[1] <= joff[1])
 }

 // ByRelevance is for sorting Items
@@ -343,79 +334,3 @@ func (a ByRelevanceTac) Swap(i, j int) {
 func (a ByRelevanceTac) Less(i, j int) bool {
 	return compareRanks(a[i], a[j], true)
 }
-
-// radixSortResults sorts Results by their points key using LSD radix sort.
-// O(n) time complexity vs O(n log n) for comparison sort.
-// The sort is stable, so equal-key items maintain original (item-index) order.
-// For tac mode, runs of equal keys are reversed after sorting.
-func radixSortResults(a []Result, tac bool, scratch []Result) []Result {
-	n := len(a)
-	if n < 128 {
-		if tac {
-			sort.Sort(ByRelevanceTac(a))
-		} else {
-			sort.Sort(ByRelevance(a))
-		}
-		return scratch[:0]
-	}
-
-	if cap(scratch) < n {
-		scratch = make([]Result, n)
-	}
-	buf := scratch[:n]
-	src, dst := a, buf
-	scattered := 0
-
-	for pass := range 8 {
-		shift := uint(pass) * 8
-
-		var count [256]int
-		for i := range src {
-			count[byte(sortKey(&src[i])>>shift)]++
-		}
-
-		// Skip if all items have the same byte value at this position
-		if count[byte(sortKey(&src[0])>>shift)] == n {
-			continue
-		}
-
-		var offset [256]int
-		for i := 1; i < 256; i++ {
-			offset[i] = offset[i-1] + count[i-1]
-		}
-
-		for i := range src {
-			b := byte(sortKey(&src[i]) >> shift)
-			dst[offset[b]] = src[i]
-			offset[b]++
-		}
-
-		src, dst = dst, src
-		scattered++
-	}
-
-	// If odd number of scatters, data is in buf, copy back to a
-	if scattered%2 == 1 {
-		copy(a, src)
-	}
-
-	// Handle tac: reverse runs of equal keys so equal-key items
-	// are in reverse item-index order
-	if tac {
-		i := 0
-		for i < n {
-			ki := sortKey(&a[i])
-			j := i + 1
-			for j < n && sortKey(&a[j]) == ki {
-				j++
-			}
-			if j-i > 1 {
-				for l, r := i, j-1; l < r; l, r = l+1, r-1 {
-					a[l], a[r] = a[r], a[l]
-				}
-			}
-			i = j
-		}
-	}
-	return scratch
-}
@@ -1,4 +1,4 @@
-//go:build !386 && !amd64 && !arm64
+//go:build !386 && !amd64

 package fzf

@@ -14,7 +14,3 @@ func compareRanks(irank Result, jrank Result, tac bool) bool {
 	}
 	return (irank.item.Index() <= jrank.item.Index()) != tac
 }
-
-func sortKey(r *Result) uint64 {
-	return uint64(r.points[0]) | uint64(r.points[1])<<16 | uint64(r.points[2])<<32 | uint64(r.points[3])<<48
-}
@@ -2,8 +2,6 @@ package fzf

 import (
 	"math"
-	"math/rand"
-	"slices"
 	"sort"
 	"testing"

@@ -20,7 +18,7 @@ func TestOffsetSort(t *testing.T) {
 	offsets := []Offset{
 		{3, 5}, {2, 7},
 		{1, 3}, {2, 9}}
-	slices.SortFunc(offsets, compareOffsets)
+	sort.Sort(ByOrder(offsets))

 	if offsets[0][0] != 1 || offsets[0][1] != 3 ||
 		offsets[1][0] != 2 || offsets[1][1] != 7 ||
@@ -126,14 +124,14 @@ func TestColorOffset(t *testing.T) {
 	item := Result{
 		item: &Item{
 			colors: &[]ansiOffset{
-				{[2]int32{0, 20}, ansiState{1, 5, -1, 0, -1, nil}},
-				{[2]int32{22, 27}, ansiState{2, 6, -1, tui.Bold, -1, nil}},
-				{[2]int32{30, 32}, ansiState{3, 7, -1, 0, -1, nil}},
-				{[2]int32{33, 40}, ansiState{4, 8, -1, tui.Bold, -1, nil}}}}}
+				{[2]int32{0, 20}, ansiState{1, 5, 0, -1, nil}},
+				{[2]int32{22, 27}, ansiState{2, 6, tui.Bold, -1, nil}},
+				{[2]int32{30, 32}, ansiState{3, 7, 0, -1, nil}},
+				{[2]int32{33, 40}, ansiState{4, 8, tui.Bold, -1, nil}}}}}

 	colBase := tui.NewColorPair(89, 189, tui.AttrUndefined)
 	colMatch := tui.NewColorPair(99, 199, tui.AttrUndefined)
-	colors := item.colorOffsets(offsets, nil, tui.Dark256, colBase, colMatch, tui.AttrUndefined, 0, false)
+	colors := item.colorOffsets(offsets, nil, tui.Dark256, colBase, colMatch, tui.AttrUndefined, false)
 	assert := func(idx int, b int32, e int32, c tui.ColorPair) {
 		o := colors[idx]
 		if o.offset[0] != b || o.offset[1] != e || o.color != c {
@@ -160,7 +158,7 @@ func TestColorOffset(t *testing.T) {

 	nthOffsets := []Offset{{37, 39}, {42, 45}}
 	for _, attr := range []tui.Attr{tui.AttrRegular, tui.StrikeThrough} {
-		colors = item.colorOffsets(offsets, nthOffsets, tui.Dark256, colRegular, colUnderline, attr, 0, false)
+		colors = item.colorOffsets(offsets, nthOffsets, tui.Dark256, colRegular, colUnderline, attr, false)

 		// [{[0 5] {1 5 0}} {[5 15] {1 5 8}} {[15 20] {1 5 0}}
 		//  {[22 25] {2 6 1}} {[25 27] {2 6 9}} {[27 30] {-1 -1 8}}
@@ -183,92 +181,4 @@ func TestColorOffset(t *testing.T) {
 		assert(10, 37, 39, tui.NewColorPair(4, 8, expected))
 		assert(11, 39, 40, tui.NewColorPair(4, 8, tui.Bold))
 	}
-
-	// Test nthOverlay: simulates nth:regular with current-fg:underline
-	// The overlay (underline) should survive even though nth:regular clears attrs.
-	// Precedence: fg < nth < current-fg
-	colors = item.colorOffsets(offsets, nthOffsets, tui.Dark256, colRegular, colUnderline, tui.AttrRegular, tui.Underline, false)
-
-	// nth regions should have Underline (from overlay), not cleared by AttrRegular
-	// Non-nth regions keep colBase attrs (AttrUndefined)
-	assert(0, 0, 5, tui.NewColorPair(1, 5, tui.AttrUndefined))
-	assert(1, 5, 15, tui.NewColorPair(1, 5, tui.Underline))
-	assert(2, 15, 20, tui.NewColorPair(1, 5, tui.AttrUndefined))
-	assert(3, 22, 25, tui.NewColorPair(2, 6, tui.Bold))
-	assert(4, 25, 27, tui.NewColorPair(2, 6, tui.Bold|tui.Underline))
-	assert(5, 27, 30, colUnderline)
-	assert(6, 30, 32, tui.NewColorPair(3, 7, tui.Underline))
-	assert(7, 32, 33, colUnderline)
-	assert(8, 33, 35, tui.NewColorPair(4, 8, tui.Bold|tui.Underline))
-	assert(9, 35, 37, tui.NewColorPair(4, 8, tui.Bold))
-	// nth region within ANSI bold: AttrRegular clears, overlay adds Underline back
-	assert(10, 37, 39, tui.NewColorPair(4, 8, tui.Bold|tui.Underline))
-	assert(11, 39, 40, tui.NewColorPair(4, 8, tui.Bold))
-
-	// Test nthOverlay with additive attrs: nth:strikethrough with selected-fg:bold
-	colors = item.colorOffsets(offsets, nthOffsets, tui.Dark256, colRegular, colUnderline, tui.StrikeThrough, tui.Bold, false)
-
-	// Non-nth entries unchanged from overlay=0 case
-	assert(0, 0, 5, tui.NewColorPair(1, 5, tui.AttrUndefined))
-	assert(5, 27, 30, colUnderline) // match only, no nth
-	assert(7, 32, 33, colUnderline) // match only, no nth
-	// nth region within ANSI bold: StrikeThrough|Bold merged with ANSI Bold
-	assert(10, 37, 39, tui.NewColorPair(4, 8, tui.Bold|tui.StrikeThrough))
-}
-
-func TestRadixSortResults(t *testing.T) {
-	sortCriteria = []criterion{byScore, byLength}
-
-	rng := rand.New(rand.NewSource(42))
-
-	for _, n := range []int{128, 256, 500, 1000} {
-		for _, tac := range []bool{false, true} {
-			// Build items with random points and indices
-			items := make([]*Item, n)
-			for i := range items {
-				items[i] = &Item{text: util.Chars{Index: int32(i)}}
-			}
-
-			results := make([]Result, n)
-			for i := range results {
-				results[i] = Result{
-					item: items[i],
-					points: [4]uint16{
-						uint16(rng.Intn(256)),
-						uint16(rng.Intn(256)),
-						uint16(rng.Intn(256)),
-						uint16(rng.Intn(256)),
-					},
-				}
-			}
-
-			// Make some duplicates to test stability
-			for i := 0; i < n/4; i++ {
-				j := rng.Intn(n)
-				k := rng.Intn(n)
-				results[j].points = results[k].points
-			}
-
-			// Copy for reference sort
-			expected := make([]Result, n)
-			copy(expected, results)
-			if tac {
-				sort.Sort(ByRelevanceTac(expected))
-			} else {
-				sort.Sort(ByRelevance(expected))
-			}
-
-			// Radix sort
-			var scratch []Result
-			scratch = radixSortResults(results, tac, scratch)
-
-			for i := range results {
-				if results[i] != expected[i] {
-					t.Errorf("n=%d tac=%v: mismatch at index %d: got item %d, want item %d",
-						n, tac, i, results[i].item.Index(), expected[i].item.Index())
-					break
-				}
-			}
-		}
-	}
 }
@@ -1,4 +1,4 @@
-//go:build 386 || amd64 || arm64
+//go:build 386 || amd64

 package fzf

@@ -14,7 +14,3 @@ func compareRanks(irank Result, jrank Result, tac bool) bool {
 	}
 	return (irank.item.Index() <= jrank.item.Index()) != tac
 }
-
-func sortKey(r *Result) uint64 {
-	return *(*uint64)(unsafe.Pointer(&r.points[0]))
-}
@@ -122,12 +122,13 @@ func startHttpServer(address listenAddress, actionChannel chan []*action, getHan
 		}
 	}

+	server := httpServer{
+		apiKey:        []byte(apiKey),
+		actionChannel: actionChannel,
+		getHandler:    getHandler,
+	}
+
 	go func() {
-		server := httpServer{
-			apiKey:        []byte(apiKey),
-			actionChannel: actionChannel,
-			getHandler:    getHandler,
-		}
 		for {
 			conn, err := listener.Accept()
 			if err != nil {
@@ -182,22 +183,23 @@ func (server *httpServer) handleHttpRequest(conn net.Conn) string {
 	})

 	section := 0
-	var getMatch []string
-Loop:
 	for scanner.Scan() {
 		text := scanner.Text()
 		switch section {
-		case 0: // Request line
-			getMatch = getRegex.FindStringSubmatch(text)
-			if len(getMatch) == 0 && !strings.HasPrefix(text, "POST / HTTP") {
+		case 0:
+			getMatch := getRegex.FindStringSubmatch(text)
+			if len(getMatch) > 0 {
+				response := server.getHandler(parseGetParams(getMatch[1]))
+				if len(response) > 0 {
+					return good(response)
+				}
+				return answer(httpUnavailable+jsonContentType, `{"error":"timeout"}`)
+			} else if !strings.HasPrefix(text, "POST / HTTP") {
 				return bad("invalid request method")
 			}
 			section++
-		case 1: // Request headers
-			if text == crlf { // End of headers
-				if len(getMatch) > 0 {
-					break Loop
-				}
+		case 1:
+			if text == crlf {
 				if contentLength == 0 {
 					return bad("content-length header missing")
 				}
@@ -217,7 +219,7 @@ Loop:
 					apiKey = strings.TrimSpace(pair[1])
 				}
 			}
-		case 2: // Request body
+		case 2:
 			body += text
 		}
 	}
@@ -226,14 +228,6 @@ Loop:
 		return unauthorized("invalid api key")
 	}

-	if len(getMatch) > 0 {
-		response := server.getHandler(parseGetParams(getMatch[1]))
-		if len(response) > 0 {
-			return good(response)
-		}
-		return answer(httpUnavailable+jsonContentType, `{"error":"timeout"}`)
-	}
-
 	if len(body) < contentLength {
 		return bad("incomplete request")
 	}
@@ -699,72 +699,3 @@ func readFile(path string) ([]byte, error) {
 		}
 	}
 }
-
-func TestWordWrapAnsiLine(t *testing.T) {
-	term := &Terminal{}
-
-	// Simple wrapping
-	result := term.wordWrapAnsiLine("hello world", 7, 2)
-	if len(result) != 2 || result[0] != "hello" || result[1] != "world" {
-		t.Errorf("Simple: %q", result)
-	}
-
-	// No wrapping needed
-	result = term.wordWrapAnsiLine("hello", 10, 2)
-	if len(result) != 1 || result[0] != "hello" {
-		t.Errorf("No wrap: %q", result)
-	}
-
-	// ANSI codes preserved across split
-	result = term.wordWrapAnsiLine("\x1b[31mhello \x1b[32mworld", 8, 2)
-	if len(result) != 2 || result[0] != "\x1b[31mhello" || result[1] != "\x1b[32mworld" {
-		t.Errorf("ANSI: %q", result)
-	}
-
-	// Long word (no space) - no break, let character wrapping handle it
-	result = term.wordWrapAnsiLine("abcdefghij", 5, 2)
-	if len(result) != 1 || result[0] != "abcdefghij" {
-		t.Errorf("Long word: %q", result)
-	}
-
-	// Multiple words with continuation wrapSignWidth
-	result = term.wordWrapAnsiLine("aa bb cc dd", 5, 2)
-	// max=5 for first line, max=3 for continuations (5-2)
-	// "aa bb" (5 wide), split at second space -> "aa bb" | "cc" | "dd"
-	if len(result) != 3 || result[0] != "aa bb" || result[1] != "cc" || result[2] != "dd" {
-		t.Errorf("Multiple words: %q", result)
-	}
-
-	// Empty string
-	result = term.wordWrapAnsiLine("", 10, 2)
-	if len(result) != 1 || result[0] != "" {
-		t.Errorf("Empty: %q", result)
-	}
-
-	// OSC 8 hyperlink preserved
-	result = term.wordWrapAnsiLine("\x1b]8;;http://example.com\x1b\\click here\x1b]8;;\x1b\\", 8, 2)
-	if len(result) != 2 {
-		t.Errorf("Hyperlink split count: %d, %q", len(result), result)
-	}
-
-	// Tab handling: tab expands to tabstop-aligned width
-	term.tabstop = 8
-	// "\thi there" - tab at column 0 expands to 8, total "hi" starts at 8
-	// maxWidth=15: "\thi" = 10 wide, "there" = 5 wide, total 16 > 15, wrap at space
-	result = term.wordWrapAnsiLine("\thi there", 15, 2)
-	if len(result) != 2 || result[0] != "\thi" || result[1] != "there" {
-		t.Errorf("Tab: %q", result)
-	}
-
-	// Tab as word boundary: "hello"(5) + tab(3→col8) + "world"(5) = 13 total
-	// maxWidth=13: fits without wrapping
-	result = term.wordWrapAnsiLine("hello\tworld", 13, 2)
-	if len(result) != 1 || result[0] != "hello\tworld" {
-		t.Errorf("Tab no wrap: %q", result)
-	}
-	// maxWidth=12: 13 > 12, wraps at tab
-	result = term.wordWrapAnsiLine("hello\tworld", 12, 2)
-	if len(result) != 2 || result[0] != "hello" || result[1] != "world" {
-		t.Errorf("Tab wrap: %q", result)
-	}
-}
@@ -1,11 +1,39 @@
 package fzf

 import (
+	"os"
 	"os/exec"
+
+	"github.com/junegunn/fzf/src/tui"
 )

 func runTmux(args []string, opts *Options) (int, error) {
-	argStr, dir := popupArgStr(args, opts)
+	// Prepare arguments
+	fzf, rest := args[0], args[1:]
+	args = []string{"--bind=ctrl-z:ignore"}
+	if !opts.Tmux.border && (opts.BorderShape == tui.BorderUndefined || opts.BorderShape == tui.BorderLine) {
+		// We append --border option at the end, because `--style=full:STYLE`
+		// may have changed the default border style.
+		if tui.DefaultBorderShape == tui.BorderRounded {
+			rest = append(rest, "--border=rounded")
+		} else {
+			rest = append(rest, "--border=sharp")
+		}
+	}
+	if opts.Tmux.border && opts.Margin == defaultMargin() {
+		args = append(args, "--margin=0,1")
+	}
+	argStr := escapeSingleQuote(fzf)
+	for _, arg := range append(args, rest...) {
+		argStr += " " + escapeSingleQuote(arg)
+	}
+	argStr += ` --no-tmux --no-height`
+
+	// Get current directory
+	dir, err := os.Getwd()
+	if err != nil {
+		dir = "."
+	}

 	// Set tmux options for popup placement
 	// C        Both    The centre of the terminal
@@ -161,7 +161,7 @@ func awkTokenizer(input string) ([]string, int) {
 	end := 0
 	for idx := 0; idx < len(input); idx++ {
 		r := input[idx]
-		white := r == 9 || r == 32 || r == 10
+		white := r == 9 || r == 32
 		switch state {
 		case awkNil:
 			if white {
@@ -218,12 +218,11 @@ func Tokenize(text string, delimiter Delimiter) []Token {
 	return withPrefixLengths(tokens, 0)
 }

-// StripLastDelimiter removes the trailing delimiter
+// StripLastDelimiter removes the trailing delimiter and whitespaces
 func StripLastDelimiter(str string, delimiter Delimiter) string {
 	if delimiter.str != nil {
-		return strings.TrimSuffix(str, *delimiter.str)
-	}
-	if delimiter.regex != nil {
+		str = strings.TrimSuffix(str, *delimiter.str)
+	} else if delimiter.regex != nil {
 		locs := delimiter.regex.FindAllStringIndex(str, -1)
 		if len(locs) > 0 {
 			lastLoc := locs[len(locs)-1]
@@ -231,7 +230,6 @@ func StripLastDelimiter(str string, delimiter Delimiter) string {
 				str = str[:lastLoc[0]]
 			}
 		}
-		return str
 	}
 	return strings.TrimRightFunc(str, unicode.IsSpace)
 }
@@ -304,7 +302,7 @@ func Transform(tokens []Token, withNth []Range) []Token {
 					end += numTokens + 1
 				}
 			}
-			minIdx = max(0, begin-1)
+			minIdx = util.Max(0, begin-1)
 			for idx := begin; idx <= end; idx++ {
 				if idx >= 1 && idx <= numTokens {
 					parts = append(parts, tokens[idx-1].text)
@@ -56,9 +56,9 @@ func TestParseRange(t *testing.T) {

 func TestTokenize(t *testing.T) {
 	// AWK-style
-	input := "  abc: \n\t def:  ghi  "
+	input := "  abc:  def:  ghi  "
 	tokens := Tokenize(input, Delimiter{})
-	if tokens[0].text.ToString() != "abc: \n\t " || tokens[0].prefixLength != 2 {
+	if tokens[0].text.ToString() != "abc:  " || tokens[0].prefixLength != 2 {
 		t.Errorf("%s", tokens)
 	}

@@ -71,9 +71,9 @@ func TestTokenize(t *testing.T) {
 	// With delimiter regex
 	tokens = Tokenize(input, delimiterRegexp("\\s+"))
 	if tokens[0].text.ToString() != "  " || tokens[0].prefixLength != 0 ||
-		tokens[1].text.ToString() != "abc: \n\t " || tokens[1].prefixLength != 2 ||
-		tokens[2].text.ToString() != "def:  " || tokens[2].prefixLength != 10 ||
-		tokens[3].text.ToString() != "ghi  " || tokens[3].prefixLength != 16 {
+		tokens[1].text.ToString() != "abc:  " || tokens[1].prefixLength != 2 ||
+		tokens[2].text.ToString() != "def:  " || tokens[2].prefixLength != 8 ||
+		tokens[3].text.ToString() != "ghi  " || tokens[3].prefixLength != 14 {
 		t.Errorf("%s", tokens)
 	}
 }
@@ -34,11 +34,11 @@ func (r *FullscreenRenderer) ShowCursor()                        {}
 func (r *FullscreenRenderer) Refresh()                           {}
 func (r *FullscreenRenderer) Close()                             {}
 func (r *FullscreenRenderer) Size() TermSize                     { return TermSize{} }
-func (r *FullscreenRenderer) Top() int                           { return 0 }
-func (r *FullscreenRenderer) MaxX() int                          { return 0 }
-func (r *FullscreenRenderer) MaxY() int                          { return 0 }
-func (r *FullscreenRenderer) GetChar(bool) Event                 { return Event{} }
-func (r *FullscreenRenderer) CancelGetChar()                     {}
+
+func (r *FullscreenRenderer) GetChar() Event { return Event{} }
+func (r *FullscreenRenderer) Top() int       { return 0 }
+func (r *FullscreenRenderer) MaxX() int      { return 0 }
+func (r *FullscreenRenderer) MaxY() int      { return 0 }

 func (r *FullscreenRenderer) RefreshWindows(windows []Window) {}

@@ -16,7 +16,7 @@ func _() {
 	_ = x[CtrlE-5]
 	_ = x[CtrlF-6]
 	_ = x[CtrlG-7]
-	_ = x[CtrlH-8]
+	_ = x[CtrlBackspace-8]
 	_ = x[Tab-9]
 	_ = x[CtrlJ-10]
 	_ = x[CtrlK-11]
@@ -99,75 +99,74 @@ func _() {
 	_ = x[CtrlRight-88]
 	_ = x[CtrlHome-89]
 	_ = x[CtrlEnd-90]
-	_ = x[CtrlBackspace-91]
-	_ = x[CtrlDelete-92]
-	_ = x[CtrlPageUp-93]
-	_ = x[CtrlPageDown-94]
-	_ = x[Alt-95]
-	_ = x[CtrlAlt-96]
-	_ = x[CtrlAltUp-97]
-	_ = x[CtrlAltDown-98]
-	_ = x[CtrlAltLeft-99]
-	_ = x[CtrlAltRight-100]
-	_ = x[CtrlAltHome-101]
-	_ = x[CtrlAltEnd-102]
-	_ = x[CtrlAltBackspace-103]
-	_ = x[CtrlAltDelete-104]
-	_ = x[CtrlAltPageUp-105]
-	_ = x[CtrlAltPageDown-106]
-	_ = x[CtrlShiftUp-107]
-	_ = x[CtrlShiftDown-108]
-	_ = x[CtrlShiftLeft-109]
-	_ = x[CtrlShiftRight-110]
-	_ = x[CtrlShiftHome-111]
-	_ = x[CtrlShiftEnd-112]
-	_ = x[CtrlShiftDelete-113]
-	_ = x[CtrlShiftPageUp-114]
-	_ = x[CtrlShiftPageDown-115]
-	_ = x[CtrlAltShiftUp-116]
-	_ = x[CtrlAltShiftDown-117]
-	_ = x[CtrlAltShiftLeft-118]
-	_ = x[CtrlAltShiftRight-119]
-	_ = x[CtrlAltShiftHome-120]
-	_ = x[CtrlAltShiftEnd-121]
-	_ = x[CtrlAltShiftDelete-122]
-	_ = x[CtrlAltShiftPageUp-123]
-	_ = x[CtrlAltShiftPageDown-124]
-	_ = x[Invalid-125]
-	_ = x[Fatal-126]
-	_ = x[BracketedPasteBegin-127]
-	_ = x[BracketedPasteEnd-128]
-	_ = x[Mouse-129]
-	_ = x[DoubleClick-130]
-	_ = x[LeftClick-131]
-	_ = x[RightClick-132]
-	_ = x[SLeftClick-133]
-	_ = x[SRightClick-134]
-	_ = x[ScrollUp-135]
-	_ = x[ScrollDown-136]
-	_ = x[SScrollUp-137]
-	_ = x[SScrollDown-138]
-	_ = x[PreviewScrollUp-139]
-	_ = x[PreviewScrollDown-140]
-	_ = x[Resize-141]
-	_ = x[Change-142]
-	_ = x[BackwardEOF-143]
-	_ = x[Start-144]
-	_ = x[Load-145]
-	_ = x[Focus-146]
-	_ = x[One-147]
-	_ = x[Zero-148]
-	_ = x[Result-149]
-	_ = x[Jump-150]
-	_ = x[JumpCancel-151]
-	_ = x[ClickHeader-152]
-	_ = x[ClickFooter-153]
-	_ = x[Multi-154]
+	_ = x[CtrlDelete-91]
+	_ = x[CtrlPageUp-92]
+	_ = x[CtrlPageDown-93]
+	_ = x[Alt-94]
+	_ = x[CtrlAlt-95]
+	_ = x[CtrlAltUp-96]
+	_ = x[CtrlAltDown-97]
+	_ = x[CtrlAltLeft-98]
+	_ = x[CtrlAltRight-99]
+	_ = x[CtrlAltHome-100]
+	_ = x[CtrlAltEnd-101]
+	_ = x[CtrlAltBackspace-102]
+	_ = x[CtrlAltDelete-103]
+	_ = x[CtrlAltPageUp-104]
+	_ = x[CtrlAltPageDown-105]
+	_ = x[CtrlShiftUp-106]
+	_ = x[CtrlShiftDown-107]
+	_ = x[CtrlShiftLeft-108]
+	_ = x[CtrlShiftRight-109]
+	_ = x[CtrlShiftHome-110]
+	_ = x[CtrlShiftEnd-111]
+	_ = x[CtrlShiftDelete-112]
+	_ = x[CtrlShiftPageUp-113]
+	_ = x[CtrlShiftPageDown-114]
+	_ = x[CtrlAltShiftUp-115]
+	_ = x[CtrlAltShiftDown-116]
+	_ = x[CtrlAltShiftLeft-117]
+	_ = x[CtrlAltShiftRight-118]
+	_ = x[CtrlAltShiftHome-119]
+	_ = x[CtrlAltShiftEnd-120]
+	_ = x[CtrlAltShiftDelete-121]
+	_ = x[CtrlAltShiftPageUp-122]
+	_ = x[CtrlAltShiftPageDown-123]
+	_ = x[Invalid-124]
+	_ = x[Fatal-125]
+	_ = x[BracketedPasteBegin-126]
+	_ = x[BracketedPasteEnd-127]
+	_ = x[Mouse-128]
+	_ = x[DoubleClick-129]
+	_ = x[LeftClick-130]
+	_ = x[RightClick-131]
+	_ = x[SLeftClick-132]
+	_ = x[SRightClick-133]
+	_ = x[ScrollUp-134]
+	_ = x[ScrollDown-135]
+	_ = x[SScrollUp-136]
+	_ = x[SScrollDown-137]
+	_ = x[PreviewScrollUp-138]
+	_ = x[PreviewScrollDown-139]
+	_ = x[Resize-140]
+	_ = x[Change-141]
+	_ = x[BackwardEOF-142]
+	_ = x[Start-143]
+	_ = x[Load-144]
+	_ = x[Focus-145]
+	_ = x[One-146]
+	_ = x[Zero-147]
+	_ = x[Result-148]
+	_ = x[Jump-149]
+	_ = x[JumpCancel-150]
+	_ = x[ClickHeader-151]
+	_ = x[ClickFooter-152]
+	_ = x[Multi-153]
 }

-const _EventType_name = "RuneCtrlACtrlBCtrlCCtrlDCtrlECtrlFCtrlGCtrlHTabCtrlJCtrlKCtrlLEnterCtrlNCtrlOCtrlPCtrlQCtrlRCtrlSCtrlTCtrlUCtrlVCtrlWCtrlXCtrlYCtrlZEscCtrlSpaceCtrlBackSlashCtrlRightBracketCtrlCaretCtrlSlashShiftTabBackspaceDeletePageUpPageDownUpDownLeftRightHomeEndInsertShiftUpShiftDownShiftLeftShiftRightShiftDeleteShiftHomeShiftEndShiftPageUpShiftPageDownF1F2F3F4F5F6F7F8F9F10F11F12AltBackspaceAltUpAltDownAltLeftAltRightAltDeleteAltHomeAltEndAltPageUpAltPageDownAltShiftUpAltShiftDownAltShiftLeftAltShiftRightAltShiftDeleteAltShiftHomeAltShiftEndAltShiftPageUpAltShiftPageDownCtrlUpCtrlDownCtrlLeftCtrlRightCtrlHomeCtrlEndCtrlBackspaceCtrlDeleteCtrlPageUpCtrlPageDownAltCtrlAltCtrlAltUpCtrlAltDownCtrlAltLeftCtrlAltRightCtrlAltHomeCtrlAltEndCtrlAltBackspaceCtrlAltDeleteCtrlAltPageUpCtrlAltPageDownCtrlShiftUpCtrlShiftDownCtrlShiftLeftCtrlShiftRightCtrlShiftHomeCtrlShiftEndCtrlShiftDeleteCtrlShiftPageUpCtrlShiftPageDownCtrlAltShiftUpCtrlAltShiftDownCtrlAltShiftLeftCtrlAltShiftRightCtrlAltShiftHomeCtrlAltShiftEndCtrlAltShiftDeleteCtrlAltShiftPageUpCtrlAltShiftPageDownInvalidFatalBracketedPasteBeginBracketedPasteEndMouseDoubleClickLeftClickRightClickSLeftClickSRightClickScrollUpScrollDownSScrollUpSScrollDownPreviewScrollUpPreviewScrollDownResizeChangeBackwardEOFStartLoadFocusOneZeroResultJumpJumpCancelClickHeaderClickFooterMulti"
+const _EventType_name = "RuneCtrlACtrlBCtrlCCtrlDCtrlECtrlFCtrlGCtrlBackspaceTabCtrlJCtrlKCtrlLEnterCtrlNCtrlOCtrlPCtrlQCtrlRCtrlSCtrlTCtrlUCtrlVCtrlWCtrlXCtrlYCtrlZEscCtrlSpaceCtrlBackSlashCtrlRightBracketCtrlCaretCtrlSlashShiftTabBackspaceDeletePageUpPageDownUpDownLeftRightHomeEndInsertShiftUpShiftDownShiftLeftShiftRightShiftDeleteShiftHomeShiftEndShiftPageUpShiftPageDownF1F2F3F4F5F6F7F8F9F10F11F12AltBackspaceAltUpAltDownAltLeftAltRightAltDeleteAltHomeAltEndAltPageUpAltPageDownAltShiftUpAltShiftDownAltShiftLeftAltShiftRightAltShiftDeleteAltShiftHomeAltShiftEndAltShiftPageUpAltShiftPageDownCtrlUpCtrlDownCtrlLeftCtrlRightCtrlHomeCtrlEndCtrlDeleteCtrlPageUpCtrlPageDownAltCtrlAltCtrlAltUpCtrlAltDownCtrlAltLeftCtrlAltRightCtrlAltHomeCtrlAltEndCtrlAltBackspaceCtrlAltDeleteCtrlAltPageUpCtrlAltPageDownCtrlShiftUpCtrlShiftDownCtrlShiftLeftCtrlShiftRightCtrlShiftHomeCtrlShiftEndCtrlShiftDeleteCtrlShiftPageUpCtrlShiftPageDownCtrlAltShiftUpCtrlAltShiftDownCtrlAltShiftLeftCtrlAltShiftRightCtrlAltShiftHomeCtrlAltShiftEndCtrlAltShiftDeleteCtrlAltShiftPageUpCtrlAltShiftPageDownInvalidFatalBracketedPasteBeginBracketedPasteEndMouseDoubleClickLeftClickRightClickSLeftClickSRightClickScrollUpScrollDownSScrollUpSScrollDownPreviewScrollUpPreviewScrollDownResizeChangeBackwardEOFStartLoadFocusOneZeroResultJumpJumpCancelClickHeaderClickFooterMulti"

-var _EventType_index = [...]uint16{0, 4, 9, 14, 19, 24, 29, 34, 39, 44, 47, 52, 57, 62, 67, 72, 77, 82, 87, 92, 97, 102, 107, 112, 117, 122, 127, 132, 135, 144, 157, 173, 182, 191, 199, 208, 214, 220, 228, 230, 234, 238, 243, 247, 250, 256, 263, 272, 281, 291, 302, 311, 319, 330, 343, 345, 347, 349, 351, 353, 355, 357, 359, 361, 364, 367, 370, 382, 387, 394, 401, 409, 418, 425, 431, 440, 451, 461, 473, 485, 498, 512, 524, 535, 549, 565, 571, 579, 587, 596, 604, 611, 624, 634, 644, 656, 659, 666, 675, 686, 697, 709, 720, 730, 746, 759, 772, 787, 798, 811, 824, 838, 851, 863, 878, 893, 910, 924, 940, 956, 973, 989, 1004, 1022, 1040, 1060, 1067, 1072, 1091, 1108, 1113, 1124, 1133, 1143, 1153, 1164, 1172, 1182, 1191, 1202, 1217, 1234, 1240, 1246, 1257, 1262, 1266, 1271, 1274, 1278, 1284, 1288, 1298, 1309, 1320, 1325}
+var _EventType_index = [...]uint16{0, 4, 9, 14, 19, 24, 29, 34, 39, 52, 55, 60, 65, 70, 75, 80, 85, 90, 95, 100, 105, 110, 115, 120, 125, 130, 135, 140, 143, 152, 165, 181, 190, 199, 207, 216, 222, 228, 236, 238, 242, 246, 251, 255, 258, 264, 271, 280, 289, 299, 310, 319, 327, 338, 351, 353, 355, 357, 359, 361, 363, 365, 367, 369, 372, 375, 378, 390, 395, 402, 409, 417, 426, 433, 439, 448, 459, 469, 481, 493, 506, 520, 532, 543, 557, 573, 579, 587, 595, 604, 612, 619, 629, 639, 651, 654, 661, 670, 681, 692, 704, 715, 725, 741, 754, 767, 782, 793, 806, 819, 833, 846, 858, 873, 888, 905, 919, 935, 951, 968, 984, 999, 1017, 1035, 1055, 1062, 1067, 1086, 1103, 1108, 1119, 1128, 1138, 1148, 1159, 1167, 1177, 1186, 1197, 1212, 1229, 1235, 1241, 1252, 1257, 1261, 1266, 1269, 1273, 1279, 1283, 1293, 1304, 1315, 1320}

 func (i EventType) String() string {
 	if i < 0 || i >= EventType(len(_EventType_index)-1) {
@@ -13,6 +13,7 @@ import (
 	"unicode/utf8"

 	"github.com/junegunn/fzf/src/util"
+	"github.com/rivo/uniseg"

 	"golang.org/x/term"
 )
@@ -25,7 +26,6 @@ const (
 	escPollInterval = 5
 	offsetPollTries = 10
 	maxInputBuffer  = 1024 * 1024
-	maxSelectTries  = 100
 )

 const DefaultTtyDevice string = "/dev/tty"
@@ -49,18 +49,6 @@ const DIM string = "\x1b[2m"
 const CR string = DIM + "␍"
 const LF string = DIM + "␊"

-type getCharResult int
-
-const (
-	getCharSuccess getCharResult = iota
-	getCharError
-	getCharCancelled
-)
-
-func (r getCharResult) ok() bool {
-	return r == getCharSuccess
-}
-
 func (r *LightRenderer) stderrInternal(str string, allowNLCR bool, resetCode string) {
 	bytes := []byte(str)
 	runes := []rune{}
@@ -116,7 +104,6 @@ type LightRenderer struct {
 	clicks        [][2]int
 	ttyin         *os.File
 	ttyout        *os.File
-	cancel        func()
 	buffer        []byte
 	origState     *term.State
 	width         int
@@ -131,9 +118,9 @@ type LightRenderer struct {
 	x             int
 	maxHeightFunc func(int) int
 	showCursor    bool
-	mutex         sync.Mutex

 	// Windows only
+	mutex           sync.Mutex
 	ttyinChannel    chan byte
 	inHandle        uintptr
 	outHandle       uintptr
@@ -206,6 +193,11 @@ func (r *LightRenderer) Init() error {
 	if r.fullscreen {
 		r.smcup()
 	} else {
+		// We assume that --no-clear is used for repetitive relaunching of fzf.
+		// So we do not clear the lower bottom of the screen.
+		if r.clearOnExit {
+			r.csi("J")
+		}
 		y, x := r.findOffset()
 		r.mouse = r.mouse && y >= 0
 		// When --no-clear is used for repetitive relaunching, there is a small
@@ -216,11 +208,6 @@ func (r *LightRenderer) Init() error {
 			r.upOneLine = true
 			r.makeSpace()
 		}
-		// We assume that --no-clear is used for repetitive relaunching of fzf.
-		// So we do not clear the lower bottom of the screen.
-		if r.clearOnExit {
-			r.csi("J")
-		}
 		for i := 1; i < r.MaxY(); i++ {
 			r.makeSpace()
 		}
@@ -275,18 +262,16 @@ func getEnv(name string, defaultValue int) int {
 	return atoi(env, defaultValue)
 }

-func (r *LightRenderer) getBytes(cancellable bool) ([]byte, getCharResult, error) {
-	return r.getBytesInternal(cancellable, r.buffer, false)
+func (r *LightRenderer) getBytes() ([]byte, error) {
+	bytes, err := r.getBytesInternal(r.buffer, false)
+	return bytes, err
 }

-func (r *LightRenderer) getBytesInternal(cancellable bool, buffer []byte, nonblock bool) ([]byte, getCharResult, error) {
-	c, result := r.getch(cancellable, nonblock)
-	if result == getCharCancelled {
-		return buffer, getCharCancelled, nil
-	}
-	if !nonblock && !result.ok() {
+func (r *LightRenderer) getBytesInternal(buffer []byte, nonblock bool) ([]byte, error) {
+	c, ok := r.getch(nonblock)
+	if !nonblock && !ok {
 		r.Close()
-		return nil, getCharError, errors.New("failed to read " + DefaultTtyDevice)
+		return nil, errors.New("failed to read " + DefaultTtyDevice)
 	}

 	retries := 0
@@ -297,8 +282,8 @@ func (r *LightRenderer) getBytesInternal(cancellable bool, buffer []byte, nonblo

 	pc := c
 	for {
-		c, result = r.getch(false, true)
-		if !result.ok() {
+		c, ok = r.getch(true)
+		if !ok {
 			if retries > 0 {
 				retries--
 				time.Sleep(escPollInterval * time.Millisecond)
@@ -317,24 +302,20 @@ func (r *LightRenderer) getBytesInternal(cancellable bool, buffer []byte, nonblo
 		// so terminate fzf immediately.
 		if len(buffer) > maxInputBuffer {
 			r.Close()
-			return nil, getCharError, fmt.Errorf("input buffer overflow (%d): %v", len(buffer), buffer)
+			return nil, fmt.Errorf("input buffer overflow (%d): %v", len(buffer), buffer)
 		}
 	}

-	return buffer, getCharSuccess, nil
+	return buffer, nil
 }

-func (r *LightRenderer) GetChar(cancellable bool) Event {
+func (r *LightRenderer) GetChar() Event {
 	var err error
-	var result getCharResult
 	if len(r.buffer) == 0 {
-		r.buffer, result, err = r.getBytes(cancellable)
+		r.buffer, err = r.getBytes()
 		if err != nil {
 			return Event{Fatal, 0, nil}
 		}
-		if result == getCharCancelled {
-			return Event{Invalid, 0, nil}
-		}
 	}
 	if len(r.buffer) == 0 {
 		return Event{Fatal, 0, nil}
@@ -370,14 +351,9 @@ func (r *LightRenderer) GetChar(cancellable bool) Event {
 		ev := r.escSequence(&sz)
 		// Second chance
 		if ev.Type == Invalid {
-			r.buffer, result, err = r.getBytes(true)
-			if err != nil {
+			if r.buffer, err = r.getBytes(); err != nil {
 				return Event{Fatal, 0, nil}
 			}
-			if result == getCharCancelled {
-				return Event{Invalid, 0, nil}
-			}
-
 			ev = r.escSequence(&sz)
 		}
 		return ev
@@ -395,21 +371,6 @@ func (r *LightRenderer) GetChar(cancellable bool) Event {
 	return Event{Rune, char, nil}
 }

-func (r *LightRenderer) CancelGetChar() {
-	r.mutex.Lock()
-	if r.cancel != nil {
-		r.cancel()
-		r.cancel = nil
-	}
-	r.mutex.Unlock()
-}
-
-func (r *LightRenderer) setCancel(f func()) {
-	r.mutex.Lock()
-	r.cancel = f
-	r.mutex.Unlock()
-}
-
 func (r *LightRenderer) escSequence(sz *int) Event {
 	if len(r.buffer) < 2 {
 		return Event{Esc, 0, nil}
@@ -689,7 +650,6 @@ func (r *LightRenderer) escSequence(sz *int) Event {
 					switch r.buffer[4] {
 					case '1', '2', '3', '4', '5', '6', '7', '8', '9':
 						//                   Kitty      iTerm2     WezTerm
-						// ARROW             "\e[1;1D"
 						// SHIFT-ARROW       "\e[1;2D"
 						// ALT-SHIFT-ARROW   "\e[1;4D"  "\e[1;10D" "\e[1;4D"
 						// CTRL-SHIFT-ARROW  "\e[1;6D"             N/A
@@ -744,7 +704,6 @@ func (r *LightRenderer) escSequence(sz *int) Event {
 							if shift {
 								return Event{ShiftUp, 0, nil}
 							}
-							return Event{Up, 0, nil}
 						case 'B':
 							if ctrlAltShift {
 								return Event{CtrlAltShiftDown, 0, nil}
@@ -767,7 +726,6 @@ func (r *LightRenderer) escSequence(sz *int) Event {
 							if shift {
 								return Event{ShiftDown, 0, nil}
 							}
-							return Event{Down, 0, nil}
 						case 'C':
 							if ctrlAltShift {
 								return Event{CtrlAltShiftRight, 0, nil}
@@ -790,7 +748,6 @@ func (r *LightRenderer) escSequence(sz *int) Event {
 							if alt {
 								return Event{AltRight, 0, nil}
 							}
-							return Event{Right, 0, nil}
 						case 'D':
 							if ctrlAltShift {
 								return Event{CtrlAltShiftLeft, 0, nil}
@@ -813,7 +770,6 @@ func (r *LightRenderer) escSequence(sz *int) Event {
 							if shift {
 								return Event{ShiftLeft, 0, nil}
 							}
-							return Event{Left, 0, nil}
 						case 'H':
 							if ctrlAltShift {
 								return Event{CtrlAltShiftHome, 0, nil}
@@ -836,7 +792,6 @@ func (r *LightRenderer) escSequence(sz *int) Event {
 							if shift {
 								return Event{ShiftHome, 0, nil}
 							}
-							return Event{Home, 0, nil}
 						case 'F':
 							if ctrlAltShift {
 								return Event{CtrlAltShiftEnd, 0, nil}
@@ -859,7 +814,6 @@ func (r *LightRenderer) escSequence(sz *int) Event {
 							if shift {
 								return Event{ShiftEnd, 0, nil}
 							}
-							return Event{End, 0, nil}
 						}
 					} // r.buffer[4]
 				} // r.buffer[3]
@@ -1079,8 +1033,8 @@ func (r *LightRenderer) MaxY() int {
 }

 func (r *LightRenderer) NewWindow(top int, left int, width int, height int, windowType WindowType, borderStyle BorderStyle, erase bool) Window {
-	width = max(0, width)
-	height = max(0, height)
+	width = util.Max(0, width)
+	height = util.Max(0, height)
 	w := &LightWindow{
 		renderer:   r,
 		colored:    r.theme.Colored,
@@ -1129,144 +1083,127 @@ func (w *LightWindow) DrawHBorder() {
 	w.drawBorder(true)
 }

-// drawHLine fills row `row` with `line` between optional left/right caps.
-// A zero rune means "no cap"; caps are placed at the very edges of `w`.
-func (w *LightWindow) drawHLine(row int, line, leftCap, rightCap rune, color ColorPair) {
-	w.Move(row, 0)
-	hw := runeWidth(line)
-	width := w.width
-	if leftCap != 0 {
-		w.CPrint(color, string(leftCap))
-		width -= runeWidth(leftCap)
-	}
-	if rightCap != 0 {
-		width -= runeWidth(rightCap)
-	}
-	if width < 0 {
-		width = 0
-	}
-	inner := width / hw
-	rem := width - inner*hw
-	w.CPrint(color, repeat(line, inner)+repeat(' ', rem))
-	if rightCap != 0 {
-		w.CPrint(color, string(rightCap))
-	}
-}
-
-func (w *LightWindow) DrawHSeparator(row int, windowType WindowType, useBottom bool) {
-	if w.height == 0 {
-		return
-	}
-	shape := w.border.shape
-	if shape == BorderNone {
-		return
-	}
-	color := BorderColor(windowType)
-	line := w.border.top
-	if useBottom {
-		line = w.border.bottom
-	}
-	var leftCap, rightCap rune
-	if shape.HasLeft() {
-		leftCap = w.border.leftMid
-	}
-	if shape.HasRight() {
-		rightCap = w.border.rightMid
-	}
-	w.drawHLine(row, line, leftCap, rightCap, color)
-}
-
-func (w *LightWindow) PaintSectionFrame(topContent, bottomContent int, windowType WindowType, edge SectionEdge) {
-	if w.height == 0 || w.border.shape == BorderNone {
-		return
-	}
-	color := BorderColor(windowType)
-	shape := w.border.shape
-	hasLeft := shape.HasLeft()
-	hasRight := shape.HasRight()
-	rightW := runeWidth(w.border.right)
-	// Content rows: overpaint left/right verticals + their 1-char margin.
-	for row := topContent; row <= bottomContent; row++ {
-		if hasLeft {
-			w.Move(row, 0)
-			w.CPrint(color, string(w.border.left)+" ")
-		}
-		if hasRight {
-			w.Move(row, w.width-rightW-1)
-			w.CPrint(color, " "+string(w.border.right))
-		}
-	}
-	if edge == SectionEdgeTop && shape.HasTop() {
-		var leftCap, rightCap rune
-		if hasLeft {
-			leftCap = w.border.topLeft
-		}
-		if hasRight {
-			rightCap = w.border.topRight
-		}
-		w.drawHLine(0, w.border.top, leftCap, rightCap, color)
-	}
-	if edge == SectionEdgeBottom && shape.HasBottom() {
-		var leftCap, rightCap rune
-		if hasLeft {
-			leftCap = w.border.bottomLeft
-		}
-		if hasRight {
-			rightCap = w.border.bottomRight
-		}
-		w.drawHLine(w.height-1, w.border.bottom, leftCap, rightCap, color)
-	}
-}
-
 func (w *LightWindow) drawBorder(onlyHorizontal bool) {
 	if w.height == 0 {
 		return
 	}
-	shape := w.border.shape
-	if shape == BorderNone {
-		return
+	switch w.border.shape {
+	case BorderRounded, BorderSharp, BorderBold, BorderBlock, BorderThinBlock, BorderDouble:
+		w.drawBorderAround(onlyHorizontal)
+	case BorderHorizontal:
+		w.drawBorderHorizontal(true, true)
+	case BorderVertical:
+		if onlyHorizontal {
+			return
+		}
+		w.drawBorderVertical(true, true)
+	case BorderTop:
+		w.drawBorderHorizontal(true, false)
+	case BorderBottom:
+		w.drawBorderHorizontal(false, true)
+	case BorderLeft:
+		if onlyHorizontal {
+			return
+		}
+		w.drawBorderVertical(true, false)
+	case BorderRight:
+		if onlyHorizontal {
+			return
+		}
+		w.drawBorderVertical(false, true)
 	}
-	color := BorderColor(w.windowType)
-	hasLeft := shape.HasLeft()
-	hasRight := shape.HasRight()
+}

-	if shape.HasTop() {
-		var leftCap, rightCap rune
-		if hasLeft {
-			leftCap = w.border.topLeft
-		}
-		if hasRight {
-			rightCap = w.border.topRight
-		}
-		w.drawHLine(0, w.border.top, leftCap, rightCap, color)
+func (w *LightWindow) drawBorderHorizontal(top, bottom bool) {
+	color := ColBorder
+	switch w.windowType {
+	case WindowList:
+		color = ColListBorder
+	case WindowInput:
+		color = ColInputBorder
+	case WindowHeader:
+		color = ColHeaderBorder
+	case WindowFooter:
+		color = ColFooterBorder
+	case WindowPreview:
+		color = ColPreviewBorder
 	}
-	if !onlyHorizontal && (hasLeft || hasRight) {
+	hw := runeWidth(w.border.top)
+	if top {
+		w.Move(0, 0)
+		w.CPrint(color, repeat(w.border.top, w.width/hw))
+	}
+
+	if bottom {
+		w.Move(w.height-1, 0)
+		w.CPrint(color, repeat(w.border.bottom, w.width/hw))
+	}
+}
+
+func (w *LightWindow) drawBorderVertical(left, right bool) {
+	vw := runeWidth(w.border.left)
+	color := ColBorder
+	switch w.windowType {
+	case WindowList:
+		color = ColListBorder
+	case WindowInput:
+		color = ColInputBorder
+	case WindowHeader:
+		color = ColHeaderBorder
+	case WindowFooter:
+		color = ColFooterBorder
+	case WindowPreview:
+		color = ColPreviewBorder
+	}
+	for y := 0; y < w.height; y++ {
+		if left {
+			w.Move(y, 0)
+			w.CPrint(color, string(w.border.left))
+			w.CPrint(color, " ") // Margin
+		}
+		if right {
+			w.Move(y, w.width-vw-1)
+			w.CPrint(color, " ") // Margin
+			w.CPrint(color, string(w.border.right))
+		}
+	}
+}
+
+func (w *LightWindow) drawBorderAround(onlyHorizontal bool) {
+	w.Move(0, 0)
+	color := ColBorder
+	switch w.windowType {
+	case WindowList:
+		color = ColListBorder
+	case WindowInput:
+		color = ColInputBorder
+	case WindowHeader:
+		color = ColHeaderBorder
+	case WindowFooter:
+		color = ColFooterBorder
+	case WindowPreview:
+		color = ColPreviewBorder
+	}
+	hw := runeWidth(w.border.top)
+	tcw := runeWidth(w.border.topLeft) + runeWidth(w.border.topRight)
+	bcw := runeWidth(w.border.bottomLeft) + runeWidth(w.border.bottomRight)
+	rem := (w.width - tcw) % hw
+	w.CPrint(color, string(w.border.topLeft)+repeat(w.border.top, (w.width-tcw)/hw)+repeat(' ', rem)+string(w.border.topRight))
+	if !onlyHorizontal {
 		vw := runeWidth(w.border.left)
-		for y := 0; y < w.height; y++ {
-			// Corner rows are already painted by drawHLine above / below.
-			if (y == 0 && shape.HasTop()) || (y == w.height-1 && shape.HasBottom()) {
-				continue
-			}
-			if hasLeft {
-				w.Move(y, 0)
-				w.CPrint(color, string(w.border.left)+" ")
-			}
-			if hasRight {
-				w.Move(y, w.width-vw-1)
-				w.CPrint(color, " "+string(w.border.right))
-			}
+		for y := 1; y < w.height-1; y++ {
+			w.Move(y, 0)
+			w.CPrint(color, string(w.border.left))
+			w.CPrint(color, " ") // Margin
+
+			w.Move(y, w.width-vw-1)
+			w.CPrint(color, " ") // Margin
+			w.CPrint(color, string(w.border.right))
 		}
 	}
-	if shape.HasBottom() {
-		var leftCap, rightCap rune
-		if hasLeft {
-			leftCap = w.border.bottomLeft
-		}
-		if hasRight {
-			rightCap = w.border.bottomRight
-		}
-		w.drawHLine(w.height-1, w.border.bottom, leftCap, rightCap, color)
-	}
+	w.Move(w.height-1, 0)
+	rem = (w.width - bcw) % hw
+	w.CPrint(color, string(w.border.bottomLeft)+repeat(w.border.bottom, (w.width-bcw)/hw)+repeat(' ', rem)+string(w.border.bottomRight))
 }

 func (w *LightWindow) csi(code string) string {
@@ -1346,18 +1283,7 @@ func attrCodes(attr Attr) []string {
 		codes = append(codes, "3")
 	}
 	if (attr & Underline) > 0 {
-		switch attr.UnderlineStyle() {
-		case UlStyleDouble:
-			codes = append(codes, "4:2")
-		case UlStyleCurly:
-			codes = append(codes, "4:3")
-		case UlStyleDotted:
-			codes = append(codes, "4:4")
-		case UlStyleDashed:
-			codes = append(codes, "4:5")
-		default:
-			codes = append(codes, "4")
-		}
+		codes = append(codes, "4")
 	}
 	if (attr & Blink) > 0 {
 		codes = append(codes, "5")
@@ -1395,27 +1321,8 @@ func colorCodes(fg Color, bg Color) []string {
 	return codes
 }

-func ulColorCode(c Color) string {
-	if c == colDefault {
-		return ""
-	}
-	if c.is24() {
-		r := (c >> 16) & 0xff
-		g := (c >> 8) & 0xff
-		b := (c) & 0xff
-		return fmt.Sprintf("58;2;%d;%d;%d", r, g, b)
-	}
-	if c >= 0 && c < 256 {
-		return fmt.Sprintf("58;5;%d", c)
-	}
-	return ""
-}
-
-func (w *LightWindow) csiColor(fg Color, bg Color, ul Color, attr Attr) (bool, string) {
+func (w *LightWindow) csiColor(fg Color, bg Color, attr Attr) (bool, string) {
 	codes := append(attrCodes(attr), colorCodes(fg, bg)...)
-	if ulCode := ulColorCode(ul); ulCode != "" {
-		codes = append(codes, ulCode)
-	}
 	code := w.csi(";" + strings.Join(codes, ";") + "m")
 	return len(codes) > 0, code
 }
@@ -1429,28 +1336,65 @@ func cleanse(str string) string {
 }

 func (w *LightWindow) CPrint(pair ColorPair, text string) {
-	_, code := w.csiColor(pair.Fg(), pair.Bg(), pair.Ul(), pair.Attr())
+	_, code := w.csiColor(pair.Fg(), pair.Bg(), pair.Attr())
 	w.stderrInternal(cleanse(text), false, code)
 	w.csi("0m")
 }

 func (w *LightWindow) cprint2(fg Color, bg Color, attr Attr, text string) {
-	hasColors, code := w.csiColor(fg, bg, colDefault, attr)
+	hasColors, code := w.csiColor(fg, bg, attr)
 	if hasColors {
 		defer w.csi("0m")
 	}
 	w.stderrInternal(cleanse(text), false, code)
 }

+type wrappedLine struct {
+	text         string
+	displayWidth int
+}
+
+func wrapLine(input string, prefixLength int, initialMax int, tabstop int, wrapSignWidth int) []wrappedLine {
+	lines := []wrappedLine{}
+	width := 0
+	line := ""
+	gr := uniseg.NewGraphemes(input)
+	max := initialMax
+	for gr.Next() {
+		rs := gr.Runes()
+		str := string(rs)
+		var w int
+		if len(rs) == 1 && rs[0] == '\t' {
+			w = tabstop - (prefixLength+width)%tabstop
+			str = repeat(' ', w)
+		} else if rs[0] == '\r' {
+			w++
+		} else {
+			w = uniseg.StringWidth(str)
+		}
+		width += w
+
+		if prefixLength+width <= max {
+			line += str
+		} else {
+			lines = append(lines, wrappedLine{string(line), width - w})
+			line = str
+			prefixLength = 0
+			width = w
+			max = initialMax - wrapSignWidth
+		}
+	}
+	lines = append(lines, wrappedLine{string(line), width})
+	return lines
+}
+
 func (w *LightWindow) fill(str string, resetCode string) FillReturn {
 	allLines := strings.Split(str, "\n")
 	for i, line := range allLines {
-		lines := WrapLine(line, w.posx, w.width, w.tabstop, w.wrapSignWidth)
+		lines := wrapLine(line, w.posx, w.width, w.tabstop, w.wrapSignWidth)
 		for j, wl := range lines {
-			if w.posx < w.width {
-				w.stderrInternal(wl.Text, false, resetCode)
-				w.posx += wl.DisplayWidth
-			}
+			w.stderrInternal(wl.text, false, resetCode)
+			w.posx += wl.displayWidth

 			// Wrap line
 			if j < len(lines)-1 || i < len(allLines)-1 {
@@ -1488,7 +1432,7 @@ func (w *LightWindow) fill(str string, resetCode string) FillReturn {

 func (w *LightWindow) setBg() string {
 	if w.bg != colDefault {
-		_, code := w.csiColor(colDefault, w.bg, colDefault, AttrRegular)
+		_, code := w.csiColor(colDefault, w.bg, AttrRegular)
 		return code
 	}
 	// Should clear dim attribute after ␍ in the preview window
@@ -1510,7 +1454,7 @@ func (w *LightWindow) Fill(text string) FillReturn {
 	return w.fill(text, code)
 }

-func (w *LightWindow) CFill(fg Color, bg Color, ul Color, attr Attr, text string) FillReturn {
+func (w *LightWindow) CFill(fg Color, bg Color, attr Attr, text string) FillReturn {
 	w.Move(w.posy, w.posx)
 	if fg == colDefault {
 		fg = w.fg
@@ -1518,7 +1462,7 @@ func (w *LightWindow) CFill(fg Color, bg Color, ul Color, attr Attr, text string
 	if bg == colDefault {
 		bg = w.bg
 	}
-	if hasColors, resetCode := w.csiColor(fg, bg, ul, attr); hasColors {
+	if hasColors, resetCode := w.csiColor(fg, bg, attr); hasColors {
 		defer w.csi("0m")
 		return w.fill(text, resetCode)
 	}
@@ -15,27 +15,10 @@ func TestLightRenderer(t *testing.T) {

 	light_renderer := renderer.(*LightRenderer)

-	go func() {
-		for {
-			light_renderer.mutex.Lock()
-			ready := light_renderer.cancel != nil
-			light_renderer.mutex.Unlock()
-
-			if ready {
-				light_renderer.CancelGetChar()
-				break
-			}
-		}
-	}()
-	event := light_renderer.GetChar(true)
-	if event.Type != Invalid {
-		t.Error("Not cancelled")
-	}
-
 	assertCharSequence := func(sequence string, name string) {
 		bytes := []byte(sequence)
 		light_renderer.buffer = bytes
-		event := light_renderer.GetChar(true)
+		event := light_renderer.GetChar()
 		if event.KeyName() != name {
 			t.Errorf(
 				"sequence: %q | %v | '%s' (%s) != %s",
@@ -99,7 +99,7 @@ func (r *LightRenderer) findOffset() (row int, col int) {
 	var err error
 	bytes := []byte{}
 	for tries := range offsetPollTries {
-		bytes, _, err = r.getBytesInternal(false, bytes, tries > 0)
+		bytes, err = r.getBytesInternal(bytes, tries > 0)
 		if err != nil {
 			return -1, -1
 		}
@@ -114,62 +114,15 @@ func (r *LightRenderer) findOffset() (row int, col int) {
 	return -1, -1
 }

-func (r *LightRenderer) getch(cancellable bool, nonblock bool) (int, getCharResult) {
+func (r *LightRenderer) getch(nonblock bool) (int, bool) {
+	b := make([]byte, 1)
 	fd := r.fd()
-	getter := func() (int, getCharResult) {
-		b := make([]byte, 1)
-		util.SetNonblock(r.ttyin, nonblock)
-		_, err := util.Read(fd, b)
-		if err != nil {
-			return 0, getCharError
-		}
-		return int(b[0]), getCharSuccess
-	}
-	if nonblock || !cancellable {
-		return getter()
-	}
-
-	rpipe, wpipe, err := os.Pipe()
+	util.SetNonblock(r.ttyin, nonblock)
+	_, err := util.Read(fd, b)
 	if err != nil {
-		// Fallback to blocking read without cancellation
-		return getter()
+		return 0, false
 	}
-	r.setCancel(func() {
-		wpipe.Write([]byte{0})
-	})
-	defer func() {
-		r.setCancel(nil)
-		rpipe.Close()
-		wpipe.Close()
-	}()
-
-	cancelFd := int(rpipe.Fd())
-	for range maxSelectTries {
-		var rfds unix.FdSet
-		limit := len(rfds.Bits) * unix.NFDBITS
-		if fd >= limit || cancelFd >= limit {
-			return getter()
-		}
-
-		rfds.Set(fd)
-		rfds.Set(cancelFd)
-		_, err := unix.Select(max(fd, cancelFd)+1, &rfds, nil, nil, nil)
-		if err != nil {
-			if err == syscall.EINTR {
-				continue
-			}
-			return 0, getCharError
-		}
-
-		if rfds.IsSet(cancelFd) {
-			return 0, getCharCancelled
-		}
-
-		if rfds.IsSet(fd) {
-			return getter()
-		}
-	}
-	return 0, getCharError
+	return int(b[0]), true
 }

 func (r *LightRenderer) Size() TermSize {
@@ -151,33 +151,16 @@ func (r *LightRenderer) findOffset() (row int, col int) {
 	return int(bufferInfo.CursorPosition.Y), int(bufferInfo.CursorPosition.X)
 }

-func (r *LightRenderer) getch(cancellable bool, nonblock bool) (int, getCharResult) {
-	if !nonblock && !cancellable {
-		bc := <-r.ttyinChannel
-		return int(bc), getCharSuccess
-	}
-
-	var timeout <-chan time.Time
+func (r *LightRenderer) getch(nonblock bool) (int, bool) {
 	if nonblock {
-		timeout = time.After(timeoutInterval * time.Millisecond)
-	}
-
-	var cancel chan struct{}
-	if cancellable {
-		cancel = make(chan struct{})
-		r.setCancel(func() {
-			close(cancel)
-		})
-		defer r.setCancel(nil)
-	}
-
-	select {
-	case bc := <-r.ttyinChannel:
-		return int(bc), getCharSuccess
-	case <-cancel:
-		return 0, getCharCancelled
-	case <-timeout:
-		// NOTE: not really an error
-		return 0, getCharError
+		select {
+		case bc := <-r.ttyinChannel:
+			return int(bc), true
+		case <-time.After(timeoutInterval * time.Millisecond):
+			return 0, false
+		}
+	} else {
+		bc := <-r.ttyinChannel
+		return int(bc), true
 	}
 }
@@ -5,7 +5,6 @@ package tui
 import (
 	"os"
 	"regexp"
-	"strings"
 	"time"

 	"github.com/gdamore/tcell/v2"
@@ -54,7 +53,6 @@ type TcellWindow struct {
 	showCursor    bool
 	wrapSign      string
 	wrapSignWidth int
-	tabstop       int
 }

 func (w *TcellWindow) Top() int {
@@ -248,7 +246,7 @@ func (r *FullscreenRenderer) Size() TermSize {
 	return TermSize{lines, cols, 0, 0}
 }

-func (r *FullscreenRenderer) GetChar(cancellable bool) Event {
+func (r *FullscreenRenderer) GetChar() Event {
 	ev := _screen.PollEvent()
 	switch ev := ev.(type) {
 	case *tcell.EventPaste:
@@ -705,10 +703,6 @@ func (r *FullscreenRenderer) GetChar(cancellable bool) Event {
 	return Event{Invalid, 0, nil}
 }

-func (r *FullscreenRenderer) CancelGetChar() {
-	// TODO
-}
-
 func (r *FullscreenRenderer) Pause(clear bool) {
 	if clear {
 		_screen.Suspend()
@@ -735,8 +729,8 @@ func (r *FullscreenRenderer) RefreshWindows(windows []Window) {
 }

 func (r *FullscreenRenderer) NewWindow(top int, left int, width int, height int, windowType WindowType, borderStyle BorderStyle, erase bool) Window {
-	width = max(0, width)
-	height = max(0, height)
+	width = util.Max(0, width)
+	height = util.Max(0, height)
 	normal := ColBorder
 	switch windowType {
 	case WindowList:
@@ -759,8 +753,7 @@ func (r *FullscreenRenderer) NewWindow(top int, left int, width int, height int,
 		height:      height,
 		normal:      normal,
 		borderStyle: borderStyle,
-		showCursor:  r.showCursor,
-		tabstop:     r.tabstop}
+		showCursor:  r.showCursor}
 	w.Erase()
 	return w
 }
@@ -828,21 +821,6 @@ func (w *TcellWindow) withUrl(style tcell.Style) tcell.Style {
 	return style
 }

-func underlineStyleFromAttr(a Attr) tcell.UnderlineStyle {
-	switch a.UnderlineStyle() {
-	case UlStyleDouble:
-		return tcell.UnderlineStyleDouble
-	case UlStyleCurly:
-		return tcell.UnderlineStyleCurly
-	case UlStyleDotted:
-		return tcell.UnderlineStyleDotted
-	case UlStyleDashed:
-		return tcell.UnderlineStyleDashed
-	default:
-		return tcell.UnderlineStyleSolid
-	}
-}
-
 func (w *TcellWindow) printString(text string, pair ColorPair) {
 	lx := 0
 	a := pair.Attr()
@@ -851,18 +829,11 @@ func (w *TcellWindow) printString(text string, pair ColorPair) {
 	if a&AttrClear == 0 {
 		style = style.
 			Reverse(a&Attr(tcell.AttrReverse) != 0).
+			Underline(a&Attr(tcell.AttrUnderline) != 0).
 			StrikeThrough(a&Attr(tcell.AttrStrikeThrough) != 0).
 			Italic(a&Attr(tcell.AttrItalic) != 0).
 			Blink(a&Attr(tcell.AttrBlink) != 0).
 			Dim(a&Attr(tcell.AttrDim) != 0)
-		if a&Attr(tcell.AttrUnderline) != 0 {
-			style = style.Underline(underlineStyleFromAttr(a))
-			if pair.Ul() != colDefault {
-				style = style.Underline(asTcellColor(pair.Ul()))
-			}
-		} else {
-			style = style.Underline(false)
-		}
 	}
 	style = w.withUrl(style)

@@ -897,8 +868,10 @@ func (w *TcellWindow) CPrint(pair ColorPair, text string) {
 	w.printString(text, pair)
 }

-func (w *TcellWindow) pairStyle(pair ColorPair) tcell.Style {
+func (w *TcellWindow) fillString(text string, pair ColorPair) FillReturn {
+	lx := 0
 	a := pair.Attr()
+
 	var style tcell.Style
 	if w.color {
 		style = pair.style()
@@ -910,73 +883,64 @@ func (w *TcellWindow) pairStyle(pair ColorPair) tcell.Style {
 		Bold(a&Attr(tcell.AttrBold) != 0 || a&BoldForce != 0).
 		Dim(a&Attr(tcell.AttrDim) != 0).
 		Reverse(a&Attr(tcell.AttrReverse) != 0).
+		Underline(a&Attr(tcell.AttrUnderline) != 0).
 		StrikeThrough(a&Attr(tcell.AttrStrikeThrough) != 0).
 		Italic(a&Attr(tcell.AttrItalic) != 0)
-	if a&Attr(tcell.AttrUnderline) != 0 {
-		style = style.Underline(underlineStyleFromAttr(a))
-		if pair.Ul() != colDefault {
-			style = style.Underline(asTcellColor(pair.Ul()))
-		}
-	} else {
-		style = style.Underline(false)
-	}
-	return w.withUrl(style)
-}
+	style = w.withUrl(style)

-func (w *TcellWindow) renderGraphemes(text string, style tcell.Style) {
 	gr := uniseg.NewGraphemes(text)
+Loop:
 	for gr.Next() {
 		st := style
 		rs := gr.Runes()
-		if len(rs) == 1 && rs[0] == '\r' {
-			st = style.Dim(true)
-			rs[0] = '␍'
-		}
-
-		xPos := w.left + w.lastX
-		yPos := w.top + w.lastY
-		if xPos < (w.left+w.width) && yPos < (w.top+w.height) {
-			_screen.SetContent(xPos, yPos, rs[0], rs[1:], st)
-		}
-		w.lastX += util.StringWidth(string(rs))
-	}
-}
-
-func (w *TcellWindow) renderWrapSign(style tcell.Style) {
-	sign := w.wrapSign
-	if w.wrapSignWidth > w.width {
-		runes, _ := util.Truncate(sign, w.width)
-		sign = string(runes)
-	}
-	gr := uniseg.NewGraphemes(sign)
-	for gr.Next() {
-		rs := gr.Runes()
-		_screen.SetContent(w.left+w.lastX, w.top+w.lastY, rs[0], rs[1:], style.Dim(true))
-		w.lastX += uniseg.StringWidth(string(rs))
-	}
-}
-
-func (w *TcellWindow) fillString(text string, pair ColorPair) FillReturn {
-	style := w.pairStyle(pair)
-
-	for i, segment := range strings.Split(text, "\n") {
-		for j, wl := range WrapLine(segment, w.lastX, w.width, w.tabstop, w.wrapSignWidth) {
-			if i > 0 || j > 0 {
+		if len(rs) == 1 {
+			r := rs[0]
+			switch r {
+			case '\r':
+				st = style.Dim(true)
+				rs[0] = '␍'
+			case '\n':
 				w.lastY++
-				if w.lastY >= w.height {
-					return FillSuspend
-				}
 				w.lastX = 0
-				if j > 0 {
-					w.renderWrapSign(style)
-				}
-			}
-			if w.lastX < w.width {
-				w.renderGraphemes(wl.Text, style)
+				lx = 0
+				continue Loop
 			}
 		}
+
+		// word wrap:
+		xPos := w.left + w.lastX + lx
+		if xPos >= w.left+w.width {
+			w.lastY++
+			if w.lastY >= w.height {
+				return FillSuspend
+			}
+			w.lastX = 0
+			lx = 0
+			xPos = w.left
+			sign := w.wrapSign
+			if w.wrapSignWidth > w.width {
+				runes, _ := util.Truncate(sign, w.width)
+				sign = string(runes)
+			}
+			wgr := uniseg.NewGraphemes(sign)
+			for wgr.Next() {
+				rs := wgr.Runes()
+				_screen.SetContent(w.left+lx, w.top+w.lastY, rs[0], rs[1:], style.Dim(true))
+				lx += uniseg.StringWidth(string(rs))
+			}
+			xPos = w.left + lx
+		}
+
+		yPos := w.top + w.lastY
+		if yPos >= (w.top + w.height) {
+			return FillSuspend
+		}
+
+		_screen.SetContent(xPos, yPos, rs[0], rs[1:], st)
+		lx += util.StringWidth(string(rs))
 	}
-	if w.lastX >= w.width {
+	w.lastX += lx
+	if w.lastX == w.width {
 		w.lastY++
 		w.lastX = 0
 		return FillNextLine
@@ -999,14 +963,14 @@ func (w *TcellWindow) LinkEnd() {
 	w.params = nil
 }

-func (w *TcellWindow) CFill(fg Color, bg Color, ul Color, a Attr, str string) FillReturn {
+func (w *TcellWindow) CFill(fg Color, bg Color, a Attr, str string) FillReturn {
 	if fg == colDefault {
 		fg = w.normal.Fg()
 	}
 	if bg == colDefault {
 		bg = w.normal.Bg()
 	}
-	return w.fillString(str, NewColorPair(fg, bg, a).WithUl(ul))
+	return w.fillString(str, NewColorPair(fg, bg, a))
 }

 func (w *TcellWindow) DrawBorder() {
@@ -1017,115 +981,6 @@ func (w *TcellWindow) DrawHBorder() {
 	w.drawBorder(true)
 }

-// borderStyleFor returns the tcell.Style used to draw borders for `wt`, honoring
-// whether the window is rendering with colors.
-func (w *TcellWindow) borderStyleFor(wt WindowType) tcell.Style {
-	if !w.color {
-		return w.normal.style()
-	}
-	return BorderColor(wt).style()
-}
-
-// drawHLine fills row `y` with `line` between optional left/right caps.
-// A zero rune means "no cap"; caps are placed at the very edges of `w`.
-// tcell has an issue displaying two overlapping wide runes, so the line
-// stops before the cap position rather than overpainting.
-func (w *TcellWindow) drawHLine(y int, line, leftCap, rightCap rune, style tcell.Style) {
-	left := w.left
-	right := left + w.width
-	hw := runeWidth(line)
-	lw := 0
-	rw := 0
-	if leftCap != 0 {
-		lw = runeWidth(leftCap)
-	}
-	if rightCap != 0 {
-		rw = runeWidth(rightCap)
-	}
-	for x := left + lw; x <= right-rw-hw; x += hw {
-		_screen.SetContent(x, y, line, nil, style)
-	}
-	if leftCap != 0 {
-		_screen.SetContent(left, y, leftCap, nil, style)
-	}
-	if rightCap != 0 {
-		_screen.SetContent(right-rw, y, rightCap, nil, style)
-	}
-}
-
-func (w *TcellWindow) DrawHSeparator(row int, windowType WindowType, useBottom bool) {
-	if w.height == 0 {
-		return
-	}
-	shape := w.borderStyle.shape
-	if shape == BorderNone {
-		return
-	}
-	style := w.borderStyleFor(windowType)
-	line := w.borderStyle.top
-	if useBottom {
-		line = w.borderStyle.bottom
-	}
-	var leftCap, rightCap rune
-	if shape.HasLeft() {
-		leftCap = w.borderStyle.leftMid
-	}
-	if shape.HasRight() {
-		rightCap = w.borderStyle.rightMid
-	}
-	w.drawHLine(w.top+row, line, leftCap, rightCap, style)
-}
-
-func (w *TcellWindow) PaintSectionFrame(topContent, bottomContent int, windowType WindowType, edge SectionEdge) {
-	if w.height == 0 {
-		return
-	}
-	shape := w.borderStyle.shape
-	if shape == BorderNone {
-		return
-	}
-	style := w.borderStyleFor(windowType)
-	left := w.left
-	right := left + w.width
-	hasLeft := shape.HasLeft()
-	hasRight := shape.HasRight()
-	leftW := runeWidth(w.borderStyle.left)
-	rightW := runeWidth(w.borderStyle.right)
-	// Content rows: overpaint the left and right verticals (+ their 1-char margin) in
-	// the section's color. Inner margin stays at whatever bg the sub-window set.
-	for row := topContent; row <= bottomContent; row++ {
-		y := w.top + row
-		if hasLeft {
-			_screen.SetContent(left, y, w.borderStyle.left, nil, style)
-			_screen.SetContent(left+leftW, y, ' ', nil, style)
-		}
-		if hasRight {
-			_screen.SetContent(right-rightW-1, y, ' ', nil, style)
-			_screen.SetContent(right-rightW, y, w.borderStyle.right, nil, style)
-		}
-	}
-	if edge == SectionEdgeTop && shape.HasTop() {
-		var leftCap, rightCap rune
-		if hasLeft {
-			leftCap = w.borderStyle.topLeft
-		}
-		if hasRight {
-			rightCap = w.borderStyle.topRight
-		}
-		w.drawHLine(w.top, w.borderStyle.top, leftCap, rightCap, style)
-	}
-	if edge == SectionEdgeBottom && shape.HasBottom() {
-		var leftCap, rightCap rune
-		if hasLeft {
-			leftCap = w.borderStyle.bottomLeft
-		}
-		if hasRight {
-			rightCap = w.borderStyle.bottomRight
-		}
-		w.drawHLine(w.top+w.height-1, w.borderStyle.bottom, leftCap, rightCap, style)
-	}
-}
-
 func (w *TcellWindow) drawBorder(onlyHorizontal bool) {
 	if w.height == 0 {
 		return
@@ -1140,44 +995,72 @@ func (w *TcellWindow) drawBorder(onlyHorizontal bool) {
 	top := w.top
 	bot := top + w.height

-	style := w.borderStyleFor(w.windowType)
-
-	hasLeft := shape.HasLeft()
-	hasRight := shape.HasRight()
-
-	if shape.HasTop() {
-		var leftCap, rightCap rune
-		if hasLeft {
-			leftCap = w.borderStyle.topLeft
+	var style tcell.Style
+	if w.color {
+		switch w.windowType {
+		case WindowBase:
+			style = ColBorder.style()
+		case WindowList:
+			style = ColListBorder.style()
+		case WindowHeader:
+			style = ColHeaderBorder.style()
+		case WindowFooter:
+			style = ColFooterBorder.style()
+		case WindowInput:
+			style = ColInputBorder.style()
+		case WindowPreview:
+			style = ColPreviewBorder.style()
 		}
-		if hasRight {
-			rightCap = w.borderStyle.topRight
-		}
-		w.drawHLine(top, w.borderStyle.top, leftCap, rightCap, style)
+	} else {
+		style = w.normal.style()
 	}
-	if shape.HasBottom() {
-		var leftCap, rightCap rune
-		if hasLeft {
-			leftCap = w.borderStyle.bottomLeft
+
+	hw := runeWidth(w.borderStyle.top)
+	switch shape {
+	case BorderRounded, BorderSharp, BorderBold, BorderBlock, BorderThinBlock, BorderDouble, BorderHorizontal, BorderTop:
+		max := right - 2*hw
+		if shape == BorderHorizontal || shape == BorderTop {
+			max = right - hw
 		}
-		if hasRight {
-			rightCap = w.borderStyle.bottomRight
+		// tcell has an issue displaying two overlapping wide runes
+		// e.g.  SetContent(  HH  )
+		//       SetContent(   TR )
+		//       ==================
+		//                 (  HH  ) => TR is ignored
+		for x := left; x <= max; x += hw {
+			_screen.SetContent(x, top, w.borderStyle.top, nil, style)
+		}
+	}
+	switch shape {
+	case BorderRounded, BorderSharp, BorderBold, BorderBlock, BorderThinBlock, BorderDouble, BorderHorizontal, BorderBottom:
+		max := right - 2*hw
+		if shape == BorderHorizontal || shape == BorderBottom {
+			max = right - hw
+		}
+		for x := left; x <= max; x += hw {
+			_screen.SetContent(x, bot-1, w.borderStyle.bottom, nil, style)
 		}
-		w.drawHLine(bot-1, w.borderStyle.bottom, leftCap, rightCap, style)
 	}
 	if !onlyHorizontal {
-		vw := runeWidth(w.borderStyle.right)
-		for y := top; y < bot; y++ {
-			// Corner rows are already painted by drawHLine above / below.
-			if (y == top && shape.HasTop()) || (y == bot-1 && shape.HasBottom()) {
-				continue
-			}
-			if hasLeft {
+		switch shape {
+		case BorderRounded, BorderSharp, BorderBold, BorderBlock, BorderThinBlock, BorderDouble, BorderVertical, BorderLeft:
+			for y := top; y < bot; y++ {
 				_screen.SetContent(left, y, w.borderStyle.left, nil, style)
 			}
-			if hasRight {
+		}
+		switch shape {
+		case BorderRounded, BorderSharp, BorderBold, BorderBlock, BorderThinBlock, BorderDouble, BorderVertical, BorderRight:
+			vw := runeWidth(w.borderStyle.right)
+			for y := top; y < bot; y++ {
 				_screen.SetContent(right-vw, y, w.borderStyle.right, nil, style)
 			}
 		}
 	}
+	switch shape {
+	case BorderRounded, BorderSharp, BorderBold, BorderBlock, BorderThinBlock, BorderDouble:
+		_screen.SetContent(left, top, w.borderStyle.topLeft, nil, style)
+		_screen.SetContent(right-runeWidth(w.borderStyle.topRight), top, w.borderStyle.topRight, nil, style)
+		_screen.SetContent(left, bot-1, w.borderStyle.bottomLeft, nil, style)
+		_screen.SetContent(right-runeWidth(w.borderStyle.bottomRight), bot-1, w.borderStyle.bottomRight, nil, style)
+	}
 }
@@ -110,21 +110,21 @@ func TestGetCharEventKey(t *testing.T) {
 		{giveKey{tcell.KeyDelete, 0, tcell.ModAlt}, wantKey{AltDelete, 0, nil}},
 		{giveKey{tcell.KeyBackspace, 0, tcell.ModCtrl}, wantKey{CtrlBackspace, 0, nil}},
 		{giveKey{tcell.KeyBackspace, 0, tcell.ModCtrl | tcell.ModAlt}, wantKey{CtrlAltBackspace, 0, nil}},
-		{giveKey{tcell.KeyBackspace, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}},                                                  // fabricated, unhandled
-		{giveKey{tcell.KeyBS, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}},                                                         // fabricated, unhandled
-		{giveKey{tcell.KeyCtrlH, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}},                                                      // fabricated, unhandled
-		{giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModNone}, wantKey{Backspace, 0, nil}},                                 // actual "Backspace" keystroke
-		{giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModAlt}, wantKey{AltBackspace, 0, nil}},                               // actual "Alt+Backspace" keystroke
-		{giveKey{tcell.KeyDEL, rune(tcell.KeyDEL), tcell.ModCtrl}, wantKey{CtrlBackspace, 0, nil}},                                 // actual "Ctrl+Backspace" keystroke
-		{giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModShift}, wantKey{Backspace, 0, nil}},                                // actual "Shift+Backspace" keystroke
-		{giveKey{tcell.KeyCtrlH, 0, tcell.ModCtrl | tcell.ModAlt}, wantKey{CtrlAltBackspace, 0, nil}},                              // actual "Ctrl+Alt+Backspace" keystroke
-		{giveKey{tcell.KeyCtrlH, 0, tcell.ModCtrl | tcell.ModShift}, wantKey{CtrlBackspace, 0, nil}},                               // actual "Ctrl+Shift+Backspace" keystroke
-		{giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModShift | tcell.ModAlt}, wantKey{AltBackspace, 0, nil}},              // actual "Shift+Alt+Backspace" keystroke
-		{giveKey{tcell.KeyCtrlH, 0, tcell.ModCtrl | tcell.ModAlt | tcell.ModShift}, wantKey{CtrlAltBackspace, 0, nil}},             // actual "Ctrl+Shift+Alt+Backspace" keystroke
-		{giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModCtrl}, wantKey{CtrlH, 0, nil}},                                     // actual "Ctrl+H" keystroke
-		{giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModCtrl | tcell.ModAlt}, wantKey{CtrlAlt, 'h', nil}},                  // fabricated "Ctrl+Alt+H" keystroke
-		{giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModCtrl | tcell.ModShift}, wantKey{CtrlH, 0, nil}},                    // actual "Ctrl+Shift+H" keystroke
-		{giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModCtrl | tcell.ModAlt | tcell.ModShift}, wantKey{CtrlAlt, 'h', nil}}, // fabricated "Ctrl+Shift+Alt+H" keystroke
+		{giveKey{tcell.KeyBackspace, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}},                                                     // fabricated, unhandled
+		{giveKey{tcell.KeyBS, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}},                                                            // fabricated, unhandled
+		{giveKey{tcell.KeyCtrlH, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}},                                                         // fabricated, unhandled
+		{giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModNone}, wantKey{CtrlBackspace, 0, nil}},                                // actual "Backspace" keystroke
+		{giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModAlt}, wantKey{AltBackspace, 0, nil}},                                  // actual "Alt+Backspace" keystroke
+		{giveKey{tcell.KeyDEL, rune(tcell.KeyDEL), tcell.ModCtrl}, wantKey{CtrlBackspace, 0, nil}},                                    // actual "Ctrl+Backspace" keystroke
+		{giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModShift}, wantKey{CtrlBackspace, 0, nil}},                               // actual "Shift+Backspace" keystroke
+		{giveKey{tcell.KeyCtrlH, 0, tcell.ModCtrl | tcell.ModAlt}, wantKey{CtrlAltBackspace, 0, nil}},                                 // actual "Ctrl+Alt+Backspace" keystroke
+		{giveKey{tcell.KeyCtrlH, 0, tcell.ModCtrl | tcell.ModShift}, wantKey{CtrlBackspace, 0, nil}},                                  // actual "Ctrl+Shift+Backspace" keystroke
+		{giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModShift | tcell.ModAlt}, wantKey{AltBackspace, 0, nil}},                 // actual "Shift+Alt+Backspace" keystroke
+		{giveKey{tcell.KeyCtrlH, 0, tcell.ModCtrl | tcell.ModAlt | tcell.ModShift}, wantKey{CtrlAltBackspace, 0, nil}},                // actual "Ctrl+Shift+Alt+Backspace" keystroke
+		{giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModCtrl}, wantKey{CtrlBackspace, 0, nil}},                                // actual "Ctrl+H" keystroke
+		{giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModCtrl | tcell.ModAlt}, wantKey{AltBackspace, 0, nil}},                  // fabricated "Ctrl+Alt+H" keystroke
+		{giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModCtrl | tcell.ModShift}, wantKey{CtrlBackspace, 0, nil}},               // actual "Ctrl+Shift+H" keystroke
+		{giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModCtrl | tcell.ModAlt | tcell.ModShift}, wantKey{AltBackspace, 0, nil}}, // fabricated "Ctrl+Shift+Alt+H" keystroke

 		// section 4: (Alt+Shift)+Key(Up|Down|Left|Right)
 		{giveKey{tcell.KeyUp, 0, tcell.ModNone}, wantKey{Up, 0, nil}},
@@ -253,7 +253,7 @@ func TestGetCharEventKey(t *testing.T) {
 		{giveKey{tcell.KeyPause, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}},  // unhandled

 	}
-	r := NewFullscreenRenderer(&ColorTheme{}, false, false, 8)
+	r := NewFullscreenRenderer(&ColorTheme{}, false, false)
 	r.Init()

 	// run and evaluate the tests
@@ -265,22 +265,22 @@ func TestGetCharEventKey(t *testing.T) {
 		t.Logf("giveEvent = %T{key: %v, ch: %q (%[3]v), mod: %#04b}\n", giveEvent, giveEvent.Key(), giveEvent.Rune(), giveEvent.Modifiers())

 		// process the event in fzf and evaluate the test
-		gotEvent := r.GetChar(true)
+		gotEvent := r.GetChar()
 		// skip Resize events, those are sometimes put in the buffer outside of this test
 		if initialResizeAsInvalid && gotEvent.Type == Invalid {
 			t.Logf("Resize as Invalid swallowed")
 			initialResizeAsInvalid = false
-			gotEvent = r.GetChar(true)
+			gotEvent = r.GetChar()
 		}
 		if gotEvent.Type == Resize {
 			t.Logf("Resize swallowed")
-			gotEvent = r.GetChar(true)
+			gotEvent = r.GetChar()
 		}
 		t.Logf("wantEvent = %T{Type: %v, Char: %q (%[3]v)}\n", test.wantKey, test.wantKey.Type, test.wantKey.Char)
 		t.Logf("gotEvent = %T{Type: %v, Char: %q (%[3]v)}\n", gotEvent, gotEvent.Type, gotEvent.Char)

-		assert(t, "r.GetChar(true).Type", gotEvent.Type, test.wantKey.Type)
-		assert(t, "r.GetChar(true).Char", gotEvent.Char, test.wantKey.Char)
+		assert(t, "r.GetChar().Type", gotEvent.Type, test.wantKey.Type)
+		assert(t, "r.GetChar().Char", gotEvent.Char, test.wantKey.Char)
 	}

 	r.Close()
@@ -2,7 +2,6 @@ package tui

 import (
 	"strconv"
-	"strings"
 	"time"

 	"github.com/junegunn/fzf/src/util"
@@ -18,34 +17,15 @@ const (
 	BoldForce     = Attr(1 << 10)
 	FullBg        = Attr(1 << 11)
 	Strip         = Attr(1 << 12)
-
-	// Underline style stored in bits 13-15 (3 bits, values 0-4)
-	// Only meaningful when the Underline attribute bit is also set.
-	// 0 = solid (default)
-	UnderlineStyleShift = 13
-	UnderlineStyleMask  = Attr(0b111 << UnderlineStyleShift)
-	UlStyleDouble       = Attr(0b001 << UnderlineStyleShift)
-	UlStyleCurly        = Attr(0b010 << UnderlineStyleShift)
-	UlStyleDotted       = Attr(0b011 << UnderlineStyleShift)
-	UlStyleDashed       = Attr(0b100 << UnderlineStyleShift)
 )

-func (a Attr) UnderlineStyle() Attr {
-	return a & UnderlineStyleMask
-}
-
 func (a Attr) Merge(b Attr) Attr {
 	if b&AttrRegular > 0 {
 		// Only keep bold attribute set by the system
 		return (b &^ AttrRegular) | (a & BoldForce)
 	}

-	merged := (a &^ AttrRegular) | b
-	// When b sets Underline, use b's underline style instead of OR'ing
-	if b&Underline > 0 {
-		merged = (merged &^ UnderlineStyleMask) | (b & UnderlineStyleMask)
-	}
-	return merged
+	return (a &^ AttrRegular) | b
 }

 // Types of user action
@@ -63,7 +43,7 @@ const (
 	CtrlE
 	CtrlF
 	CtrlG
-	CtrlH
+	CtrlBackspace
 	Tab
 	CtrlJ
 	CtrlK
@@ -157,7 +137,6 @@ const (
 	CtrlRight
 	CtrlHome
 	CtrlEnd
-	CtrlBackspace
 	CtrlDelete
 	CtrlPageUp
 	CtrlPageDown
@@ -372,7 +351,6 @@ const (
 type ColorPair struct {
 	fg   Color
 	bg   Color
-	ul   Color
 	attr Attr
 }

@@ -384,11 +362,11 @@ func HexToColor(rrggbb string) Color {
 }

 func NewColorPair(fg Color, bg Color, attr Attr) ColorPair {
-	return ColorPair{fg, bg, colDefault, attr}
+	return ColorPair{fg, bg, attr}
 }

 func NoColorPair() ColorPair {
-	return ColorPair{-1, -1, -1, 0}
+	return ColorPair{-1, -1, 0}
 }

 func (p ColorPair) Fg() Color {
@@ -399,16 +377,6 @@ func (p ColorPair) Bg() Color {
 	return p.bg
 }

-func (p ColorPair) Ul() Color {
-	return p.ul
-}
-
-func (p ColorPair) WithUl(ul Color) ColorPair {
-	dup := p
-	dup.ul = ul
-	return dup
-}
-
 func (p ColorPair) Attr() Attr {
 	return p.attr
 }
@@ -435,9 +403,6 @@ func (p ColorPair) merge(other ColorPair, except Color) ColorPair {
 	if other.bg != except {
 		dup.bg = other.bg
 	}
-	if other.ul != except {
-		dup.ul = other.ul
-	}
 	return dup
 }

@@ -447,21 +412,15 @@ func (p ColorPair) WithAttr(attr Attr) ColorPair {
 	return dup
 }

-func (p ColorPair) WithNewAttr(attr Attr) ColorPair {
-	dup := p
-	dup.attr = attr
-	return dup
-}
-
 func (p ColorPair) WithFg(fg ColorAttr) ColorPair {
 	dup := p
-	fgPair := ColorPair{fg.Color, colUndefined, colUndefined, fg.Attr}
+	fgPair := ColorPair{fg.Color, colUndefined, fg.Attr}
 	return dup.Merge(fgPair)
 }

 func (p ColorPair) WithBg(bg ColorAttr) ColorPair {
 	dup := p
-	bgPair := ColorPair{colUndefined, bg.Color, colUndefined, bg.Attr}
+	bgPair := ColorPair{colUndefined, bg.Color, bg.Attr}
 	return dup.Merge(bgPair)
 }

@@ -496,7 +455,6 @@ type ColorTheme struct {
 	PreviewBg        ColorAttr
 	DarkBg           ColorAttr
 	Gutter           ColorAttr
-	AltGutter        ColorAttr
 	Prompt           ColorAttr
 	InputBg          ColorAttr
 	InputBorder      ColorAttr
@@ -526,8 +484,6 @@ type ColorTheme struct {
 	ListLabel        ColorAttr
 	ListBorder       ColorAttr
 	GapLine          ColorAttr
-	NthCurrentAttr   Attr // raw current-fg attr (before fg merge) for nth overlay
-	NthSelectedAttr  Attr // raw selected-fg attr (before ListFg inherit) for nth overlay
 }

 type Event struct {
@@ -595,12 +551,11 @@ const (
 	BorderBottom
 	BorderLeft
 	BorderRight
-	BorderInline
 )

 func (s BorderShape) HasLeft() bool {
 	switch s {
-	case BorderNone, BorderPhantom, BorderLine, BorderInline, BorderRight, BorderTop, BorderBottom, BorderHorizontal: // No Left
+	case BorderNone, BorderPhantom, BorderLine, BorderRight, BorderTop, BorderBottom, BorderHorizontal: // No Left
 		return false
 	}
 	return true
@@ -608,7 +563,7 @@ func (s BorderShape) HasLeft() bool {

 func (s BorderShape) HasRight() bool {
 	switch s {
-	case BorderNone, BorderPhantom, BorderLine, BorderInline, BorderLeft, BorderTop, BorderBottom, BorderHorizontal: // No right
+	case BorderNone, BorderPhantom, BorderLine, BorderLeft, BorderTop, BorderBottom, BorderHorizontal: // No right
 		return false
 	}
 	return true
@@ -616,7 +571,7 @@ func (s BorderShape) HasRight() bool {

 func (s BorderShape) HasTop() bool {
 	switch s {
-	case BorderNone, BorderPhantom, BorderLine, BorderInline, BorderLeft, BorderRight, BorderBottom, BorderVertical: // No top
+	case BorderNone, BorderPhantom, BorderLine, BorderLeft, BorderRight, BorderBottom, BorderVertical: // No top
 		return false
 	}
 	return true
@@ -624,7 +579,7 @@ func (s BorderShape) HasTop() bool {

 func (s BorderShape) HasBottom() bool {
 	switch s {
-	case BorderNone, BorderPhantom, BorderLine, BorderInline, BorderLeft, BorderRight, BorderTop, BorderVertical: // No bottom
+	case BorderNone, BorderPhantom, BorderLine, BorderLeft, BorderRight, BorderTop, BorderVertical: // No bottom
 		return false
 	}
 	return true
@@ -644,8 +599,6 @@ type BorderStyle struct {
 	topRight    rune
 	bottomLeft  rune
 	bottomRight rune
-	leftMid     rune
-	rightMid    rune
 }

 type BorderCharacter int
@@ -661,9 +614,7 @@ func MakeBorderStyle(shape BorderShape, unicode bool) BorderStyle {
 			topLeft:     ' ',
 			topRight:    ' ',
 			bottomLeft:  ' ',
-			bottomRight: ' ',
-			leftMid:     ' ',
-			rightMid:    ' '}
+			bottomRight: ' '}
 	}
 	if !unicode {
 		return BorderStyle{
@@ -676,8 +627,6 @@ func MakeBorderStyle(shape BorderShape, unicode bool) BorderStyle {
 			topRight:    '+',
 			bottomLeft:  '+',
 			bottomRight: '+',
-			leftMid:     '+',
-			rightMid:    '+',
 		}
 	}
 	switch shape {
@@ -692,8 +641,6 @@ func MakeBorderStyle(shape BorderShape, unicode bool) BorderStyle {
 			topRight:    '┐',
 			bottomLeft:  '└',
 			bottomRight: '┘',
-			leftMid:     '├',
-			rightMid:    '┤',
 		}
 	case BorderBold:
 		return BorderStyle{
@@ -706,8 +653,6 @@ func MakeBorderStyle(shape BorderShape, unicode bool) BorderStyle {
 			topRight:    '┓',
 			bottomLeft:  '┗',
 			bottomRight: '┛',
-			leftMid:     '┣',
-			rightMid:    '┫',
 		}
 	case BorderBlock:
 		// ▛▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▜
@@ -723,8 +668,6 @@ func MakeBorderStyle(shape BorderShape, unicode bool) BorderStyle {
 			topRight:    '▜',
 			bottomLeft:  '▙',
 			bottomRight: '▟',
-			leftMid:     '▌',
-			rightMid:    '▐',
 		}

 	case BorderThinBlock:
@@ -741,8 +684,6 @@ func MakeBorderStyle(shape BorderShape, unicode bool) BorderStyle {
 			topRight:    '🭾',
 			bottomLeft:  '🭼',
 			bottomRight: '🭿',
-			leftMid:     '▏',
-			rightMid:    '▕',
 		}

 	case BorderDouble:
@@ -756,8 +697,6 @@ func MakeBorderStyle(shape BorderShape, unicode bool) BorderStyle {
 			topRight:    '╗',
 			bottomLeft:  '╚',
 			bottomRight: '╝',
-			leftMid:     '╠',
-			rightMid:    '╣',
 		}
 	}
 	return BorderStyle{
@@ -770,8 +709,6 @@ func MakeBorderStyle(shape BorderShape, unicode bool) BorderStyle {
 		topRight:    '╮',
 		bottomLeft:  '╰',
 		bottomRight: '╯',
-		leftMid:     '├',
-		rightMid:    '┤',
 	}
 }

@@ -793,35 +730,6 @@ const (
 	WindowFooter
 )

-// BorderColor returns the ColorPair used to draw borders for the given WindowType.
-func BorderColor(wt WindowType) ColorPair {
-	switch wt {
-	case WindowList:
-		return ColListBorder
-	case WindowInput:
-		return ColInputBorder
-	case WindowHeader:
-		return ColHeaderBorder
-	case WindowFooter:
-		return ColFooterBorder
-	case WindowPreview:
-		return ColPreviewBorder
-	}
-	return ColBorder
-}
-
-// SectionEdge selects which outer edge of the frame an inline section
-// should claim when PaintSectionFrame overpaints its adjacent border.
-// SectionEdgeNone paints only the inner verticals (for sections that
-// don't touch the outer top or bottom).
-type SectionEdge int
-
-const (
-	SectionEdgeNone SectionEdge = iota
-	SectionEdgeTop
-	SectionEdgeBottom
-)
-
 type Renderer interface {
 	DefaultTheme() *ColorTheme
 	Init() error
@@ -839,8 +747,7 @@ type Renderer interface {
 	HideCursor()
 	ShowCursor()

-	GetChar(cancellable bool) Event
-	CancelGetChar()
+	GetChar() Event

 	Top() int
 	MaxX() int
@@ -859,19 +766,6 @@ type Window interface {

 	DrawBorder()
 	DrawHBorder()
-	// DrawHSeparator draws an inline horizontal separator at `row` (relative to the
-	// window's top) using the color for `windowType`. The separator is conceptually
-	// the section's inner edge (e.g. the bottom border of an inline header), so the
-	// whole row including junctions carries the section's fg + bg. When useBottom is
-	// true the `bottom` horizontal char is used instead of `top`; for thinblock/block
-	// styles this keeps the thin line bonded to the list content on the opposite side.
-	DrawHSeparator(row int, windowType WindowType, useBottom bool)
-	// PaintSectionFrame overpaints the border cells around the rows [topContent,
-	// bottomContent] (inclusive, relative to the window's top) with the color for
-	// `windowType`. When edge is SectionEdgeTop / SectionEdgeBottom, the
-	// corresponding outer horizontal (+ corners) is also painted, letting the
-	// inline section claim that edge of the outer frame.
-	PaintSectionFrame(topContent, bottomContent int, windowType WindowType, edge SectionEdge)
 	Refresh()
 	FinishFill()

@@ -886,7 +780,7 @@ type Window interface {
 	Print(text string)
 	CPrint(color ColorPair, text string)
 	Fill(text string) FillReturn
-	CFill(fg Color, bg Color, ul Color, attr Attr, text string) FillReturn
+	CFill(fg Color, bg Color, attr Attr, text string) FillReturn
 	LinkBegin(uri string, params string)
 	LinkEnd()
 	Erase()
@@ -899,18 +793,16 @@ type FullscreenRenderer struct {
 	theme        *ColorTheme
 	mouse        bool
 	forceBlack   bool
-	tabstop      int
 	prevDownTime time.Time
 	clicks       [][2]int
 	showCursor   bool
 }

-func NewFullscreenRenderer(theme *ColorTheme, forceBlack bool, mouse bool, tabstop int) Renderer {
+func NewFullscreenRenderer(theme *ColorTheme, forceBlack bool, mouse bool) Renderer {
 	r := &FullscreenRenderer{
 		theme:        theme,
 		mouse:        mouse,
 		forceBlack:   forceBlack,
-		tabstop:      tabstop,
 		prevDownTime: time.Unix(0, 0),
 		clicks:       [][2]int{},
 		showCursor:   true}
@@ -933,8 +825,6 @@ var (
 	ColCursor               ColorPair
 	ColCursorEmpty          ColorPair
 	ColCursorEmptyChar      ColorPair
-	ColAltCursorEmpty       ColorPair
-	ColAltCursorEmptyChar   ColorPair
 	ColMarker               ColorPair
 	ColSelected             ColorPair
 	ColSelectedMatch        ColorPair
@@ -1000,7 +890,6 @@ func init() {
 		PreviewFg:        defaultColor,
 		PreviewBg:        defaultColor,
 		Gutter:           undefined,
-		AltGutter:        undefined,
 		PreviewBorder:    defaultColor,
 		PreviewScrollbar: defaultColor,
 		PreviewLabel:     defaultColor,
@@ -1053,7 +942,6 @@ func init() {
 		PreviewFg:        undefined,
 		PreviewBg:        undefined,
 		Gutter:           undefined,
-		AltGutter:        undefined,
 		PreviewBorder:    undefined,
 		PreviewScrollbar: undefined,
 		PreviewLabel:     undefined,
@@ -1102,7 +990,6 @@ func init() {
 		PreviewFg:        undefined,
 		PreviewBg:        undefined,
 		Gutter:           undefined,
-		AltGutter:        undefined,
 		PreviewBorder:    undefined,
 		PreviewScrollbar: undefined,
 		PreviewLabel:     undefined,
@@ -1153,7 +1040,6 @@ func init() {
 		PreviewFg:        undefined,
 		PreviewBg:        undefined,
 		Gutter:           undefined,
-		AltGutter:        undefined,
 		PreviewBorder:    undefined,
 		PreviewScrollbar: undefined,
 		PreviewLabel:     undefined,
@@ -1204,7 +1090,6 @@ func init() {
 		PreviewFg:        undefined,
 		PreviewBg:        undefined,
 		Gutter:           undefined,
-		AltGutter:        undefined,
 		PreviewBorder:    undefined,
 		PreviewScrollbar: undefined,
 		PreviewLabel:     undefined,
@@ -1227,7 +1112,7 @@ func init() {
 	}
 }

-func InitTheme(theme *ColorTheme, baseTheme *ColorTheme, boldify bool, forceBlack bool, hasInputWindow bool, hasHeaderWindow bool, headerInline bool, footerInline bool) {
+func InitTheme(theme *ColorTheme, baseTheme *ColorTheme, boldify bool, forceBlack bool, hasInputWindow bool, hasHeaderWindow bool) {
 	if forceBlack {
 		theme.Bg = ColorAttr{colBlack, AttrUndefined}
 	}
@@ -1268,19 +1153,13 @@ func InitTheme(theme *ColorTheme, baseTheme *ColorTheme, boldify bool, forceBlac
 		match.Attr = Underline
 	}
 	theme.Match = o(baseTheme.Match, match)
-	// These colors are not defined in the base themes.
-	// Resolve ListFg/ListBg early so Current and Selected can inherit from them.
-	theme.ListFg = o(theme.Fg, theme.ListFg)
-	theme.ListBg = o(theme.Bg, theme.ListBg)
-	// Inherit from 'list-fg', so that we don't have to write 'current-fg:dim'
+	// Inherit from 'fg', so that we don't have to write 'current-fg:dim'
 	// e.g. fzf --delimiter / --nth -1 --color fg:dim,nth:regular
 	current := theme.Current
 	if !baseTheme.Colored && current.IsUndefined() {
 		current.Attr |= Reverse
 	}
-	resolvedCurrent := o(baseTheme.Current, current)
-	theme.NthCurrentAttr = resolvedCurrent.Attr
-	theme.Current = theme.ListFg.Merge(resolvedCurrent)
+	theme.Current = theme.Fg.Merge(o(baseTheme.Current, current))
 	currentMatch := theme.CurrentMatch
 	if !baseTheme.Colored && currentMatch.IsUndefined() {
 		currentMatch.Attr |= Reverse | Underline
@@ -1305,8 +1184,10 @@ func InitTheme(theme *ColorTheme, baseTheme *ColorTheme, boldify bool, forceBlac
 	scrollbarDefined := theme.Scrollbar != undefined
 	previewBorderDefined := theme.PreviewBorder != undefined

-	theme.NthSelectedAttr = theme.SelectedFg.Attr
-	theme.SelectedFg = theme.ListFg.Merge(theme.SelectedFg)
+	// These colors are not defined in the base themes
+	theme.ListFg = o(theme.Fg, theme.ListFg)
+	theme.ListBg = o(theme.Bg, theme.ListBg)
+	theme.SelectedFg = o(theme.ListFg, theme.SelectedFg)
 	theme.SelectedBg = o(theme.ListBg, theme.SelectedBg)
 	theme.SelectedMatch = o(theme.Match, theme.SelectedMatch)

@@ -1326,7 +1207,6 @@ func InitTheme(theme *ColorTheme, baseTheme *ColorTheme, boldify bool, forceBlac
 		gutter.Attr = Dim
 	}
 	theme.Gutter = o(theme.DarkBg, gutter)
-	theme.AltGutter = o(theme.Gutter, theme.AltGutter)
 	theme.PreviewFg = o(theme.Fg, theme.PreviewFg)
 	theme.PreviewBg = o(theme.Bg, theme.PreviewBg)
 	theme.PreviewLabel = o(theme.BorderLabel, theme.PreviewLabel)
@@ -1361,22 +1241,11 @@ func InitTheme(theme *ColorTheme, baseTheme *ColorTheme, boldify bool, forceBlac
 	} else {
 		theme.HeaderBg = o(theme.Bg, theme.ListBg)
 	}
-	// Inline header/footer borders sit inside the list frame, so default their color
-	// to the list-border color when the user has not explicitly set it. The inline
-	// separator then matches the surrounding frame.
-	headerBorderFallback := theme.Border
-	if headerInline {
-		headerBorderFallback = theme.ListBorder
-	}
-	theme.HeaderBorder = o(headerBorderFallback, theme.HeaderBorder)
+	theme.HeaderBorder = o(theme.Border, theme.HeaderBorder)
 	theme.HeaderLabel = o(theme.BorderLabel, theme.HeaderLabel)

 	theme.FooterBg = o(theme.Bg, theme.FooterBg)
-	footerBorderFallback := theme.Border
-	if footerInline {
-		footerBorderFallback = theme.ListBorder
-	}
-	theme.FooterBorder = o(footerBorderFallback, theme.FooterBorder)
+	theme.FooterBorder = o(theme.Border, theme.FooterBorder)
 	theme.FooterLabel = o(theme.BorderLabel, theme.FooterLabel)

 	if theme.Nomatch.IsUndefined() {
@@ -1391,7 +1260,7 @@ func initPalette(theme *ColorTheme) {
 		if fg.Color == colDefault && (fg.Attr&Reverse) > 0 {
 			bg.Color = colDefault
 		}
-		return ColorPair{fg.Color, bg.Color, colDefault, fg.Attr}
+		return ColorPair{fg.Color, bg.Color, fg.Attr}
 	}
 	blank := theme.ListFg
 	blank.Attr = AttrRegular
@@ -1407,8 +1276,6 @@ func initPalette(theme *ColorTheme) {
 	ColCursor = pair(theme.Cursor, theme.Gutter)
 	ColCursorEmpty = pair(blank, theme.Gutter)
 	ColCursorEmptyChar = pair(theme.Gutter, theme.ListBg)
-	ColAltCursorEmpty = pair(blank, theme.AltGutter)
-	ColAltCursorEmptyChar = pair(theme.AltGutter, theme.ListBg)
 	if theme.SelectedBg.Color != theme.ListBg.Color {
 		ColMarker = pair(theme.Marker, theme.SelectedBg)
 	} else {
@@ -1447,46 +1314,3 @@ func initPalette(theme *ColorTheme) {
 func runeWidth(r rune) int {
 	return uniseg.StringWidth(string(r))
 }
-
-// WrappedLine represents a single visual line after character-level wrapping.
-type WrappedLine struct {
-	Text         string
-	DisplayWidth int
-}
-
-// WrapLine splits a single line (no embedded \n) into visual lines
-// that fit within initialMax columns. Character-level wrapping only.
-func WrapLine(input string, prefixLength int, initialMax int, tabstop int, wrapSignWidth int) []WrappedLine {
-	lines := []WrappedLine{}
-	width := 0
-	line := ""
-	gr := uniseg.NewGraphemes(input)
-	maxWidth := initialMax
-	contMax := max(1, initialMax-wrapSignWidth)
-	for gr.Next() {
-		rs := gr.Runes()
-		str := string(rs)
-		var w int
-		if len(rs) == 1 && rs[0] == '\t' {
-			w = tabstop - (prefixLength+width)%tabstop
-			str = strings.Repeat(" ", w)
-		} else if rs[0] == '\r' {
-			w++
-		} else {
-			w = uniseg.StringWidth(str)
-		}
-		width += w
-
-		if prefixLength+width <= maxWidth {
-			line += str
-		} else {
-			lines = append(lines, WrappedLine{string(line), width - w})
-			line = str
-			prefixLength = 0
-			width = w
-			maxWidth = contMax
-		}
-	}
-	lines = append(lines, WrappedLine{string(line), width})
-	return lines
-}
@@ -2,46 +2,6 @@ package tui

 import "testing"

-func TestWrapLine(t *testing.T) {
-	// Basic wrapping
-	lines := WrapLine("hello world", 0, 7, 8, 2)
-	if len(lines) != 2 || lines[0].Text != "hello w" || lines[1].Text != "orld" {
-		t.Errorf("Basic wrap: %v", lines)
-	}
-
-	// Exact fit - no wrapping needed
-	lines = WrapLine("hello", 0, 5, 8, 2)
-	if len(lines) != 1 || lines[0].Text != "hello" || lines[0].DisplayWidth != 5 {
-		t.Errorf("Exact fit: %v", lines)
-	}
-
-	// With prefix length
-	lines = WrapLine("hello", 3, 5, 8, 2)
-	if len(lines) != 2 || lines[0].Text != "he" || lines[1].Text != "llo" {
-		t.Errorf("Prefix length: %v", lines)
-	}
-
-	// Empty string
-	lines = WrapLine("", 0, 10, 8, 2)
-	if len(lines) != 1 || lines[0].Text != "" || lines[0].DisplayWidth != 0 {
-		t.Errorf("Empty string: %v", lines)
-	}
-
-	// Continuation lines account for wrapSignWidth
-	lines = WrapLine("abcdefghij", 0, 5, 8, 2)
-	// First line: "abcde" (5 chars fit in width 5)
-	// Continuation max: 5-2=3, so "fgh" then "ij"
-	if len(lines) != 3 || lines[0].Text != "abcde" || lines[1].Text != "fgh" || lines[2].Text != "ij" {
-		t.Errorf("Continuation: %v", lines)
-	}
-
-	// Tab expansion
-	lines = WrapLine("\there", 0, 10, 4, 2)
-	if len(lines) != 1 || lines[0].DisplayWidth != 8 {
-		t.Errorf("Tab: %v", lines)
-	}
-}
-
 func TestHexToColor(t *testing.T) {
 	assert := func(expr string, r, g, b int) {
 		color := HexToColor(expr)
@@ -187,7 +187,7 @@ func (chars *Chars) TrailingWhitespaces() int {
 func (chars *Chars) TrimTrailingWhitespaces(maxIndex int) {
 	whitespaces := chars.TrailingWhitespaces()
 	end := len(chars.slice) - whitespaces
-	chars.slice = chars.slice[0:max(end, maxIndex)]
+	chars.slice = chars.slice[0:Max(end, maxIndex)]
 }

 func (chars *Chars) TrimSuffix(runes []rune) {
@@ -249,7 +249,7 @@ func (chars *Chars) Prepend(prefix string) {
 	}
 }

-func (chars *Chars) Lines(multiLine bool, maxLines int, wrapCols int, wrapSignWidth int, tabstop int, wrapWord bool) ([][]rune, bool) {
+func (chars *Chars) Lines(multiLine bool, maxLines int, wrapCols int, wrapSignWidth int, tabstop int) ([][]rune, bool) {
 	text := make([]rune, chars.Length())
 	copy(text, chars.ToRunes())

@@ -307,19 +307,6 @@ func (chars *Chars) Lines(multiLine bool, maxLines int, wrapCols int, wrapSignWi
 				if overflowIdx == 0 {
 					overflowIdx = 1
 				}
-				if wrapWord {
-					// Find last space/tab at or before overflowIdx
-					breakIdx := -1
-					for k := overflowIdx; k > 0; k-- {
-						if line[k-1] == ' ' || line[k-1] == '\t' {
-							breakIdx = k
-							break
-						}
-					}
-					if breakIdx > 0 {
-						overflowIdx = breakIdx
-					}
-				}
 				if len(wrapped) >= maxLines {
 					return wrapped, true
 				}
@@ -51,7 +51,7 @@ func TestTrimLength(t *testing.T) {
 func TestCharsLines(t *testing.T) {
 	chars := ToChars([]byte("abcdef\n가나다\n\tdef"))
 	check := func(multiLine bool, maxLines int, wrapCols int, wrapSignWidth int, tabstop int, expectedNumLines int, expectedOverflow bool) {
-		lines, overflow := chars.Lines(multiLine, maxLines, wrapCols, wrapSignWidth, tabstop, false)
+		lines, overflow := chars.Lines(multiLine, maxLines, wrapCols, wrapSignWidth, tabstop)
 		fmt.Println(lines, overflow)
 		if len(lines) != expectedNumLines || overflow != expectedOverflow {
 			t.Errorf("Invalid result: %d %v (expected %d %v)", len(lines), overflow, expectedNumLines, expectedOverflow)
@@ -81,51 +81,3 @@ func TestCharsLines(t *testing.T) {
 	// With wrap sign (3 + 2) and no multi-line
 	check(false, 100, 3, 2, 1, 13, false)
 }
-
-func TestCharsLinesWrapWord(t *testing.T) {
-	// "hello world foo bar" with width 12 should break at word boundaries
-	chars := ToChars([]byte("hello world foo bar"))
-	lines, overflow := chars.Lines(false, 100, 12, 0, 8, true)
-	// "hello world " (12) | "foo bar" (7)
-	if len(lines) != 2 || overflow {
-		t.Errorf("Expected 2 lines, got %d (overflow: %v): %v", len(lines), overflow, lines)
-	}
-	if string(lines[0]) != "hello world " {
-		t.Errorf("Expected first line 'hello world ', got %q", string(lines[0]))
-	}
-	if string(lines[1]) != "foo bar" {
-		t.Errorf("Expected second line 'foo bar', got %q", string(lines[1]))
-	}
-
-	// No word boundary: a single long word falls back to character wrap
-	chars2 := ToChars([]byte("abcdefghijklmnop"))
-	lines2, _ := chars2.Lines(false, 100, 10, 0, 8, true)
-	if len(lines2) != 2 {
-		t.Errorf("Expected 2 lines for long word, got %d: %v", len(lines2), lines2)
-	}
-	if string(lines2[0]) != "abcdefghij" {
-		t.Errorf("Expected first line 'abcdefghij', got %q", string(lines2[0]))
-	}
-
-	// Tab as word boundary
-	chars3 := ToChars([]byte("hello\tworld"))
-	lines3, _ := chars3.Lines(false, 100, 7, 0, 8, true)
-	// "hello\t" should break at tab (width of tab at pos 5 with tabstop 8 = 3, total width = 8 > 7)
-	// Actually RunesWidth: 'h'=1,'e'=1,'l'=1,'l'=1,'o'=1,'\t'=3 = 8 > 7, overflowIdx=5
-	// Then word-wrap scans back and finds no space/tab before idx 5 (tab IS at idx 5 but we check line[k-1])
-	// Wait - let me think: overflowIdx=5, we check k=5 -> line[4]='o', k=4 -> line[3]='l'... no space/tab found
-	// Falls back to character wrap: "hello" | "\tworld"
-	if len(lines3) < 2 {
-		t.Errorf("Expected at least 2 lines for tab test, got %d: %v", len(lines3), lines3)
-	}
-
-	// wrapWord=false still character-wraps
-	chars4 := ToChars([]byte("hello world"))
-	lines4, _ := chars4.Lines(false, 100, 8, 0, 8, false)
-	if len(lines4) != 2 {
-		t.Errorf("Expected 2 lines with wrapWord=false, got %d: %v", len(lines4), lines4)
-	}
-	if string(lines4[0]) != "hello wo" {
-		t.Errorf("Expected first line 'hello wo', got %q", string(lines4[0]))
-	}
-}
@@ -1,11 +1,11 @@
 package util

 import (
-	"cmp"
 	"math"
 	"os"
 	"strconv"
 	"strings"
+	"time"

 	"github.com/mattn/go-isatty"
 	"github.com/rivo/uniseg"
@@ -18,13 +18,8 @@ func StringWidth(s string) int {

 // RunesWidth returns runes width
 func RunesWidth(runes []rune, prefixWidth int, tabstop int, limit int) (int, int) {
-	return StringsWidth(string(runes), prefixWidth, tabstop, limit)
-}
-
-// StringsWidth returns the width of the string
-func StringsWidth(str string, prefixWidth int, tabstop int, limit int) (int, int) {
 	width := 0
-	gr := uniseg.NewGraphemes(str)
+	gr := uniseg.NewGraphemes(string(runes))
 	idx := 0
 	for gr.Next() {
 		rs := gr.Runes()
@@ -60,8 +55,54 @@ func Truncate(input string, limit int) ([]rune, int) {
 	return runes, width
 }

-func Constrain[T cmp.Ordered](val, minimum, maximum T) T {
-	return max(min(val, maximum), minimum)
+// Max returns the largest integer
+func Max(first int, second int) int {
+	if first >= second {
+		return first
+	}
+	return second
+}
+
+// Max16 returns the largest integer
+func Max16(first int16, second int16) int16 {
+	if first >= second {
+		return first
+	}
+	return second
+}
+
+// Max32 returns the largest 32-bit integer
+func Max32(first int32, second int32) int32 {
+	if first > second {
+		return first
+	}
+	return second
+}
+
+// Min returns the smallest integer
+func Min(first int, second int) int {
+	if first <= second {
+		return first
+	}
+	return second
+}
+
+// Min32 returns the smallest 32-bit integer
+func Min32(first int32, second int32) int32 {
+	if first <= second {
+		return first
+	}
+	return second
+}
+
+// Constrain32 limits the given 32-bit integer with the upper and lower bounds
+func Constrain32(val int32, min int32, max int32) int32 {
+	return Max32(Min32(val, max), min)
+}
+
+// Constrain limits the given integer with the upper and lower bounds
+func Constrain(val int, min int, max int) int {
+	return Max(Min(val, max), min)
 }

 func AsUint16(val int) uint16 {
@@ -73,6 +114,18 @@ func AsUint16(val int) uint16 {
 	return uint16(val)
 }

+// DurWithin limits the given time.Duration with the upper and lower bounds
+func DurWithin(
+	val time.Duration, min time.Duration, max time.Duration) time.Duration {
+	if val < min {
+		return min
+	}
+	if val > max {
+		return max
+	}
+	return val
+}
+
 // IsTty returns true if the file is a terminal
 func IsTty(file *os.File) bool {
 	fd := file.Fd()
@@ -144,7 +197,7 @@ func CompareVersions(v1, v2 string) int {
 		return n
 	}

-	for i := 0; i < max(len(parts1), len(parts2)); i++ {
+	for i := 0; i < Max(len(parts1), len(parts2)); i++ {
 		var p1, p2 int
 		if i < len(parts1) {
 			p1 = atoi(parts1[i])
@@ -4,8 +4,72 @@ import (
 	"math"
 	"strings"
 	"testing"
+	"time"
 )

+func TestMax(t *testing.T) {
+	if Max(10, 1) != 10 {
+		t.Error("Expected", 10)
+	}
+	if Max(-2, 5) != 5 {
+		t.Error("Expected", 5)
+	}
+}
+
+func TestMax16(t *testing.T) {
+	if Max16(10, 1) != 10 {
+		t.Error("Expected", 10)
+	}
+	if Max16(-2, 5) != 5 {
+		t.Error("Expected", 5)
+	}
+	if Max16(math.MaxInt16, 0) != math.MaxInt16 {
+		t.Error("Expected", math.MaxInt16)
+	}
+	if Max16(0, math.MinInt16) != 0 {
+		t.Error("Expected", 0)
+	}
+}
+
+func TestMax32(t *testing.T) {
+	if Max32(10, 1) != 10 {
+		t.Error("Expected", 10)
+	}
+	if Max32(-2, 5) != 5 {
+		t.Error("Expected", 5)
+	}
+	if Max32(math.MaxInt32, 0) != math.MaxInt32 {
+		t.Error("Expected", math.MaxInt32)
+	}
+	if Max32(0, math.MinInt32) != 0 {
+		t.Error("Expected", 0)
+	}
+}
+
+func TestMin(t *testing.T) {
+	if Min(10, 1) != 1 {
+		t.Error("Expected", 1)
+	}
+	if Min(-2, 5) != -2 {
+		t.Error("Expected", -2)
+	}
+}
+
+func TestMin32(t *testing.T) {
+	if Min32(10, 1) != 1 {
+		t.Error("Expected", 1)
+	}
+	if Min32(-2, 5) != -2 {
+		t.Error("Expected", -2)
+	}
+	if Min32(math.MaxInt32, 0) != 0 {
+		t.Error("Expected", 0)
+	}
+	if Min32(0, math.MinInt32) != math.MinInt32 {
+		t.Error("Expected", math.MinInt32)
+	}
+}
+
 func TestConstrain(t *testing.T) {
 	if Constrain(-3, -1, 3) != -1 {
 		t.Error("Expected", -1)
@@ -19,6 +83,22 @@ func TestConstrain(t *testing.T) {
 	}
 }

+func TestConstrain32(t *testing.T) {
+	if Constrain32(-3, -1, 3) != -1 {
+		t.Error("Expected", -1)
+	}
+	if Constrain32(2, -1, 3) != 2 {
+		t.Error("Expected", 2)
+	}
+
+	if Constrain32(5, -1, 3) != 3 {
+		t.Error("Expected", 3)
+	}
+	if Constrain32(0, math.MinInt32, math.MaxInt32) != 0 {
+		t.Error("Expected", 0)
+	}
+}
+
 func TestAsUint16(t *testing.T) {
 	if AsUint16(5) != 5 {
 		t.Error("Expected", 5)
@@ -40,6 +120,18 @@ func TestAsUint16(t *testing.T) {
 	}
 }

+func TestDurWithIn(t *testing.T) {
+	if DurWithin(time.Duration(5), time.Duration(1), time.Duration(8)) != time.Duration(5) {
+		t.Error("Expected", time.Duration(0))
+	}
+	if DurWithin(time.Duration(0)*time.Second, time.Second, time.Duration(3)*time.Second) != time.Second {
+		t.Error("Expected", time.Second)
+	}
+	if DurWithin(time.Duration(10)*time.Second, time.Duration(0), time.Second) != time.Second {
+		t.Error("Expected", time.Second)
+	}
+}
+
 func TestOnce(t *testing.T) {
 	o := Once(false)
 	if o() {
@@ -9,7 +9,6 @@ import (
 	"strings"
 	"syscall"

-	"github.com/junegunn/go-shellwords"
 	"golang.org/x/sys/unix"
 )

@@ -21,8 +20,8 @@ type Executor struct {

 func NewExecutor(withShell string) *Executor {
 	shell := os.Getenv("SHELL")
-	args, err := shellwords.Parse(withShell)
-	if err == nil && len(args) > 0 {
+	args := strings.Fields(withShell)
+	if len(args) > 0 {
 		shell = args[0]
 		args = args[1:]
 	} else {
@@ -11,8 +11,6 @@ import (
 	"strings"
 	"sync/atomic"
 	"syscall"
-
-	"golang.org/x/sys/windows"
 )

 type shellType int
@@ -21,7 +19,6 @@ const (
 	shellTypeUnknown shellType = iota
 	shellTypeCmd
 	shellTypePowerShell
-	shellTypePwsh
 )

 var escapeRegex = regexp.MustCompile(`[&|<>()^%!"]`)
@@ -49,10 +46,7 @@ func NewExecutor(withShell string) *Executor {
 	} else if strings.HasPrefix(basename, "cmd") {
 		shellType = shellTypeCmd
 		args = []string{"/s/c"}
-	} else if strings.HasPrefix(basename, "pwsh") {
-		shellType = shellTypePwsh
-		args = []string{"-NoProfile", "-Command"}
-	} else if strings.HasPrefix(basename, "powershell") {
+	} else if strings.HasPrefix(basename, "pwsh") || strings.HasPrefix(basename, "powershell") {
 		shellType = shellTypePowerShell
 		args = []string{"-NoProfile", "-Command"}
 	} else {
@@ -62,12 +56,8 @@ func NewExecutor(withShell string) *Executor {
 }

 // ExecCommand executes the given command with $SHELL
-//
-// On Windows, setpgid controls whether the spawned process is placed in a new
-// process group (so that it can be signaled independently, e.g. for previews).
-// However, we only do this for "pwsh" and non-standard shells, because cmd.exe
-// and Windows PowerShell ("powershell.exe") don't always exit on Ctrl-Break.
-//
+// FIXME: setpgid is unused. We set it in the Unix implementation so that we
+// can kill preview process with its child processes at once.
 // NOTE: For "powershell", we should ideally set output encoding to UTF8,
 // but it is left as is now because no adverse effect has been observed.
 func (x *Executor) ExecCommand(command string, setpgid bool) *exec.Cmd {
@@ -83,31 +73,19 @@ func (x *Executor) ExecCommand(command string, setpgid bool) *exec.Cmd {
 		}
 		x.shellPath.Store(shell)
 	}
-
-	var creationFlags uint32
-	// Set new process group for pwsh (PowerShell 7+) and unknown/posix-ish shells
-	if setpgid && (x.shellType == shellTypePwsh || x.shellType == shellTypeUnknown) {
-		creationFlags = windows.CREATE_NEW_PROCESS_GROUP
-	}
-
 	var cmd *exec.Cmd
 	if x.shellType == shellTypeCmd {
 		cmd = exec.Command(shell)
 		cmd.SysProcAttr = &syscall.SysProcAttr{
 			HideWindow:    false,
 			CmdLine:       fmt.Sprintf(`%s "%s"`, strings.Join(x.args, " "), command),
-			CreationFlags: creationFlags,
+			CreationFlags: 0,
 		}
 	} else {
-		args := x.args
-		if setpgid && x.shellType == shellTypePwsh {
-			// pwsh needs -NonInteractive flag to exit on Ctrl-Break
-			args = append([]string{"-NonInteractive"}, x.args...)
-		}
-		cmd = exec.Command(shell, append(args, command)...)
+		cmd = exec.Command(shell, append(x.args, command)...)
 		cmd.SysProcAttr = &syscall.SysProcAttr{
 			HideWindow:    false,
-			CreationFlags: creationFlags,
+			CreationFlags: 0,
 		}
 	}
 	return cmd
@@ -178,7 +156,7 @@ func (x *Executor) QuoteEntry(entry string) string {
 		   fd -H --no-ignore -td -d 4 | fzf --preview ".\eza.exe --color=always --tree --level=3 --icons=always {}" --with-shell "powershell -NoProfile -Command"
 		*/
 		return escapeArg(entry)
-	case shellTypePowerShell, shellTypePwsh:
+	case shellTypePowerShell:
 		escaped := strings.ReplaceAll(entry, `"`, `\"`)
 		return "'" + strings.ReplaceAll(escaped, "'", "''") + "'"
 	default:
@@ -188,21 +166,6 @@ func (x *Executor) QuoteEntry(entry string) string {

 // KillCommand kills the process for the given command
 func KillCommand(cmd *exec.Cmd) error {
-	// Safely handle nil command or process.
-	if cmd == nil || cmd.Process == nil {
-		return nil
-	}
-	// If it has its own process group, we can send it Ctrl-Break
-	if cmd.SysProcAttr != nil && cmd.SysProcAttr.CreationFlags&windows.CREATE_NEW_PROCESS_GROUP != 0 {
-		if err := windows.GenerateConsoleCtrlEvent(windows.CTRL_BREAK_EVENT, uint32(cmd.Process.Pid)); err == nil {
-			return nil
-		}
-	}
-	// If it's the same process group, or if sending the console control event
-	// fails (e.g., no console, different console, or process already exited),
-	// fall back to a standard kill.  This probably won't *help* if there's I/O
-	// going on, because Wait() will still hang until the I/O finishes unless we
-	// hard-kill the entire process group.  But it doesn't hurt to try!
 	return cmd.Process.Kill()
 }

@@ -1,41 +0,0 @@
-package fzf
-
-import (
-	"os/exec"
-)
-
-func runZellij(args []string, opts *Options) (int, error) {
-	argStr, dir := popupArgStr(args, opts)
-
-	zellijArgs := []string{
-		"run", "--floating", "--close-on-exit", "--block-until-exit",
-		"--cwd", dir,
-	}
-	if !opts.Tmux.border {
-		zellijArgs = append(zellijArgs, "--borderless", "true")
-	}
-	switch opts.Tmux.position {
-	case posUp:
-		zellijArgs = append(zellijArgs, "-y", "0")
-	case posDown:
-		zellijArgs = append(zellijArgs, "-y", "9999")
-	case posLeft:
-		zellijArgs = append(zellijArgs, "-x", "0")
-	case posRight:
-		zellijArgs = append(zellijArgs, "-x", "9999")
-	case posCenter:
-		// Zellij centers floating panes by default
-	}
-	zellijArgs = append(zellijArgs, "--width", opts.Tmux.width.String())
-	zellijArgs = append(zellijArgs, "--height", opts.Tmux.height.String())
-	zellijArgs = append(zellijArgs, "--")
-
-	return runProxy(argStr, func(temp string, needBash bool) (*exec.Cmd, error) {
-		sh, err := sh(needBash)
-		if err != nil {
-			return nil, err
-		}
-		zellijArgs = append(zellijArgs, sh, temp)
-		return exec.Command("zellij", zellijArgs...), nil
-	}, opts, true)
-}
@@ -1,16 +0,0 @@
-# Unset fzf variables
-set -e FZF_DEFAULT_COMMAND FZF_DEFAULT_OPTS FZF_DEFAULT_OPTS_FILE FZF_TMUX FZF_TMUX_OPTS
-set -e FZF_CTRL_T_COMMAND FZF_CTRL_T_OPTS FZF_ALT_C_COMMAND FZF_ALT_C_OPTS FZF_CTRL_R_OPTS
-set -e FZF_API_KEY
-# Unset completion-specific variables
-set -e FZF_COMPLETION_OPTS FZF_EXPANSION_OPTS
-
-set -gx FZF_DEFAULT_OPTS "--no-scrollbar --pointer '>' --marker '>'"
-set -gx fish_history fzf_test
-
-# Add fzf to PATH
-fish_add_path <%= BASE %>/bin
-
-# Source key bindings and completion
-source "<%= BASE %>/shell/key-bindings.fish"
-source "<%= BASE %>/shell/completion.fish"
@@ -11,7 +11,6 @@ require 'net/http'
 require 'json'

 TEMPLATE = File.read(File.expand_path('common.sh', __dir__))
-FISH_TEMPLATE = File.read(File.expand_path('common.fish', __dir__))
 UNSETS = %w[
  FZF_DEFAULT_COMMAND FZF_DEFAULT_OPTS
  FZF_TMUX FZF_TMUX_OPTS
@@ -67,16 +66,7 @@ class Shell
    end

    def fish
-      @fish ||=
-        begin
-          confdir = '/tmp/fzf-fish'
-          FileUtils.rm_rf(confdir)
-          FileUtils.mkdir_p("#{confdir}/fish/conf.d")
-          File.open("#{confdir}/fish/conf.d/fzf.fish", 'w') do |f|
-            f.puts ERB.new(FISH_TEMPLATE).result(binding)
-          end
-          "rm -f ~/.local/share/fish/fzf_test_history; XDG_CONFIG_HOME=#{confdir} fish"
-        end
+      "unset #{UNSETS.join(' ')}; rm -f ~/.local/share/fish/fzf_test_history; FZF_DEFAULT_OPTS=\"--no-scrollbar --pointer '>' --marker '>'\" fish_history=fzf_test fish"
    end
  end
 end
@@ -105,23 +95,6 @@ class Tmux
    go(%W[send-keys -t #{win}] + args.map(&:to_s))
  end

-  # Simulate a mouse click at the given 1-based column and row using the SGR mouse protocol
-  # (xterm mouse mode 1006, which fzf enables). The escape sequence is injected as literal
-  # keystrokes via tmux, and fzf parses it like a real terminal mouse event.
-  #
-  # tmux's own mouse handling intercepts these sequences when `set -g mouse on`, so we toggle
-  # mouse off for the duration of the click and restore the previous state afterwards.
-  def click(col, row, button: 0)
-    prev = go(%w[show-options -gv mouse]).first
-    go(%w[set-option -g mouse off])
-    begin
-      seq = "\e[<#{button};#{col};#{row}M\e[<#{button};#{col};#{row}m"
-      go(%W[send-keys -t #{win} -l #{seq}])
-    ensure
-      go(%W[set-option -g mouse #{prev}]) if prev && !prev.empty?
-    end
-  end
-
  def paste(str)
    system('tmux', 'setb', str, ';', 'pasteb', '-t', win, ';', 'send-keys', '-t', win, 'Enter')
  end
@@ -130,71 +103,6 @@ class Tmux
    go(%W[capture-pane -p -J -t #{win}]).map(&:rstrip).reverse.drop_while(&:empty?).reverse
  end

-  # Raw pane capture with ANSI escape sequences preserved.
-  def capture_ansi
-    go(%W[capture-pane -p -J -e -t #{win}])
-  end
-
-  # 3-bit ANSI bg code (40..47) -> color name used in --color options.
-  BG_NAMES = %w[black red green yellow blue magenta cyan white].freeze
-
-  # Parse `tmux capture-pane -e` output into per-row bg ranges. Each row is an
-  # array of [col_start, col_end, bg] tuples where bg is one of:
-  #   'default'
-  #   'red' / 'green' / 'blue' / ... (3-bit names)
-  #   'bright-red' / ...             (bright variants)
-  #   '256:<n>'                      (256-color fallback)
-  # ANSI state persists across rows, matching real terminal behavior.
-  def bg_ranges
-    raw = go(%W[capture-pane -p -J -e -t #{win}])
-    bg = 'default'
-    raw.map do |row|
-      cells = []
-      i = 0
-      len = row.length
-      while i < len
-        c = row[i]
-        if c == "\e" && row[i + 1] == '['
-          j = i + 2
-          j += 1 while j < len && row[j] != 'm'
-          parts = row[i + 2...j].split(';')
-          k = 0
-          while k < parts.length
-            p = parts[k].to_i
-            case p
-            when 0, 49 then bg = 'default'
-            when 40..47 then bg = BG_NAMES[p - 40]
-            when 100..107 then bg = "bright-#{BG_NAMES[p - 100]}"
-            when 48
-              if parts[k + 1] == '5'
-                bg = "256:#{parts[k + 2]}"
-                k += 2
-              elsif parts[k + 1] == '2'
-                bg = "rgb:#{parts[k + 2]}:#{parts[k + 3]}:#{parts[k + 4]}"
-                k += 4
-              end
-            end
-            k += 1
-          end
-          i = j + 1
-        else
-          cells << bg
-          i += 1
-        end
-      end
-      ranges = []
-      start = 0
-      cells.each_with_index do |b, idx|
-        if idx.positive? && b != cells[idx - 1]
-          ranges << [start, idx - 1, cells[idx - 1]]
-          start = idx
-        end
-      end
-      ranges << [start, cells.length - 1, cells.last] unless cells.empty?
-      ranges
-    end
-  end
-
  def until(refresh = false, timeout: DEFAULT_TIMEOUT)
    lines = nil
    begin
@@ -245,7 +153,6 @@ class Tmux
      self.until(true) do |lines|
        message = "Prepare[#{tries}]"
        send_keys ' ', 'C-u', :Enter, message, :Left, :Right
-        sleep(0.15)
        lines[-1] == message
      end
    rescue Minitest::Assertion
@@ -404,11 +404,11 @@ class TestCore < TestInteractive
      tmux.send_keys "seq 1 111 | #{fzf("-m +s --tac #{opt} -q11")}", :Enter
      tmux.until { |lines| assert_equal '> 111', lines[-3] }
      tmux.send_keys :Tab
-      tmux.until { |lines| assert_equal '  4/111 (1) -S', lines[-2] }
+      tmux.until { |lines| assert_equal '  4/111 -S (1)', lines[-2] }
      tmux.send_keys 'C-R'
      tmux.until { |lines| assert_equal '> 11', lines[-3] }
      tmux.send_keys :Tab
-      tmux.until { |lines| assert_equal '  4/111 (2) +S', lines[-2] }
+      tmux.until { |lines| assert_equal '  4/111 +S (2)', lines[-2] }
      tmux.send_keys :Enter
      assert_equal %w[111 11], fzf_output_lines
    end
@@ -1190,18 +1190,8 @@ class TestCore < TestInteractive
    tmux.until { |lines| assert lines.any_include?('9999␊10000') }
  end

-  def test_freeze_left_tabstop
-    writelines(%W[1\t2\t3])
-    # With --freeze-left 1 and --tabstop=2:
-    # Frozen left: "1" (width 1)
-    # Middle starts with "\t" at prefix width 1, tabstop 2 → 1 space
-    # Then "2" at column 2, next "\t" at column 3 → 1 space, then "3"
-    tmux.send_keys %(cat #{tempname} | #{FZF} --tabstop=2 --freeze-left 1), :Enter
-    tmux.until { |lines| assert_equal '> 1 2 3', lines[-3] }
-  end
-
  def test_freeze_left_keep_right
-    tmux.send_keys %(seq 10000 | #{FZF} --read0 --delimiter "\n" --freeze-left 3 --keep-right --ellipsis XX --no-multi-line --bind space:toggle-multi-line), :Enter
+    tmux.send_keys %[seq 10000 | #{FZF} --read0 --delimiter "\n" --freeze-left 3 --keep-right --ellipsis XX --no-multi-line --bind space:toggle-multi-line], :Enter
    tmux.until { |lines| assert_match(/^> 1␊2␊3XX.*10000␊$/, lines[-3]) }
    tmux.send_keys '5'
    tmux.until { |lines| assert_match(/^> 1␊2␊3␊4␊5␊.*XX$/, lines[-3]) }
@@ -1212,21 +1202,21 @@ class TestCore < TestInteractive
  end

  def test_freeze_left_and_right
-    tmux.send_keys %(seq 10000 | tr "\n" ' ' | #{FZF} --freeze-left 3 --freeze-right 3 --ellipsis XX), :Enter
+    tmux.send_keys %[seq 10000 | tr "\n" ' ' | #{FZF} --freeze-left 3 --freeze-right 3 --ellipsis XX], :Enter
    tmux.until { |lines| assert_match(/XX9998 9999 10000$/, lines[-3]) }
    tmux.send_keys "'1000"
-    tmux.until { |lines| assert_match(/^> 1 2 3XX.*XX9998 9999 10000$/, lines[-3]) }
+    tmux.until { |lines| assert_match(/^> 1 2 3XX.*XX9998 9999 10000$/,lines[-3]) }
  end

  def test_freeze_left_and_right_delimiter
-    tmux.send_keys %(seq 10000 | tr "\n" ' ' | sed 's/ / , /g' | #{FZF} --freeze-left 3 --freeze-right 3 --ellipsis XX --delimiter ' , '), :Enter
+    tmux.send_keys %[seq 10000 | tr "\n" ' ' | sed 's/ / , /g' | #{FZF} --freeze-left 3 --freeze-right 3 --ellipsis XX --delimiter ' , '], :Enter
    tmux.until { |lines| assert_match(/XX, 9999 , 10000 ,$/, lines[-3]) }
    tmux.send_keys "'1000"
-    tmux.until { |lines| assert_match(/^> 1 , 2 , 3 ,XX.*XX, 9999 , 10000 ,$/, lines[-3]) }
+    tmux.until { |lines| assert_match(/^> 1 , 2 , 3 ,XX.*XX, 9999 , 10000 ,$/,lines[-3]) }
  end

  def test_freeze_right_exceed_range
-    tmux.send_keys %(seq 10000 | tr "\n" ' ' | #{FZF} --freeze-right 100000 --ellipsis XX), :Enter
+    tmux.send_keys %[seq 10000 | tr "\n" ' ' | #{FZF} --freeze-right 100000 --ellipsis XX], :Enter
    ['', "'1000"].each do |query|
      tmux.send_keys query
      tmux.until { |lines| assert lines.any_include?("> #{query}".strip) }
@@ -1238,23 +1228,13 @@ class TestCore < TestInteractive
  end

  def test_freeze_right_exceed_range_with_freeze_left
-    tmux.send_keys %(seq 10000 | tr "\n" ' ' | #{FZF} --freeze-left 3  --freeze-right 100000 --ellipsis XX), :Enter
+    tmux.send_keys %[seq 10000 | tr "\n" ' ' | #{FZF} --freeze-left 3  --freeze-right 100000 --ellipsis XX], :Enter
    tmux.until do |lines|
      assert_match(/^> 1 2 3XX.*9998 9999 10000$/, lines[-3])
      assert_equal(1, lines[-3].scan('XX').size)
    end
  end

-  def test_freeze_right_with_ellipsis_and_scrolling
-    tmux.send_keys "{ seq 6; ruby -e 'print \"g\"*1000, \"\\n\"'; seq 8 100; } | #{FZF} --ellipsis='777' --freeze-right 1 --scroll-off 0 --bind a:offset-up", :Enter
-    tmux.until { |lines| assert_equal '  100/100', lines[-2] }
-    tmux.send_keys(*Array.new(6) { :a })
-    tmux.until do |lines|
-      assert_match(/> 777g+$/, lines[-3])
-      assert_equal(1, lines.count { |l| l.end_with?('g') })
-    end
-  end
-
  def test_backward_eof
    tmux.send_keys "echo foo | #{FZF} --bind 'backward-eof:reload(seq 100)'", :Enter
    tmux.until { |lines| lines.item_count == 1 && lines.match_count == 1 }
@@ -1598,16 +1578,14 @@ class TestCore < TestInteractive
  end

  def test_track_action
-    tmux.send_keys "seq 1000 | #{FZF} --pointer x --query 555 --bind t:track,T:up+track", :Enter
+    tmux.send_keys "seq 1000 | #{FZF} --query 555 --bind t:track", :Enter
    tmux.until do |lines|
      assert_equal 1, lines.match_count
-      assert_includes lines, 'x 555'
      assert_includes lines, '> 555'
    end
    tmux.send_keys :BSpace
    tmux.until do |lines|
      assert_equal 28, lines.match_count
-      assert_includes lines, 'x 55'
      assert_includes lines, '> 55'
    end
    tmux.send_keys :t
@@ -1617,8 +1595,7 @@ class TestCore < TestInteractive
    tmux.send_keys :BSpace
    tmux.until do |lines|
      assert_equal 271, lines.match_count
-      assert_includes lines, 'x 55'
-      assert_includes lines, '> 5'
+      assert_includes lines, '> 55'
    end

    # Automatically disabled when the tracking item is no longer visible
@@ -1630,263 +1607,16 @@ class TestCore < TestInteractive
    tmux.send_keys :BSpace
    tmux.until do |lines|
      assert_equal 271, lines.match_count
-      assert_includes lines, 'x 52'
      assert_includes lines, '> 5'
    end
    tmux.send_keys :t
    tmux.until do |lines|
      assert_includes lines[-2], '+t'
    end
-
-    # Automatically disabled when the focus has moved
    tmux.send_keys :Up
    tmux.until do |lines|
-      assert_includes lines, 'x 53'
      refute_includes lines[-2], '+t'
    end
-
-    # Should work even when combined with a focus moving actions
-    tmux.send_keys 'T'
-    tmux.until do |lines|
-      assert_includes lines, 'x 54'
-      assert_includes lines[-2], '+t'
-    end
-
-    tmux.send_keys 'T'
-    tmux.until do |lines|
-      assert_includes lines, 'x 55'
-      assert_includes lines[-2], '+t'
-    end
-  end
-
-  def test_track_nth_reload_whole_line
-    # --track --id-nth .. should track by entire line across reloads
-    tmux.send_keys "seq 1000 | #{FZF} --track --id-nth .. --bind 'ctrl-r:reload:seq 1000 | sort -R'", :Enter
-    tmux.until { |lines| assert_equal 1000, lines.match_count }
-
-    # Move to item 555
-    tmux.send_keys '555'
-    tmux.until do |lines|
-      assert_equal 1, lines.match_count
-      assert_includes lines, '> 555'
-    end
-    tmux.send_keys :BSpace, :BSpace, :BSpace
-
-    # Reload with shuffled order - cursor should track "555"
-    tmux.send_keys 'C-r'
-    tmux.until do |lines|
-      assert_equal 1000, lines.match_count
-      assert_includes lines, '> 555'
-      assert_includes lines[-2], '+T'
-      refute_includes lines[-2], '+T*'
-    end
-  end
-
-  def test_track_nth_reload_field
-    # --track --id-nth 1 should track by first field across reloads
-    tmux.send_keys "printf '1 apple\\n2 banana\\n3 cherry\\n' | #{FZF} --track --id-nth 1 --bind 'ctrl-r:reload:printf \"1 apricot\\n2 blueberry\\n3 cranberry\\n\"'", :Enter
-    tmux.until do |lines|
-      assert_equal 3, lines.match_count
-      assert_includes lines, '> 1 apple'
-    end
-
-    # Move up to "2 banana"
-    tmux.send_keys :Up
-    tmux.until { |lines| assert_includes lines, '> 2 banana' }
-
-    # Reload - the second field changes, but first field "2" stays
-    tmux.send_keys 'C-r'
-    tmux.until do |lines|
-      assert_equal 3, lines.match_count
-      assert_includes lines, '> 2 blueberry'
-    end
-  end
-
-  def test_track_nth_reload_no_match
-    # When tracked item is not found after reload, cursor stays at current position
-    tmux.send_keys "printf 'alpha\\nbeta\\ngamma\\n' | #{FZF} --track --id-nth .. --bind 'ctrl-r:reload:printf \"delta\\nepsilon\\nzeta\\n\"'", :Enter
-    tmux.until { |lines| assert_equal 3, lines.match_count }
-    tmux.send_keys :Up
-    tmux.until { |lines| assert_includes lines, '> beta' }
-
-    # Reload with completely different items - no match for "beta"
-    # Cursor stays at the same position (second item)
-    tmux.send_keys 'C-r'
-    tmux.until do |lines|
-      assert_equal 3, lines.match_count
-      assert_includes lines, '> epsilon'
-      refute_includes lines[-2], '+T*'
-    end
-  end
-
-  def test_track_nth_blocked_indicator
-    # +T* should appear during reload and disappear when match is found
-    tmux.send_keys "seq 100 | #{FZF} --track --id-nth .. --bind 'ctrl-r:reload:sleep 1; seq 100 | sort -R'", :Enter
-    tmux.until do |lines|
-      assert_equal 100, lines.match_count
-      assert_includes lines[-2], '+T'
-    end
-
-    # Trigger slow reload - should show +T* while blocked
-    tmux.send_keys 'C-r'
-    tmux.until { |lines| assert_includes lines[-2], '+T*' }
-
-    # After reload completes, +T* should clear back to +T
-    tmux.until do |lines|
-      assert_equal 100, lines.match_count
-      assert_includes lines[-2], '+T'
-      refute_includes lines[-2], '+T*'
-    end
-  end
-
-  def test_track_nth_abort_unblocks
-    # Escape during track-blocked state should unblock, not quit
-    tmux.send_keys "seq 100 | #{FZF} --track --id-nth .. --bind 'ctrl-r:reload:sleep 3; seq 100'", :Enter
-    tmux.until do |lines|
-      assert_equal 100, lines.match_count
-      assert_includes lines[-2], '+T'
-    end
-
-    # Trigger slow reload
-    tmux.send_keys 'C-r'
-    tmux.until { |lines| assert_includes lines[-2], '+T*' }
-
-    # Escape should unblock, not quit fzf
-    tmux.send_keys :Escape
-    tmux.until do |lines|
-      assert_includes lines[-2], '+T'
-      refute_includes lines[-2], '+T*'
-    end
-  end
-
-  def test_track_nth_reload_async_unblocks_early
-    # With async reload, +T* should clear as soon as the match streams in,
-    # even while loading is still in progress.
-    # sleep 1 first so +T* is observable, then the match arrives, then more items after a delay.
-    tmux.send_keys "seq 5 | #{FZF} --track --id-nth .. --bind 'ctrl-r:reload:sleep 1; echo 1; sleep 2; seq 2 10'", :Enter
-    tmux.until do |lines|
-      assert_equal 5, lines.match_count
-      assert_includes lines, '> 1'
-    end
-
-    # Trigger reload - blocked during initial sleep
-    tmux.send_keys 'C-r'
-    tmux.until { |lines| assert_includes lines[-2], '+T*' }
-    # Match "1" arrives, unblocks before the remaining items load
-    tmux.until do |lines|
-      assert_equal 1, lines.match_count
-      assert_includes lines, '> 1'
-      assert_includes lines[-2], '+T'
-      refute_includes lines[-2], '+T*'
-    end
-  end
-
-  def test_track_nth_reload_sync_blocks_until_complete
-    # With reload-sync, +T* should stay until the entire stream is complete,
-    # even though the match arrives early in the stream.
-    tmux.send_keys "seq 5 | #{FZF} --track --id-nth .. --bind 'ctrl-r:reload-sync:sleep 1; echo 1; sleep 2; seq 2 10'", :Enter
-    tmux.until do |lines|
-      assert_equal 5, lines.match_count
-      assert_includes lines, '> 1'
-    end
-
-    # Trigger reload-sync - every observable state must be either:
-    # 1. +T* (still blocked), or
-    # 2. final state (count=10, +T without *)
-    # Any other combination (e.g. unblocked while count < 10) is a bug.
-    tmux.send_keys 'C-r'
-    tmux.until do |lines|
-      info = lines[-2]
-      blocked = info&.include?('+T*')
-      unless blocked
-        raise "Unblocked before stream complete (count: #{lines.match_count})" if lines.match_count != 10
-
-        assert_includes info, '+T'
-        assert_includes lines, '> 1'
-      end
-      !blocked
-    end
-  end
-
-  def test_track_nth_toggle_track_unblocks
-    # toggle-track during track-blocked state should unblock and disable tracking
-    tmux.send_keys "seq 100 | #{FZF} --track --id-nth .. --bind 'ctrl-r:reload:sleep 5; seq 100' --bind 'ctrl-t:toggle-track'", :Enter
-    tmux.until do |lines|
-      assert_equal 100, lines.match_count
-      assert_includes lines[-2], '+T'
-    end
-
-    # Trigger slow reload
-    tmux.send_keys 'C-r'
-    tmux.until { |lines| assert_includes lines[-2], '+T*' }
-
-    # toggle-track should unblock and disable tracking before reload completes
-    tmux.send_keys 'C-t'
-    tmux.until(timeout: 3) do |lines|
-      refute_includes lines[-2], '+T'
-    end
-  end
-
-  def test_track_nth_reload_async_no_match
-    # With async reload, when tracked item is not found, cursor stays at
-    # current position after stream completes
-    tmux.send_keys "printf 'alpha\\nbeta\\ngamma\\n' | #{FZF} --track --id-nth .. --bind 'ctrl-r:reload:sleep 1; printf \"delta\\nepsilon\\nzeta\\n\"'", :Enter
-    tmux.until { |lines| assert_equal 3, lines.match_count }
-    tmux.send_keys :Up
-    tmux.until { |lines| assert_includes lines, '> beta' }
-
-    # Reload with completely different items - no match for "beta"
-    tmux.send_keys 'C-r'
-    tmux.until { |lines| assert_includes lines[-2], '+T*' }
-    # After stream completes, unblocks with cursor at same position (second item)
-    tmux.until do |lines|
-      assert_equal 3, lines.match_count
-      assert_includes lines, '> epsilon'
-      refute_includes lines[-2], '+T*'
-    end
-  end
-
-  def test_track_action_with_id_nth
-    # track-current with --id-nth should track by specified field
-    tmux.send_keys "printf '1 apple\\n2 banana\\n3 cherry\\n' | #{FZF} --id-nth 1 --bind 'ctrl-t:track-current,ctrl-r:reload:printf \"1 apricot\\n2 blueberry\\n3 cranberry\\n\"'", :Enter
-    tmux.until { |lines| assert_equal 3, lines.match_count }
-
-    # Move to "2 banana" and activate tracking
-    tmux.send_keys :Up
-    tmux.until { |lines| assert_includes lines, '> 2 banana' }
-    tmux.send_keys 'C-t'
-    tmux.until { |lines| assert_includes lines[-2], '+t' }
-
-    # Reload - should track by field "2"
-    tmux.send_keys 'C-r'
-    tmux.until do |lines|
-      assert_equal 3, lines.match_count
-      assert_includes lines, '> 2 blueberry'
-    end
-  end
-
-  def test_id_nth_preserve_multi_selection
-    # --id-nth with --multi should preserve selections across reload-sync
-    File.write(tempname, "1 apricot\n2 blueberry\n3 cranberry\n")
-    tmux.send_keys "printf '1 apple\\n2 banana\\n3 cherry\\n' | #{fzf("--multi --id-nth 1 --bind 'ctrl-r:reload-sync:cat #{tempname}'")}", :Enter
-    tmux.until { |lines| assert_equal 3, lines.match_count }
-
-    # Select first item (1 apple) and third item (3 cherry)
-    tmux.send_keys :Tab
-    tmux.send_keys :Up, :Up, :Tab
-    tmux.until { |lines| assert_includes lines[-2], '(2)' }
-
-    # Reload - selections should be preserved by id-nth key
-    tmux.send_keys 'C-r'
-    tmux.until do |lines|
-      assert_equal 3, lines.match_count
-      assert_includes lines[-2], '(2)'
-      assert(lines.any? { |l| l.include?('apricot') })
-    end
-
-    # Accept and verify the correct items were preserved
-    tmux.send_keys :Enter
-    assert_equal ['1 apricot', '3 cranberry'], fzf_output_lines
  end

  def test_one_and_zero
@@ -1985,191 +1715,6 @@ class TestCore < TestInteractive
    end
  end

-  def test_change_with_nth
-    input = [
-      'foo bar baz',
-      'aaa bbb ccc',
-      'xxx yyy zzz'
-    ]
-    writelines(input)
-    # Start with field 1 only, cycle through fields, verify $FZF_WITH_NTH via prompt
-    tmux.send_keys %(#{FZF} --with-nth 1 --bind 'space:change-with-nth(2|3|1),result:transform-prompt:echo "[$FZF_WITH_NTH]> "' < #{tempname}), :Enter
-    tmux.until do |lines|
-      assert_equal 3, lines.item_count
-      assert lines.any_include?('[1]>')
-      assert lines.any_include?('foo')
-      refute lines.any_include?('bar')
-    end
-    tmux.send_keys :Space
-    tmux.until do |lines|
-      assert lines.any_include?('[2]>')
-      assert lines.any_include?('bar')
-      refute lines.any_include?('foo')
-    end
-    tmux.send_keys :Space
-    tmux.until do |lines|
-      assert lines.any_include?('[3]>')
-      assert lines.any_include?('baz')
-      refute lines.any_include?('bar')
-    end
-    tmux.send_keys :Space
-    tmux.until do |lines|
-      assert lines.any_include?('[1]>')
-      assert lines.any_include?('foo')
-      refute lines.any_include?('bar')
-    end
-  end
-
-  def test_change_with_nth_default
-    # Empty value restores the default --with-nth
-    tmux.send_keys %(echo -e 'a b c\nd e f' | #{FZF} --with-nth 1 --bind 'space:change-with-nth(2|)'), :Enter
-    tmux.until do |lines|
-      assert_equal 2, lines.item_count
-      assert lines.any_include?('a')
-      refute lines.any_include?('b')
-    end
-    # Switch to field 2
-    tmux.send_keys :Space
-    tmux.until do |lines|
-      assert lines.any_include?('b')
-      refute lines.any_include?('a')
-    end
-    # Empty restores default (field 1)
-    tmux.send_keys :Space
-    tmux.until do |lines|
-      assert lines.any_include?('a')
-      refute lines.any_include?('b')
-    end
-  end
-
-  def test_transform_with_nth_search
-    input = [
-      'alpha bravo charlie',
-      'delta echo foxtrot',
-      'golf hotel india'
-    ]
-    writelines(input)
-    tmux.send_keys %(#{FZF} --with-nth 1 --bind 'space:transform-with-nth(echo 2)' -q '^bravo$' < #{tempname}), :Enter
-    tmux.until do |lines|
-      assert_equal 0, lines.match_count
-    end
-    tmux.send_keys :Space
-    tmux.until do |lines|
-      assert_equal 1, lines.match_count
-    end
-  end
-
-  def test_bg_transform_with_nth_output
-    tmux.send_keys %(echo -e 'a b c\nd e f' | #{FZF} --with-nth 2 --bind 'space:bg-transform-with-nth(echo 3)'), :Enter
-    tmux.until do |lines|
-      assert_equal 2, lines.item_count
-      assert lines.any_include?('b')
-    end
-    tmux.send_keys :Space
-    tmux.until do |lines|
-      assert lines.any_include?('c')
-      refute lines.any_include?('b')
-    end
-    tmux.send_keys :Enter
-    tmux.until { |lines| assert lines.any_include?('a b c') || lines.any_include?('d e f') }
-  end
-
-  def test_change_with_nth_search
-    input = [
-      'alpha bravo charlie',
-      'delta echo foxtrot',
-      'golf hotel india'
-    ]
-    writelines(input)
-    tmux.send_keys %(#{FZF} --with-nth 1 --bind 'space:change-with-nth(2)' -q '^bravo$' < #{tempname}), :Enter
-    tmux.until do |lines|
-      assert_equal 0, lines.match_count
-    end
-    tmux.send_keys :Space
-    tmux.until do |lines|
-      assert_equal 1, lines.match_count
-    end
-  end
-
-  def test_change_with_nth_output
-    tmux.send_keys %(echo -e 'a b c\nd e f' | #{FZF} --with-nth 2 --bind 'space:change-with-nth(3)'), :Enter
-    tmux.until do |lines|
-      assert_equal 2, lines.item_count
-      assert lines.any_include?('b')
-    end
-    tmux.send_keys :Space
-    tmux.until do |lines|
-      assert lines.any_include?('c')
-      refute lines.any_include?('b')
-    end
-    tmux.send_keys :Enter
-    tmux.until { |lines| assert lines.any_include?('a b c') || lines.any_include?('d e f') }
-  end
-
-  def test_change_with_nth_selection
-    # Items: field1 has unique values, field2 has 'match' or 'miss'
-    input = [
-      'one match x',
-      'two miss y',
-      'three match z'
-    ]
-    writelines(input)
-    # Start showing field 2 (match/miss), query 'match', select all matches, then switch to field 3
-    tmux.send_keys %(#{FZF} --with-nth 2 --multi --bind 'ctrl-a:select-all,space:change-with-nth(3)' -q match < #{tempname}), :Enter
-    tmux.until do |lines|
-      assert_equal 2, lines.match_count
-    end
-    # Select all matching items
-    tmux.send_keys 'C-a'
-    tmux.until do |lines|
-      assert lines.any_include?('(2)')
-    end
-    # Now change with-nth to field 3; 'x' and 'z' don't contain 'match'
-    tmux.send_keys :Space
-    tmux.until do |lines|
-      assert_equal 0, lines.match_count
-      # Selections of non-matching items should be cleared
-      assert lines.any_include?('(0)')
-    end
-  end
-
-  def test_change_with_nth_multiline
-    # Each item has 3 lines: "N-a\nN-b\nN-c"
-    # --with-nth 1 shows 1 line per item, --with-nth 1..3 shows 3 lines per item
-    tmux.send_keys %(seq 20 | xargs -I{} printf '{}-a\\n{}-b\\n{}-c\\0' | #{FZF} --read0 --delimiter "\n" --with-nth 1 --bind 'space:change-with-nth(1..3|1)' --no-sort), :Enter
-    tmux.until do |lines|
-      assert_equal 20, lines.item_count
-      assert lines.any_include?('1-a')
-      refute lines.any_include?('1-b')
-    end
-    # Expand to 3 lines per item
-    tmux.send_keys :Space
-    tmux.until do |lines|
-      assert lines.any_include?('1-a')
-      assert lines.any_include?('1-b')
-      assert lines.any_include?('1-c')
-    end
-    # Scroll down a few items
-    5.times { tmux.send_keys :Down }
-    tmux.until do |lines|
-      assert lines.any_include?('6-a')
-      assert lines.any_include?('6-b')
-      assert lines.any_include?('6-c')
-    end
-    # Collapse back to 1 line per item
-    tmux.send_keys :Space
-    tmux.until do |lines|
-      assert lines.any_include?('6-a')
-      refute lines.any_include?('6-b')
-    end
-    # Scroll down more after collapse
-    5.times { tmux.send_keys :Down }
-    tmux.until do |lines|
-      assert lines.any_include?('11-a')
-      refute lines.any_include?('11-b')
-    end
-  end
-
  def test_env_vars
    def env_vars
      return {} unless File.exist?(tempname)
@@ -2180,7 +1725,7 @@ class TestCore < TestInteractive
      end
    end

-    tmux.send_keys %({ echo foo; seq 100; } | #{FZF} --header-lines 1 --multi --reverse --preview-window 0 --preview 'env | grep ^FZF_ | sort > #{tempname}' --no-input --bind enter:show-input+refresh-preview,space:disable-search+refresh-preview), :Enter
+    tmux.send_keys %(seq 100 | #{FZF} --multi --reverse --preview-window 0 --preview 'env | grep ^FZF_ | sort > #{tempname}' --no-input --bind enter:show-input+refresh-preview,space:disable-search+refresh-preview), :Enter
    expected = {
      FZF_DIRECTION: 'down',
      FZF_TOTAL_COUNT: '100',
@@ -2325,13 +1870,13 @@ class TestCore < TestInteractive
    tmux.send_keys %(echo "foo  ,bar,baz" | #{FZF} -d, --accept-nth 2,2,1,3,1 --sync --bind start:accept > #{tempname}), :Enter
    wait do
      assert_path_exists tempname
-      # Last delimiter is removed
-      assert_equal ['bar,bar,foo  ,bazfoo  '], File.readlines(tempname, chomp: true)
+      # Last delimiter and the whitespaces are removed
+      assert_equal ['bar,bar,foo  ,bazfoo'], File.readlines(tempname, chomp: true)
    end
  end

  def test_accept_nth_regex_delimiter
-    tmux.send_keys %(echo "foo  :,:bar,baz" | #{FZF} --delimiter=' *[:,]+ *' --accept-nth 2,2,1,3,1 --sync --bind start:accept > #{tempname}), :Enter
+    tmux.send_keys %(echo "foo  :,:bar,baz" | #{FZF} --delimiter='[:,]+' --accept-nth 2,2,1,3,1 --sync --bind start:accept > #{tempname}), :Enter
    wait do
      assert_path_exists tempname
      # Last delimiter and the whitespaces are removed
@@ -2349,7 +1894,7 @@ class TestCore < TestInteractive
  end

  def test_accept_nth_template
-    tmux.send_keys %(echo "foo  ,bar,baz" | #{FZF} -d " *, *" --accept-nth '[{n}] 1st: {1}, 3rd: {3}, 2nd: {2}' --sync --bind start:accept > #{tempname}), :Enter
+    tmux.send_keys %(echo "foo  ,bar,baz" | #{FZF} -d, --accept-nth '[{n}] 1st: {1}, 3rd: {3}, 2nd: {2}' --sync --bind start:accept > #{tempname}), :Enter
    wait do
      assert_path_exists tempname
      # Last delimiter and the whitespaces are removed
@@ -2600,87 +2145,4 @@ class TestCore < TestInteractive
      assert_equal 1, it.match_count
    end
  end
-
-  def test_change_header_lines
-    tmux.send_keys %(seq 10 | #{FZF} --header-lines 3 --bind 'space:change-header-lines(5),enter:transform-header-lines(echo 1)'), :Enter
-    tmux.until do |lines|
-      assert_equal 7, lines.item_count
-      assert lines.any_include?('> 4')
-    end
-    tmux.send_keys :Space
-    tmux.until do |lines|
-      assert_equal 5, lines.item_count
-      assert lines.any_include?('> 6')
-    end
-    tmux.send_keys :Enter
-    tmux.until do |lines|
-      assert_equal 9, lines.item_count
-      assert lines.any_include?('> 6')
-    end
-  end
-
-  def test_change_header_lines_to_zero
-    tmux.send_keys %(seq 5 | #{FZF} --header-lines 3 --bind 'space:bg-transform-header-lines(echo 0)'), :Enter
-    tmux.until do |lines|
-      assert_equal 2, lines.item_count
-      assert lines.any_include?('> 4')
-    end
-    tmux.send_keys :Space
-    tmux.until do |lines|
-      assert_equal 5, lines.item_count
-      # All items are now in the list, cursor stays on item 4
-      assert lines.any_include?('> 4')
-    end
-  end
-
-  def test_change_header_lines_deselect
-    # Selected items that become part of the header should be deselected
-    tmux.send_keys %(seq 10 | #{FZF} --multi --header-lines 0 --bind 'space:change-header-lines(3),enter:change-header-lines(1)'), :Enter
-    tmux.until do |lines|
-      assert_equal 10, lines.item_count
-      assert lines.any_include?('> 1')
-    end
-    # Select items 1, 2, 3 (these will become header lines)
-    tmux.send_keys :BTab, :BTab, :BTab
-    tmux.until { |lines| assert_equal 3, lines.select_count }
-    # Also select item 4 (this should remain selected)
-    tmux.send_keys :BTab
-    tmux.until { |lines| assert_equal 4, lines.select_count }
-    # Change header-lines to 3: items 1, 2, 3 become headers and should be deselected
-    tmux.send_keys :Space
-    tmux.until do |lines|
-      assert_equal 7, lines.item_count
-      assert_equal 1, lines.select_count
-      assert lines.any_include?('> 5')
-    end
-    # Change header-lines to 1
-    tmux.send_keys :Enter
-    tmux.until do |lines|
-      assert_equal 9, lines.item_count
-      assert_equal 1, lines.select_count
-      assert lines.any_include?('> 5')
-    end
-  end
-
-  def test_change_header_lines_reverse
-    tmux.send_keys %(seq 10 | #{FZF} --header-lines 2 --reverse --bind 'space:change-header-lines(4)'), :Enter
-    tmux.until do |lines|
-      assert_equal 8, lines.item_count
-      assert lines.any_include?('> 3')
-    end
-    tmux.send_keys :Space
-    tmux.until do |lines|
-      assert_equal 6, lines.item_count
-      assert lines.any_include?('> 5')
-    end
-  end
-
-  def test_zero_width_characters
-    tmux.send_keys %(for i in {1..1000}; do string+="a̱$i"; printf '\\e[43m%s\\e[0m\\n' "$string"; done | #{FZF} --ansi --query a500 --ellipsis XX), :Enter
-    tmux.until do |lines|
-      assert_equal 981, lines.match_count
-      assert_match(/^> XX.*a̱500/, lines[-3])
-      assert(lines.reverse.drop(5).all? { it.match?(/^  XX.*a̱500.*XX/) })
-    end
-  end
 end
@@ -312,41 +312,4 @@ class TestFilter < TestBase
      assert_equal expected, result
    end
  end
-
-  def test_accept_nth
-    # Single field selection
-    assert_equal 'three', `echo 'one two three' | #{FZF} -d' ' --with-nth 1 --accept-nth -1 -f one`.chomp
-
-    # Multiple field selection
-    writelines(['ID001:John:Developer', 'ID002:Jane:Manager', 'ID003:Bob:Designer'])
-    assert_equal 'ID001', `#{FZF} -d: --with-nth 2 --accept-nth 1 -f John < #{tempname}`.chomp
-    assert_equal 'ID002:Manager', `#{FZF} -d: --with-nth 2 --accept-nth 1,3 -f Jane < #{tempname}`.chomp
-
-    # Test with different delimiters
-    writelines(['emp001 Alice Engineering', 'emp002 Bob Marketing'])
-    assert_equal 'emp001', `#{FZF} -d' ' --with-nth 2 --accept-nth 1 -f Alice < #{tempname}`.chomp
-  end
-
-  def test_header_lines_filter
-    assert_equal %w[4 5 6 7 8 9 10],
-                 `seq 10 | #{FZF} --header-lines 3 -f ""`.lines(chomp: true)
-    assert_equal %w[5],
-                 `seq 10 | #{FZF} --header-lines 3 -f 5`.lines(chomp: true)
-    # Header items should not be matched
-    assert_empty `seq 10 | #{FZF} --header-lines 3 -f "^1$"`.lines(chomp: true)
-  end
-
-  def test_header_lines_filter_with_nth
-    writelines(%w[a:1 b:2 c:3 d:4 e:5])
-    assert_equal %w[c:3 d:4 e:5],
-                 `#{FZF} --header-lines 2 -d: --with-nth 2 -f "" < #{tempname}`.lines(chomp: true)
-    assert_equal %w[d:4],
-                 `#{FZF} --header-lines 2 -d: --with-nth 2 -f 4 < #{tempname}`.lines(chomp: true)
-  end
-
-  def test_header_lines_all_headers
-    # When all lines are header lines, no results
-    assert_empty `seq 3 | #{FZF} --header-lines 10 -f ""`.chomp
-    assert_equal 1, $CHILD_STATUS.exitstatus
-  end
 end
@@ -1215,15 +1215,6 @@ class TestLayout < TestInteractive
    end
  end

-  def test_header_and_footer_should_not_be_wider_than_list
-    tmux.send_keys %(WIDE=$(printf 'x%.0s' {1..1000}); (echo $WIDE; echo $WIDE) | fzf --header-lines 1 --style full --header-border bottom --header-lines-border top --ellipsis XX --header "$WIDE" --footer "$WIDE" --no-footer-border), :Enter
-    tmux.until do |lines|
-      matches = lines.filter_map { |line| line[/x+XX/] }
-      assert_equal 4, matches.length
-      assert_equal 1, matches.uniq.length
-    end
-  end
-
  def test_combinations
    skip unless ENV['LONGTEST']

@@ -1298,325 +1289,4 @@ class TestLayout < TestInteractive
      tmux.send_keys :Enter
    end
  end
-
-  # Locate a word in the currently captured screen and click its first character.
-  # tmux rows/columns are 1-based; capture indices are 0-based.
-  def click_word(word)
-    tmux.capture.each_with_index do |line, idx|
-      col = line.index(word)
-      return tmux.click(col + 1, idx + 1) if col
-    end
-    flunk("word #{word.inspect} not found on screen")
-  end
-
-  # Launch fzf with a click-{header,footer} binding that echoes FZF_CLICK_* into the prompt,
-  # then click each word in `clicks` and assert the resulting L/W values.
-  # `clicks` is an array of [word_to_click, expected_line].
-  def verify_clicks(kind:, opts:, input:, clicks:)
-    var = kind.to_s.upcase # HEADER or FOOTER
-    binding = "click-#{kind}:transform-prompt:" \
-              "echo \"L=$FZF_CLICK_#{var}_LINE W=$FZF_CLICK_#{var}_WORD> \""
-    # --multi makes the info line end in " (0)" so the wait regex is unambiguous.
-    tmux.send_keys %(#{input} | #{FZF} #{opts} --multi --bind '#{binding}'), :Enter
-    # Wait for fzf to fully render before inspecting the screen, otherwise the echoed
-    # command line can shadow click targets.
-    tmux.until { |lines| lines.any_include?(%r{ [0-9]+/[0-9]+ \(0\)}) }
-    clicks.each do |word, line|
-      click_word(word)
-      tmux.until { |lines| assert lines.any_include?("L=#{line} W=#{word}>") }
-    end
-    tmux.send_keys 'Escape'
-  end
-
-  # Header lines (--header-lines) are rendered in reverse display order only under
-  # layout=default; in layout=reverse and layout=reverse-list they keep the input order.
-  # FZF_CLICK_HEADER_LINE reflects the visual row, so the expected value flips.
-  HEADER_CLICKS = [%w[Aaa 1], %w[Bbb 2], %w[Ccc 3]].freeze
-
-  %w[default reverse reverse-list].each do |layout|
-    slug = layout.tr('-', '_')
-
-    # Plain --header with no border around the header section.
-    define_method(:"test_click_header_plain_#{slug}") do
-      verify_clicks(kind: :header,
-                    opts: %(--layout=#{layout} --header $'Aaa\\nBbb\\nCcc'),
-                    input: 'seq 5',
-                    clicks: HEADER_CLICKS)
-    end
-
-    # --header with a framing border (--style full gives --header-border=rounded by default).
-    define_method(:"test_click_header_border_rounded_#{slug}") do
-      verify_clicks(kind: :header,
-                    opts: %(--layout=#{layout} --style full --header $'Aaa\\nBbb\\nCcc'),
-                    input: 'seq 5',
-                    clicks: HEADER_CLICKS)
-    end
-
-    # --header-lines consumed from stdin, with its own framing border.
-    define_method(:"test_click_header_lines_border_rounded_#{slug}") do
-      clicks_hl = if layout == 'default'
-                    [%w[Xaa 3], %w[Ybb 2], %w[Zcc 1]]
-                  else
-                    [%w[Xaa 1], %w[Ybb 2], %w[Zcc 3]]
-                  end
-      verify_clicks(kind: :header,
-                    opts: %(--layout=#{layout} --style full --header-lines 3),
-                    input: "(printf 'Xaa\\nYbb\\nZcc\\n'; seq 5)",
-                    clicks: clicks_hl)
-    end
-
-    # --footer with a framing border.
-    define_method(:"test_click_footer_border_rounded_#{slug}") do
-      verify_clicks(kind: :footer,
-                    opts: %(--layout=#{layout} --style full --footer $'Foo\\nBar\\nBaz'),
-                    input: 'seq 5',
-                    clicks: [%w[Foo 1], %w[Bar 2], %w[Baz 3]])
-    end
-
-    # --header and --header-lines combined. Click-header numbering concatenates the two
-    # sections, but the order depends on the layout:
-    #   layoutReverse:     custom header (1..N), then header-lines (N+1..N+M)
-    #   layoutDefault:     header-lines (1..M, reversed visually), then custom header (M+1..M+N)
-    #   layoutReverseList: header-lines (1..M), then custom header (M+1..M+N)
-    define_method(:"test_click_header_combined_#{slug}") do
-      clicks = case layout
-               when 'reverse'
-                 [%w[Aaa 1], %w[Bbb 2], %w[Ccc 3], %w[Xaa 4], %w[Ybb 5], %w[Zcc 6]]
-               when 'default'
-                 [%w[Aaa 4], %w[Bbb 5], %w[Ccc 6], %w[Xaa 3], %w[Ybb 2], %w[Zcc 1]]
-               else # reverse-list
-                 [%w[Aaa 4], %w[Bbb 5], %w[Ccc 6], %w[Xaa 1], %w[Ybb 2], %w[Zcc 3]]
-               end
-      verify_clicks(kind: :header,
-                    opts: %(--layout=#{layout} --header $'Aaa\\nBbb\\nCcc' --header-lines 3),
-                    input: "(printf 'Xaa\\nYbb\\nZcc\\n'; seq 5)",
-                    clicks: clicks)
-    end
-
-    # Inline header inside a rounded list border.
-    define_method(:"test_click_header_border_inline_#{slug}") do
-      opts = %(--layout=#{layout} --style full --header $'Aaa\\nBbb\\nCcc' --header-border=inline)
-      verify_clicks(kind: :header, opts: opts, input: 'seq 5', clicks: HEADER_CLICKS)
-    end
-
-    # Inline header inside a horizontal list border (top+bottom only, no T-junctions).
-    define_method(:"test_click_header_border_inline_horizontal_list_#{slug}") do
-      opts = %(--layout=#{layout} --style full --list-border=horizontal --header $'Aaa\\nBbb\\nCcc' --header-border=inline)
-      verify_clicks(kind: :header, opts: opts, input: 'seq 5', clicks: HEADER_CLICKS)
-    end
-
-    # Inline header-lines inside a rounded list border.
-    define_method(:"test_click_header_lines_border_inline_#{slug}") do
-      clicks_hl = if layout == 'default'
-                    [%w[Xaa 3], %w[Ybb 2], %w[Zcc 1]]
-                  else
-                    [%w[Xaa 1], %w[Ybb 2], %w[Zcc 3]]
-                  end
-      opts = %(--layout=#{layout} --style full --header-lines 3 --header-lines-border=inline)
-      verify_clicks(kind: :header, opts: opts,
-                    input: "(printf 'Xaa\\nYbb\\nZcc\\n'; seq 5)",
-                    clicks: clicks_hl)
-    end
-
-    # Inline footer inside a rounded list border.
-    define_method(:"test_click_footer_border_inline_#{slug}") do
-      opts = %(--layout=#{layout} --style full --footer $'Foo\\nBar\\nBaz' --footer-border=inline)
-      verify_clicks(kind: :footer, opts: opts, input: 'seq 5',
-                    clicks: [%w[Foo 1], %w[Bar 2], %w[Baz 3]])
-    end
-  end
-
-  # An inline section requesting far more rows than the terminal can fit must not
-  # break the layout. The list frame must still render inside the pane with both
-  # corners visible and the prompt line present.
-  def test_inline_header_lines_oversized
-    tmux.send_keys %(seq 10000 | #{FZF} --style full --header-border inline --header-lines 9999), :Enter
-    tmux.until { |lines| lines.any_include?(%r{ [0-9]+/[0-9]+}) }
-    lines = tmux.capture
-    # Rounded (light) and sharp (tcell) default border glyphs.
-    top_corners = /[╭┌]/
-    bottom_corners = /[╰└]/
-    assert(lines.any? { |l| l.match?(top_corners) }, "list frame top missing: #{lines.inspect}")
-    assert(lines.any? { |l| l.match?(bottom_corners) }, "list frame bottom missing: #{lines.inspect}")
-    assert(lines.any? { |l| l.include?('>') }, "prompt missing: #{lines.inspect}")
-    tmux.send_keys 'Escape'
-  end
-
-  # A non-inline section that consumes all available rows must still render without
-  # crashing when another section is inline but has no budget. The inline section's
-  # content is clipped to 0 but the layout proceeds.
-  def test_inline_footer_starved_by_non_inline_header
-    tmux.send_keys %(seq 10000 | #{FZF} --style full --footer-border inline --footer "$(seq 1000)" --header "$(seq 1000)"), :Enter
-    tmux.until { |lines| lines.any_include?(%r{ [0-9]+/[0-9]+}) }
-    lines = tmux.capture
-    assert(lines.any? { |l| l.include?('>') }, "prompt missing: #{lines.inspect}")
-    tmux.send_keys 'Escape'
-  end
-
-  # Without a line-drawing --list-border, --header-border=inline must silently
-  # fall back to the `line` style (documented behavior).
-  def test_inline_falls_back_without_list_border
-    tmux.send_keys %(seq 5 | #{FZF} --list-border=none --header HEADER --header-border=inline), :Enter
-    tmux.until { |lines| lines.any_include?(%r{ [0-9]+/[0-9]+}) }
-    lines = tmux.capture
-    assert(lines.any? { |l| l.include?('HEADER') }, "header missing: #{lines.inspect}")
-    # Neither list frame corners (rounded/sharp) nor T-junction runes appear,
-    # since we've fallen back to a plain line separator.
-    assert(lines.none? { |l| l.match?(/[╭╮╰╯┌┐└┘├┤]/) }, "unexpected frame glyphs: #{lines.inspect}")
-    tmux.send_keys 'Escape'
-  end
-
-  # Regression: when --header-border=inline falls back to `line` because the
-  # list border can't host an inline separator, the header-border color must
-  # inherit from `border`, not `list-border`. The effective shape is `line`,
-  # so color inheritance must match what `line` rendering would use.
-  def test_inline_fallback_does_not_inherit_list_border_color
-    # Marker attribute (bold) on list-border. If HeaderBorder wrongly inherits
-    # from ListBorder, the header separator characters will carry the bold
-    # attribute. --info=hidden and --no-separator strip other separator lines
-    # so the only row of `─` chars is the header separator.
-    tmux.send_keys %(seq 5 | #{FZF} --list-border=none --header HEADER --header-border=inline --info=hidden --no-separator --color=bg:-1,list-border:red:bold), :Enter
-    sep_row = nil
-    tmux.until do |_|
-      sep_row = tmux.capture_ansi.find do |row|
-        stripped = row.gsub(/\e\[[\d;]*m/, '').rstrip
-        stripped.match?(/\A─+\z/)
-      end
-      !sep_row.nil?
-    end
-    # Bold (1) or red fg (31) on the header separator means it inherited from
-    # list-border even though the effective shape is `line` (non-inline).
-    refute_match(/\e\[(?:[\d;]*;)?(?:1|31)(?:;[\d;]*)?m─/, sep_row,
-                 "header separator inherited list-border attr: #{sep_row.inspect}")
-    tmux.send_keys 'Escape'
-  end
-
-  # Inline takes precedence over --header-first: the main header stays
-  # inside the list frame instead of moving below the input.
-  def test_inline_header_border_overrides_header_first
-    tmux.send_keys %(seq 5 | #{FZF} --style full --header foo --header-first --header-border inline), :Enter
-    tmux.until do |lines|
-      foo_idx = lines.index { |l| l.match?(/\A│\s+foo\s+│\z/) }
-      input_idx = lines.index { |l| l.match?(/\A│\s+>\s+\d+\/\d+\s+│\z/) }
-      foo_idx && input_idx && foo_idx < input_idx
-    end
-  end
-
-  # With both sections present, --header-first still moves the main --header
-  # below the input while --header-lines-border=inline keeps header-lines
-  # inside the list frame.
-  def test_inline_header_lines_with_header_first_and_main_header
-    tmux.send_keys %(seq 5 | #{FZF} --style full --header foo --header-lines 1 --header-first --header-lines-border inline), :Enter
-    tmux.until do |lines|
-      one_idx = lines.index { |l| l.match?(/\A│\s+1\s+│\z/) }
-      foo_idx = lines.index { |l| l.match?(/\A│\s+foo\s+│\z/) }
-      input_idx = lines.index { |l| l.match?(/\A│\s+>\s+\d+\/\d+\s+│\z/) }
-      one_idx && foo_idx && input_idx && one_idx < input_idx && input_idx < foo_idx
-    end
-  end
-
-  # With no main --header, --header-first previously repositioned
-  # header-lines. Inline now takes precedence: header-lines stays inside
-  # the list frame.
-  def test_inline_header_lines_with_header_first_no_main_header
-    tmux.send_keys %(seq 5 | #{FZF} --style full --header-lines 1 --header-first --header-lines-border inline), :Enter
-    tmux.until do |lines|
-      one_idx = lines.index { |l| l.match?(/\A│\s+1\s+│\z/) }
-      input_idx = lines.index { |l| l.match?(/\A│\s+>\s+\d+\/\d+\s+│\z/) }
-      one_idx && input_idx && one_idx < input_idx
-    end
-  end
-
-  # Regression: with --header-border=inline and --header-lines but no
-  # --header, the inline slot was sized for header-lines only. After
-  # change-header added a main header line, resizeIfNeeded tolerated the
-  # too-small slot, so the header-lines line got displaced and disappeared.
-  def test_inline_change_header_grows_slot
-    tmux.send_keys %(seq 5 | #{FZF} --style full --header-lines 1 --header-border inline --bind space:change-header:tada), :Enter
-    tmux.until { |lines| lines.any_include?(/\A│\s+1\s+│\z/) }
-    tmux.send_keys ' '
-    tmux.until do |lines|
-      lines.any_include?(/\A│\s+1\s+│\z/) && lines.any_include?(/\A│\s+tada\s+│\z/)
-    end
-  end
-
-  # Invalid inline combinations must be rejected at startup.
-  def test_inline_rejected_on_unsupported_options
-    [
-      ['--border=inline', 'inline border is only supported'],
-      ['--list-border=inline', 'inline border is only supported'],
-      ['--input-border=inline', 'inline border is only supported'],
-      ['--preview-window=border-inline --preview :', 'invalid preview window option: border-inline'],
-      ['--header-border=inline --header-lines-border=sharp --header-lines=1',
-       '--header-border=inline requires --header-lines-border to be inline or unset']
-    ].each do |args, expected|
-      output = `#{FZF} #{args} < /dev/null 2>&1`
-      refute_equal 0, $CHILD_STATUS.exitstatus, "expected non-zero exit for: #{args}"
-      assert_includes output, expected, "wrong error for: #{args}"
-    end
-  end
-
-  private
-
-  # Count rows whose entire width is a single `color` range.
-  def count_full_rows(ranges_by_row, color)
-    ranges_by_row.count { |r| r.length == 1 && r[0][2] == color }
-  end
-
-  # Wait until `tmux.bg_ranges` has at least `count` fully-`color` rows; return them.
-  def wait_for_full_rows(color, count)
-    ranges = nil
-    tmux.until do |_|
-      ranges = tmux.bg_ranges
-      count_full_rows(ranges, color) >= count
-    end
-    ranges
-  end
-
-  public
-
-  # Inline header's entire section (outer edge + content-row verticals + separator)
-  # carries the header-bg color; list rows below carry list-bg.
-  def test_inline_header_bg_color
-    tmux.send_keys %(seq 5 | #{FZF} --list-border --reverse --header HEADER --header-border=inline --color=bg:-1,header-border:white,list-border:white,header-bg:red,list-bg:green), :Enter
-    tmux.until { |lines| lines.any_include?(%r{ [0-9]+/[0-9]+}) }
-    # 3 fully-red rows: top edge, header content, separator.
-    ranges = wait_for_full_rows('red', 3)
-    assert_equal_org(3, count_full_rows(ranges, 'red'))
-    # List rows below (>=5) are fully green.
-    assert_operator count_full_rows(ranges, 'green'), :>=, 5
-    tmux.send_keys 'Escape'
-  end
-
-  # Regression: when --header-lines-border=inline is the only inline section
-  # (no --header-border), the section must still use header-bg, not list-bg.
-  def test_inline_header_lines_bg_without_main_header
-    tmux.send_keys %(seq 5 | #{FZF} --list-border --reverse --header-lines 2 --header-lines-border=inline --color=bg:-1,header-border:white,list-border:white,header-bg:red,list-bg:green), :Enter
-    tmux.until { |lines| lines.any_include?(%r{ [0-9]+/[0-9]+}) }
-    # Top edge + 2 content rows + separator = 4 fully-red rows.
-    ranges = wait_for_full_rows('red', 4)
-    assert_equal_org(4, count_full_rows(ranges, 'red'))
-    tmux.send_keys 'Escape'
-  end
-
-  # Inline footer's entire section carries footer-bg; list rows above carry list-bg.
-  def test_inline_footer_bg_color
-    tmux.send_keys %(seq 5 | #{FZF} --list-border --footer FOOTER --footer-border=inline --color=bg:-1,footer-border:white,list-border:white,footer-bg:blue,list-bg:green), :Enter
-    tmux.until { |lines| lines.any_include?(%r{ [0-9]+/[0-9]+}) }
-    ranges = wait_for_full_rows('blue', 3)
-    assert_equal_org(3, count_full_rows(ranges, 'blue'))
-    tmux.send_keys 'Escape'
-  end
-
-  # The list-label's bg is swapped to match the adjacent inline section so it reads as
-  # part of the section frame rather than a list-colored island on a section-colored edge.
-  def test_list_label_bg_on_inline_section_edge
-    tmux.send_keys %(seq 5 | #{FZF} --list-border --reverse --header HEADER --header-border=inline --list-label=LL --color=bg:-1,header-border:white,list-border:white,header-bg:red,list-bg:green,list-label:yellow:bold), :Enter
-    tmux.until { |lines| lines.any_include?(%r{ [0-9]+/[0-9]+}) }
-    # The label sits on the header-owned top edge, so the entire row must be a
-    # single red run (no green breaks where the label cells are).
-    ranges = wait_for_full_rows('red', 3)
-    assert_operator count_full_rows(ranges, 'red'), :>=, 3
-    tmux.send_keys 'Escape'
-  end
 end
@@ -383,30 +383,6 @@ class TestPreview < TestInteractive
    end
  end

-  def test_preview_follow_wrap
-    tmux.send_keys "seq 1 | #{FZF} --preview 'seq 1000' --preview-window right,2,follow,wrap", :Enter
-    tmux.until { |lines| assert_equal 1, lines.match_count }
-    tmux.until do |lines|
-      idx = lines.rindex { it.include?('│ 10 │') }
-      assert_includes lines[idx + 1], '│ ↳  │'
-      assert_includes lines[idx + 2], '│ ↳  │'
-    end
-  end
-
-  def test_preview_follow_wrap_long_line
-    tmux.send_keys %(seq 1 | #{FZF} --preview "seq 2; yes yes | head -10000 | tr '\n' ' '" --preview-window follow,wrap --bind up:preview-up,down:preview-down), :Enter
-    tmux.until do |lines|
-      assert_equal 1, lines.match_count
-      assert lines.any_include?('3/3 │')
-    end
-    tmux.send_keys :Up
-    tmux.until { |lines| assert lines.any_include?('2/3 │') }
-    tmux.send_keys :Up
-    tmux.until { |lines| assert lines.any_include?('1/3 │') }
-    tmux.send_keys :Down
-    tmux.until { |lines| assert lines.any_include?('2/3 │') }
-  end
-
  def test_close
    tmux.send_keys "seq 100 | #{FZF} --preview 'echo foo' --bind ctrl-c:close", :Enter
    tmux.until { |lines| assert_equal 100, lines.match_count }
@@ -565,7 +541,7 @@ class TestPreview < TestInteractive
    tmux.send_keys "seq 10 | #{FZF} --preview-border rounded --preview-window '~5,2,+0,<100000(~0,+100,wrap,noinfo)' --preview 'seq 1000'", :Enter
    tmux.until { |lines| assert_equal 10, lines.match_count }
    tmux.until do |lines|
-      assert_equal ['╭────╮', '│ 10 │', '│ ↳  │', '│ 10 │', '│ ↳  │'], lines.take(5).map(&:strip)
+      assert_equal ['╭────╮', '│ 10 │', '│ ↳ 0│', '│ 10 │', '│ ↳ 1│'], lines.take(5).map(&:strip)
    end
  end

@@ -596,47 +572,4 @@ class TestPreview < TestInteractive
      assert_equal 1, lines.match_count
    end
  end
-
-  def test_preview_wrap_sign_between_ansi_fragments
-    tmux.send_keys %(seq 1 | #{FZF} --preview 'echo -e "\\x1b[33m1234567890 \\x1b[mhello"; echo -e "\\x1b[33m1234567890 \\x1b[mhello"' --preview-window 10,wrap-word), :Enter
-    tmux.until do |lines|
-      assert_equal 1, lines.match_count
-      assert_equal(2, lines.count { |line| line.include?('│ 1234567890 │') })
-      assert_equal(2, lines.count { |line| line.include?('│ ↳ hello    │') })
-    end
-  end
-
-  def test_preview_wrap_sign_between_ansi_fragments_overflow
-    tmux.send_keys %(seq 1 | #{FZF} --preview 'echo -e "\\x1b[33m123 \\x1b[mhi"; echo -e "\\x1b[33m123 \\x1b[mhi"' --preview-window 2,wrap-word,noinfo), :Enter
-    tmux.until do |lines|
-      assert_equal 1, lines.match_count
-      assert_equal(2, lines.count { |line| line.include?('│ 12 │') })
-      assert_equal(0, lines.count { |line| line.include?('│ h') })
-    end
-  end
-
-  def test_preview_wrap_sign_between_ansi_fragments_overflow2
-    tmux.send_keys %(seq 1 | #{FZF} --preview 'echo -e "\\x1b[33m123 \\x1b[mhi"; echo -e "\\x1b[33m123 \\x1b[mhi"' --preview-window 1,wrap-word,noinfo), :Enter
-    tmux.until do |lines|
-      assert_equal 1, lines.match_count
-      assert_equal(2, lines.count { |line| line.include?('│ 1 │') })
-      assert_equal(0, lines.count { |line| line.include?('│ h') })
-    end
-  end
-
-  def test_preview_toggle_should_redraw_scrollbar
-    tmux.send_keys %(seq 1 | #{FZF} --no-border --scrollbar --preview 'seq $((FZF_PREVIEW_LINES + 1))' --preview-border line --bind tab:toggle-preview --header foo --header-border --footer bar --footer-border), :Enter
-    tmux.until do |lines|
-      assert_equal 1, lines.match_count
-      assert_operator lines.count { |line| line.end_with?('│') }, :>, 2
-    end
-    tmux.send_keys :Tab
-    tmux.until do |lines|
-      assert_equal(2, lines.count { |line| line.end_with?('│') })
-    end
-    tmux.send_keys :Tab
-    tmux.until do |lines|
-      assert_operator lines.count { |line| line.end_with?('│') }, :>, 2
-    end
-  end
 end
@@ -16,31 +16,6 @@ class TestServer < TestInteractive
      assert_empty state[:query]
      assert_equal({ index: 0, text: '1' }, state[:current])

-      # No positions when query is empty
-      state[:matches].each do |m|
-        assert_nil m[:positions]
-      end
-      assert_nil state[:current][:positions] if state[:current]
-
-      # Positions with a single-character query
-      Net::HTTP.post(fn.call, 'change-query(1)')
-      tmux.until { |lines| assert_equal 2, lines.match_count }
-      state = JSON.parse(Net::HTTP.get(fn.call), symbolize_names: true)
-      assert_equal [0], state[:current][:positions]
-      state[:matches].each do |m|
-        assert_includes m[:text], '1'
-        assert_equal [m[:text].index('1')], m[:positions]
-      end
-
-      # Positions with a multi-character query; verify sorted ascending
-      Net::HTTP.post(fn.call, 'change-query(10)')
-      tmux.until { |lines| assert_equal 1, lines.match_count }
-      state = JSON.parse(Net::HTTP.get(fn.call), symbolize_names: true)
-      assert_equal '10', state[:current][:text]
-      assert_equal [0, 1], state[:current][:positions]
-      assert_equal state[:current][:positions], state[:current][:positions].sort
-
-      # No match - no current item
      Net::HTTP.post(fn.call, 'change-query(yo)+reload(seq 100)+change-prompt:hundred> ')
      tmux.until { |lines| assert_equal 100, lines.item_count }
      tmux.until { |lines| assert_equal 'hundred> yo', lines[-1] }
@@ -56,32 +31,22 @@ class TestServer < TestInteractive
  end

  def test_listen_with_api_key
-    uri = URI('http://localhost:6266')
+    post_uri = URI('http://localhost:6266')
    tmux.send_keys 'seq 10 | FZF_API_KEY=123abc fzf --listen 6266', :Enter
    tmux.until { |lines| assert_equal 10, lines.match_count }
    # Incorrect API Key
    [nil, { 'x-api-key' => '' }, { 'x-api-key' => '124abc' }].each do |headers|
-      res = Net::HTTP.post(uri, 'change-query(yo)+reload(seq 100)+change-prompt:hundred> ', headers)
-      assert_equal '401', res.code
-      assert_equal 'Unauthorized', res.message
-      assert_equal "invalid api key\n", res.body
-
-      res = Net::HTTP.get_response(uri, headers)
+      res = Net::HTTP.post(post_uri, 'change-query(yo)+reload(seq 100)+change-prompt:hundred> ', headers)
      assert_equal '401', res.code
      assert_equal 'Unauthorized', res.message
      assert_equal "invalid api key\n", res.body
    end
-
    # Valid API Key
    [{ 'x-api-key' => '123abc' }, { 'X-API-Key' => '123abc' }].each do |headers|
-      res = Net::HTTP.post(uri, 'change-query(yo)+reload(seq 100)+change-prompt:hundred> ', headers)
+      res = Net::HTTP.post(post_uri, 'change-query(yo)+reload(seq 100)+change-prompt:hundred> ', headers)
      assert_equal '200', res.code
      tmux.until { |lines| assert_equal 100, lines.item_count }
      tmux.until { |lines| assert_equal 'hundred> yo', lines[-1] }
-
-      res = Net::HTTP.get_response(uri, headers)
-      assert_equal '200', res.code
-      assert_equal 'yo', JSON.parse(res.body, symbolize_names: true)[:query]
    end
  end
 end
@@ -27,10 +27,6 @@ module TestShell
    tmux.prepare
  end

-  def trigger
-    '**'
-  end
-
  def test_ctrl_t
    set_var('FZF_CTRL_T_COMMAND', 'seq 100')

@@ -138,7 +134,7 @@ module TestShell
    tmux.send_keys 'C-r'
    tmux.until { |lines| assert_equal '>', lines[-1] }
    tmux.send_keys 'foo bar'
-    tmux.until { |lines| assert_includes lines[-4], '"foo' } if shell == :bash
+    tmux.until { |lines| assert_includes lines[-4], '"foo' } unless shell == :zsh
    tmux.until { |lines| assert lines[-3]&.match?(/bar"␊?/) }
    tmux.send_keys :Enter
    tmux.until { |lines| assert lines[-1]&.match?(/bar"␊?/) }
@@ -169,11 +165,7 @@ module CompletionTest
      FileUtils.touch(File.expand_path(f))
    end
    tmux.prepare
-    if shell == :fish
-      tmux.send_keys 'cat /tmp/fzf-test/10', 'C-t'
-    else
-      tmux.send_keys "cat /tmp/fzf-test/10#{trigger}", :Tab
-    end
+    tmux.send_keys 'cat /tmp/fzf-test/10**', :Tab
    tmux.until { |lines| assert_operator lines.match_count, :>, 0 }
    tmux.send_keys ' !d'
    tmux.until { |lines| assert_equal 2, lines.match_count }
@@ -187,11 +179,7 @@ module CompletionTest
    # ~USERNAME**<TAB>
    user = `whoami`.chomp
    tmux.send_keys 'C-u'
-    if shell == :fish
-      tmux.send_keys "cat ~#{user}", 'C-t'
-    else
-      tmux.send_keys "cat ~#{user}#{trigger}", :Tab
-    end
+    tmux.send_keys "cat ~#{user}**", :Tab
    tmux.until { |lines| assert_operator lines.match_count, :>, 0 }
    tmux.send_keys "/#{user}"
    tmux.until { |lines| assert(lines.any? { |l| l.end_with?("/#{user}") }) }
@@ -202,29 +190,14 @@ module CompletionTest

    # ~INVALID_USERNAME**<TAB>
    tmux.send_keys 'C-u'
-    if shell == :fish
-      tmux.send_keys 'cat ~such', 'C-t'
-    else
-      tmux.send_keys "cat ~such#{trigger}", :Tab
-    end
+    tmux.send_keys 'cat ~such**', :Tab
    tmux.until(true) { |lines| assert lines.any_include?('no~such~user') }
    tmux.send_keys :Enter
-    tmux.until(true) do |lines|
-      if shell == :fish
-        # Fish's string escape quotes filenames with ~ to prevent tilde expansion
-        assert_equal 'cat no\\~such\\~user', lines[-1]
-      else
-        assert_equal 'cat no~such~user', lines[-1]
-      end
-    end
+    tmux.until(true) { |lines| assert_equal 'cat no~such~user', lines[-1] }

    # /tmp/fzf\ test**<TAB>
    tmux.send_keys 'C-u'
-    if shell == :fish
-      tmux.send_keys 'cat /tmp/fzf\\ test/', 'C-t'
-    else
-      tmux.send_keys "cat /tmp/fzf\\ test/#{trigger}", :Tab
-    end
+    tmux.send_keys 'cat /tmp/fzf\ test/**', :Tab
    tmux.until { |lines| assert_operator lines.match_count, :>, 0 }
    tmux.send_keys 'foobar$'
    tmux.until do |lines|
@@ -237,11 +210,7 @@ module CompletionTest
    # Should include hidden files
    (1..100).each { |i| FileUtils.touch("/tmp/fzf-test/.hidden-#{i}") }
    tmux.send_keys 'C-u'
-    if shell == :fish
-      tmux.send_keys 'cat /tmp/fzf-test/hidden', 'C-t'
-    else
-      tmux.send_keys "cat /tmp/fzf-test/hidden#{trigger}", :Tab
-    end
+    tmux.send_keys 'cat /tmp/fzf-test/hidden**', :Tab
    tmux.until(true) do |lines|
      assert_equal 100, lines.match_count
      assert lines.any_include?('/tmp/fzf-test/.hidden-')
@@ -254,89 +223,70 @@ module CompletionTest
  end

  def test_file_completion_root
-    if shell == :fish
-      tmux.send_keys 'ls /', 'C-t'
-    else
-      tmux.send_keys "ls /#{trigger}", :Tab
-    end
+    tmux.send_keys 'ls /**', :Tab
    tmux.until { |lines| assert_operator lines.match_count, :>, 0 }
    tmux.send_keys :Enter
  end

  def test_dir_completion
-    FileUtils.mkdir_p('/tmp/fzf-test-dir')
    (1..100).each do |idx|
-      FileUtils.mkdir_p("/tmp/fzf-test-dir/d#{idx}")
+      FileUtils.mkdir_p("/tmp/fzf-test/d#{idx}")
    end
-    FileUtils.touch('/tmp/fzf-test-dir/d55/xxx')
+    FileUtils.touch('/tmp/fzf-test/d55/xxx')
    tmux.prepare
-    if shell == :fish
-      tmux.send_keys 'cd /tmp/fzf-test-dir/', 'C-t'
-    else
-      tmux.send_keys "cd /tmp/fzf-test-dir/#{trigger}", :Tab
-    end
+    tmux.send_keys 'cd /tmp/fzf-test/**', :Tab
    tmux.until { |lines| assert_operator lines.match_count, :>, 0 }
-    # Tab selects items in C-t's --multi mode, so skip for fish
-    tmux.send_keys :Tab, :Tab unless shell == :fish # Tab does not work here
-    tmux.send_keys '55/$'
+    tmux.send_keys :Tab, :Tab # Tab does not work here
+    tmux.send_keys 55
    tmux.until do |lines|
      assert_equal 1, lines.match_count
-      assert_includes lines, '> 55/$'
-      assert_includes lines, '> /tmp/fzf-test-dir/d55/'
+      assert_includes lines, '> 55'
+      assert_includes lines, '> /tmp/fzf-test/d55/'
    end
    tmux.send_keys :Enter
-    tmux.until(true) { |lines| assert_equal 'cd /tmp/fzf-test-dir/d55/', lines[-1] }
-    # C-t appends a trailing space after the result
-    tmux.send_keys :BSpace if shell == :fish
+    tmux.until(true) { |lines| assert_equal 'cd /tmp/fzf-test/d55/', lines[-1] }
    tmux.send_keys :xx
-    tmux.until { |lines| assert_equal 'cd /tmp/fzf-test-dir/d55/xx', lines[-1] }
+    tmux.until { |lines| assert_equal 'cd /tmp/fzf-test/d55/xx', lines[-1] }

    # Should not match regular files (bash-only)
    if instance_of?(TestBash)
      tmux.send_keys :Tab
-      tmux.until { |lines| assert_equal 'cd /tmp/fzf-test-dir/d55/xx', lines[-1] }
+      tmux.until { |lines| assert_equal 'cd /tmp/fzf-test/d55/xx', lines[-1] }
    end

    # Fail back to plusdirs
    tmux.send_keys :BSpace, :BSpace, :BSpace
-    tmux.until { |lines| assert_equal 'cd /tmp/fzf-test-dir/d55', lines[-1] }
+    tmux.until { |lines| assert_equal 'cd /tmp/fzf-test/d55', lines[-1] }
    tmux.send_keys :Tab
-    tmux.until { |lines| assert_equal 'cd /tmp/fzf-test-dir/d55/', lines[-1] }
-  ensure
-    FileUtils.rm_rf('/tmp/fzf-test-dir')
+    tmux.until { |lines| assert_equal 'cd /tmp/fzf-test/d55/', lines[-1] }
  end

  def test_process_completion
-    skip('fish background job format differs') if shell == :fish
-
-    begin
-      tmux.send_keys 'sleep 12345 &', :Enter
-      lines = tmux.until { |lines| assert lines[-1]&.start_with?('[1] ') }
-      pid = lines[-1]&.split&.last
-      tmux.prepare
-      tmux.send_keys 'C-L'
-      tmux.send_keys "kill #{trigger}", :Tab
-      tmux.until { |lines| assert_operator lines.match_count, :>, 0 }
-      tmux.send_keys 'sleep12345'
-      tmux.until { |lines| assert lines.any_include?('sleep 12345') }
-      tmux.send_keys :Enter
-      tmux.until(true) { |lines| assert_equal "kill #{pid}", lines[-1] }
-    ensure
-      if pid
-        begin
-          Process.kill('KILL', pid.to_i)
-        rescue StandardError
-          nil
-        end
+    tmux.send_keys 'sleep 12345 &', :Enter
+    lines = tmux.until { |lines| assert lines[-1]&.start_with?('[1] ') }
+    pid = lines[-1]&.split&.last
+    tmux.prepare
+    tmux.send_keys 'C-L'
+    tmux.send_keys 'kill **', :Tab
+    tmux.until { |lines| assert_operator lines.match_count, :>, 0 }
+    tmux.send_keys 'sleep12345'
+    tmux.until { |lines| assert lines.any_include?('sleep 12345') }
+    tmux.send_keys :Enter
+    tmux.until(true) { |lines| assert_equal "kill #{pid}", lines[-1] }
+  ensure
+    if pid
+      begin
+        Process.kill('KILL', pid.to_i)
+      rescue StandardError
+        nil
      end
    end
  end

  def test_custom_completion
-    skip('fish does not use _fzf_compgen_path; path completion is via ctrl-t') if shell == :fish
    tmux.send_keys '_fzf_compgen_path() { echo "$1"; seq 10; }', :Enter
    tmux.prepare
-    tmux.send_keys "ls /tmp/#{trigger}", :Tab
+    tmux.send_keys 'ls /tmp/**', :Tab
    tmux.until { |lines| assert_equal 11, lines.match_count }
    tmux.send_keys :Tab, :Tab, :Tab
    tmux.until { |lines| assert_equal 3, lines.select_count }
@@ -345,12 +295,11 @@ module CompletionTest
  end

  def test_unset_completion
-    skip('fish has native completion for set and unset variables') if shell == :fish
    tmux.send_keys 'export FZFFOOBAR=BAZ', :Enter
    tmux.prepare

    # Using tmux
-    tmux.send_keys "unset FZFFOOBR#{trigger}", :Tab
+    tmux.send_keys 'unset FZFFOOBR**', :Tab
    tmux.until { |lines| assert_equal 1, lines.match_count }
    tmux.send_keys :Enter
    tmux.until { |lines| assert_equal 'unset FZFFOOBAR', lines[-1] }
@@ -359,57 +308,34 @@ module CompletionTest
    # FZF_TMUX=1
    new_shell
    tmux.focus
-    tmux.send_keys "unset FZFFOOBR#{trigger}", :Tab
+    tmux.send_keys 'unset FZFFOOBR**', :Tab
    tmux.until { |lines| assert_equal 1, lines.match_count }
    tmux.send_keys :Enter
    tmux.until { |lines| assert_equal 'unset FZFFOOBAR', lines[-1] }
  end

  def test_completion_in_command_sequence
-    if shell == :fish
-      FileUtils.mkdir_p('/tmp/fzf-test-seq')
-      FileUtils.touch('/tmp/fzf-test-seq/fzffoobar')
-      tmux.prepare
-      # Fish uses Shift-Tab for fzf completion (no trigger system)
-      command = 'echo foo; QUX=THUD ls /tmp/fzf-test-seq/fzffoobr'
-      expected = 'echo foo; QUX=THUD ls /tmp/fzf-test-seq/fzffoobar'
-      tmux.send_keys command, :BTab
+    tmux.send_keys 'export FZFFOOBAR=BAZ', :Enter
+    tmux.prepare
+
+    triggers = ['**', '~~', '++', 'ff', '/']
+    triggers.push('&', '[', ';', '`') if instance_of?(TestZsh)
+
+    triggers.each do |trigger|
+      set_var('FZF_COMPLETION_TRIGGER', trigger)
+      command = "echo foo; QUX=THUD unset FZFFOOBR#{trigger}"
+      tmux.send_keys command.sub(/(;|`)$/, '\\\\\1'), :Tab
      tmux.until { |lines| assert_equal 1, lines.match_count }
      tmux.send_keys :Enter
-      tmux.until { |lines| assert_equal expected, lines[-1] }
-    else
-      tmux.send_keys 'export FZFFOOBAR=BAZ', :Enter
-      tmux.prepare
-
-      triggers = ['**', '~~', '++', 'ff', '/']
-      triggers.push('&', '[', ';', '`') if instance_of?(TestZsh)
-
-      triggers.each do |trigger|
-        set_var('FZF_COMPLETION_TRIGGER', trigger)
-        command = "echo foo; QUX=THUD unset FZFFOOBR#{trigger}"
-        expected = 'echo foo; QUX=THUD unset FZFFOOBAR'
-        tmux.send_keys command.sub(/(;|`)$/, '\\\\\1'), :Tab
-        tmux.until { |lines| assert_equal 1, lines.match_count }
-        tmux.send_keys :Enter
-        tmux.until { |lines| assert_equal expected, lines[-1] }
-      end
+      tmux.until { |lines| assert_equal 'echo foo; QUX=THUD unset FZFFOOBAR', lines[-1] }
    end
-  ensure
-    FileUtils.rm_rf('/tmp/fzf-test-seq') if shell == :fish
  end

  def test_file_completion_unicode
    FileUtils.mkdir_p('/tmp/fzf-test')
-    # Shell-agnostic file creation
-    File.write('/tmp/fzf-test/fzf-unicode 테스트1', "test3\n")
-    File.write('/tmp/fzf-test/fzf-unicode 테스트2', "test4\n")
-    tmux.send_keys 'cd /tmp/fzf-test', :Enter
+    tmux.paste "cd /tmp/fzf-test; echo test3 > $'fzf-unicode \\355\\205\\214\\354\\212\\244\\355\\212\\2701'; echo test4 > $'fzf-unicode \\355\\205\\214\\354\\212\\244\\355\\212\\2702'"
    tmux.prepare
-    if shell == :fish
-      tmux.send_keys 'cat fzf-unicode', 'C-t'
-    else
-      tmux.send_keys "cat fzf-unicode#{trigger}", :Tab
-    end
+    tmux.send_keys 'cat fzf-unicode**', :Tab
    tmux.until { |lines| assert_equal 2, lines.match_count }

    tmux.send_keys '1'
@@ -432,41 +358,36 @@ module CompletionTest
  end

  def test_custom_completion_api
-    skip('bash-specific _comprun/declare syntax') if shell == :fish
-
-    begin
-      tmux.send_keys 'eval "_fzf$(declare -f _comprun)"', :Enter
-      %w[f g].each do |command|
-        tmux.prepare
-        tmux.send_keys "#{command} b#{trigger}", :Tab
-        tmux.until do |lines|
-          assert_equal 2, lines.item_count
-          assert_equal 1, lines.match_count
-          assert lines.any_include?("prompt-#{command}")
-          assert lines.any_include?("preview-#{command}-bar")
-        end
-        tmux.send_keys :Enter
-        tmux.until { |lines| assert_equal "#{command} #{command}barbar", lines[-1] }
-        tmux.send_keys 'C-u'
-      end
-    ensure
+    tmux.send_keys 'eval "_fzf$(declare -f _comprun)"', :Enter
+    %w[f g].each do |command|
      tmux.prepare
-      tmux.send_keys 'unset -f _fzf_comprun', :Enter
+      tmux.send_keys "#{command} b**", :Tab
+      tmux.until do |lines|
+        assert_equal 2, lines.item_count
+        assert_equal 1, lines.match_count
+        assert lines.any_include?("prompt-#{command}")
+        assert lines.any_include?("preview-#{command}-bar")
+      end
+      tmux.send_keys :Enter
+      tmux.until { |lines| assert_equal "#{command} #{command}barbar", lines[-1] }
+      tmux.send_keys 'C-u'
    end
+  ensure
+    tmux.prepare
+    tmux.send_keys 'unset -f _fzf_comprun', :Enter
  end

  def test_ssh_completion
-    skip('fish uses native ssh completion') if shell == :fish
    (1..5).each { |i| FileUtils.touch("/tmp/fzf-test-ssh-#{i}") }

-    tmux.send_keys "ssh jg@localhost#{trigger}", :Tab
+    tmux.send_keys 'ssh jg@localhost**', :Tab
    tmux.until do |lines|
      assert_operator lines.match_count, :>=, 1
    end

    tmux.send_keys :Enter
    tmux.until { |lines| assert lines.any_include?('ssh jg@localhost') }
-    tmux.send_keys " -i /tmp/fzf-test-ssh#{trigger}", :Tab
+    tmux.send_keys ' -i /tmp/fzf-test-ssh**', :Tab
    tmux.until do |lines|
      assert_operator lines.match_count, :>=, 5
      assert_equal 0, lines.select_count
@@ -478,344 +399,11 @@ module CompletionTest
    tmux.send_keys :Enter
    tmux.until { |lines| assert lines.any_include?('ssh jg@localhost  -i /tmp/fzf-test-ssh-') }

-    tmux.send_keys "localhost#{trigger}", :Tab
+    tmux.send_keys 'localhost**', :Tab
    tmux.until do |lines|
      assert_operator lines.match_count, :>=, 1
    end
  end
-
-  def test_option_equals_long_option
-    FileUtils.mkdir_p('/tmp/fzf-test-opt-eq-long')
-    FileUtils.touch('/tmp/fzf-test-opt-eq-long/SECURITY.md')
-    tmux.prepare
-    tmux.send_keys 'cd /tmp/fzf-test-opt-eq-long', :Enter
-    tmux.prepare
-    if shell == :fish
-      tmux.send_keys 'some-command --opt=SECURI', 'C-t'
-    else
-      tmux.send_keys "some-command --opt=SECURI#{trigger}", :Tab
-    end
-
-    case shell
-    when :bash
-      tmux.until do |lines|
-        assert_equal 1, lines.match_count
-        assert_includes lines, '> SECURI'
-      end
-      tmux.send_keys :Enter
-      tmux.until(true) { |lines| assert_equal 'some-command --opt=SECURITY.md', lines[-1] }
-    when :fish
-      tmux.until do |lines|
-        assert_equal 1, lines.match_count
-        assert lines.any_include?('SECURITY.md')
-      end
-      tmux.send_keys :Enter
-      tmux.until(true) { |lines| assert_equal 'some-command --opt=SECURITY.md', lines[-1] }
-    when :zsh
-      tmux.until do |lines|
-        assert_equal 0, lines.match_count
-        assert_includes lines, '> --opt=SECURI'
-      end
-    end
-  ensure
-    FileUtils.rm_rf('/tmp/fzf-test-opt-eq-long')
-  end
-
-  def test_option_equals_long_option_after_double_dash
-    FileUtils.mkdir_p('/tmp/fzf-test-opt-eq-long-ddash')
-    FileUtils.touch('/tmp/fzf-test-opt-eq-long-ddash/SECURITY.md')
-    tmux.prepare
-    tmux.send_keys 'cd /tmp/fzf-test-opt-eq-long-ddash', :Enter
-    tmux.prepare
-    if shell == :fish
-      tmux.send_keys 'some-command -- --opt=SECURI', 'C-t'
-    else
-      tmux.send_keys "some-command -- --opt=SECURI#{trigger}", :Tab
-    end
-
-    case shell
-    when :bash
-      tmux.until do |lines|
-        assert_equal 1, lines.match_count
-        assert_includes lines, '> SECURI'
-      end
-      tmux.send_keys :Enter
-      tmux.until(true) { |lines| assert_equal 'some-command -- --opt=SECURITY.md', lines[-1] }
-    when :fish, :zsh
-      tmux.until do |lines|
-        assert_equal 0, lines.match_count
-        assert_includes lines, '> --opt=SECURI'
-      end
-    end
-  ensure
-    FileUtils.rm_rf('/tmp/fzf-test-opt-eq-long-ddash')
-  end
-
-  def test_option_equals_short_option
-    FileUtils.mkdir_p('/tmp/fzf-test-opt-eq-short')
-    FileUtils.touch('/tmp/fzf-test-opt-eq-short/SECURITY.md')
-    tmux.prepare
-    tmux.send_keys 'cd /tmp/fzf-test-opt-eq-short', :Enter
-    tmux.prepare
-    if shell == :fish
-      tmux.send_keys 'some-command -o=SECURI', 'C-t'
-    else
-      tmux.send_keys "some-command -o=SECURI#{trigger}", :Tab
-    end
-
-    case shell
-    when :bash, :fish
-      tmux.until do |lines|
-        assert_equal 1, lines.match_count
-        assert lines.any_include?('> SECURITY.md')
-      end
-      tmux.send_keys :Enter
-      tmux.until(true) { |lines| assert_equal 'some-command -o=SECURITY.md', lines[-1] }
-    when :zsh
-      tmux.until do |lines|
-        assert_equal 0, lines.match_count
-        assert_includes lines, '> -o=SECURI'
-      end
-    end
-  ensure
-    FileUtils.rm_rf('/tmp/fzf-test-opt-eq-short')
-  end
-
-  def test_option_equals_short_option_after_double_dash
-    FileUtils.mkdir_p('/tmp/fzf-test-opt-eq-short-ddash')
-    FileUtils.touch('/tmp/fzf-test-opt-eq-short-ddash/SECURITY.md')
-    tmux.prepare
-    tmux.send_keys 'cd /tmp/fzf-test-opt-eq-short-ddash', :Enter
-    tmux.prepare
-    if shell == :fish
-      tmux.send_keys 'some-command -- -o=SECURI', 'C-t'
-    else
-      tmux.send_keys "some-command -- -o=SECURI#{trigger}", :Tab
-    end
-
-    case shell
-    when :bash
-      tmux.until do |lines|
-        assert_equal 1, lines.match_count
-        assert_includes lines, '> SECURITY.md'
-      end
-      tmux.send_keys :Enter
-      tmux.until(true) { |lines| assert_equal 'some-command -- -o=SECURITY.md', lines[-1] }
-    when :fish, :zsh
-      tmux.until do |lines|
-        assert_equal 0, lines.match_count
-        assert_includes lines, '> -o=SECURI'
-      end
-    end
-  ensure
-    FileUtils.rm_rf('/tmp/fzf-test-opt-eq-short-ddash')
-  end
-
-  def test_option_no_equals_long_option
-    FileUtils.mkdir_p('/tmp/fzf-test-opt-no-eq-long')
-    FileUtils.touch('/tmp/fzf-test-opt-no-eq-long/SECURITY.md')
-    tmux.prepare
-    tmux.send_keys 'cd /tmp/fzf-test-opt-no-eq-long', :Enter
-    tmux.prepare
-    if shell == :fish
-      tmux.send_keys 'some-command --optSECURI', 'C-t'
-    else
-      tmux.send_keys "some-command --optSECURI#{trigger}", :Tab
-    end
-
-    tmux.until do |lines|
-      assert_equal 0, lines.match_count
-      assert_includes lines, '> --optSECURI'
-    end
-  ensure
-    FileUtils.rm_rf('/tmp/fzf-test-opt-no-eq-long')
-  end
-
-  def test_option_no_equals_long_option_after_double_dash
-    FileUtils.mkdir_p('/tmp/fzf-test-opt-no-eq-long-ddash')
-    FileUtils.touch('/tmp/fzf-test-opt-no-eq-long-ddash/SECURITY.md')
-    tmux.prepare
-    tmux.send_keys 'cd /tmp/fzf-test-opt-no-eq-long-ddash', :Enter
-    tmux.prepare
-    if shell == :fish
-      tmux.send_keys 'some-command -- --optSECURI', 'C-t'
-    else
-      tmux.send_keys "some-command -- --optSECURI#{trigger}", :Tab
-    end
-
-    tmux.until do |lines|
-      assert_equal 0, lines.match_count
-      assert_includes lines, '> --optSECURI'
-    end
-  ensure
-    FileUtils.rm_rf('/tmp/fzf-test-opt-no-eq-long-ddash')
-  end
-
-  def test_option_no_equals_short_option
-    FileUtils.mkdir_p('/tmp/fzf-test-opt-no-eq-short')
-    FileUtils.touch('/tmp/fzf-test-opt-no-eq-short/SECURITY.md')
-    tmux.prepare
-    tmux.send_keys 'cd /tmp/fzf-test-opt-no-eq-short', :Enter
-    tmux.prepare
-    if shell == :fish
-      tmux.send_keys 'some-command -oSECURI', 'C-t'
-    else
-      tmux.send_keys "some-command -oSECURI#{trigger}", :Tab
-    end
-
-    case shell
-    when :bash, :zsh
-      tmux.until do |lines|
-        assert_equal 0, lines.match_count
-        assert_includes lines, '> -oSECURI'
-      end
-    when :fish
-      tmux.until do |lines|
-        assert_equal 1, lines.match_count
-        assert lines.any_include?('> SECURITY.md')
-      end
-      tmux.send_keys :Enter
-      tmux.until(true) { |lines| assert_equal 'some-command -oSECURITY.md', lines[-1] }
-    end
-  ensure
-    FileUtils.rm_rf('/tmp/fzf-test-opt-no-eq-short')
-  end
-
-  def test_option_no_equals_short_option_after_double_dash
-    FileUtils.mkdir_p('/tmp/fzf-test-opt-no-eq-short-ddash')
-    FileUtils.touch('/tmp/fzf-test-opt-no-eq-short-ddash/SECURITY.md')
-    tmux.prepare
-    tmux.send_keys 'cd /tmp/fzf-test-opt-no-eq-short-ddash', :Enter
-    tmux.prepare
-    if shell == :fish
-      tmux.send_keys 'some-command -- -oSECURI', 'C-t'
-    else
-      tmux.send_keys "some-command -- -oSECURI#{trigger}", :Tab
-    end
-
-    tmux.until do |lines|
-      assert_equal 0, lines.match_count
-      assert_includes lines, '> -oSECURI'
-    end
-  ensure
-    FileUtils.rm_rf('/tmp/fzf-test-opt-no-eq-short-ddash')
-  end
-
-  def test_filename_with_newline
-    FileUtils.mkdir_p('/tmp/fzf-test-newline')
-    FileUtils.touch("/tmp/fzf-test-newline/xyz\nwith\nnewlines")
-    tmux.prepare
-    tmux.send_keys 'cd /tmp/fzf-test-newline', :Enter
-    tmux.prepare
-    if shell == :fish
-      tmux.send_keys 'cat xyz', 'C-t'
-    else
-      tmux.send_keys "cat xyz#{trigger}", :Tab
-    end
-
-    case shell
-    when :fish
-      tmux.until do |lines|
-        assert_equal 1, lines.match_count
-        assert_includes lines, '> xyz'
-      end
-      tmux.send_keys :Enter
-      # fish escapes newlines in filenames
-      tmux.until(true) { |lines| assert_equal 'cat xyz\\nwith\\nnewlines', lines[-1] }
-    when :bash, :zsh
-      tmux.until do |lines|
-        assert_equal 1, lines.match_count
-        assert_includes lines, '> xyz'
-      end
-      tmux.send_keys :Enter
-      # bash and zsh replace newlines with spaces in filenames
-      tmux.until(true) { |lines| assert_equal 'cat xyz with newlines', lines[-1] }
-    end
-  ensure
-    FileUtils.rm_rf('/tmp/fzf-test-newline')
-  end
-
-  def test_path_with_special_chars
-    FileUtils.mkdir_p('/tmp/fzf-test-[special]')
-    FileUtils.touch('/tmp/fzf-test-[special]/xyz123')
-    tmux.prepare
-    if shell == :fish
-      tmux.send_keys 'ls /tmp/fzf-test-\[special\]/xyz', 'C-t'
-    else
-      tmux.send_keys "ls /tmp/fzf-test-\\[special\\]/xyz#{trigger}", :Tab
-    end
-    tmux.until { |lines| assert_equal 1, lines.match_count }
-    tmux.send_keys :Enter
-    tmux.until(true) { |lines| assert_equal 'ls /tmp/fzf-test-\\[special\\]/xyz123', lines[-1] }
-  ensure
-    FileUtils.rm_rf('/tmp/fzf-test-[special]')
-  end
-
-  def test_query_with_dollar_anchor
-    FileUtils.mkdir_p('/tmp/fzf-test-dollar-anchor')
-    FileUtils.touch('/tmp/fzf-test-dollar-anchor/file.txt')
-    FileUtils.touch('/tmp/fzf-test-dollar-anchor/filetxt.md')
-    tmux.prepare
-    tmux.send_keys 'cd /tmp/fzf-test-dollar-anchor', :Enter
-    tmux.prepare
-    if shell == :fish
-      tmux.send_keys 'ls txt$', 'C-t'
-    else
-      tmux.send_keys "ls txt$#{trigger}", :Tab
-    end
-    tmux.until do |lines|
-      assert_equal 1, lines.match_count
-      assert_includes lines, '> txt$'
-    end
-    tmux.send_keys :Enter
-    tmux.until(true) { |lines| assert_equal 'ls file.txt', lines[-1] }
-  ensure
-    FileUtils.rm_rf('/tmp/fzf-test-dollar-anchor')
-  end
-
-  def test_single_flag_completion
-    FileUtils.mkdir_p('/tmp/fzf-test-single-flag')
-    FileUtils.touch('/tmp/fzf-test-single-flag/-testfile.txt')
-    tmux.prepare
-    tmux.send_keys 'cd /tmp/fzf-test-single-flag', :Enter
-    tmux.prepare
-    if shell == :fish
-      tmux.send_keys 'ls -', 'C-t'
-    else
-      tmux.send_keys "ls -#{trigger}", :Tab
-    end
-
-    tmux.until do |lines|
-      assert_equal 1, lines.match_count
-      assert_includes lines, '> -'
-    end
-    tmux.send_keys :Enter
-    tmux.until(true) { |lines| assert_equal 'ls -testfile.txt', lines[-1] }
-  ensure
-    FileUtils.rm_rf('/tmp/fzf-test-single-flag')
-  end
-
-  def test_double_flag_completion
-    FileUtils.mkdir_p('/tmp/fzf-test-double-flag')
-    FileUtils.touch('/tmp/fzf-test-double-flag/--testfile.txt')
-    tmux.prepare
-    tmux.send_keys 'cd /tmp/fzf-test-double-flag', :Enter
-    tmux.prepare
-    if shell == :fish
-      tmux.send_keys 'ls --', 'C-t'
-    else
-      tmux.send_keys "ls --#{trigger}", :Tab
-    end
-
-    tmux.until do |lines|
-      assert_equal 1, lines.match_count
-      assert_includes lines, '> --'
-    end
-    tmux.send_keys :Enter
-    tmux.until(true) { |lines| assert_equal 'ls --testfile.txt', lines[-1] }
-  ensure
-    FileUtils.rm_rf('/tmp/fzf-test-double-flag')
-  end
 end

 class TestBash < TestBase
@@ -832,60 +420,11 @@ class TestBash < TestBase
    tmux.prepare
  end

-  def test_ctrl_r_delete
-    tmux.prepare
-    tmux.send_keys 'echo to-keep', :Enter
-    tmux.prepare
-    tmux.send_keys 'echo to-delete-1', :Enter
-    tmux.prepare
-    tmux.send_keys 'echo to-delete-2', :Enter
-    tmux.prepare
-    tmux.send_keys 'echo to-delete-3', :Enter
-    tmux.prepare
-    tmux.send_keys 'echo another-keeper', :Enter
-    tmux.prepare
-
-    # Open Ctrl-R and delete one entry
-    tmux.send_keys 'C-r'
-    tmux.until { |lines| assert_operator lines.match_count, :>, 0 }
-    tmux.send_keys 'to-delete'
-    tmux.until { |lines| assert_equal 3, lines.match_count }
-    tmux.send_keys 'S-Delete'
-    tmux.until { |lines| assert_equal 2, lines.match_count }
-
-    # Multi-select remaining two and delete them at once
-    tmux.send_keys :BTab, :BTab
-    tmux.until { |lines| assert_includes lines[-2], '(2)' }
-    tmux.send_keys 'S-Delete'
-    tmux.until { |lines| assert_equal 0, lines.match_count }
-
-    # Exit without selecting
-    tmux.send_keys :Escape
-    tmux.prepare
-
-    # Verify deleted entries are gone from history
-    tmux.send_keys 'C-r'
-    tmux.until { |lines| assert_operator lines.match_count, :>, 0 }
-    tmux.send_keys 'to-delete'
-    tmux.until { |lines| assert_equal 0, lines.match_count }
-    tmux.send_keys :Escape
-    tmux.prepare
-
-    # Verify kept entries are still there
-    tmux.send_keys 'C-r'
-    tmux.until { |lines| assert_operator lines.match_count, :>, 0 }
-    tmux.send_keys 'to-keep'
-    tmux.until { |lines| assert_equal 1, lines.match_count }
-    tmux.send_keys :Enter
-    tmux.until { |lines| assert_equal 'echo to-keep', lines[-1] }
-    tmux.send_keys 'C-c'
-  end
-
  def test_dynamic_completion_loader
    tmux.paste 'touch /tmp/foo; _fzf_completion_loader=1'
    tmux.paste '_completion_loader() { complete -o default fake; }'
    tmux.paste 'complete -F _fzf_path_completion -o default -o bashdefault fake'
-    tmux.send_keys "fake /tmp/foo#{trigger}", :Tab
+    tmux.send_keys 'fake /tmp/foo**', :Tab
    tmux.until { |lines| assert_operator lines.match_count, :>, 0 }
    tmux.send_keys 'C-c'

@@ -894,7 +433,7 @@ class TestBash < TestBase
    tmux.send_keys :Tab, 'C-u'

    tmux.prepare
-    tmux.send_keys "fake /tmp/foo#{trigger}", :Tab
+    tmux.send_keys 'fake /tmp/foo**', :Tab
    tmux.until { |lines| assert_operator lines.match_count, :>, 0 }
  end
 end
@@ -916,143 +455,24 @@ class TestZsh < TestBase
    tmux.send_keys 'export FZFFOOBAR=BAZ', :Enter
    ['unset', '\unset', "'unset'"].each do |command|
      tmux.prepare
-      tmux.send_keys "#{command} FZFFOOBR#{trigger}", :Tab
+      tmux.send_keys "#{command} FZFFOOBR**", :Tab
      tmux.until { |lines| assert_equal 1, lines.match_count }
      tmux.send_keys :Enter
      tmux.until { |lines| assert_equal "#{command} FZFFOOBAR", lines[-1] }
      tmux.send_keys 'C-c'
    end
  end
-
-  # Helper function to run test with Perl and again with Awk
-  def self.test_perl_and_awk(name, &block)
-    define_method(:"test_#{name}") do
-      instance_eval(&block)
-    end
-
-    define_method(:"test_#{name}_awk") do
-      tmux.send_keys "unset 'commands[perl]'", :Enter
-      tmux.prepare
-      # Verify perl is actually unset (0 = not found)
-      tmux.send_keys 'echo ${+commands[perl]}', :Enter
-      tmux.until { |lines| assert_equal '0', lines[-1] }
-      tmux.prepare
-      instance_eval(&block)
-    end
-  end
-
-  def prepare_ctrl_r_test
-    tmux.send_keys ':', :Enter
-    tmux.send_keys 'echo match-collision', :Enter
-    tmux.prepare
-    tmux.send_keys 'echo "line 1', :Enter, '2 line 2"', :Enter
-    tmux.prepare
-    tmux.send_keys 'echo "foo', :Enter, 'bar"', :Enter
-    tmux.prepare
-    tmux.send_keys 'echo "bar', :Enter, 'foo"', :Enter
-    tmux.prepare
-    tmux.send_keys 'echo "trailing_space "', :Enter
-    tmux.prepare
-    tmux.send_keys 'cat <<EOF | wc -c', :Enter, 'qux thud', :Enter, 'EOF', :Enter
-    tmux.prepare
-    tmux.send_keys 'C-l', 'C-r'
-  end
-
-  test_perl_and_awk 'ctrl_r_accept_or_print_query' do
-    set_var('FZF_CTRL_R_OPTS', '--bind enter:accept-or-print-query')
-    prepare_ctrl_r_test
-    tmux.until { |lines| assert_operator lines.match_count, :>, 0 }
-    tmux.send_keys '1 foobar'
-    tmux.until { |lines| assert_equal 0, lines.match_count }
-    tmux.send_keys :Enter
-    tmux.until { |lines| assert_equal '1 foobar', lines[-1] }
-  end
-
-  test_perl_and_awk 'ctrl_r_multiline_index_collision' do
-    tmux.send_keys 'setopt sh_glob', :Enter
-    # Leading number in multi-line history content is not confused with index
-    prepare_ctrl_r_test
-    tmux.send_keys "'line 1"
-    tmux.until { |lines| assert_equal 1, lines.match_count }
-    tmux.send_keys :Enter
-    tmux.until do |lines|
-      assert_equal ['echo "line 1', '2 line 2"'], lines[-2..]
-    end
-  end
-
-  test_perl_and_awk 'ctrl_r_multi_selection' do
-    prepare_ctrl_r_test
-    tmux.until { |lines| assert_operator lines.match_count, :>, 0 }
-    tmux.send_keys :BTab, :BTab, :BTab
-    tmux.until { |lines| assert_includes lines[-2], '(3)' }
-    tmux.send_keys :Enter
-    tmux.until do |lines|
-      assert_equal ['cat <<EOF | wc -c', 'qux thud', 'EOF', 'echo "trailing_space "', 'echo "bar', 'foo"'], lines[-6..]
-    end
-  end
-
-  test_perl_and_awk 'ctrl_r_no_multi_selection' do
-    set_var('FZF_CTRL_R_OPTS', '--no-multi')
-    prepare_ctrl_r_test
-    tmux.until { |lines| assert_operator lines.match_count, :>, 0 }
-    tmux.send_keys :BTab, :BTab, :BTab
-    tmux.until { |lines| refute_includes lines[-2], '(3)' }
-    tmux.send_keys :Enter
-    tmux.until do |lines|
-      assert_equal ['cat <<EOF | wc -c', 'qux thud', 'EOF'], lines[-3..]
-    end
-  end
-
-  # NOTE: 'Perl/$history' won't see foreign cmds immediately, unlike 'awk/fc'.
-  # Perl passes only because another cmd runs between mocking and triggering C-r
-  # https://github.com/junegunn/fzf/issues/4061
-  # https://zsh.org/mla/users/2024/msg00692.html
-  test_perl_and_awk 'ctrl_r_foreign_commands' do
-    histfile = "#{tempname}-foreign-hist"
-    tmux.send_keys "HISTFILE=#{histfile}", :Enter
-    tmux.prepare
-    # SHARE_HISTORY picks up foreign commands; marked with * in fc
-    tmux.send_keys 'setopt SHARE_HISTORY', :Enter
-    tmux.prepare
-    tmux.send_keys 'fzf_cmd_local', :Enter
-    tmux.prepare
-    # Mock foreign command (for testing only; don't edit your HISTFILE this way)
-    tmux.send_keys "echo ': 0:0;fzf_cmd_foreign' >> $HISTFILE", :Enter
-    tmux.prepare
-    # Verify fc shows foreign command with asterisk
-    tmux.send_keys 'fc -rl -1', :Enter
-    tmux.until { |lines| assert(lines.any? { |l| l.match?(/^\s*\d+\* fzf_cmd_foreign/) }) }
-    tmux.prepare
-    # Test ctrl-r correctly extracts the foreign command
-    tmux.send_keys 'C-r'
-    tmux.until { |lines| assert_operator lines.match_count, :>, 0 }
-    tmux.send_keys '^fzf_cmd_'
-    tmux.until { |lines| assert_equal 2, lines.match_count }
-    tmux.send_keys :BTab, :BTab
-    tmux.until { |lines| assert_includes lines[-2], '(2)' }
-    tmux.send_keys :Enter
-    tmux.until do |lines|
-      assert_equal %w[fzf_cmd_foreign fzf_cmd_local], lines[-2..]
-    end
-  ensure
-    FileUtils.rm_f(histfile)
-  end
 end

 class TestFish < TestBase
  include TestShell
-  include CompletionTest

  def shell
    :fish
  end

-  def trigger
-    '++'
-  end
-
  def new_shell
-    tmux.send_keys 'env FZF_TMUX=1 XDG_CONFIG_HOME=/tmp/fzf-fish fish', :Enter
+    tmux.send_keys 'env FZF_TMUX=1 FZF_DEFAULT_OPTS=--no-scrollbar fish', :Enter
    tmux.send_keys 'function fish_prompt; end; clear', :Enter
    tmux.until { |lines| assert_empty lines }
  end
@@ -1070,23 +490,15 @@ class TestFish < TestBase
    tmux.send_keys 'echo "bar', :Enter, 'foo"', :Enter
    tmux.prepare
    tmux.send_keys 'C-l', 'C-r'
-    offset = -6
    block = <<~BLOCK
      echo "foo
      bar"
      echo "bar
      foo"
    BLOCK
-    if shell == :fish
-      offset = -4
-      block = <<~FISH
-        echo "foo␊bar"
-        echo "bar␊foo"
-      FISH
-    end
    tmux.until do |lines|
      block.lines.each_with_index do |line, idx|
-        assert_includes lines[idx + offset], line.chomp
+        assert_includes lines[-6 + idx], line.chomp
      end
    end
    tmux.send_keys :BTab, :BTab
@@ -5,7 +5,6 @@ fo = "fo"
 enew = "enew"
 tabe = "tabe"
 Iterm = "Iterm"
-ser = "ser"

 [files]
-extend-exclude = ["README.md", "*.s"]
+extend-exclude = ["README.md"]
@@ -33,9 +33,6 @@ for opt in "$@"; do
  esac
 done

-cd "$(dirname "${BASH_SOURCE[0]}")"
-fzf_base=$(pwd)
-
 ask() {
  while true; do
    read -p "$1 ([y]/n) " -r
@@ -97,15 +94,12 @@ done
 bind_file="${fish_dir}/functions/fish_user_key_bindings.fish"
 if [ -f "$bind_file" ]; then
  remove_line "$bind_file" "fzf_key_bindings"
-  remove_line "$bind_file" "fzf_completion_setup"
  remove_line "$bind_file" "fzf --fish | source"
 fi

 if [ -d "${fish_dir}/functions" ]; then
  remove "${fish_dir}/functions/fzf.fish"
  remove "${fish_dir}/functions/fzf_key_bindings.fish"
-  remove_line "$bind_file" "source \"${fzf_base}/shell/completion.fish\""
-  remove_line "$bind_file" "source \"${fzf_base}/shell/key-bindings.fish\""

  if [ -z "$(ls -A "${fish_dir}/functions")" ]; then
    rmdir "${fish_dir}/functions"