Leverage existing bash completion

This is a PoC implementation for leveraging existing bash completion git **<tab> kubectl **<tab>
2025-11-10 20:33:48 -05:00 · 2024-09-30 19:08:28 +09:00
47 changed files with 1645 additions and 3901 deletions
--- a/.github/workflows/typos.yml
+++ b/.github/workflows/typos.yml
@@ -7,4 +7,4 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - uses: actions/checkout@v4
-    - uses: crate-ci/typos@v1.28.4
+    - uses: crate-ci/typos@v1.24.1
--- a/ADVANCED.md
+++ b/ADVANCED.md
@@ -128,7 +128,7 @@ fzf  --height 70% --tmux 70%
 You can also specify the position, width, and height of the popup window in
 the following format:

-* `[center|top|bottom|left|right][,SIZE[%]][,SIZE[%][,border-native]]`
+* `[center|top|bottom|left|right][,SIZE[%]][,SIZE[%]]`

 ```sh
 # 100% width and 60% height
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,159 +1,6 @@
 CHANGELOG
 =========

-0.58.0
------
-_Release highlights: https://junegunn.github.io/fzf/releases/0.58.0/_
-
-This version introduces three new border types, `--list-border`, `--input-border`, and `--header-border`, offering much greater flexibility for customizing the user interface.
-
-<img src="https://raw.githubusercontent.com/junegunn/i/master/fzf-4-borders.png" />
-
-Also, fzf now offers "style presets" for quick customization, which can be activated using the `--style` option.
-
-| Preset    | Screenshot                                                                             |
-| :---      | :---                                                                                   |
-| `default` | <img src="https://raw.githubusercontent.com/junegunn/i/master/fzf-style-default.png"/> |
-| `full`    | <img src="https://raw.githubusercontent.com/junegunn/i/master/fzf-style-full.png"/>    |
-| `minimal` | <img src="https://raw.githubusercontent.com/junegunn/i/master/fzf-style-minimal.png"/> |
-
- Style presets (#4160)
-    - `--style=full[:BORDER_STYLE]`
-    - `--style=default`
-    - `--style=minimal`
- Border and label for the list section (#4148)
-    - Options
-        - `--list-border[=STYLE]`
-        - `--list-label=LABEL`
-        - `--list-label-pos=COL[:bottom]`
-    - Colors
-        - `list-fg`
-        - `list-bg`
-        - `list-border`
-        - `list-label`
-    - Actions
-        - `change-list-label`
-        - `transform-list-label`
- Border and label for the input section (prompt line and info line) (#4154)
-    - Options
-        - `--input-border[=STYLE]`
-        - `--input-label=LABEL`
-        - `--input-label-pos=COL[:bottom]`
-    - Colors
-        - `input-fg` (`query`)
-        - `input-bg`
-        - `input-border`
-        - `input-label`
-    - Actions
-        - `change-input-label`
-        - `transform-input-label`
- Border and label for the header section (#4159)
-    - Options
-        - `--header-border[=STYLE]`
-        - `--header-label=LABEL`
-        - `--header-label-pos=COL[:bottom]`
-    - Colors
-        - `header-fg` (`header`)
-        - `header-bg`
-        - `header-border`
-        - `header-label`
-    - Actions
-        - `change-header-label`
-        - `transform-header-label`
- Added `--preview-border[=STYLE]` as short for `--preview-window=border[-STYLE]`
- Added new preview border style `line` which draws a single separator line between the preview window and the rest of the interface
- fzf will now render a dashed line (`┈┈`) in each `--gap` for better visual separation.
-  ```sh
-  # All bash/zsh functions, highlighted
-  declare -f |
-    perl -0 -pe 's/^}\n/}\0/gm' |
-    bat --plain --language bash --color always |
-    fzf --read0 --ansi --layout reverse --multi --highlight-line --gap
-  ```
-    * You can customize the line using `--gap-line[=STR]`.
- You can specify `border-native` to `--tmux` so that native tmux border is used instead of `--border`. This can be useful if you start a different program from inside the popup.
-  ```sh
-  fzf --tmux border-native --bind 'enter:execute:less {}'
-  ```
- Added `toggle-multi-line` action
- Added `toggle-hscroll` action
- Added `change-nth` action for dynamically changing the value of the `--nth` option
-  ```sh
-  # Start with --nth 1, then 2, then 3, then back to the default, 1
-  echo 'foo foobar foobarbaz' | fzf --bind 'space:change-nth(2|3|)' --nth 1 -q foo
-  ```
- `--nth` parts of each line can now be rendered in a different text style
-  ```sh
-  # nth in a different style
-  ls -al | fzf --nth -1 --color nth:italic
-  ls -al | fzf --nth -1 --color nth:reverse
-  ls -al | fzf --nth -1 --color nth:reverse:bold
-
-  # Dim the other parts
-  ls -al | fzf --nth -1 --color nth:regular,fg:dim
-
-  # With 'change-nth'. The current nth option is exported as $FZF_NTH.
-  ps -ef | fzf --reverse --header-lines 1 --header-border bottom --input-border \
-             --color nth:regular,fg:dim \
-             --bind 'ctrl-n:change-nth(8..|1|2|3|4|5|6|7|)' \
-             --bind 'result:transform-prompt:echo "${FZF_NTH}> "'
-  ```
- A single-character delimiter is now treated as a plain string delimiter rather than a regular expression delimiter, even if it's a regular expression meta-character.
-    - This means you can just write `--delimiter '|'` instead of escaping it as `--delimiter '\|'`
- Bug fixes
- Bug fixes and improvements in fish scripts (thanks to @bitraid)
-
-0.57.0
------
- You can now resize the preview window by dragging the border
- Built-in walker improvements
-    - `--walker-root` can take multiple directory arguments. e.g. `--walker-root include src lib`
-    - `--walker-skip` can handle multi-component patterns. e.g. `--walker-skip target/build`
- Removed long processing delay when displaying images in the preview window
- `FZF_PREVIEW_*` environment variables are exported to all child processes (#4098)
- Bug fixes in fish scripts
-
-0.56.3
------
- Bug fixes in zsh scripts
-    - fix(zsh): handle backtick trigger edge case (#4090)
-    - revert(zsh): remove 'fc -RI' call in the history widget (#4093)
-    - Thanks to @LangLangBart for the contributions
-
-0.56.2
------
- Bug fixes
-    - Fixed abnormal scrolling behavior when `--wrap` is set (#4083)
-    - [zsh] Fixed warning message when `ksh_arrays` is set (#4084)
-
-0.56.1
------
- Bug fixes and improvements
-    - Fixed a race condition which would cause fzf to present stale results after `reload` (#4070)
-    - `page-up` and `page-down` actions now work correctly with multi-line items (#4069)
-    - `{n}` is allowed in `SCROLL` expression in `--preview-window` (#4079)
-    - [zsh] Fixed regression in history loading with shared option (#4071)
-    - [zsh] Better command extraction in zsh completion (#4082)
- Thanks to @LangLangBart, @jaydee-coder, @alex-huff, and @vejkse for the contributions
-
-0.56.0
------
- Added `--gap[=N]` option to display empty lines between items.
-    - This can be useful to visually separate adjacent multi-line items.
-      ```sh
-      # All bash functions, highlighted
-      declare -f | perl -0777 -pe 's/^}\n/}\0/gm' |
-        bat --plain --language bash --color always |
-        fzf --read0 --ansi --reverse --multi --highlight-line --gap
-      ```
-    - Or just to make the list easier to read. For single-line items, you probably want to set `--color gutter:-1` as well to hide the gutter.
-      ```sh
-      fzf --info inline-right --gap --color gutter:-1
-      ```
- Added `noinfo` option to `--preview-window` to hide the scroll indicator in the preview window
- Bug fixes
-    - Thanks to @LangLangBart, @akinomyoga, and @charlievieth for fixing the bugs
-
 0.55.0
 ------
 _Release highlights: https://junegunn.github.io/fzf/releases/0.55.0/_
--- a/4
+++ b/4
@@ -8,5 +8,5 @@ RUN echo '. ~/.bashrc' >> ~/.bash_profile
 RUN rm -f /etc/bash.bashrc
 COPY . /fzf
 RUN cd /fzf && make install && ./install --all
-ENV LANG=C.UTF-8
-CMD ["bash", "-ic", "tmux new 'set -o pipefail; ruby /fzf/test/test_go.rb | tee out && touch ok' && cat out && [ -e ok ]"]
+ENV LANG C.UTF-8
+CMD tmux new 'set -o pipefail; ruby /fzf/test/test_go.rb | tee out && touch ok' && cat out && [ -e ok ]
--- a/3
+++ b/3
@@ -1,3 +1,4 @@
+SHELL          := bash
 GO             ?= go
 GOOS           ?= $(shell $(GO) env GOOS)

@@ -13,7 +14,7 @@ endif
 ifeq ($(VERSION),)
 $(error Not on git repository; cannot determine $$FZF_VERSION)
 endif
-VERSION_TRIM   := $(shell echo $(VERSION) | sed "s/^v//; s/-.*//")
+VERSION_TRIM   := $(shell sed "s/^v//; s/-.*//" <<< $(VERSION))
 VERSION_REGEX  := $(subst .,\.,$(VERSION_TRIM))

 ifdef FZF_REVISION
--- a/README.md
+++ b/README.md
--- a/bin/fzf-preview.sh
+++ b/bin/fzf-preview.sh
@@ -9,24 +9,12 @@
 # - https://iterm2.com/utilities/imgcat

 if [[ $# -ne 1 ]]; then
-  >&2 echo "usage: $0 FILENAME[:LINENO][:IGNORED]"
+  >&2 echo "usage: $0 FILENAME"
  exit 1
 fi

 file=${1/#\~\//$HOME/}
-
-center=0
-if [[ ! -r $file ]]; then
-  if [[ $file =~ ^(.+):([0-9]+)\ *$ ]] && [[ -r ${BASH_REMATCH[1]} ]]; then
-    file=${BASH_REMATCH[1]}
-    center=${BASH_REMATCH[2]}
-  elif [[ $file =~ ^(.+):([0-9]+):[0-9]+\ *$ ]] && [[ -r ${BASH_REMATCH[1]} ]]; then
-    file=${BASH_REMATCH[1]}
-    center=${BASH_REMATCH[2]}
-  fi
-fi
-
-type=$(file --brief --dereference --mime -- "$file")
+type=$(file --dereference --mime -- "$file")

 if [[ ! $type =~ image/ ]]; then
  if [[ $type =~ =binary ]]; then
@@ -44,7 +32,7 @@ if [[ ! $type =~ image/ ]]; then
    exit
  fi

-  ${batname} --style="${BAT_STYLE:-numbers}" --color=always --pager=never --highlight-line="${center:-0}" -- "$file"
+  ${batname} --style="${BAT_STYLE:-numbers}" --color=always --pager=never -- "$file"
  exit
 fi

--- a/go.mod
+++ b/go.mod
@@ -1,20 +1,20 @@
 module github.com/junegunn/fzf

 require (
-	github.com/charlievieth/fastwalk v1.0.9
-	github.com/gdamore/tcell/v2 v2.8.1
+	github.com/charlievieth/fastwalk v1.0.8
+	github.com/gdamore/tcell/v2 v2.7.4
 	github.com/junegunn/go-shellwords v0.0.0-20240813092932-a62c48c52e97
 	github.com/mattn/go-isatty v0.0.20
 	github.com/rivo/uniseg v0.4.7
-	golang.org/x/sys v0.29.0
-	golang.org/x/term v0.28.0
+	golang.org/x/sys v0.25.0
+	golang.org/x/term v0.24.0
 )

 require (
-	github.com/gdamore/encoding v1.0.1 // indirect
+	github.com/gdamore/encoding v1.0.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
-	github.com/mattn/go-runewidth v0.0.16 // indirect
-	golang.org/x/text v0.21.0 // indirect
+	github.com/mattn/go-runewidth v0.0.15 // indirect
+	golang.org/x/text v0.14.0 // indirect
 )

 go 1.20
--- a/go.sum
+++ b/go.sum
@@ -1,18 +1,17 @@
-github.com/charlievieth/fastwalk v1.0.9 h1:Odb92AfoReO3oFBfDGT5J+nwgzQPF/gWAw6E6/lkor0=
-github.com/charlievieth/fastwalk v1.0.9/go.mod h1:yGy1zbxog41ZVMcKA/i8ojXLFsuayX5VvwhQVoj9PBI=
-github.com/gdamore/encoding v1.0.1 h1:YzKZckdBL6jVt2Gc+5p82qhrGiqMdG/eNs6Wy0u3Uhw=
-github.com/gdamore/encoding v1.0.1/go.mod h1:0Z0cMFinngz9kS1QfMjCP8TY7em3bZYeeklsSDPivEo=
-github.com/gdamore/tcell/v2 v2.8.1 h1:KPNxyqclpWpWQlPLx6Xui1pMk8S+7+R37h3g07997NU=
-github.com/gdamore/tcell/v2 v2.8.1/go.mod h1:bj8ori1BG3OYMjmb3IklZVWfZUJ1UBQt9JXrOCOhGWw=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/charlievieth/fastwalk v1.0.8 h1:uaoH6cAKSk73aK7aKXqs0+bL+J3Txzd3NGH8tRXgHko=
+github.com/charlievieth/fastwalk v1.0.8/go.mod h1:yGy1zbxog41ZVMcKA/i8ojXLFsuayX5VvwhQVoj9PBI=
+github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko=
+github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
+github.com/gdamore/tcell/v2 v2.7.4 h1:sg6/UnTM9jGpZU+oFYAsDahfchWAFW8Xx2yFinNSAYU=
+github.com/gdamore/tcell/v2 v2.7.4/go.mod h1:dSXtXTSK0VsW1biw65DZLZ2NKr7j0qP/0J7ONmsraWg=
 github.com/junegunn/go-shellwords v0.0.0-20240813092932-a62c48c52e97 h1:rqzLixVo1c/GQW6px9j1xQmlvQIn+lf/V6M1UQ7IFzw=
 github.com/junegunn/go-shellwords v0.0.0-20240813092932-a62c48c52e97/go.mod h1:6EILKtGpo5t+KLb85LNZLAF6P9LKp78hJI80PXMcn3c=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
-github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
+github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
@@ -20,29 +19,15 @@ github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUc
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
-golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
-golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -50,36 +35,23 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
-golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
-golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
-golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
-golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
+golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
+golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
--- a/35
+++ b/35
@@ -2,7 +2,7 @@

 set -u

-version=0.58.0
+version=0.55.0
 auto_completion=
 key_bindings=
 update_config=2
@@ -83,7 +83,7 @@ ask() {
 check_binary() {
  echo -n "  - Checking fzf executable ... "
  local output
-  output=$(FZF_DEFAULT_OPTS= "$fzf_base"/bin/fzf --version 2>&1)
+  output=$("$fzf_base"/bin/fzf --version 2>&1)
  if [ $? -ne 0 ]; then
    echo "Error: $output"
    binary_error="Invalid binary"
@@ -295,44 +295,35 @@ EOF
 fi

 append_line() {
-  local update line file pat lines
+  set -e
+
+  local update line file pat lno
  update="$1"
  line="$2"
  file="$3"
  pat="${4:-}"
-  lines=""
+  lno=""

  echo "Update $file:"
  echo "  - $line"
  if [ -f "$file" ]; then
    if [ $# -lt 4 ]; then
-      lines=$(\grep -nF "$line" "$file")
+      lno=$(\grep -nF "$line" "$file" | sed 's/:.*//' | tr '\n' ' ')
    else
-      lines=$(\grep -nF "$pat" "$file")
+      lno=$(\grep -nF "$pat" "$file" | sed 's/:.*//' | tr '\n' ' ')
    fi
  fi
-
-  if [ -n "$lines" ]; then
-    echo "    - Already exists:"
-    sed 's/^/        Line /' <<< "$lines"
-
-    update=0
-    if ! \grep -qv "^[0-9]*:[[:space:]]*#" <<< "$lines" ; then
-      echo "    - But they all seem to be commented"
-      ask  "    - Continue modifying $file?"
-      update=$?
-    fi
-  fi
-
-  set -e
-  if [ "$update" -eq 1 ]; then
+  if [ -n "$lno" ]; then
+    echo "    - Already exists: line #$lno"
+  else
+    if [ $update -eq 1 ]; then
      [ -f "$file" ] && echo >> "$file"
      echo "$line" >> "$file"
      echo "    + Added"
    else
      echo "    ~ Skipped"
    fi
-
+  fi
  echo
  set +e
 }
--- a/install.ps1
+++ b/install.ps1
@@ -1,4 +1,4 @@
-$version="0.58.0"
+$version="0.55.0"

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

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

-var version = "0.58"
+var version = "0.55"
 var revision = "devel"

 //go:embed shell/key-bindings.bash
--- a/man/man1/fzf-tmux.1
+++ b/man/man1/fzf-tmux.1
@@ -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 "Jan 2025" "fzf 0.58.0" "fzf\-tmux - open fzf in tmux split pane"
+.TH fzf\-tmux 1 "Aug 2024" "fzf 0.55.0" "fzf\-tmux - open fzf in tmux split pane"

 .SH NAME
 fzf\-tmux - open fzf in tmux split pane
--- a/man/man1/fzf.1
+++ b/man/man1/fzf.1
@@ -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 "Jan 2025" "fzf 0.58.0" "fzf - a command-line fuzzy finder"
+.TH fzf 1 "Sep 2024" "fzf 0.56.0" "fzf - a command-line fuzzy finder"

 .SH NAME
 fzf - a command-line fuzzy finder
@@ -36,15 +36,15 @@ It implements a "fuzzy" matching algorithm, so you can quickly type in patterns
 with omitted characters and still get the results you want.

 .SH OPTIONS
-.SS NOTE
+.SS Note
 .TP
 Most long options have the opposite version with \fB\-\-no\-\fR prefix.

-.SS SEARCH
+.SS Search mode
 .TP
 .B "\-x, \-\-extended"
-Extended-search mode. Enabled by default. You can disable it with \fB+x\fR or
-\fB\-\-no\-extended\fR.
+Extended-search mode. Since 0.10.9, this is enabled by default. You can disable
+it with \fB+x\fR or \fB\-\-no\-extended\fR.
 .TP
 .B "\-e, \-\-exact"
 Enable exact-match
@@ -55,9 +55,6 @@ Case-insensitive match (default: smart-case match)
 .B "+i, \-\-no\-ignore\-case"
 Case-sensitive match
 .TP
-.B "\-\-smart\-case"
-Smart-case match (default)
-.TP
 .B "\-\-literal"
 Do not normalize latin script letters for matching.
 .TP
@@ -112,28 +109,49 @@ fields.
 .BI "\-\-with\-nth=" "N[,..]"
 Transform the presentation of each line using field index expressions
 .TP
-.B "+s, \-\-no\-sort"
-Do not sort the result
-.TP
 .BI "\-d, \-\-delimiter=" "STR"
 Field delimiter regex for \fB\-\-nth\fR, \fB\-\-with\-nth\fR, and field index
 expressions (default: AWK-style)
 .TP
+.BI "\-\-disabled"
+Do not perform search. With this option, fzf becomes a simple selector
+interface rather than a "fuzzy finder". You can later enable the search using
+\fBenable\-search\fR or \fBtoggle\-search\fR action.
+.SS Search result
+.TP
+.B "+s, \-\-no\-sort"
+Do not sort the result
+.TP
 .B "\-\-tail=NUM"
 Maximum number of items to keep in memory. This is useful when you want to
 browse an endless stream of data (e.g. log stream) with fzf while limiting
 memory usage.
-
 .RS
 e.g.
     \fB# Interactive filtering of a log stream
     tail \-f *.log | fzf \-\-tail 100000 \-\-tac \-\-no\-sort \-\-exact\fR
 .RE
 .TP
-.BI "\-\-disabled"
-Do not perform search. With this option, fzf becomes a simple selector
-interface rather than a "fuzzy finder". You can later enable the search using
-\fBenable\-search\fR or \fBtoggle\-search\fR action.
+.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. Also, consider using \fBtrack\fR action instead of this
+option.
+
+.RS
+e.g.
+     \fBgit log \-\-oneline \-\-graph \-\-color=always | nl |
+         fzf \-\-ansi \-\-track \-\-no\-sort \-\-layout=reverse\-list\fR
+.RE
+.TP
+.B "\-\-tac"
+Reverse the order of the input
+
+.RS
+e.g.
+     \fBhistory | fzf \-\-tac \-\-no\-sort\fR
+.RE
 .TP
 .BI "\-\-tiebreak=" "CRI[,..]"
 Comma-separated list of sort criteria to apply when the scores are tied.
@@ -161,146 +179,66 @@ Comma-separated list of sort criteria to apply when the scores are tied.
 - Default is \fBlength\fR (or equivalently \fBlength\fR,index)
 .br
 - If \fBend\fR is found in the list, fzf will scan each line backwards
-.SS INPUT/OUTPUT
+.SS Interface
 .TP
-.B "\-\-read0"
-Read input delimited by ASCII NUL characters instead of newline characters
+.B "\-m, \-\-multi"
+Enable multi-select with tab/shift\-tab. It optionally takes an integer argument
+which denotes the maximum number of items that can be selected.
 .TP
-.B "\-\-print0"
-Print output delimited by ASCII NUL characters instead of newline characters
+.B "+m, \-\-no\-multi"
+Disable multi-select
 .TP
-.B "\-\-ansi"
-Enable processing of ANSI color codes
+.B "\-\-no\-mouse"
+Disable mouse
 .TP
-.B "\-\-sync"
-Synchronous search for multi-staged filtering. If specified, fzf will launch
-the finder only after the input stream is complete and the initial filtering
-and the associated actions (bound to any of \fBstart\fR, \fBload\fR,
-\fBresult\fR, or \fBfocus\fR) are complete.
-
-.RS
-e.g. \fB# Avoid rendering both fzf instances at the same time
-     fzf \-\-multi | fzf \-\-sync
-
-     # fzf will not render intermediate states
-     (sleep 1; seq 1000000; sleep 1) |
-       fzf \-\-sync \-\-query 5 \-\-listen \-\-bind start:up,load:up,result:up,focus:change\-header:Ready\fR
-.RE
-.SS GLOBAL STYLE
+.BI "\-\-bind=" "KEYBINDS"
+Comma-separated list of custom key bindings. See \fBKEY/EVENT BINDINGS\fR for
+the details.
 .TP
-.BI "\-\-style=" "PRESET"
-Apply a style preset [default|minimal|full[:BORDER_STYLE]]
+.B "\-\-cycle"
+Enable cyclic scroll
 .TP
-.BI "\-\-color=" "[BASE_SCHEME][,COLOR_NAME[:ANSI_COLOR][:ANSI_ATTRIBUTES]]..."
-Color configuration. The name of the base color scheme is followed by custom
-color mappings.
-
-.RS
-.B BASE SCHEME:
-    (default: \fBdark\fR on 256-color terminal, otherwise \fB16\fR; If \fBNO_COLOR\fR is set, \fBbw\fR)
-
-    \fBdark    \fRColor scheme for dark 256-color terminal
-    \fBlight   \fRColor scheme for light 256-color terminal
-    \fB16      \fRColor scheme for 16-color terminal
-    \fBbw      \fRNo colors (equivalent to \fB\-\-no\-color\fR)
-
-.B COLOR NAMES:
-    \fBfg                    \fRText
-      \fBlist\-fg             \fRText in the list section
-        \fBselected\-fg       \fRSelected line text
-      \fBpreview\-fg          \fRPreview window text
-    \fBbg                    \fRBackground
-      \fBlist\-bg             \fRList section background
-        \fBselected\-bg       \fRSelected line background
-      \fBpreview\-bg          \fRPreview window background
-      \fBinput\-bg            \fRInput window background (\fB\-\-input\-border\fR)
-      \fBheader\-bg           \fRHeader window background (\fB\-\-header\-border\fR)
-    \fBhl                    \fRHighlighted substrings
-      \fBselected\-hl         \fRHighlighted substrings in the selected line
-    \fBcurrent\-fg (fg+)      \fRText (current line)
-    \fBcurrent\-bg (bg+)      \fRBackground (current line)
-      \fBgutter              \fRGutter on the left
-    \fBcurrent\-hl (hl+)      \fRHighlighted substrings (current line)
-    \fBquery (input\-fg)      \fRQuery string
-      \fBdisabled            \fRQuery string when search is disabled (\fB\-\-disabled\fR)
-    \fBinfo                  \fRInfo line (match counters)
-    \fBborder                \fRBorder around the window (\fB\-\-border\fR and \fB\-\-preview\fR)
-      \fBlist\-border         \fRBorder around the list section (\fB\-\-list\-border\fR)
-        \fBscrollbar         \fRScrollbar
-        \fBseparator         \fRHorizontal separator on info line
-        \fBgap\-line          \fRHorizontal line on each gap
-      \fBpreview\-border      \fRBorder around the preview window (\fB\-\-preview\fR)
-        \fBpreview\-scrollbar \fRScrollbar
-      \fBinput\-border        \fRBorder around the input window (\fB\-\-input\-border\fR)
-      \fBheader\-border       \fRBorder around the header window (\fB\-\-header\-border\fR)
-    \fBlabel                 \fRBorder label (\fB\-\-border\-label\fR, \fB\-\-list\-label\fR, \fB\-\-input\-label\fR, and \fB\-\-preview\-label\fR)
-      \fBlist\-label          \fRBorder label of the list section (\fB\-\-list\-label\fR)
-      \fBpreview\-label       \fRBorder label of the preview window (\fB\-\-preview\-label\fR)
-      \fBinput\-label         \fRBorder label of the input window (\fB\-\-input\-label\fR)
-      \fBheader\-label        \fRBorder label of the header window (\fB\-\-header\-label\fR)
-    \fBprompt                \fRPrompt
-    \fBpointer               \fRPointer to the current line
-    \fBmarker                \fRMulti\-select marker
-    \fBspinner               \fRStreaming input indicator
-    \fBheader (header\-fg)   \fRHeader
-    \fBnth                   \fRParts of the line specified by \fB\-\-nth\fR (only supports attributes)
-
-.B ANSI COLORS:
-    \fB\-1         \fRDefault terminal foreground/background color
-    \fB           \fR(or the original color of the text)
-    \fB0 ~ 15     \fR16 base colors
-      \fBblack\fR
-      \fBred\fR
-      \fBgreen\fR
-      \fByellow\fR
-      \fBblue\fR
-      \fBmagenta\fR
-      \fBcyan\fR
-      \fBwhite\fR
-      \fBbright\-black\fR (gray | grey)
-      \fBbright\-red\fR
-      \fBbright\-green\fR
-      \fBbright\-yellow\fR
-      \fBbright\-blue\fR
-      \fBbright\-magenta\fR
-      \fBbright\-cyan\fR
-      \fBbright\-white\fR
-    \fB16 ~ 255   \fRANSI 256 colors
-    \fB#rrggbb    \fR24-bit colors
-
-.B ANSI ATTRIBUTES: (Only applies to foreground colors)
-    \fBregular    \fRClears previously set attributes; should precede the other ones
-    \fBbold\fR
-    \fBunderline\fR
-    \fBreverse\fR
-    \fBdim\fR
-    \fBitalic\fR
-    \fBstrikethrough\fR
-
-.B EXAMPLES:
-
-     \fB# Seoul256 theme with 8-bit colors
-     # (https://github.com/junegunn/seoul256.vim)
-     fzf \-\-color='bg:237,bg+:236,info:143,border:240,spinner:108' \\
-         \-\-color='hl:65,fg:252,header:65,fg+:252' \\
-         \-\-color='pointer:161,marker:168,prompt:110,hl+:108'
-
-     # Seoul256 theme with 24-bit colors
-     fzf \-\-color='bg:#4B4B4B,bg+:#3F3F3F,info:#BDBB72,border:#6B6B6B,spinner:#98BC99' \\
-         \-\-color='hl:#719872,fg:#D9D9D9,header:#719872,fg+:#D9D9D9' \\
-         \-\-color='pointer:#E12672,marker:#E17899,prompt:#98BEDE,hl+:#98BC99'\fR
-.RE
+.B "\-\-wrap"
+Enable line wrap
 .TP
-.B "\-\-no\-color"
-Disable colors
+.BI "\-\-wrap\-sign" "=INDICATOR"
+Indicator for wrapped lines. The default is '↳ ' or '> ' depending on
+\fB\-\-no\-unicode\fR.
 .TP
-.B "\-\-no\-bold"
-Do not use bold text
+.B "\-\-no\-multi\-line"
+Disable multi-line display of items when using \fB\-\-read0\fR
 .TP
-.B "\-\-black"
-Use black background
+.B "\-\-keep\-right"
+Keep the right end of the line visible when it's too long. Effective only when
+the query string is empty.
+.TP
+.BI "\-\-scroll\-off=" "LINES"
+Number of screen lines to keep above or below when scrolling to the top or to
+the bottom (default: 3).
+.TP
+.B "\-\-no\-hscroll"
+Disable horizontal scroll
+.TP
+.BI "\-\-hscroll\-off=" "COLS"
+Number of screen columns to keep to the right of the highlighted substring
+(default: 10). Setting it to a large value will cause the text to be positioned
+on the center of the screen.
+.TP
+.B "\-\-filepath\-word"
+Make word-wise movements and actions respect path separators. The following
+actions are affected:

-.SS DISPLAY MODE
+\fBbackward\-kill\-word\fR
+.br
+\fBbackward\-word\fR
+.br
+\fBforward\-word\fR
+.br
+\fBkill\-word\fR
+.TP
+.BI "\-\-jump\-labels=" "CHARS"
+Label characters for \fBjump\fR mode.
+.SS Layout
 .TP
 .BI "\-\-height=" "[~]HEIGHT[%]"
 Display fzf window below the cursor with the given height instead of using
@@ -330,7 +268,7 @@ Adaptive height has the following limitations:
 Minimum height when \fB\-\-height\fR is given in percent (default: 10).
 Ignored when \fB\-\-height\fR is not specified.
 .TP
-.BI "\-\-tmux" "[=[center|top|bottom|left|right][,SIZE[%]][,SIZE[%]][,border-native]]"
+.BI "\-\-tmux" "[=[center|top|bottom|left|right][,SIZE[%]][,SIZE[%]]]"
 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.

@@ -345,12 +283,8 @@ e.g.
  fzf \-\-tmux bottom,30%

  # Popup on the top with 80% width and 40% height
-  fzf \-\-tmux top,80%,40%
+  fzf \-\-tmux top,80%,40%\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
 .BI "\-\-layout=" "LAYOUT"
 Choose the layout (default: default)
@@ -368,56 +302,7 @@ Choose the layout (default: default)
 A synonym for \fB\-\-layout=reverse\fB

 .TP
-.BI "\-\-margin=" MARGIN
-Comma-separated expression for margins around the finder.
-.br
-
-.br
-.RS
-.BR TRBL "     Same margin for top, right, bottom, and left"
-.br
-.BR TB,RL "    Vertical, horizontal margin"
-.br
-.BR T,RL,B "   Top, horizontal, bottom margin"
-.br
-.BR T,R,B,L "  Top, right, bottom, left margin"
-.br
-
-.br
-Each part can be given in absolute number or in percentage relative to the
-terminal size with \fB%\fR suffix.
-.br
-
-.br
-e.g.
-     \fBfzf \-\-margin 10%
-     fzf \-\-margin 1,5%\fR
-.RE
-.TP
-.BI "\-\-padding=" PADDING
-Comma-separated expression for padding inside the border. Padding is
-distinguishable from margin only when \fB\-\-border\fR option is used.
-.br
-
-.br
-e.g.
-     \fBfzf \-\-margin 5% \-\-padding 5% \-\-border \-\-preview 'cat {}' \\
-         \-\-color bg:#222222,preview\-bg:#333333\fR
-
-.br
-.RS
-.BR TRBL "     Same padding for top, right, bottom, and left"
-.br
-.BR TB,RL "    Vertical, horizontal padding"
-.br
-.BR T,RL,B "   Top, horizontal, bottom padding"
-.br
-.BR T,R,B,L "  Top, right, bottom, left padding"
-.br
-.RE
-
-.TP
-.BI "\-\-border" [=STYLE]
+.BI "\-\-border" [=BORDER_OPT]
 Draw border around the finder

 .br
@@ -496,120 +381,65 @@ the label. Label is printed on the top border line by default, add
 \fB:bottom\fR to put it on the border line on the bottom. The default value
 \fB0 (or \fBcenter\fR) will put the label at the center of the border line.

-.SS LIST SECTION
 .TP
-.BI "\-m, \-\-multi" "[=MAX]"
-Enable multi-select with tab/shift\-tab. It optionally takes an integer argument
-which denotes the maximum number of items that can be selected.
-.TP
-.B "+m, \-\-no\-multi"
-Disable multi-select
-.TP
-.B "\-\-highlight\-line"
-Highlight the whole current line
-.TP
-.B "\-\-cycle"
-Enable cyclic scroll
-.TP
-.B "\-\-wrap"
-Enable line wrap
-.TP
-.BI "\-\-wrap\-sign" "=INDICATOR"
-Indicator for wrapped lines. The default is '↳ ' or '> ' depending on
-\fB\-\-no\-unicode\fR.
-.TP
-.B "\-\-no\-multi\-line"
-Disable multi-line display of items when using \fB\-\-read0\fR
-.TP
-.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. Also, consider using \fBtrack\fR action instead of this
-option.
+.B "\-\-no\-unicode"
+Use ASCII characters instead of Unicode drawing characters to draw borders,
+the spinner and the horizontal separator.

+.TP
+.B "\-\-ambidouble"
+Set this option if your terminal displays ambiguous width characters (e.g.
+box-drawing characters for borders) as 2 columns.
+
+.TP
+.BI "\-\-margin=" MARGIN
+Comma-separated expression for margins around the finder.
+.br
+
+.br
 .RS
+.BR TRBL "     Same margin for top, right, bottom, and left"
+.br
+.BR TB,RL "    Vertical, horizontal margin"
+.br
+.BR T,RL,B "   Top, horizontal, bottom margin"
+.br
+.BR T,R,B,L "  Top, right, bottom, left margin"
+.br
+
+.br
+Each part can be given in absolute number or in percentage relative to the
+terminal size with \fB%\fR suffix.
+.br
+
+.br
 e.g.
-     \fBgit log \-\-oneline \-\-graph \-\-color=always | nl |
-         fzf \-\-ansi \-\-track \-\-no\-sort \-\-layout=reverse\-list\fR
+     \fBfzf \-\-margin 10%
+     fzf \-\-margin 1,5%\fR
 .RE
 .TP
-.B "\-\-tac"
-Reverse the order of the input
+.BI "\-\-padding=" PADDING
+Comma-separated expression for padding inside the border. Padding is
+distinguishable from margin only when \fB\-\-border\fR option is used.
+.br

-.RS
+.br
 e.g.
-     \fBhistory | fzf \-\-tac \-\-no\-sort\fR
+     \fBfzf \-\-margin 5% \-\-padding 5% \-\-border \-\-preview 'cat {}' \\
+         \-\-color bg:#222222,preview\-bg:#333333\fR
+
+.br
+.RS
+.BR TRBL "     Same padding for top, right, bottom, and left"
+.br
+.BR TB,RL "    Vertical, horizontal padding"
+.br
+.BR T,RL,B "   Top, horizontal, bottom padding"
+.br
+.BR T,R,B,L "  Top, right, bottom, left padding"
+.br
 .RE
-.TP
-.BI "\-\-gap" "[=N]"
-Render empty lines between each item
-.TP
-.BI "\-\-gap\-line" "[=STR]"
-The given string will be repeated to draw a horizontal line on each gap
-(default: '┈' or '\-' depending on \fB\-\-no\-unicode\fR).
-.TP
-.B "\-\-keep\-right"
-Keep the right end of the line visible when it's too long. Effective only when
-the query string is empty.
-.TP
-.BI "\-\-scroll\-off=" "LINES"
-Number of screen lines to keep above or below when scrolling to the top or to
-the bottom (default: 3).
-.TP
-.B "\-\-no\-hscroll"
-Disable horizontal scroll
-.TP
-.BI "\-\-hscroll\-off=" "COLS"
-Number of screen columns to keep to the right of the highlighted substring
-(default: 10). Setting it to a large value will cause the text to be positioned
-on the center of the screen.
-.TP
-.BI "\-\-jump\-labels=" "CHARS"
-Label characters for \fBjump\fR mode.
-.TP
-.BI "\-\-pointer=" "STR"
-Pointer to the current line (default: '▌' or '>' depending on \fB\-\-no\-unicode\fR)
-.TP
-.BI "\-\-marker=" "STR"
-Multi-select marker (default: '┃' or '>' depending on \fB\-\-no\-unicode\fR)
-.TP
-.BI "\-\-marker\-multi\-line=" "STR"
-Multi-select marker for multi-line entries. 3 elements for top, middle, and bottom.
-(default: '╻┃╹' or '.|'' depending on \fB\-\-no\-unicode\fR)
-.TP
-.BI "\-\-ellipsis=" "STR"
-Ellipsis to show when line is truncated (default: '··')
-.TP
-.BI "\-\-tabstop=" SPACES
-Number of spaces for a tab character (default: 8)
-.TP
-.BI "\-\-scrollbar=" "CHAR1[CHAR2]"
-Use the given character to render scrollbar. (default: '│' or ':' depending on
-\fB\-\-no\-unicode\fR). The optional \fBCHAR2\fR is used to render scrollbar of
-the preview window.

-.TP
-.B "\-\-no\-scrollbar"
-Do not display scrollbar. A synonym for \fB\-\-scrollbar=''\fB
-
-.TP
-.BI "\-\-list\-border" [=STYLE]
-Draw border around the list section
-
-.TP
-.BI "\-\-list\-label" [=LABEL]
-Label to print on the list border
-
-.TP
-.BI "\-\-list\-label\-pos" [=N[:top|bottom]]
-Position of the list label
-
-.SS INPUT SECTION
-
-.TP
-.BI "\-\-prompt=" "STR"
-Input prompt (default: '> ')
 .TP
 .BI "\-\-info=" "STYLE"
 Determines the display style of the finder info. (e.g. match counter, loading indicator, etc.)
@@ -658,30 +488,160 @@ Do not display horizontal separator on the info line. A synonym for
 \fB\-\-separator=''\fB

 .TP
-.B "\-\-filepath\-word"
-Make word-wise movements and actions respect path separators. The following
-actions are affected:
-
-\fBbackward\-kill\-word\fR
-.br
-\fBbackward\-word\fR
-.br
-\fBforward\-word\fR
-.br
-\fBkill\-word\fR
-.TP
-.BI "\-\-input\-border" [=STYLE]
-Draw border around the input section
+.BI "\-\-scrollbar=" "CHAR1[CHAR2]"
+Use the given character to render scrollbar. (default: '│' or ':' depending on
+\fB\-\-no\-unicode\fR). The optional \fBCHAR2\fR is used to render scrollbar of
+the preview window.

 .TP
-.BI "\-\-input\-label" [=LABEL]
-Label to print on the input border
+.B "\-\-no\-scrollbar"
+Do not display scrollbar. A synonym for \fB\-\-scrollbar=''\fB

 .TP
-.BI "\-\-input\-label\-pos" [=N[:top|bottom]]
-Position of the input label
+.BI "\-\-prompt=" "STR"
+Input prompt (default: '> ')
+.TP
+.BI "\-\-pointer=" "STR"
+Pointer to the current line (default: '▌' or '>' depending on \fB\-\-no\-unicode\fR)
+.TP
+.BI "\-\-marker=" "STR"
+Multi-select marker (default: '┃' or '>' depending on \fB\-\-no\-unicode\fR)
+.TP
+.BI "\-\-marker\-multi\-line=" "STR"
+Multi-select marker for multi-line entries. 3 elements for top, middle, and bottom.
+(default: '╻┃╹' or '.|'' depending on \fB\-\-no\-unicode\fR)
+.TP
+.BI "\-\-header=" "STR"
+The given string will be printed as the sticky header. The lines are displayed
+in the given order from top to bottom regardless of \fB\-\-layout\fR option, and
+are not affected by \fB\-\-with\-nth\fR. ANSI color codes are processed even when
+\fB\-\-ansi\fR is not set.
+.TP
+.BI "\-\-header\-lines=" "N"
+The first N lines of the input are treated as the sticky header. When
+\fB\-\-with\-nth\fR is set, the lines are transformed just like the other
+lines that follow.
+.TP
+.B "\-\-header\-first"
+Print header before the prompt line
+.TP
+.BI "\-\-ellipsis=" "STR"
+Ellipsis to show when line is truncated (default: '··')
+.SS Display
+.TP
+.B "\-\-ansi"
+Enable processing of ANSI color codes
+.TP
+.BI "\-\-tabstop=" SPACES
+Number of spaces for a tab character (default: 8)
+.TP
+.BI "\-\-color=" "[BASE_SCHEME][,COLOR_NAME[:ANSI_COLOR][:ANSI_ATTRIBUTES]]..."
+Color configuration. The name of the base color scheme is followed by custom
+color mappings.

-.SS PREVIEW WINDOW
+.RS
+.B BASE SCHEME:
+    (default: \fBdark\fR on 256-color terminal, otherwise \fB16\fR; If \fBNO_COLOR\fR is set, \fBbw\fR)
+
+    \fBdark    \fRColor scheme for dark 256-color terminal
+    \fBlight   \fRColor scheme for light 256-color terminal
+    \fB16      \fRColor scheme for 16-color terminal
+    \fBbw      \fRNo colors (equivalent to \fB\-\-no\-color\fR)
+
+.B COLOR NAMES:
+    \fBfg                  \fRText
+      \fBselected\-fg       \fRSelected line text
+      \fBpreview\-fg        \fRPreview window text
+    \fBbg                  \fRBackground
+      \fBselected\-bg       \fRSelected line background
+      \fBpreview\-bg        \fRPreview window background
+    \fBhl                  \fRHighlighted substrings
+      \fBselected\-hl       \fRHighlighted substrings in the selected line
+    \fBcurrent\-fg (fg+)    \fRText (current line)
+    \fBcurrent\-bg (bg+)    \fRBackground (current line)
+      \fBgutter            \fRGutter on the left
+    \fBcurrent\-hl (hl+)    \fRHighlighted substrings (current line)
+    \fBquery               \fRQuery string
+      \fBdisabled          \fRQuery string when search is disabled (\fB\-\-disabled\fR)
+    \fBinfo                \fRInfo line (match counters)
+    \fBborder              \fRBorder around the window (\fB\-\-border\fR and \fB\-\-preview\fR)
+      \fBscrollbar         \fRScrollbar
+      \fBpreview\-border    \fRBorder around the preview window (\fB\-\-preview\fR)
+      \fBpreview\-scrollbar \fRScrollbar
+      \fBseparator         \fRHorizontal separator on info line
+    \fBlabel               \fRBorder label (\fB\-\-border\-label\fR and \fB\-\-preview\-label\fR)
+      \fBpreview\-label     \fRBorder label of the preview window (\fB\-\-preview\-label\fR)
+    \fBprompt              \fRPrompt
+    \fBpointer             \fRPointer to the current line
+    \fBmarker              \fRMulti\-select marker
+    \fBspinner             \fRStreaming input indicator
+    \fBheader              \fRHeader
+
+.B ANSI COLORS:
+    \fB\-1         \fRDefault terminal foreground/background color
+    \fB           \fR(or the original color of the text)
+    \fB0 ~ 15     \fR16 base colors
+      \fBblack\fR
+      \fBred\fR
+      \fBgreen\fR
+      \fByellow\fR
+      \fBblue\fR
+      \fBmagenta\fR
+      \fBcyan\fR
+      \fBwhite\fR
+      \fBbright\-black\fR (gray | grey)
+      \fBbright\-red\fR
+      \fBbright\-green\fR
+      \fBbright\-yellow\fR
+      \fBbright\-blue\fR
+      \fBbright\-magenta\fR
+      \fBbright\-cyan\fR
+      \fBbright\-white\fR
+    \fB16 ~ 255   \fRANSI 256 colors
+    \fB#rrggbb    \fR24-bit colors
+
+.B ANSI ATTRIBUTES: (Only applies to foreground colors)
+    \fBregular    \fRClears previously set attributes; should precede the other ones
+    \fBbold\fR
+    \fBunderline\fR
+    \fBreverse\fR
+    \fBdim\fR
+    \fBitalic\fR
+    \fBstrikethrough\fR
+
+.B EXAMPLES:
+
+     \fB# Seoul256 theme with 8-bit colors
+     # (https://github.com/junegunn/seoul256.vim)
+     fzf \-\-color='bg:237,bg+:236,info:143,border:240,spinner:108' \\
+         \-\-color='hl:65,fg:252,header:65,fg+:252' \\
+         \-\-color='pointer:161,marker:168,prompt:110,hl+:108'
+
+     # Seoul256 theme with 24-bit colors
+     fzf \-\-color='bg:#4B4B4B,bg+:#3F3F3F,info:#BDBB72,border:#6B6B6B,spinner:#98BC99' \\
+         \-\-color='hl:#719872,fg:#D9D9D9,header:#719872,fg+:#D9D9D9' \\
+         \-\-color='pointer:#E12672,marker:#E17899,prompt:#98BEDE,hl+:#98BC99'\fR
+.RE
+.TP
+.B "\-\-highlight\-line"
+Highlight the whole current line
+.TP
+.B "\-\-no\-bold"
+Do not use bold text
+.TP
+.B "\-\-black"
+Use black background
+.SS History
+.TP
+.BI "\-\-history=" "HISTORY_FILE"
+Load search history from the specified file and update the file on completion.
+When enabled, \fBCTRL\-N\fR and \fBCTRL\-P\fR are automatically remapped to
+\fBnext\-history\fR and \fBprev\-history\fR.
+.TP
+.BI "\-\-history\-size=" "N"
+Maximum number of entries in the history file (default: 1000). The file is
+automatically truncated when the number of the lines exceeds the value.
+.SS Preview
 .TP
 .BI "\-\-preview=" "COMMAND"
 Execute the given command for the current line and display the result on the
@@ -761,13 +721,6 @@ e.g.

 .RE

-.TP
-.BI "\-\-preview\-border" [=STYLE]
-Short for \fB\-\-preview\-window=border\-STYLE\fR. In addition to the other
-styles, \fBline\fR style is also supported for preview border, which draws
-a single separator line between the preview window and the rest of the
-interface.
-
 .TP
 .BI "\-\-preview\-label" [=LABEL]
 Label to print on the horizontal border line of the preview window.
@@ -803,7 +756,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][,[no]follow][,[no]cycle][,[no]info][,[no]hidden][,+SCROLL[OFFSETS][/DENOM]][,~HEADER_LINES][,default][,<SIZE_THRESHOLD(ALTERNATIVE_LAYOUT)]"
+.BI "\-\-preview\-window=" "[POSITION][,SIZE[%]][,border\-BORDER_OPT][,[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)
@@ -846,14 +799,10 @@ e.g. \fBborder\-rounded\fR (border with rounded edges, default),
 \fBborder\-sharp\fR (border with sharp edges), \fBborder\-left\fR,
 \fBborder\-none\fR, etc.

-* In addition to the other border styles, \fBborder\-line\fR style is also
-supported, which draws a single separator line between the preview window and
-the rest of the interface.
-
 * \fB[:+SCROLL[OFFSETS][/DENOM]]\fR determines the initial scroll offset of the
 preview window.

-  - \fBSCROLL\fR can be either a numeric integer or a single-field index expression that refers to a numeric integer or {n} to refer to the zero-based ordinal index of the current item.
+  - \fBSCROLL\fR can be either a numeric integer or a single-field index expression that refers to a numeric integer.

  - The optional \fBOFFSETS\fR part is for adjusting the base offset. It should be given as a series of signed integers (\fB\-INTEGER\fR or \fB+INTEGER\fR).

@@ -901,35 +850,7 @@ e.g.
      \fBfzf \-\-preview 'cat {}' \-\-preview\-window 'right,border\-left,<30(up,30%,border\-bottom)'\fR
 .RE

-.SS HEADER
-
-.TP
-.BI "\-\-header=" "STR"
-The given string will be printed as the sticky header. The lines are displayed
-in the given order from top to bottom regardless of \fB\-\-layout\fR option, and
-are not affected by \fB\-\-with\-nth\fR. ANSI color codes are processed even when
-\fB\-\-ansi\fR is not set.
-.TP
-.BI "\-\-header\-lines=" "N"
-The first N lines of the input are treated as the sticky header. When
-\fB\-\-with\-nth\fR is set, the lines are transformed just like the other
-lines that follow.
-.TP
-.B "\-\-header\-first"
-Print header before the prompt line
-.TP
-.BI "\-\-header\-border" [=STYLE]
-Draw border around the header section
-
-.TP
-.BI "\-\-header\-label" [=LABEL]
-Label to print on the header border
-
-.TP
-.BI "\-\-header\-label\-pos" [=N[:top|bottom]]
-Position of the header label
-
-.SS SCRIPTING
+.SS Scripting
 .TP
 .BI "\-q, \-\-query=" "STR"
 Start the finder with the given query
@@ -958,15 +879,24 @@ with the default enter key. If \fB\-\-expect\fR option is specified multiple
 times, fzf will expect the union of the keys. \fB\-\-no\-expect\fR will clear the
 list.

+.RS
 e.g.
     \fBfzf \-\-expect=ctrl\-v,ctrl\-t,alt\-s \-\-expect=f1,f2,~,@\fR
+.RE

 This option is not compatible with \fB\-\-bind\fR on the same key and will take
 precedence over it. To combine the two, use \fBprint\fR action.

+.RS
 e.g.
-     \fBfzf \-\-multi \\
-         \-\-bind 'enter:print()+accept,ctrl\-y:select\-all+print(ctrl\-y)+accept'\fR
+     \fBfzf \-\-multi \-\-bind 'enter:print()+accept,ctrl\-y:select\-all+print(ctrl\-y)+accept'\fR
+.RE
+.TP
+.B "\-\-read0"
+Read input delimited by ASCII NUL characters instead of newline characters
+.TP
+.B "\-\-print0"
+Print output delimited by ASCII NUL characters instead of newline characters
 .TP
 .B "\-\-no\-clear"
 Do not clear finder interface on exit. If fzf was started in full screen mode,
@@ -982,13 +912,21 @@ e.g.
       exit 1
     ) && seq "$foo" 100 | fzf

-.SS KEY/EVENT BINDING
 .TP
-.BI "\-\-bind=" "BINDINGS"
-Comma-separated list of custom key/event bindings. See \fBKEY/EVENT BINDINGS\fR
-for the details.
+.B "\-\-sync"
+Synchronous search for multi-staged filtering. If specified, fzf will launch
+the finder only after the input stream is complete and the initial filtering
+and the associated actions (bound to any of \fBstart\fR, \fBload\fR,
+\fBresult\fR, or \fBfocus\fR) are complete.

-.SS ADVANCED
+.RS
+e.g. \fB# Avoid rendering both fzf instances at the same time
+     fzf \-\-multi | fzf \-\-sync
+
+     # fzf will not render intermediate states
+     (sleep 1; seq 1000000; sleep 1) |
+       fzf \-\-sync \-\-query 5 \-\-listen \-\-bind start:up,load:up,result:up,focus:change\-header:Ready\fR
+.RE
 .TP
 .B "\-\-with\-shell=STR"
 Shell command and flags to start child processes with. On *nix Systems, the
@@ -996,6 +934,9 @@ default value is \fB$SHELL \-c\fR if \fB$SHELL\fR is set, otherwise \fBsh \-c\fR
 On Windows, the default value is \fBcmd /s/c\fR when \fB$SHELL\fR is not
 set.

+.RS
+e.g. \fBgem list | fzf \-\-with\-shell 'ruby \-e' \-\-preview 'pp Gem::Specification.find_by_name({1})'\fR
+.RE
 .TP
 .B "\-\-listen[=[ADDR:]PORT]" "\-\-listen\-unsafe[=[ADDR:]PORT]"
 Start HTTP server and listen on the given address. It allows external processes
@@ -1034,8 +975,18 @@ e.g.
     # Choose port automatically and export it as $FZF_PORT to the child process
     fzf \-\-listen \-\-bind 'start:execute\-silent:echo $FZF_PORT > /tmp/fzf\-port'
     \fR
+.SS Help
+.TP
+.B "\-\-version"
+Display version information and exit
+.TP
+.B "\-\-help"
+Show help message
+.TP
+.B "\-\-man"
+Show man page

-.SS DIRECTORY TRAVERSAL
+.SS Directory traversal
 .TP
 .B "\-\-walker=[file][,dir][,follow][,hidden]"
 Determines the behavior of the built-in directory walker that is used when
@@ -1051,8 +1002,8 @@ Determines the behavior of the built-in directory walker that is used when
 .br

 .TP
-.B "\-\-walker\-root=DIR [...]"
-List of directory names to start the built-in directory walker.
+.B "\-\-walker\-root=DIR"
+The root directory from which to start the built-in directory walker.
 The default value is the current working directory.

 .TP
@@ -1060,22 +1011,7 @@ The default value is the current working directory.
 Comma-separated list of directory names to skip during the directory walk.
 The default value is \fB.git,node_modules\fR.

-.SS HISTORY
-.TP
-.BI "\-\-history=" "HISTORY_FILE"
-Load search history from the specified file and update the file on completion.
-When enabled, \fBCTRL\-N\fR and \fBCTRL\-P\fR are automatically remapped to
-\fBnext\-history\fR and \fBprev\-history\fR.
-.TP
-.BI "\-\-history\-size=" "N"
-Maximum number of entries in the history file (default: 1000). The file is
-automatically truncated when the number of the lines exceeds the value.
-
-.RS
-e.g. \fBgem list | fzf \-\-with\-shell 'ruby \-e' \-\-preview 'pp Gem::Specification.find_by_name({1})'\fR
-.RE
-
-.SS SHELL INTEGRATION
+.SS Shell integration
 .TP
 .B "\-\-bash"
 Print script to set up Bash shell integration
@@ -1094,31 +1030,6 @@ Print script to set up Fish shell integration

 e.g. \fBfzf \-\-fish | source\fR

-.SS OTHERS
-.TP
-.B "\-\-no\-mouse"
-Disable mouse
-.TP
-.B "\-\-no\-unicode"
-Use ASCII characters instead of Unicode drawing characters to draw borders,
-the spinner and the horizontal separator.
-
-.TP
-.B "\-\-ambidouble"
-Set this option if your terminal displays ambiguous width characters (e.g.
-box-drawing characters for borders) as 2 columns.
-
-.SS HELP
-.TP
-.B "\-\-version"
-Display version information and exit
-.TP
-.B "\-\-help"
-Show help message
-.TP
-.B "\-\-man"
-Show man page
-
 .SH ENVIRONMENT VARIABLES
 .TP
 .B FZF_DEFAULT_COMMAND
@@ -1196,8 +1107,6 @@ fzf exports the following environment variables to its child processes.
 .br
 .BR FZF_QUERY "           Current query string"
 .br
-.BR FZF_NTH "             Current \-\-nth option"
-.br
 .BR FZF_PROMPT "          Prompt string"
 .br
 .BR FZF_PREVIEW_LABEL "   Preview label string"
@@ -1210,6 +1119,9 @@ fzf exports the following environment variables to its child processes.
 .br
 .BR FZF_PORT "            Port number when \-\-listen option is used"
 .br
+
+The following variables are additionally exported to the preview commands.
+
 .BR FZF_PREVIEW_TOP "     Top position of the preview window"
 .br
 .BR FZF_PREVIEW_LEFT "    Left position of the preview window"
@@ -1528,12 +1440,8 @@ A key or an event can be bound to one or more of the following actions.
    \fBcancel\fR                       (clear query string if not empty, abort fzf otherwise)
    \fBchange\-border\-label(...)\fR     (change \fB\-\-border\-label\fR to the given string)
    \fBchange\-header(...)\fR           (change header to the given string; doesn't affect \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\-preview(...)\fR          (change \fB\-\-preview\fR option)
    \fBchange\-preview\-label(...)\fR    (change \fB\-\-preview\-label\fR to the given string)
    \fBchange\-preview\-window(...)\fR   (change \fB\-\-preview\-window\fR option; rotate through the multiple option sets separated by '|')
@@ -1584,7 +1492,7 @@ A key or an event can be bound to one or more of the following actions.
    \fBpreview\-half\-page\-up\fR
    \fBpreview\-bottom\fR
    \fBpreview\-top\fR
-    \fBprint(...)\fR                   (add string to the output queue and print on normal exit)
+    \fBprint(...)\fR                   (add string to the output queue and print on exit)
    \fBput\fR                          (put the character to the prompt)
    \fBput(...)\fR                     (put the given string to the prompt)
    \fBrefresh\-preview\fR
@@ -1598,11 +1506,10 @@ A key or an event can be bound to one or more of the following actions.
    \fBshow\-preview\fR
    \fBtoggle\fR                       (\fIright\-click\fR)
    \fBtoggle\-all\fR                   (toggle all matches)
+    \fBtoggle+down\fR                  \fIctrl\-i  (tab)\fR
+    \fBtoggle\-header\fR
    \fBtoggle\-in\fR                    (\fB\-\-layout=reverse*\fR ? \fBtoggle+up\fR : \fBtoggle+down\fR)
    \fBtoggle\-out\fR                   (\fB\-\-layout=reverse*\fR ? \fBtoggle+down\fR : \fBtoggle+up\fR)
-    \fBtoggle\-header\fR
-    \fBtoggle\-hscroll\fR
-    \fBtoggle\-multi\-line\fR
    \fBtoggle\-preview\fR
    \fBtoggle\-preview\-wrap\fR
    \fBtoggle\-search\fR                (toggle search functionality)
@@ -1610,15 +1517,11 @@ A key or an event can be bound to one or more of the following actions.
    \fBtoggle\-track\fR                 (toggle global tracking option (\fB\-\-track\fR))
    \fBtoggle\-track\-current\fR         (toggle tracking of the current item)
    \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)
    \fBtransform(...)\fR               (transform states using the output of an external command)
    \fBtransform\-border\-label(...)\fR  (transform border label using an external command)
    \fBtransform\-header(...)\fR        (transform header 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\-preview\-label(...)\fR (transform preview label using an external command)
    \fBtransform\-prompt(...)\fR        (transform prompt string using an external command)
    \fBtransform\-query(...)\fR         (transform query string using an external command)
--- a/shell/completion.bash
+++ b/shell/completion.bash
@@ -283,7 +283,7 @@ _fzf_handle_dynamic_completion() {
 }

 __fzf_generic_path_completion() {
-  local cur base dir leftover matches trigger cmd
+  local cur base dir leftover matches trigger cmd rest
  cmd="${COMP_WORDS[0]}"
  if [[ $cmd == \\* ]]; then
    cmd="${cmd:1}"
@@ -295,6 +295,16 @@ __fzf_generic_path_completion() {
    base=${cur:0:${#cur}-${#trigger}}
    eval "base=$base" 2> /dev/null || return

+    # Try to leverage existing completion
+    rest=("${@:4}")
+    unset 'rest[${#rest[@]}-2]'
+    COMP_LINE=${COMP_LINE:0:${#COMP_LINE}-${#trigger}}
+    COMP_POINT=$((COMP_POINT-${#trigger}))
+    COMP_WORDS[$COMP_CWORD]=$base
+    _fzf_handle_dynamic_completion "$cmd" "${rest[@]}"
+    [[ $? -ne 0 ]] &&
+      _fzf_handle_dynamic_completion "$cmd" "${rest[@]}"
+
    dir=
    [[ $base = *"/"* ]] && dir="$base"
    while true; do
@@ -306,7 +316,11 @@ __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 declare -F "$1" > /dev/null; then
+          if [[ ${#COMPREPLY[@]} -gt 0 ]]; then
+            for h in "${COMPREPLY[@]}"; do
+              echo "$h"
+            done | command sort -u | __fzf_comprun "$4" -q "$leftover"
+          elif declare -F "$1" > /dev/null; then
            eval "$1 $(printf %q "$dir")" | __fzf_comprun "$4" -q "$leftover"
          else
            if [[ $1 =~ dir ]]; then
@@ -374,10 +388,23 @@ _fzf_complete() {
  if [[ "$cur" == *"$trigger" ]] && [[ $cur != *'$('* ]] && [[ $cur != *':='* ]] && [[ $cur != *'`'* ]]; then
    cur=${cur:0:${#cur}-${#trigger}}

+    # Try to leverage existing completion
+    COMP_LINE=${COMP_LINE:0:${#COMP_LINE}-${#trigger}}
+    COMP_POINT=$((COMP_POINT-${#trigger}))
+    unset 'rest[${#rest[@]}-2]'
+    _fzf_handle_dynamic_completion "$cmd" "${rest[@]}"
+    [[ $? -ne 0 ]] &&
+      _fzf_handle_dynamic_completion "$cmd" "${rest[@]}"
+
    selected=$(
+      (if [[ ${#COMPREPLY[@]} -gt 0 ]]; then
+        for h in "${COMPREPLY[@]}"; do
+          echo "$h"
+        done
+      fi; cat) | command sort -u |
      FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse" "${FZF_COMPLETION_OPTS-} $str_arg") \
      FZF_DEFAULT_OPTS_FILE='' \
-        __fzf_comprun "${rest[0]}" "${args[@]}" -q "$cur" | eval "$post" | command tr '\n' ' ')
+        __fzf_comprun "${rest[0]}" "${args[@]}" -q "$cur" | $post | command tr '\n' ' ')
    selected=${selected% } # Strip trailing space not to repeat "-o nospace"
    if [[ -n "$selected" ]]; then
      COMPREPLY=("$selected")
--- a/shell/completion.zsh
+++ b/shell/completion.zsh
@@ -120,18 +120,25 @@ __fzf_comprun() {
  fi
 }

-# Extract the name of the command. e.g. ls; foo=1 ssh **<tab>
+# Extract the name of the command. e.g. foo=1 bar baz**<tab>
 __fzf_extract_command() {
-  # Control completion with the "compstate" parameter, insert and list nothing
-  compstate[insert]=
-  compstate[list]=
-  cmd_word="${(Q)words[1]}"
+  local token tokens
+  tokens=(${(z)1})
+  for token in $tokens; do
+    token=${(Q)token}
+    if [[ "$token" =~ [[:alnum:]] && ! "$token" =~ "=" ]]; then
+      echo "$token"
+      return
+    fi
+  done
+  echo "${tokens[1]}"
 }

 __fzf_generic_path_completion() {
-  local base lbuf compgen fzf_opts suffix tail dir leftover matches
+  local base lbuf cmd compgen fzf_opts suffix tail dir leftover matches
  base=$1
  lbuf=$2
+  cmd=$(__fzf_extract_command "$lbuf")
  compgen=$3
  fzf_opts=$4
  suffix=$5
@@ -154,7 +161,7 @@ __fzf_generic_path_completion() {
        FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse --scheme=path" "${FZF_COMPLETION_OPTS-}")
        unset FZF_DEFAULT_COMMAND FZF_DEFAULT_OPTS_FILE
        if declare -f "$compgen" > /dev/null; then
-          eval "$compgen $(printf %q "$dir")" | __fzf_comprun "$cmd_word" ${(Q)${(Z+n+)fzf_opts}} -q "$leftover"
+          eval "$compgen $(printf %q "$dir")" | __fzf_comprun "$cmd" ${(Q)${(Z+n+)fzf_opts}} -q "$leftover"
        else
          if [[ $compgen =~ dir ]]; then
            walker=dir,follow
@@ -163,7 +170,7 @@ __fzf_generic_path_completion() {
            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
+          __fzf_comprun "$cmd" ${(Q)${(Z+n+)fzf_opts}} -q "$leftover" --walker "$walker" --walker-root="$dir" ${(Q)${(Z+n+)rest}} < /dev/tty
        fi | while read -r item; do
          item="${item%$suffix}$suffix"
          echo -n -E "${(q)item} "
@@ -220,9 +227,10 @@ _fzf_complete() {
    rest=("$@")
  fi

-  local fifo lbuf matches post
+  local fifo lbuf cmd matches post
  fifo="${TMPDIR:-/tmp}/fzf-complete-fifo-$$"
  lbuf=${rest[0]}
+  cmd=$(__fzf_extract_command "$lbuf")
  post="${funcstack[1]}_post"
  type $post > /dev/null 2>&1 || post=cat

@@ -230,7 +238,7 @@ _fzf_complete() {
  matches=$(
    FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse" "${FZF_COMPLETION_OPTS-} $str_arg") \
    FZF_DEFAULT_OPTS_FILE='' \
-      __fzf_comprun "$cmd_word" "${args[@]}" -q "${(Q)prefix}" < "$fifo" | $post | tr '\n' ' ')
+      __fzf_comprun "$cmd" "${args[@]}" -q "${(Q)prefix}" < "$fifo" | $post | tr '\n' ' ')
  if [ -n "$matches" ]; then
    LBUFFER="$lbuf$matches"
  fi
@@ -302,7 +310,7 @@ _fzf_complete_kill_post() {
 }

 fzf-completion() {
-  local tokens prefix trigger tail matches lbuf d_cmds cursor_pos cmd_word
+  local tokens cmd prefix trigger tail matches lbuf d_cmds
  setopt localoptions noshwordsplit noksh_arrays noposixbuiltins

  # http://zsh.sourceforge.net/FAQ/zshfaq03.html
@@ -313,9 +321,11 @@ fzf-completion() {
    return
  fi

+  cmd=$(__fzf_extract_command "$LBUFFER")
+
  # Explicitly allow for empty trigger.
  trigger=${FZF_COMPLETION_TRIGGER-'**'}
-  [[ -z $trigger && ${LBUFFER[-1]} == ' ' ]] && tokens+=("")
+  [ -z "$trigger" -a ${LBUFFER[-1]} = ' ' ] && tokens+=("")

  # When the trigger starts with ';', it becomes a separate token
  if [[ ${LBUFFER} = *"${tokens[-2]-}${tokens[-1]}" ]]; then
@@ -330,37 +340,16 @@ fzf-completion() {
  if [ ${#tokens} -gt 1 -a "$tail" = "$trigger" ]; then
    d_cmds=(${=FZF_COMPLETION_DIR_COMMANDS-cd pushd rmdir})

-    {
-      cursor_pos=$CURSOR
-      # Move the cursor before the trigger to preserve word array elements when
-      # trigger chars like ';' or '`' would otherwise reset the 'words' array.
-      CURSOR=$((cursor_pos - ${#trigger} - 1))
-      # Check if at least one completion system (old or new) is active.
-      # If at least one user-defined completion widget is detected, nothing will
-      # be completed if neither the old nor the new completion system is enabled.
-      # In such cases, the 'zsh/compctl' module is loaded as a fallback.
-      if ! zmodload -F zsh/parameter p:functions 2>/dev/null || ! (( ${+functions[compdef]} )); then
-        zmodload -F zsh/compctl 2>/dev/null
-      fi
-      # Create a completion widget to access the 'words' array (man zshcompwid)
-      zle -C __fzf_extract_command .complete-word __fzf_extract_command
-      zle __fzf_extract_command
-    } always {
-      CURSOR=$cursor_pos
-      # Delete the completion widget
-      zle -D __fzf_extract_command  2>/dev/null
-    }
-
    [ -z "$trigger"      ] && prefix=${tokens[-1]} || prefix=${tokens[-1]:0:-${#trigger}}
    if [[ $prefix = *'$('* ]] || [[ $prefix = *'<('* ]] || [[ $prefix = *'>('* ]] || [[ $prefix = *':='* ]] || [[ $prefix = *'`'* ]]; then
      return
    fi
    [ -n "${tokens[-1]}" ] && lbuf=${lbuf:0:-${#tokens[-1]}}

-    if eval "noglob type _fzf_complete_${cmd_word} >/dev/null"; then
-      prefix="$prefix" eval _fzf_complete_${cmd_word} ${(q)lbuf}
+    if eval "type _fzf_complete_${cmd} > /dev/null"; then
+      prefix="$prefix" eval _fzf_complete_${cmd} ${(q)lbuf}
      zle reset-prompt
-    elif [ ${d_cmds[(i)$cmd_word]} -le ${#d_cmds} ]; then
+    elif [ ${d_cmds[(i)$cmd]} -le ${#d_cmds} ]; then
      _fzf_dir_completion "$prefix" "$lbuf"
    else
      _fzf_path_completion "$prefix" "$lbuf"
@@ -377,7 +366,6 @@ fzf-completion() {
  unset binding
 }

-# Normal widget
 zle     -N   fzf-completion
 bindkey '^I' fzf-completion
 fi
--- a/shell/key-bindings.fish
+++ b/shell/key-bindings.fish
@@ -11,6 +11,8 @@
 # - $FZF_ALT_C_COMMAND
 # - $FZF_ALT_C_OPTS

+status is-interactive; or exit 0
+

 # Key bindings
 # ------------
@@ -21,7 +23,7 @@ function fzf_key_bindings
    # $2: Append to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS
    test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
    echo "--height $FZF_TMUX_HEIGHT --bind=ctrl-z:ignore" $argv[1]
-    test -r "$FZF_DEFAULT_OPTS_FILE"; and string collect -N -- <$FZF_DEFAULT_OPTS_FILE
+    command cat "$FZF_DEFAULT_OPTS_FILE" 2> /dev/null
    echo $FZF_DEFAULT_OPTS $argv[2]
  end

@@ -31,16 +33,15 @@ function fzf_key_bindings
    set -lx dir $commandline[1]
    set -l fzf_query $commandline[2]
    set -l prefix $commandline[3]
-    set -l result

    test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
    begin
-      set -lx FZF_DEFAULT_OPTS (__fzf_defaults "--reverse --walker=file,dir,follow,hidden --scheme=path --walker-root=$dir" "$FZF_CTRL_T_OPTS")
+      set -lx FZF_DEFAULT_OPTS (__fzf_defaults "--reverse --walker=file,dir,follow,hidden --scheme=path --walker-root='$dir'" "$FZF_CTRL_T_OPTS")
      set -lx FZF_DEFAULT_COMMAND "$FZF_CTRL_T_COMMAND"
      set -lx FZF_DEFAULT_OPTS_FILE ''
-      set result (eval (__fzfcmd) -m --query=$fzf_query)
+      eval (__fzfcmd)' -m --query "'$fzf_query'"' | while read -l r; set result $result $r; end
    end
-    if test -z "$result"
+    if [ -z "$result" ]
      commandline -f repaint
      return
    else
@@ -49,7 +50,7 @@ function fzf_key_bindings
    end
    for i in $result
      commandline -it -- $prefix
-      commandline -it -- (string escape -- $i)
+      commandline -it -- (string escape $i)
      commandline -it -- ' '
    end
    commandline -f repaint
@@ -58,25 +59,33 @@ function fzf_key_bindings
  function fzf-history-widget -d "Show command history"
    test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
    begin
-      # merge history from other sessions before searching
-      test -z "$fish_private_mode"; and builtin history merge
+      set -l FISH_MAJOR (echo $version | cut -f1 -d.)
+      set -l FISH_MINOR (echo $version | cut -f2 -d.)

-      set -lx FZF_DEFAULT_OPTS (__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort --wrap-sign '"\t"↳ ' --highlight-line +m $FZF_CTRL_R_OPTS")
-      set -lx FZF_DEFAULT_OPTS_FILE ''
-      set -lx FZF_DEFAULT_COMMAND
-      string match -q -r -- '/fish$' $SHELL; or set -lx SHELL (type -p fish)
-      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 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'
+      # merge history from other sessions before searching
+      if test -z "$fish_private_mode"
+        builtin history merge
      end
-      set -l result (eval "$FZF_DEFAULT_COMMAND | $(__fzfcmd) --read0 --print0 -q (commandline) --bind='enter:become:string replace -a -- \n\t \n {2..} | string collect'")
+
+      # history's -z flag is needed for multi-line support.
+      # history's -z flag was added in fish 2.4.0, so don't use it for versions
+      # before 2.4.0.
+      if [ "$FISH_MAJOR" -gt 2 -o \( "$FISH_MAJOR" -eq 2 -a "$FISH_MINOR" -ge 4 \) ];
+        if type -P perl > /dev/null 2>&1
+          set -lx FZF_DEFAULT_OPTS (__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort --wrap-sign '"\t"↳ ' --highlight-line $FZF_CTRL_R_OPTS +m")
+          set -lx FZF_DEFAULT_OPTS_FILE ''
+          builtin history -z --reverse | command perl -0 -pe 's/^/$.\t/g; s/\n/\n\t/gm' | eval (__fzfcmd) --tac --read0 --print0 -q '(commandline)' | command perl -pe 's/^\d*\t//' | read -lz result
          and commandline -- $result
+        else
+          set -lx FZF_DEFAULT_OPTS (__fzf_defaults "" "--scheme=history --bind=ctrl-r:toggle-sort --wrap-sign '"\t"↳ ' --highlight-line $FZF_CTRL_R_OPTS +m")
+          set -lx FZF_DEFAULT_OPTS_FILE ''
+          builtin history -z | eval (__fzfcmd) --read0 --print0 -q '(commandline)' | read -lz result
+          and commandline -- $result
+        end
+      else
+        builtin history | eval (__fzfcmd) -q '(commandline)' | read -l result
+        and commandline -- $result
+      end
    end
    commandline -f repaint
  end
@@ -89,12 +98,12 @@ function fzf_key_bindings

    test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
    begin
-      set -lx FZF_DEFAULT_OPTS (__fzf_defaults "--reverse --walker=dir,follow,hidden --scheme=path --walker-root=$dir" "$FZF_ALT_C_OPTS")
+      set -lx FZF_DEFAULT_OPTS (__fzf_defaults "--reverse --walker=dir,follow,hidden --scheme=path --walker-root='$dir'" "$FZF_ALT_C_OPTS")
      set -lx FZF_DEFAULT_OPTS_FILE ''
      set -lx FZF_DEFAULT_COMMAND "$FZF_ALT_C_COMMAND"
-      set -l result (eval (__fzfcmd) +m --query=$fzf_query)
+      eval (__fzfcmd)' +m --query "'$fzf_query'"' | read -l result

-      if test -n "$result"
+      if [ -n "$result" ]
        cd -- $result

        # Remove last token from commandline.
@@ -109,9 +118,9 @@ function fzf_key_bindings
  function __fzfcmd
    test -n "$FZF_TMUX"; or set FZF_TMUX 0
    test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
-    if test -n "$FZF_TMUX_OPTS"
+    if [ -n "$FZF_TMUX_OPTS" ]
      echo "fzf-tmux $FZF_TMUX_OPTS -- "
-    else if test "$FZF_TMUX" = "1"
+    else if [ $FZF_TMUX -eq 1 ]
      echo "fzf-tmux -d$FZF_TMUX_HEIGHT -- "
    else
      echo "fzf"
@@ -126,6 +135,7 @@ function fzf_key_bindings
    bind \ec fzf-cd-widget
  end

+  if bind -M insert > /dev/null 2>&1
    bind -M insert \cr fzf-history-widget
    if not set -q FZF_CTRL_T_COMMAND; or test -n "$FZF_CTRL_T_COMMAND"
      bind -M insert \ct fzf-file-widget
@@ -133,6 +143,7 @@ function fzf_key_bindings
    if not set -q FZF_ALT_C_COMMAND; or test -n "$FZF_ALT_C_COMMAND"
      bind -M insert \ec fzf-cd-widget
    end
+  end

  function __fzf_parse_commandline -d 'Parse the current command line token and return split of existing filepath, fzf query, and optional -option= prefix'
    set -l commandline (commandline -t)
@@ -141,53 +152,40 @@ function fzf_key_bindings
    set -l prefix (string match -r -- '^-[^\s=]+=' $commandline)
    set commandline (string replace -- "$prefix" '' $commandline)

-    # Enable home directory expansion of leading ~/
-    set commandline (string replace -r -- '^~/' '\$HOME/' $commandline)
-
-    # escape special characters, except for the $ sign of valid variable names,
-    # so that after eval, the original string is returned, but with the
-    # variable names replaced by their values.
-    set commandline (string escape -n -- $commandline)
-    set commandline (string replace -r -a -- '\x5c\$(?=[\w])' '\$' $commandline)
-
    # eval is used to do shell expansion on paths
    eval set commandline $commandline

-    # Combine multiple consecutive slashes into one
-    set commandline (string replace -r -a -- '/+' '/' $commandline)
-
-    if test -z "$commandline"
+    if [ -z $commandline ]
      # Default to current directory with no --query
      set dir '.'
      set fzf_query ''
    else
      set dir (__fzf_get_dir $commandline)

-      # BUG: on combined expressions, if a left argument is a single `!`, the
-      # builtin test command of fish will treat it as the ! operator. To
-      # overcome this, have the variable parts on the right.
-      if test "." = "$dir" -a "./" != (string sub -l 2 -- $commandline)
+      if [ "$dir" = "." -a (string sub -l 1 -- $commandline) != '.' ]
        # if $dir is "." but commandline is not a relative path, this means no file path found
        set fzf_query $commandline
      else
        # Also remove trailing slash after dir, to "split" input properly
-        set fzf_query (string replace -r -- "^$dir/?" '' $commandline)
+        set fzf_query (string replace -r "^$dir/?" -- '' "$commandline")
      end
    end

-    echo (string escape -- $dir)
-    echo (string escape -- $fzf_query)
+    echo $dir
+    echo $fzf_query
    echo $prefix
  end

  function __fzf_get_dir -d 'Find the longest existing filepath from input string'
    set dir $argv

-    # Strip trailing slash, unless $dir is root dir (/)
-    set dir (string replace -r -- '(?<!^)/$' '' $dir)
+    # Strip all trailing slashes. Ignore if $dir is root dir (/)
+    if [ (string length -- $dir) -gt 1 ]
+      set dir (string replace -r '/*$' -- '' $dir)
+    end

    # Iteratively check if dir exists and strip tail end of path
-    while test ! -d "$dir"
+    while [ ! -d "$dir" ]
      # If path is absolute, this can keep going until ends up at /
      # If path is relative, this can keep going until entire input is consumed, dirname returns "."
      set dir (dirname -- "$dir")
--- a/shell/key-bindings.zsh
+++ b/shell/key-bindings.zsh
@@ -108,10 +108,9 @@ fi
 fzf-history-widget() {
  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
+  # Ensure the associative history array, which maps event numbers to the full
+  # history lines, is loaded, and that Perl is installed for multi-line output.
+  if zmodload -F zsh/parameter p: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 --wrap-sign '\t↳ ' --highlight-line ${FZF_CTRL_R_OPTS-} --query=${(qqq)LBUFFER} +m --read0") \
--- a/src/actiontype_string.go
+++ b/src/actiontype_string.go
@@ -25,116 +25,107 @@ func _() {
 	_ = x[actBackwardWord-14]
 	_ = x[actCancel-15]
 	_ = x[actChangeBorderLabel-16]
-	_ = x[actChangeListLabel-17]
-	_ = x[actChangeInputLabel-18]
-	_ = x[actChangeHeader-19]
-	_ = x[actChangeHeaderLabel-20]
-	_ = x[actChangeMulti-21]
-	_ = x[actChangePreviewLabel-22]
-	_ = x[actChangePrompt-23]
-	_ = x[actChangeQuery-24]
-	_ = x[actChangeNth-25]
-	_ = x[actClearScreen-26]
-	_ = x[actClearQuery-27]
-	_ = x[actClearSelection-28]
-	_ = x[actClose-29]
-	_ = x[actDeleteChar-30]
-	_ = x[actDeleteCharEof-31]
-	_ = x[actEndOfLine-32]
-	_ = x[actFatal-33]
-	_ = x[actForwardChar-34]
-	_ = x[actForwardWord-35]
-	_ = x[actKillLine-36]
-	_ = x[actKillWord-37]
-	_ = x[actUnixLineDiscard-38]
-	_ = x[actUnixWordRubout-39]
-	_ = x[actYank-40]
-	_ = x[actBackwardKillWord-41]
-	_ = x[actSelectAll-42]
-	_ = x[actDeselectAll-43]
-	_ = x[actToggle-44]
-	_ = x[actToggleSearch-45]
-	_ = x[actToggleAll-46]
-	_ = x[actToggleDown-47]
-	_ = x[actToggleUp-48]
-	_ = x[actToggleIn-49]
-	_ = x[actToggleOut-50]
-	_ = x[actToggleTrack-51]
-	_ = x[actToggleTrackCurrent-52]
-	_ = x[actToggleHeader-53]
-	_ = x[actToggleWrap-54]
-	_ = x[actToggleMultiLine-55]
-	_ = x[actToggleHscroll-56]
-	_ = x[actTrackCurrent-57]
-	_ = x[actUntrackCurrent-58]
-	_ = x[actDown-59]
-	_ = x[actUp-60]
-	_ = x[actPageUp-61]
-	_ = x[actPageDown-62]
-	_ = x[actPosition-63]
-	_ = x[actHalfPageUp-64]
-	_ = x[actHalfPageDown-65]
-	_ = x[actOffsetUp-66]
-	_ = x[actOffsetDown-67]
-	_ = x[actOffsetMiddle-68]
-	_ = x[actJump-69]
-	_ = x[actJumpAccept-70]
-	_ = x[actPrintQuery-71]
-	_ = x[actRefreshPreview-72]
-	_ = x[actReplaceQuery-73]
-	_ = x[actToggleSort-74]
-	_ = x[actShowPreview-75]
-	_ = x[actHidePreview-76]
-	_ = x[actTogglePreview-77]
-	_ = x[actTogglePreviewWrap-78]
-	_ = x[actTransform-79]
-	_ = x[actTransformBorderLabel-80]
-	_ = x[actTransformListLabel-81]
-	_ = x[actTransformInputLabel-82]
-	_ = x[actTransformHeader-83]
-	_ = x[actTransformHeaderLabel-84]
-	_ = x[actTransformPreviewLabel-85]
-	_ = x[actTransformPrompt-86]
-	_ = x[actTransformQuery-87]
-	_ = x[actPreview-88]
-	_ = x[actChangePreview-89]
-	_ = x[actChangePreviewWindow-90]
-	_ = x[actPreviewTop-91]
-	_ = x[actPreviewBottom-92]
-	_ = x[actPreviewUp-93]
-	_ = x[actPreviewDown-94]
-	_ = x[actPreviewPageUp-95]
-	_ = x[actPreviewPageDown-96]
-	_ = x[actPreviewHalfPageUp-97]
-	_ = x[actPreviewHalfPageDown-98]
-	_ = x[actPrevHistory-99]
-	_ = x[actPrevSelected-100]
-	_ = x[actPrint-101]
-	_ = x[actPut-102]
-	_ = x[actNextHistory-103]
-	_ = x[actNextSelected-104]
-	_ = x[actExecute-105]
-	_ = x[actExecuteSilent-106]
-	_ = x[actExecuteMulti-107]
-	_ = x[actSigStop-108]
-	_ = x[actFirst-109]
-	_ = x[actLast-110]
-	_ = x[actReload-111]
-	_ = x[actReloadSync-112]
-	_ = x[actDisableSearch-113]
-	_ = x[actEnableSearch-114]
-	_ = x[actSelect-115]
-	_ = x[actDeselect-116]
-	_ = x[actUnbind-117]
-	_ = x[actRebind-118]
-	_ = x[actBecome-119]
-	_ = x[actShowHeader-120]
-	_ = x[actHideHeader-121]
+	_ = x[actChangeHeader-17]
+	_ = x[actChangeMulti-18]
+	_ = x[actChangePreviewLabel-19]
+	_ = x[actChangePrompt-20]
+	_ = x[actChangeQuery-21]
+	_ = x[actClearScreen-22]
+	_ = x[actClearQuery-23]
+	_ = x[actClearSelection-24]
+	_ = x[actClose-25]
+	_ = x[actDeleteChar-26]
+	_ = x[actDeleteCharEof-27]
+	_ = x[actEndOfLine-28]
+	_ = x[actFatal-29]
+	_ = x[actForwardChar-30]
+	_ = x[actForwardWord-31]
+	_ = x[actKillLine-32]
+	_ = x[actKillWord-33]
+	_ = x[actUnixLineDiscard-34]
+	_ = x[actUnixWordRubout-35]
+	_ = x[actYank-36]
+	_ = x[actBackwardKillWord-37]
+	_ = x[actSelectAll-38]
+	_ = x[actDeselectAll-39]
+	_ = x[actToggle-40]
+	_ = x[actToggleSearch-41]
+	_ = x[actToggleAll-42]
+	_ = x[actToggleDown-43]
+	_ = x[actToggleUp-44]
+	_ = x[actToggleIn-45]
+	_ = x[actToggleOut-46]
+	_ = x[actToggleTrack-47]
+	_ = x[actToggleTrackCurrent-48]
+	_ = x[actToggleHeader-49]
+	_ = x[actToggleWrap-50]
+	_ = x[actTrackCurrent-51]
+	_ = x[actUntrackCurrent-52]
+	_ = x[actDown-53]
+	_ = x[actUp-54]
+	_ = x[actPageUp-55]
+	_ = x[actPageDown-56]
+	_ = x[actPosition-57]
+	_ = x[actHalfPageUp-58]
+	_ = x[actHalfPageDown-59]
+	_ = x[actOffsetUp-60]
+	_ = x[actOffsetDown-61]
+	_ = x[actOffsetMiddle-62]
+	_ = x[actJump-63]
+	_ = x[actJumpAccept-64]
+	_ = x[actPrintQuery-65]
+	_ = x[actRefreshPreview-66]
+	_ = x[actReplaceQuery-67]
+	_ = x[actToggleSort-68]
+	_ = x[actShowPreview-69]
+	_ = x[actHidePreview-70]
+	_ = x[actTogglePreview-71]
+	_ = x[actTogglePreviewWrap-72]
+	_ = x[actTransform-73]
+	_ = x[actTransformBorderLabel-74]
+	_ = x[actTransformHeader-75]
+	_ = x[actTransformPreviewLabel-76]
+	_ = x[actTransformPrompt-77]
+	_ = x[actTransformQuery-78]
+	_ = x[actPreview-79]
+	_ = x[actChangePreview-80]
+	_ = x[actChangePreviewWindow-81]
+	_ = x[actPreviewTop-82]
+	_ = x[actPreviewBottom-83]
+	_ = x[actPreviewUp-84]
+	_ = x[actPreviewDown-85]
+	_ = x[actPreviewPageUp-86]
+	_ = x[actPreviewPageDown-87]
+	_ = x[actPreviewHalfPageUp-88]
+	_ = x[actPreviewHalfPageDown-89]
+	_ = x[actPrevHistory-90]
+	_ = x[actPrevSelected-91]
+	_ = x[actPrint-92]
+	_ = x[actPut-93]
+	_ = x[actNextHistory-94]
+	_ = x[actNextSelected-95]
+	_ = x[actExecute-96]
+	_ = x[actExecuteSilent-97]
+	_ = x[actExecuteMulti-98]
+	_ = x[actSigStop-99]
+	_ = x[actFirst-100]
+	_ = x[actLast-101]
+	_ = x[actReload-102]
+	_ = x[actReloadSync-103]
+	_ = x[actDisableSearch-104]
+	_ = x[actEnableSearch-105]
+	_ = x[actSelect-106]
+	_ = x[actDeselect-107]
+	_ = x[actUnbind-108]
+	_ = x[actRebind-109]
+	_ = x[actBecome-110]
+	_ = x[actShowHeader-111]
+	_ = x[actHideHeader-112]
 }

-const _actionType_name = "actIgnoreactStartactClickactInvalidactCharactMouseactBeginningOfLineactAbortactAcceptactAcceptNonEmptyactAcceptOrPrintQueryactBackwardCharactBackwardDeleteCharactBackwardDeleteCharEofactBackwardWordactCancelactChangeBorderLabelactChangeListLabelactChangeInputLabelactChangeHeaderactChangeHeaderLabelactChangeMultiactChangePreviewLabelactChangePromptactChangeQueryactChangeNthactClearScreenactClearQueryactClearSelectionactCloseactDeleteCharactDeleteCharEofactEndOfLineactFatalactForwardCharactForwardWordactKillLineactKillWordactUnixLineDiscardactUnixWordRuboutactYankactBackwardKillWordactSelectAllactDeselectAllactToggleactToggleSearchactToggleAllactToggleDownactToggleUpactToggleInactToggleOutactToggleTrackactToggleTrackCurrentactToggleHeaderactToggleWrapactToggleMultiLineactToggleHscrollactTrackCurrentactUntrackCurrentactDownactUpactPageUpactPageDownactPositionactHalfPageUpactHalfPageDownactOffsetUpactOffsetDownactOffsetMiddleactJumpactJumpAcceptactPrintQueryactRefreshPreviewactReplaceQueryactToggleSortactShowPreviewactHidePreviewactTogglePreviewactTogglePreviewWrapactTransformactTransformBorderLabelactTransformListLabelactTransformInputLabelactTransformHeaderactTransformHeaderLabelactTransformPreviewLabelactTransformPromptactTransformQueryactPreviewactChangePreviewactChangePreviewWindowactPreviewTopactPreviewBottomactPreviewUpactPreviewDownactPreviewPageUpactPreviewPageDownactPreviewHalfPageUpactPreviewHalfPageDownactPrevHistoryactPrevSelectedactPrintactPutactNextHistoryactNextSelectedactExecuteactExecuteSilentactExecuteMultiactSigStopactFirstactLastactReloadactReloadSyncactDisableSearchactEnableSearchactSelectactDeselectactUnbindactRebindactBecomeactShowHeaderactHideHeader"
+const _actionType_name = "actIgnoreactStartactClickactInvalidactCharactMouseactBeginningOfLineactAbortactAcceptactAcceptNonEmptyactAcceptOrPrintQueryactBackwardCharactBackwardDeleteCharactBackwardDeleteCharEofactBackwardWordactCancelactChangeBorderLabelactChangeHeaderactChangeMultiactChangePreviewLabelactChangePromptactChangeQueryactClearScreenactClearQueryactClearSelectionactCloseactDeleteCharactDeleteCharEofactEndOfLineactFatalactForwardCharactForwardWordactKillLineactKillWordactUnixLineDiscardactUnixWordRuboutactYankactBackwardKillWordactSelectAllactDeselectAllactToggleactToggleSearchactToggleAllactToggleDownactToggleUpactToggleInactToggleOutactToggleTrackactToggleTrackCurrentactToggleHeaderactToggleWrapactTrackCurrentactUntrackCurrentactDownactUpactPageUpactPageDownactPositionactHalfPageUpactHalfPageDownactOffsetUpactOffsetDownactOffsetMiddleactJumpactJumpAcceptactPrintQueryactRefreshPreviewactReplaceQueryactToggleSortactShowPreviewactHidePreviewactTogglePreviewactTogglePreviewWrapactTransformactTransformBorderLabelactTransformHeaderactTransformPreviewLabelactTransformPromptactTransformQueryactPreviewactChangePreviewactChangePreviewWindowactPreviewTopactPreviewBottomactPreviewUpactPreviewDownactPreviewPageUpactPreviewPageDownactPreviewHalfPageUpactPreviewHalfPageDownactPrevHistoryactPrevSelectedactPrintactPutactNextHistoryactNextSelectedactExecuteactExecuteSilentactExecuteMultiactSigStopactFirstactLastactReloadactReloadSyncactDisableSearchactEnableSearchactSelectactDeselectactUnbindactRebindactBecomeactShowHeaderactHideHeader"

-var _actionType_index = [...]uint16{0, 9, 17, 25, 35, 42, 50, 68, 76, 85, 102, 123, 138, 159, 183, 198, 207, 227, 245, 264, 279, 299, 313, 334, 349, 363, 375, 389, 402, 419, 427, 440, 456, 468, 476, 490, 504, 515, 526, 544, 561, 568, 587, 599, 613, 622, 637, 649, 662, 673, 684, 696, 710, 731, 746, 759, 777, 793, 808, 825, 832, 837, 846, 857, 868, 881, 896, 907, 920, 935, 942, 955, 968, 985, 1000, 1013, 1027, 1041, 1057, 1077, 1089, 1112, 1133, 1155, 1173, 1196, 1220, 1238, 1255, 1265, 1281, 1303, 1316, 1332, 1344, 1358, 1374, 1392, 1412, 1434, 1448, 1463, 1471, 1477, 1491, 1506, 1516, 1532, 1547, 1557, 1565, 1572, 1581, 1594, 1610, 1625, 1634, 1645, 1654, 1663, 1672, 1685, 1698}
+var _actionType_index = [...]uint16{0, 9, 17, 25, 35, 42, 50, 68, 76, 85, 102, 123, 138, 159, 183, 198, 207, 227, 242, 256, 277, 292, 306, 320, 333, 350, 358, 371, 387, 399, 407, 421, 435, 446, 457, 475, 492, 499, 518, 530, 544, 553, 568, 580, 593, 604, 615, 627, 641, 662, 677, 690, 705, 722, 729, 734, 743, 754, 765, 778, 793, 804, 817, 832, 839, 852, 865, 882, 897, 910, 924, 938, 954, 974, 986, 1009, 1027, 1051, 1069, 1086, 1096, 1112, 1134, 1147, 1163, 1175, 1189, 1205, 1223, 1243, 1265, 1279, 1294, 1302, 1308, 1322, 1337, 1347, 1363, 1378, 1388, 1396, 1403, 1412, 1425, 1441, 1456, 1465, 1476, 1485, 1494, 1503, 1516, 1529}

 func (i actionType) String() string {
 	if i < 0 || i >= actionType(len(_actionType_index)-1) {
--- a/src/algo/algo.go
+++ b/src/algo/algo.go
@@ -401,7 +401,7 @@ func debugV2(T []rune, pattern []rune, F []int32, lastIdx int, H []int16, C []in
 		if i == 0 {
 			fmt.Print("  ")
 			for j := int(f); j <= lastIdx; j++ {
-				fmt.Print(" " + string(T[j]) + " ")
+				fmt.Printf(" " + string(T[j]) + " ")
 			}
 			fmt.Println()
 		}
--- a/src/ansi.go
+++ b/src/ansi.go
@@ -44,7 +44,7 @@ func (s *ansiState) ToString() string {
 	}

 	ret := ""
-	if s.attr&tui.Bold > 0 || s.attr&tui.BoldForce > 0 {
+	if s.attr&tui.Bold > 0 {
 		ret += "1;"
 	}
 	if s.attr&tui.Dim > 0 {
@@ -98,11 +98,11 @@ func isPrint(c uint8) bool {
 	return '\x20' <= c && c <= '\x7e'
 }

-func matchOperatingSystemCommand(s string, start int) int {
+func matchOperatingSystemCommand(s string) int {
 	// `\x1b][0-9][;:][[:print:]]+(?:\x1b\\\\|\x07)`
-	//                 ^ match starting here after the first printable character
+	//                        ^ match starting here
 	//
-	i := start // prefix matched in nextAnsiEscapeSequence()
+	i := 5 // prefix matched in nextAnsiEscapeSequence()
 	for ; i < len(s) && isPrint(s[i]); i++ {
 	}
 	if i < len(s) {
@@ -156,7 +156,7 @@ func isCtrlSeqStart(c uint8) bool {
 // nextAnsiEscapeSequence returns the ANSI escape sequence and is equivalent to
 // calling FindStringIndex() on the below regex (which was originally used):
 //
-// "(?:\x1b[\\[()][0-9;:?]*[a-zA-Z@]|\x1b][0-9]+[;:][[:print:]]+(?:\x1b\\\\|\x07)|\x1b.|[\x0e\x0f]|.\x08)"
+// "(?:\x1b[\\[()][0-9;:?]*[a-zA-Z@]|\x1b][0-9][;:][[:print:]]+(?:\x1b\\\\|\x07)|\x1b.|[\x0e\x0f]|.\x08)"
 func nextAnsiEscapeSequence(s string) (int, int) {
 	// fast check for ANSI escape sequences
 	i := 0
@@ -191,20 +191,12 @@ Loop:
 				}
 			}

-			// match: `\x1b][0-9]+[;:][[:print:]]+(?:\x1b\\\\|\x07)`
-			if i+5 < len(s) && s[i+1] == ']' {
-				j := 2
-				// \x1b][0-9]+[;:][[:print:]]+(?:\x1b\\\\|\x07)
-				//      ------
-				for ; i+j < len(s) && isNumeric(s[i+j]); j++ {
-				}
+			// match: `\x1b][0-9][;:][[:print:]]+(?:\x1b\\\\|\x07)`
+			if i+5 < len(s) && s[i+1] == ']' && isNumeric(s[i+2]) &&
+				(s[i+3] == ';' || s[i+3] == ':') && isPrint(s[i+4]) {

-				// \x1b][0-9]+[;:][[:print:]]+(?:\x1b\\\\|\x07)
-				//            ---------------
-				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
-					}
+				if j := matchOperatingSystemCommand(s[i:]); j != -1 {
+					return i, i + j
 				}
 			}

@@ -318,15 +310,20 @@ func extractColor(str string, state *ansiState, proc func(string, *ansiState) bo
 	return trimmed, nil, state
 }

-func parseAnsiCode(s string) (int, string) {
+func parseAnsiCode(s string, delimiter byte) (int, byte, string) {
 	var remaining string
 	var i int
+	if delimiter == 0 {
 		// Faster than strings.IndexAny(";:")
 		i = strings.IndexByte(s, ';')
 		if i < 0 {
 			i = strings.IndexByte(s, ':')
 		}
+	} else {
+		i = strings.IndexByte(s, delimiter)
+	}
 	if i >= 0 {
+		delimiter = s[i]
 		remaining = s[i+1:]
 		s = s[:i]
 	}
@@ -338,14 +335,14 @@ func parseAnsiCode(s string) (int, string) {
 		for _, ch := range stringBytes(s) {
 			ch -= '0'
 			if ch > 9 {
-				return -1, remaining
+				return -1, delimiter, remaining
 			}
 			code = code*10 + int(ch)
 		}
-		return code, remaining
+		return code, delimiter, remaining
 	}

-	return -1, remaining
+	return -1, delimiter, remaining
 }

 func interpretCode(ansiCode string, prevState *ansiState) ansiState {
@@ -381,10 +378,11 @@ func interpretCode(ansiCode string, prevState *ansiState) ansiState {
 	state256 := 0
 	ptr := &state.fg

+	var delimiter byte
 	count := 0
 	for len(ansiCode) != 0 {
 		var num int
-		if num, ansiCode = parseAnsiCode(ansiCode); num != -1 {
+		if num, delimiter, ansiCode = parseAnsiCode(ansiCode, delimiter); num != -1 {
 			count++
 			switch state256 {
 			case 0:
--- a/src/ansi_test.go
+++ b/src/ansi_test.go
@@ -335,28 +335,6 @@ func TestExtractColor(t *testing.T) {
 		assert((*offsets)[0], 0, 6, 2, -1, true)
 		assert((*offsets)[1], 6, 11, 200, 100, false)
 	})
-
-	state = nil
-	var color24 tui.Color = (1 << 24) + (180 << 16) + (190 << 8) + 254
-	src = "\x1b[1mhello \x1b[22;1;38:2:180:190:254mworld"
-	check(func(offsets *[]ansiOffset, state *ansiState) {
-		if len(*offsets) != 2 {
-			t.Fail()
-		}
-		if state.fg != color24 || state.attr != 1 {
-			t.Fail()
-		}
-		assert((*offsets)[0], 0, 6, -1, -1, true)
-		assert((*offsets)[1], 6, 11, color24, -1, true)
-	})
-
-	src = "\x1b]133;A\x1b\\hello \x1b]133;C\x1b\\world"
-	check(func(offsets *[]ansiOffset, state *ansiState) {
-		if len(*offsets) != 1 {
-			t.Fail()
-		}
-		assert((*offsets)[0], 0, 11, color24, -1, true)
-	})
 }

 func TestAnsiCodeStringConversion(t *testing.T) {
@@ -403,7 +381,7 @@ func TestParseAnsiCode(t *testing.T) {
 		{"-2", "", -1},
 	}
 	for _, x := range tests {
-		n, s := parseAnsiCode(x.In)
+		n, _, s := parseAnsiCode(x.In, 0)
 		if n != x.N || s != x.Exp {
 			t.Fatalf("%q: got: (%d %q) want: (%d %q)", x.In, n, s, x.N, x.Exp)
 		}
--- a/src/core.go
+++ b/src/core.go
@@ -172,9 +172,7 @@ func Run(opts *Options) (int, error) {
 			return chunkList.Push(data)
 		}, eventBox, executor, opts.ReadZero, opts.Filter == nil)

-		readyChan := make(chan bool)
-		go reader.ReadSource(opts.Input, opts.WalkerRoot, opts.WalkerOpts, opts.WalkerSkip, initialReload, initialEnv, readyChan)
-		<-readyChan
+		go reader.ReadSource(opts.Input, opts.WalkerRoot, opts.WalkerOpts, opts.WalkerSkip, initialReload, initialEnv)
 	}

 	// Matcher
@@ -190,14 +188,11 @@ func Run(opts *Options) (int, error) {
 			forward = true
 		}
 	}
-
-	nth := opts.Nth
-	nthRevision := 0
 	patternCache := make(map[string]*Pattern)
 	patternBuilder := func(runes []rune) *Pattern {
 		return BuildPattern(cache, patternCache,
 			opts.Fuzzy, opts.FuzzyAlgo, opts.Extended, opts.Case, opts.Normalize, forward, withPos,
-			opts.Filter == nil, nth, opts.Delimiter, nthRevision, runes)
+			opts.Filter == nil, opts.Nth, opts.Delimiter, runes)
 	}
 	inputRevision := revision{}
 	snapshotRevision := revision{}
@@ -229,7 +224,7 @@ func Run(opts *Options) (int, error) {
 					}
 					return false
 				}, eventBox, executor, opts.ReadZero, false)
-			reader.ReadSource(opts.Input, opts.WalkerRoot, opts.WalkerOpts, opts.WalkerSkip, initialReload, initialEnv, nil)
+			reader.ReadSource(opts.Input, opts.WalkerRoot, opts.WalkerOpts, opts.WalkerSkip, initialReload, initialEnv)
 		} else {
 			eventBox.Unwatch(EvtReadNew)
 			eventBox.WaitFor(EvtReadFin)
@@ -304,9 +299,7 @@ func Run(opts *Options) (int, error) {
 		itemIndex = 0
 		inputRevision.bumpMajor()
 		header = make([]string, 0, opts.HeaderLines)
-		readyChan := make(chan bool)
-		go reader.restart(command, environ, readyChan)
-		<-readyChan
+		go reader.restart(command, environ)
 	}

 	exitCode := ExitOk
@@ -376,14 +369,6 @@ func Run(opts *Options) (int, error) {
 						command = val.command
 						environ = val.environ
 						changed = val.changed
-						if val.nth != nil {
-							// Change nth and clear caches
-							nth = *val.nth
-							nthRevision++
-							patternCache = make(map[string]*Pattern)
-							cache.Clear()
-							inputRevision.bumpMinor()
-						}
 						if command != nil {
 							useSnapshot = val.sync
 						}
--- a/src/item.go
+++ b/src/item.go
@@ -6,17 +6,10 @@ import (
 	"github.com/junegunn/fzf/src/util"
 )

-type transformed struct {
-	// Because nth can be changed dynamically by change-nth action, we need to
-	// keep the revision number at the time of transformation.
-	revision int
-	tokens   []Token
-}
-
 // Item represents each input line. 56 bytes.
 type Item struct {
 	text        util.Chars    // 32 = 24 + 1 + 1 + 2 + 4
-	transformed *transformed  // 8
+	transformed *[]Token      // 8
 	origText    *[]byte       // 8
 	colors      *[]ansiOffset // 8
 }
--- a/src/matcher.go
+++ b/src/matcher.go
@@ -102,7 +102,7 @@ func (m *Matcher) Loop() {
 		if !cacheCleared {
 			if count == prevCount {
 				// Look up mergerCache
-				if cached, found := m.mergerCache[patternString]; found && cached.final == request.final {
+				if cached, found := m.mergerCache[patternString]; found {
 					merger = cached
 				}
 			} else {
--- a/src/options.go
+++ b/src/options.go
--- a/src/options_test.go
+++ b/src/options_test.go
@@ -9,13 +9,9 @@ import (
 )

 func TestDelimiterRegex(t *testing.T) {
-	// Valid regex, but a single character -> string
+	// Valid regex
 	delim := delimiterRegexp(".")
-	if delim.regex != nil || *delim.str != "." {
-		t.Error(delim)
-	}
-	delim = delimiterRegexp("|")
-	if delim.regex != nil || *delim.str != "|" {
+	if delim.regex == nil || delim.str != nil {
 		t.Error(delim)
 	}
 	// Broken regex -> string
--- a/src/pattern.go
+++ b/src/pattern.go
@@ -60,7 +60,6 @@ type Pattern struct {
 	cacheKey      string
 	delimiter     Delimiter
 	nth           []Range
-	revision      int
 	procFun       map[termType]algo.Algo
 	cache         *ChunkCache
 }
@@ -73,7 +72,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 int, runes []rune) *Pattern {
+	withPos bool, cacheable bool, nth []Range, delimiter Delimiter, runes []rune) *Pattern {

 	var asString string
 	if extended {
@@ -141,7 +140,6 @@ func BuildPattern(cache *ChunkCache, patternCache map[string]*Pattern, fuzzy boo
 		sortable:      sortable,
 		cacheable:     cacheable,
 		nth:           nth,
-		revision:      revision,
 		delimiter:     delimiter,
 		cache:         cache,
 		procFun:       make(map[termType]algo.Algo)}
@@ -395,15 +393,12 @@ func (p *Pattern) extendedMatch(item *Item, withPos bool, slab *util.Slab) ([]Of

 func (p *Pattern) transformInput(item *Item) []Token {
 	if item.transformed != nil {
-		transformed := *item.transformed
-		if transformed.revision == p.revision {
-			return transformed.tokens
-		}
+		return *item.transformed
 	}

 	tokens := Tokenize(item.text.ToString(), p.delimiter)
 	ret := Transform(tokens, p.nth)
-	item.transformed = &transformed{p.revision, ret}
+	item.transformed = &ret
 	return ret
 }

--- a/src/pattern_test.go
+++ b/src/pattern_test.go
@@ -68,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, 0, runes)
+		withPos, cacheable, nth, delimiter, runes)
 }

 func TestExact(t *testing.T) {
@@ -135,12 +135,12 @@ func TestOrigTextAndTransformed(t *testing.T) {
 		chunk.items[0] = Item{
 			text:        util.ToChars([]byte("junegunn")),
 			origText:    &origBytes,
-			transformed: &transformed{pattern.revision, trans}}
+			transformed: &trans}
 		pattern.extended = extended
 		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)) {
+			reflect.DeepEqual(*matches[0].item.transformed, trans)) {
 			t.Error("Invalid match result", matches)
 		}

@@ -148,7 +148,7 @@ func TestOrigTextAndTransformed(t *testing.T) {
 		if !(match.item.text.ToString() == "junegunn" &&
 			string(*match.item.origText) == "junegunn.choi" &&
 			offsets[0][0] == 0 && offsets[0][1] == 5 &&
-			reflect.DeepEqual((*match.item.transformed).tokens, trans)) {
+			reflect.DeepEqual(*match.item.transformed, trans)) {
 			t.Error("Invalid match result", match, offsets, extended)
 		}
 		if !((*pos)[0] == 4 && (*pos)[1] == 0) {
--- a/src/reader.go
+++ b/src/reader.go
@@ -6,8 +6,8 @@ import (
 	"io"
 	"io/fs"
 	"os"
+	"os/exec"
 	"path/filepath"
-	"strings"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -25,26 +25,16 @@ type Reader struct {
 	event    int32
 	finChan  chan bool
 	mutex    sync.Mutex
-	killed   bool
-	termFunc func()
+	exec     *exec.Cmd
+	execOut  io.ReadCloser
 	command  *string
+	killed   bool
 	wait     bool
 }

 // NewReader returns new Reader object
 func NewReader(pusher func([]byte) bool, eventBox *util.EventBox, executor *util.Executor, delimNil bool, wait bool) *Reader {
-	return &Reader{
-		pusher,
-		executor,
-		eventBox,
-		delimNil,
-		int32(EvtReady),
-		make(chan bool, 1),
-		sync.Mutex{},
-		false,
-		func() { os.Stdin.Close() },
-		nil,
-		wait}
+	return &Reader{pusher, executor, eventBox, delimNil, int32(EvtReady), make(chan bool, 1), sync.Mutex{}, nil, nil, nil, false, wait}
 }

 func (r *Reader) startEventPoller() {
@@ -90,19 +80,19 @@ func (r *Reader) fin(success bool) {
 func (r *Reader) terminate() {
 	r.mutex.Lock()
 	r.killed = true
-	if r.termFunc != nil {
-		r.termFunc()
-		r.termFunc = nil
+	if r.exec != nil && r.exec.Process != nil {
+		r.execOut.Close()
+		util.KillCommand(r.exec)
+	} else {
+		os.Stdin.Close()
 	}
 	r.mutex.Unlock()
 }

-func (r *Reader) restart(command commandSpec, environ []string, readyChan chan bool) {
+func (r *Reader) restart(command commandSpec, environ []string) {
 	r.event = int32(EvtReady)
 	r.startEventPoller()
-	success := r.readFromCommand(command.command, environ, func() {
-		readyChan <- true
-	})
+	success := r.readFromCommand(command.command, environ)
 	r.fin(success)
 	removeFiles(command.tempFiles)
 }
@@ -121,29 +111,21 @@ func (r *Reader) readChannel(inputChan chan string) bool {
 }

 // ReadSource reads data from the default command or from standard input
-func (r *Reader) ReadSource(inputChan chan string, roots []string, opts walkerOpts, ignores []string, initCmd string, initEnv []string, readyChan chan bool) {
+func (r *Reader) ReadSource(inputChan chan string, root string, opts walkerOpts, ignores []string, initCmd string, initEnv []string) {
 	r.startEventPoller()
 	var success bool
-	signalReady := func() {
-		if readyChan != nil {
-			readyChan <- true
-		}
-	}
 	if inputChan != nil {
-		signalReady()
 		success = r.readChannel(inputChan)
 	} else if len(initCmd) > 0 {
-		success = r.readFromCommand(initCmd, initEnv, signalReady)
+		success = r.readFromCommand(initCmd, initEnv)
 	} else if util.IsTty(os.Stdin) {
 		cmd := os.Getenv("FZF_DEFAULT_COMMAND")
 		if len(cmd) == 0 {
-			signalReady()
-			success = r.readFiles(roots, opts, ignores)
+			success = r.readFiles(root, opts, ignores)
 		} else {
-			success = r.readFromCommand(cmd, initEnv, signalReady)
+			success = r.readFromCommand(cmd, initEnv)
 		}
 	} else {
-		signalReady()
 		success = r.readFromStdin()
 	}
 	r.fin(success)
@@ -266,33 +248,14 @@ func trimPath(path string) string {
 	return byteString(bytes)
 }

-func (r *Reader) readFiles(roots []string, opts walkerOpts, ignores []string) bool {
+func (r *Reader) readFiles(root string, opts walkerOpts, ignores []string) bool {
+	r.killed = false
 	conf := fastwalk.Config{
 		Follow: opts.follow,
 		// Use forward slashes when running a Windows binary under WSL or MSYS
 		ToSlash: fastwalk.DefaultToSlash(),
 		Sort:    fastwalk.SortFilesFirst,
 	}
-	ignoresBase := []string{}
-	ignoresFull := []string{}
-	ignoresSuffix := []string{}
-	sep := string(os.PathSeparator)
-	for _, ignore := range ignores {
-		if strings.ContainsRune(ignore, os.PathSeparator) {
-			if strings.HasPrefix(ignore, sep) {
-				ignoresSuffix = append(ignoresSuffix, ignore)
-			} else {
-				// 'foo/bar' should match match
-				// * 'foo/bar'
-				// * 'baz/foo/bar'
-				// * but NOT 'bazfoo/bar'
-				ignoresFull = append(ignoresFull, ignore)
-				ignoresSuffix = append(ignoresSuffix, sep+ignore)
-			}
-		} else {
-			ignoresBase = append(ignoresBase, ignore)
-		}
-	}
 	fn := func(path string, de os.DirEntry, err error) error {
 		if err != nil {
 			return nil
@@ -302,24 +265,14 @@ func (r *Reader) readFiles(roots []string, opts walkerOpts, ignores []string) bo
 			isDir := de.IsDir()
 			if isDir || opts.follow && isSymlinkToDir(path, de) {
 				base := filepath.Base(path)
-				if !opts.hidden && base[0] == '.' && base != ".." {
+				if !opts.hidden && base[0] == '.' {
 					return filepath.SkipDir
 				}
-				for _, ignore := range ignoresBase {
+				for _, ignore := range ignores {
 					if ignore == base {
 						return filepath.SkipDir
 					}
 				}
-				for _, ignore := range ignoresFull {
-					if ignore == path {
-						return filepath.SkipDir
-					}
-				}
-				for _, ignore := range ignoresSuffix {
-					if strings.HasSuffix(path, ignore) {
-						return filepath.SkipDir
-					}
-				}
 			}
 			if ((opts.file && !isDir) || (opts.dir && isDir)) && r.pusher(stringBytes(path)) {
 				atomic.StoreInt32(&r.event, int32(EvtReadNew))
@@ -332,39 +285,34 @@ func (r *Reader) readFiles(roots []string, opts walkerOpts, ignores []string) bo
 		}
 		return nil
 	}
-	noerr := true
-	for _, root := range roots {
-		noerr = noerr && (fastwalk.Walk(&conf, root, fn) == nil)
-	}
-	return noerr
+	return fastwalk.Walk(&conf, root, fn) == nil
 }

-func (r *Reader) readFromCommand(command string, environ []string, signalReady func()) bool {
+func (r *Reader) readFromCommand(command string, environ []string) bool {
 	r.mutex.Lock()
-
 	r.killed = false
-	r.termFunc = nil
 	r.command = &command
-	exec := r.executor.ExecCommand(command, true)
+	r.exec = r.executor.ExecCommand(command, true)
 	if environ != nil {
-		exec.Env = environ
+		r.exec.Env = environ
 	}
-	execOut, err := exec.StdoutPipe()
-	if err != nil || exec.Start() != nil {
-		signalReady()
+
+	var err error
+	r.execOut, err = r.exec.StdoutPipe()
+	if err != nil {
+		r.exec = nil
 		r.mutex.Unlock()
 		return false
 	}

-	// Function to call to terminate the running command
-	r.termFunc = func() {
-		execOut.Close()
-		util.KillCommand(exec)
-	}
-
-	signalReady()
+	err = r.exec.Start()
+	if err != nil {
+		r.exec = nil
 		r.mutex.Unlock()
-
-	r.feed(execOut)
-	return exec.Wait() == nil
+		return false
+	}
+
+	r.mutex.Unlock()
+	r.feed(r.execOut)
+	return r.exec.Wait() == nil
 }
--- a/src/reader_test.go
+++ b/src/reader_test.go
@@ -23,12 +23,8 @@ func TestReadFromCommand(t *testing.T) {
 	}

 	// Normal command
-	counter := 0
-	ready := func() {
-		counter++
-	}
-	reader.fin(reader.readFromCommand(`echo abc&&echo def`, nil, ready))
-	if len(strs) != 2 || strs[0] != "abc" || strs[1] != "def" || counter != 1 {
+	reader.fin(reader.readFromCommand(`echo abc&&echo def`, nil))
+	if len(strs) != 2 || strs[0] != "abc" || strs[1] != "def" {
 		t.Errorf("%s", strs)
 	}

@@ -52,9 +48,9 @@ func TestReadFromCommand(t *testing.T) {
 	reader.startEventPoller()

 	// Failing command
-	reader.fin(reader.readFromCommand(`no-such-command`, nil, ready))
+	reader.fin(reader.readFromCommand(`no-such-command`, nil))
 	strs = []string{}
-	if len(strs) > 0 || counter != 2 {
+	if len(strs) > 0 {
 		t.Errorf("%s", strs)
 	}

--- a/src/result.go
+++ b/src/result.go
@@ -104,11 +104,11 @@ 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, current bool) []colorOffset {
+func (result *Result) colorOffsets(matchOffsets []Offset, theme *tui.ColorTheme, colBase tui.ColorPair, colMatch tui.ColorPair, current bool) []colorOffset {
 	itemColors := result.item.Colors()

 	// No ANSI codes
-	if len(itemColors) == 0 && len(nthOffsets) == 0 {
+	if len(itemColors) == 0 {
 		var offsets []colorOffset
 		for _, off := range matchOffsets {
 			offsets = append(offsets, colorOffset{offset: [2]int32{off[0], off[1]}, color: colMatch, match: true})
@@ -118,7 +118,7 @@ func (result *Result) colorOffsets(matchOffsets []Offset, nthOffsets []Offset, t

 	// Find max column
 	var maxCol int32
-	for _, off := range append(matchOffsets, nthOffsets...) {
+	for _, off := range matchOffsets {
 		if off[1] > maxCol {
 			maxCol = off[1]
 		}
@@ -129,30 +129,21 @@ func (result *Result) colorOffsets(matchOffsets []Offset, nthOffsets []Offset, t
 		}
 	}

-	type cellInfo struct {
-		index int
-		color bool
-		match bool
-		nth   bool
-	}
-
-	cols := make([]cellInfo, maxCol)
+	cols := make([]int, maxCol)
 	for colorIndex, ansi := range itemColors {
 		for i := ansi.offset[0]; i < ansi.offset[1]; i++ {
-			cols[i] = cellInfo{colorIndex, true, false, false}
+			cols[i] = colorIndex + 1 // 1-based index of itemColors
 		}
 	}

 	for _, off := range matchOffsets {
 		for i := off[0]; i < off[1]; i++ {
-			cols[i].match = true
+			// Negative of 1-based index of itemColors
+			// - The extra -1 means highlighted
+			if cols[i] >= 0 {
+				cols[i] = cols[i]*-1 - 1
 			}
 		}
-
-	for _, off := range nthOffsets {
-		for i := off[0]; i < off[1]; i++ {
-			cols[i].nth = true
-		}
 	}

 	// sort.Sort(ByOrder(offsets))
@@ -161,7 +152,7 @@ func (result *Result) colorOffsets(matchOffsets []Offset, nthOffsets []Offset, t
 	// ------------  ----  --  ----
 	//   ++++++++      ++++++++++
 	// --++++++++--  --++++++++++---
-	var curr cellInfo = cellInfo{0, false, false, false}
+	curr := 0
 	start := 0
 	ansiToColorPair := func(ansi ansiOffset, base tui.ColorPair) tui.ColorPair {
 		fg := ansi.color.fg
@@ -184,17 +175,12 @@ func (result *Result) colorOffsets(matchOffsets []Offset, nthOffsets []Offset, t
 	}
 	var colors []colorOffset
 	add := func(idx int) {
-		if (curr.color || curr.nth || curr.match) && idx > start {
-			if curr.match {
-				var color tui.ColorPair
-				if curr.nth {
-					color = colBase.WithAttr(attrNth).Merge(colMatch)
-				} else {
-					color = colBase.Merge(colMatch)
-				}
+		if curr != 0 && idx > start {
+			if curr < 0 {
+				color := colMatch
 				var url *url
-				if curr.color && theme.Colored {
-					ansi := itemColors[curr.index]
+				if curr < -1 && theme.Colored {
+					ansi := itemColors[-curr-2]
 					url = ansi.color.url
 					origColor := ansiToColorPair(ansi, colMatch)
 					// hl or hl+ only sets the foreground color, so colMatch is the
@@ -207,32 +193,19 @@ func (result *Result) colorOffsets(matchOffsets []Offset, nthOffsets []Offset, t
 					//      echo -e "\x1b[42mfoo\x1b[mbar" | fzf --ansi --color bg+:1,hl+:-1:underline
 					if color.Fg().IsDefault() && origColor.HasBg() {
 						color = origColor
-						if curr.nth {
-							color = color.WithAttr(attrNth)
-						}
 					} else {
 						color = origColor.MergeNonDefault(color)
 					}
 				}
 				colors = append(colors, colorOffset{
 					offset: [2]int32{int32(start), int32(idx)}, color: color, match: true, url: url})
-			} else if curr.color {
-				ansi := itemColors[curr.index]
-				color := ansiToColorPair(ansi, colBase)
-				if curr.nth {
-					color = color.WithAttr(attrNth)
-				}
+			} else {
+				ansi := itemColors[curr-1]
 				colors = append(colors, colorOffset{
 					offset: [2]int32{int32(start), int32(idx)},
-					color:  color,
+					color:  ansiToColorPair(ansi, colBase),
 					match:  false,
 					url:    ansi.color.url})
-			} else {
-				colors = append(colors, colorOffset{
-					offset: [2]int32{int32(start), int32(idx)},
-					color:  colBase.WithAttr(attrNth),
-					match:  false,
-					url:    nil})
 			}
 		}
 	}
--- a/src/result_test.go
+++ b/src/result_test.go
@@ -131,7 +131,7 @@ func TestColorOffset(t *testing.T) {

 	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, true)
+	colors := item.colorOffsets(offsets, tui.Dark256, colBase, colMatch, true)
 	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 {
@@ -155,15 +155,12 @@ func TestColorOffset(t *testing.T) {

 	colRegular := tui.NewColorPair(-1, -1, tui.AttrUndefined)
 	colUnderline := tui.NewColorPair(-1, -1, tui.Underline)
-
-	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, true)
+	colors = item.colorOffsets(offsets, tui.Dark256, colRegular, colUnderline, true)

 	// [{[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}}
 	//  {[30 32] {3 7 8}} {[32 33] {-1 -1 8}} {[33 35] {4 8 9}}
-		//  {[35 37] {4 8 1}} {[37 39] {4 8 x|1}} {[39 40] {4 8 x|1}}]
+	//  {[35 40] {4 8 1}}]
 	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))
@@ -173,12 +170,5 @@ func TestColorOffset(t *testing.T) {
 	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))
-		expected := tui.Bold | attr
-		if attr == tui.AttrRegular {
-			expected = tui.AttrRegular
-		}
-		assert(10, 37, 39, tui.NewColorPair(4, 8, expected))
-		assert(11, 39, 40, tui.NewColorPair(4, 8, tui.Bold))
-	}
+	assert(9, 35, 40, tui.NewColorPair(4, 8, tui.Bold))
 }
--- a/src/terminal.go
+++ b/src/terminal.go
--- a/src/terminal_test.go
+++ b/src/terminal_test.go
@@ -507,34 +507,6 @@ func TestParsePlaceholder(t *testing.T) {
 	}
 }

-func TestExtractPassthroughs(t *testing.T) {
-	for _, middle := range []string{
-		"\x1bPtmux;\x1b\x1bbar\x1b\\",
-		"\x1bPtmux;\x1b\x1bbar\x1bbar\x1b\\",
-		"\x1b]1337;bar\x1b\\",
-		"\x1b]1337;bar\x1bbar\x1b\\",
-		"\x1b]1337;bar\a",
-		"\x1b_Ga=T,f=32,s=1258,v=1295,c=74,r=35,m=1\x1b\\",
-		"\x1b_Ga=T,f=32,s=1258,v=1295,c=74,r=35,m=1\x1b\\\r",
-		"\x1b_Ga=T,f=32,s=1258,v=1295,c=74,r=35,m=1\x1bbar\x1b\\\r",
-		"\x1b_Gm=1;AAAAAAAAA=\x1b\\",
-		"\x1b_Gm=1;AAAAAAAAA=\x1b\\\r",
-		"\x1b_Gm=1;\x1bAAAAAAAAA=\x1b\\\r",
-	} {
-		line := "foo" + middle + "baz"
-		loc := findPassThrough(line)
-		if loc == nil || line[0:loc[0]] != "foo" || line[loc[1]:] != "baz" {
-			t.Error("failed to find passthrough")
-		}
-		garbage := "\x1bPtmux;\x1b]1337;\x1b_Ga=\x1b]1337;bar\x1b."
-		line = strings.Repeat("foo"+middle+middle+"baz", 3) + garbage
-		passthroughs, result := extractPassThroughs(line)
-		if result != "foobazfoobazfoobaz"+garbage || len(passthroughs) != 6 {
-			t.Error("failed to extract passthroughs")
-		}
-	}
-}
-
 /* utilities section */

 // Item represents one line in fzf UI. Usually it is relative path to files and folders.
--- a/src/tmux.go
+++ b/src/tmux.go
@@ -9,18 +9,13 @@ import (

 func runTmux(args []string, opts *Options) (int, error) {
 	// Prepare arguments
-	fzf, rest := args[0], args[1:]
-	args = []string{"--bind=ctrl-z:ignore"}
-	if !opts.Tmux.border && opts.BorderShape == tui.BorderUndefined {
-		// We append --border option at the end, because `--style=full:STYLE`
-		// may have changed the default border style.
-		rest = append(rest, "--border")
-	}
-	if opts.Tmux.border && opts.Margin == defaultMargin() {
-		args = append(args, "--margin=0,1")
+	fzf := args[0]
+	args = append([]string{"--bind=ctrl-z:ignore"}, args[1:]...)
+	if opts.BorderShape == tui.BorderUndefined {
+		args = append(args, "--border")
 	}
 	argStr := escapeSingleQuote(fzf)
-	for _, arg := range append(args, rest...) {
+	for _, arg := range args {
 		argStr += " " + escapeSingleQuote(arg)
 	}
 	argStr += ` --no-tmux --no-height`
@@ -38,10 +33,7 @@ func runTmux(args []string, opts *Options) (int, error) {
 	// M        Both    The mouse position
 	// W        Both    The window position on the status line
 	// S        -y      The line above or below the status line
-	tmuxArgs := []string{"display-popup", "-E", "-d", dir}
-	if !opts.Tmux.border {
-		tmuxArgs = append(tmuxArgs, "-B")
-	}
+	tmuxArgs := []string{"display-popup", "-E", "-B", "-d", dir}
 	switch opts.Tmux.position {
 	case posUp:
 		tmuxArgs = append(tmuxArgs, "-xC", "-y0")
--- a/src/tokenizer.go
+++ b/src/tokenizer.go
@@ -18,36 +18,6 @@ type Range struct {
 	end   int
 }

-func (r Range) IsFull() bool {
-	return r.begin == rangeEllipsis && r.end == rangeEllipsis
-}
-
-func RangesToString(ranges []Range) string {
-	strs := []string{}
-	for _, r := range ranges {
-		s := ""
-		if r.begin == rangeEllipsis && r.end == rangeEllipsis {
-			s = ".."
-		} else if r.begin == r.end {
-			s = strconv.Itoa(r.begin)
-		} else {
-			if r.begin != rangeEllipsis {
-				s += strconv.Itoa(r.begin)
-			}
-
-			if r.begin != -1 {
-				s += ".."
-				if r.end != rangeEllipsis {
-					s += strconv.Itoa(r.end)
-				}
-			}
-		}
-		strs = append(strs, s)
-	}
-
-	return strings.Join(strs, ",")
-}
-
 // Token contains the tokenized part of the strings and its prefix length
 type Token struct {
 	text         *util.Chars
@@ -71,7 +41,7 @@ func (d Delimiter) String() string {
 }

 func newRange(begin int, end int) Range {
-	if begin == 1 && end != 1 {
+	if begin == 1 {
 		begin = rangeEllipsis
 	}
 	if end == -1 {
@@ -103,7 +73,7 @@ func ParseRange(str *string) (Range, bool) {
 		}
 		begin, err1 := strconv.Atoi(ns[0])
 		end, err2 := strconv.Atoi(ns[1])
-		if err1 != nil || err2 != nil || begin == 0 || end == 0 || begin < 0 && end > 0 {
+		if err1 != nil || err2 != nil || begin == 0 || end == 0 {
 			return Range{}, false
 		}
 		return newRange(begin, end), true
--- a/src/tokenizer_test.go
+++ b/src/tokenizer_test.go
@@ -40,18 +40,6 @@ func TestParseRange(t *testing.T) {
 			t.Errorf("%v", r)
 		}
 	}
-	{
-		i := "1..3..5"
-		if r, ok := ParseRange(&i); ok {
-			t.Errorf("%v", r)
-		}
-	}
-	{
-		i := "-3..3"
-		if r, ok := ParseRange(&i); ok {
-			t.Errorf("%v", r)
-		}
-	}
 }

 func TestTokenize(t *testing.T) {
--- a/src/tui/dummy.go
+++ b/src/tui/dummy.go
@@ -11,11 +11,6 @@ func HasFullscreenRenderer() bool {
 var DefaultBorderShape = BorderRounded

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

@@ -23,7 +18,6 @@ const (
 	AttrUndefined = Attr(0)
 	AttrRegular   = Attr(1 << 8)
 	AttrClear     = Attr(1 << 9)
-	BoldForce     = Attr(1 << 10)

 	Bold          = Attr(1)
 	Dim           = Attr(1 << 1)
@@ -36,7 +30,6 @@ const (
 )

 func (r *FullscreenRenderer) Init() error                        { return nil }
-func (r *FullscreenRenderer) DefaultTheme() *ColorTheme          { return nil }
 func (r *FullscreenRenderer) Resize(maxHeightFunc func(int) int) {}
 func (r *FullscreenRenderer) Pause(bool)                         {}
 func (r *FullscreenRenderer) Resume(bool, bool)                  {}
@@ -55,6 +48,6 @@ func (r *FullscreenRenderer) MaxY() int      { return 0 }

 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 {
+func (r *FullscreenRenderer) NewWindow(top int, left int, width int, height int, preview bool, borderStyle BorderStyle) Window {
 	return nil
 }
--- a/src/tui/light.go
+++ b/src/tui/light.go
@@ -73,15 +73,11 @@ func (r *LightRenderer) csi(code string) string {

 func (r *LightRenderer) flush() {
 	if r.queued.Len() > 0 {
-		r.flushRaw("\x1b[?7l\x1b[?25l" + r.queued.String() + "\x1b[?25h\x1b[?7h")
+		fmt.Fprint(r.ttyout, "\x1b[?7l\x1b[?25l"+r.queued.String()+"\x1b[?25h\x1b[?7h")
 		r.queued.Reset()
 	}
 }

-func (r *LightRenderer) flushRaw(sequence string) {
-	fmt.Fprint(r.ttyout, sequence)
-}
-
 // Light renderer
 type LightRenderer struct {
 	closed        *util.AtomicBool
@@ -118,7 +114,7 @@ type LightRenderer struct {
 type LightWindow struct {
 	renderer *LightRenderer
 	colored  bool
-	windowType WindowType
+	preview  bool
 	border   BorderStyle
 	top      int
 	left     int
@@ -174,6 +170,7 @@ func (r *LightRenderer) Init() error {
 		return err
 	}
 	r.updateTerminalSize()
+	initTheme(r.theme, r.defaultTheme(), r.forceBlack)

 	if r.fullscreen {
 		r.smcup()
@@ -658,13 +655,11 @@ func (r *LightRenderer) mouseSequence(sz *int) Event {
 }

 func (r *LightRenderer) smcup() {
-	r.flush()
-	r.flushRaw("\x1b[?1049h")
+	r.csi("?1049h")
 }

 func (r *LightRenderer) rmcup() {
-	r.flush()
-	r.flushRaw("\x1b[?1049l")
+	r.csi("?1049l")
 }

 func (r *LightRenderer) Pause(clear bool) {
@@ -779,13 +774,11 @@ func (r *LightRenderer) MaxY() int {
 	return r.height
 }

-func (r *LightRenderer) NewWindow(top int, left int, width int, height int, windowType WindowType, borderStyle BorderStyle, erase bool) Window {
-	width = util.Max(0, width)
-	height = util.Max(0, height)
+func (r *LightRenderer) NewWindow(top int, left int, width int, height int, preview bool, borderStyle BorderStyle) Window {
 	w := &LightWindow{
 		renderer: r,
 		colored:  r.theme.Colored,
-		windowType: windowType,
+		preview:  preview,
 		border:   borderStyle,
 		top:      top,
 		left:     left,
@@ -794,25 +787,14 @@ func (r *LightRenderer) NewWindow(top int, left int, width int, height int, wind
 		tabstop:  r.tabstop,
 		fg:       colDefault,
 		bg:       colDefault}
-	switch windowType {
-	case WindowBase:
-		w.fg = r.theme.Fg.Color
-		w.bg = r.theme.Bg.Color
-	case WindowList:
-		w.fg = r.theme.ListFg.Color
-		w.bg = r.theme.ListBg.Color
-	case WindowInput:
-		w.fg = r.theme.Input.Color
-		w.bg = r.theme.InputBg.Color
-	case WindowHeader:
-		w.fg = r.theme.Header.Color
-		w.bg = r.theme.HeaderBg.Color
-	case WindowPreview:
+	if preview {
 		w.fg = r.theme.PreviewFg.Color
 		w.bg = r.theme.PreviewBg.Color
+	} else {
+		w.fg = r.theme.Fg.Color
+		w.bg = r.theme.Bg.Color
 	}
-	if erase && !w.bg.IsDefault() && w.border.shape != BorderNone {
-		// fzf --color bg:blue --border --padding 1,2
+	if !w.bg.IsDefault() && w.border.shape != BorderNone {
 		w.Erase()
 	}
 	w.drawBorder(false)
@@ -828,9 +810,6 @@ func (w *LightWindow) DrawHBorder() {
 }

 func (w *LightWindow) drawBorder(onlyHorizontal bool) {
-	if w.height == 0 {
-		return
-	}
 	switch w.border.shape {
 	case BorderRounded, BorderSharp, BorderBold, BorderBlock, BorderThinBlock, BorderDouble:
 		w.drawBorderAround(onlyHorizontal)
@@ -860,14 +839,7 @@ func (w *LightWindow) drawBorder(onlyHorizontal bool) {

 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 WindowPreview:
+	if w.preview {
 		color = ColPreviewBorder
 	}
 	hw := runeWidth(w.border.top)
@@ -885,14 +857,7 @@ func (w *LightWindow) drawBorderHorizontal(top, bottom bool) {
 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 WindowPreview:
+	if w.preview {
 		color = ColPreviewBorder
 	}
 	for y := 0; y < w.height; y++ {
@@ -912,14 +877,7 @@ func (w *LightWindow) drawBorderVertical(left, right bool) {
 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 WindowPreview:
+	if w.preview {
 		color = ColPreviewBorder
 	}
 	hw := runeWidth(w.border.top)
@@ -971,6 +929,9 @@ func (w *LightWindow) Height() int {
 func (w *LightWindow) Refresh() {
 }

+func (w *LightWindow) Close() {
+}
+
 func (w *LightWindow) X() int {
 	return w.posx
 }
@@ -979,16 +940,9 @@ func (w *LightWindow) Y() int {
 	return w.posy
 }

-func (w *LightWindow) EncloseX(x int) bool {
-	return x >= w.left && x < (w.left+w.width)
-}
-
-func (w *LightWindow) EncloseY(y int) bool {
-	return y >= w.top && y < (w.top+w.height)
-}
-
 func (w *LightWindow) Enclose(y int, x int) bool {
-	return w.EncloseX(x) && w.EncloseY(y)
+	return x >= w.left && x < (w.left+w.width) &&
+		y >= w.top && y < (w.top+w.height)
 }

 func (w *LightWindow) Move(y int, x int) {
@@ -1011,7 +965,7 @@ func attrCodes(attr Attr) []string {
 	if (attr & AttrClear) > 0 {
 		return codes
 	}
-	if (attr&Bold) > 0 || (attr&BoldForce) > 0 {
+	if (attr & Bold) > 0 {
 		codes = append(codes, "1")
 	}
 	if (attr & Dim) > 0 {
@@ -1143,7 +1097,7 @@ func (w *LightWindow) fill(str string, resetCode string) FillReturn {
 			}
 		}
 	}
-	if w.posx >= w.Width() {
+	if w.posx+1 >= w.Width() {
 		if w.posy+1 >= w.height {
 			return FillSuspend
 		}
--- a/src/tui/light_unix.go
+++ b/src/tui/light_unix.go
@@ -18,7 +18,7 @@ func IsLightRendererSupported() bool {
 	return true
 }

-func (r *LightRenderer) DefaultTheme() *ColorTheme {
+func (r *LightRenderer) defaultTheme() *ColorTheme {
 	if strings.Contains(os.Getenv("TERM"), "256") {
 		return Dark256
 	}
--- a/src/tui/light_windows.go
+++ b/src/tui/light_windows.go
@@ -39,7 +39,7 @@ func IsLightRendererSupported() bool {
 	return canSetVt100
 }

-func (r *LightRenderer) DefaultTheme() *ColorTheme {
+func (r *LightRenderer) defaultTheme() *ColorTheme {
 	// the getenv check is borrowed from here: https://github.com/gdamore/tcell/commit/0c473b86d82f68226a142e96cc5a34c5a29b3690#diff-b008fcd5e6934bf31bc3d33bf49f47d8R178:
 	if !IsLightRendererSupported() || os.Getenv("ConEmuPID") != "" || os.Getenv("TCELL_TRUECOLOR") == "disable" {
 		return Default16
--- a/src/tui/tcell.go
+++ b/src/tui/tcell.go
@@ -40,7 +40,7 @@ type Attr int32

 type TcellWindow struct {
 	color       bool
-	windowType  WindowType
+	preview     bool
 	top         int
 	left        int
 	width       int
@@ -97,7 +97,6 @@ const (
 	AttrUndefined = Attr(0)
 	AttrRegular   = Attr(1 << 7)
 	AttrClear     = Attr(1 << 8)
-	BoldForce     = Attr(1 << 10)
 )

 func (r *FullscreenRenderer) PassThrough(str string) {
@@ -107,12 +106,8 @@ func (r *FullscreenRenderer) PassThrough(str string) {

 func (r *FullscreenRenderer) Resize(maxHeightFunc func(int) int) {}

-func (r *FullscreenRenderer) DefaultTheme() *ColorTheme {
-	s, e := r.getScreen()
-	if e != nil {
-		return Default16
-	}
-	if s.Colors() >= 256 {
+func (r *FullscreenRenderer) defaultTheme() *ColorTheme {
+	if _screen.Colors() >= 256 {
 		return Dark256
 	}
 	return Default16
@@ -142,11 +137,6 @@ func (c Color) Style() tcell.Color {
 }

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

@@ -158,19 +148,8 @@ var (
 	_initialResize   bool = true
 )

-func (r *FullscreenRenderer) getScreen() (tcell.Screen, error) {
-	if _screen == nil {
-		s, e := tcell.NewScreen()
-		if e != nil {
-			return nil, e
-		}
-		_screen = s
-	}
-	return _screen, nil
-}
-
 func (r *FullscreenRenderer) initScreen() error {
-	s, e := r.getScreen()
+	s, e := tcell.NewScreen()
 	if e != nil {
 		return e
 	}
@@ -182,6 +161,7 @@ func (r *FullscreenRenderer) initScreen() error {
 	} else {
 		s.DisableMouse()
 	}
+	_screen = s

 	return nil
 }
@@ -194,6 +174,7 @@ func (r *FullscreenRenderer) Init() error {
 	if err := r.initScreen(); err != nil {
 		return err
 	}
+	initTheme(r.theme, r.defaultTheme(), r.forceBlack)

 	return nil
 }
@@ -556,23 +537,14 @@ func (r *FullscreenRenderer) RefreshWindows(windows []Window) {
 	_screen.Show()
 }

-func (r *FullscreenRenderer) NewWindow(top int, left int, width int, height int, windowType WindowType, borderStyle BorderStyle, erase bool) Window {
-	width = util.Max(0, width)
-	height = util.Max(0, height)
-	normal := ColBorder
-	switch windowType {
-	case WindowList:
-		normal = ColNormal
-	case WindowHeader:
-		normal = ColHeader
-	case WindowInput:
-		normal = ColInput
-	case WindowPreview:
+func (r *FullscreenRenderer) NewWindow(top int, left int, width int, height int, preview bool, borderStyle BorderStyle) Window {
+	normal := ColNormal
+	if preview {
 		normal = ColPreview
 	}
 	w := &TcellWindow{
 		color:       r.theme.Colored,
-		windowType:  windowType,
+		preview:     preview,
 		top:         top,
 		left:        left,
 		width:       width,
@@ -583,6 +555,10 @@ func (r *FullscreenRenderer) NewWindow(top int, left int, width int, height int,
 	return w
 }

+func (w *TcellWindow) Close() {
+	// TODO
+}
+
 func fill(x, y, w, h int, n ColorPair, r rune) {
 	for ly := 0; ly <= h; ly++ {
 		for lx := 0; lx <= w; lx++ {
@@ -592,7 +568,11 @@ func fill(x, y, w, h int, n ColorPair, r rune) {
 }

 func (w *TcellWindow) Erase() {
+	if w.borderStyle.shape.HasLeft() {
+		fill(w.left-1, w.top, w.width, w.height-1, w.normal, ' ')
+	} else {
 		fill(w.left, w.top, w.width-1, w.height-1, w.normal, ' ')
+	}
 	w.drawBorder(false)
 }

@@ -601,16 +581,9 @@ func (w *TcellWindow) EraseMaybe() bool {
 	return true
 }

-func (w *TcellWindow) EncloseX(x int) bool {
-	return x >= w.left && x < (w.left+w.width)
-}
-
-func (w *TcellWindow) EncloseY(y int) bool {
-	return y >= w.top && y < (w.top+w.height)
-}
-
 func (w *TcellWindow) Enclose(y int, x int) bool {
-	return w.EncloseX(x) && w.EncloseY(y)
+	return x >= w.left && x < (w.left+w.width) &&
+		y >= w.top && y < (w.top+w.height)
 }

 func (w *TcellWindow) Move(y int, x int) {
@@ -700,7 +673,7 @@ func (w *TcellWindow) fillString(text string, pair ColorPair) FillReturn {
 	}
 	style = style.
 		Blink(a&Attr(tcell.AttrBlink) != 0).
-		Bold(a&Attr(tcell.AttrBold) != 0 || a&BoldForce != 0).
+		Bold(a&Attr(tcell.AttrBold) != 0).
 		Dim(a&Attr(tcell.AttrDim) != 0).
 		Reverse(a&Attr(tcell.AttrReverse) != 0).
 		Underline(a&Attr(tcell.AttrUnderline) != 0).
@@ -787,9 +760,6 @@ func (w *TcellWindow) DrawHBorder() {
 }

 func (w *TcellWindow) drawBorder(onlyHorizontal bool) {
-	if w.height == 0 {
-		return
-	}
 	shape := w.borderStyle.shape
 	if shape == BorderNone {
 		return
@@ -802,17 +772,10 @@ func (w *TcellWindow) drawBorder(onlyHorizontal bool) {

 	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 WindowInput:
-			style = ColInputBorder.style()
-		case WindowPreview:
+		if w.preview {
 			style = ColPreviewBorder.style()
+		} else {
+			style = ColBorder.style()
 		}
 	} else {
 		style = w.normal.style()
--- a/src/tui/ttyname_windows.go
+++ b/src/tui/ttyname_windows.go
@@ -15,7 +15,7 @@ func TtyIn() (*os.File, error) {
 	return os.Stdin, nil
 }

-// TtyOut on Windows returns nil
+// TtyIn on Windows returns nil
 func TtyOut() (*os.File, error) {
 	return nil, nil
 }
--- a/src/tui/tui.go
+++ b/src/tui/tui.go
@@ -205,24 +205,10 @@ type ColorAttr struct {
 	Attr  Attr
 }

-func (a ColorAttr) IsColorDefined() bool {
-	return a.Color != colUndefined
-}
-
 func NewColorAttr() ColorAttr {
 	return ColorAttr{Color: colUndefined, Attr: AttrUndefined}
 }

-func (a ColorAttr) Merge(other ColorAttr) ColorAttr {
-	if other.Color != colUndefined {
-		a.Color = other.Color
-	}
-	if other.Attr != AttrUndefined {
-		a.Attr = a.Attr.Merge(other.Attr)
-	}
-	return a
-}
-
 const (
 	colUndefined Color = -2
 	colDefault   Color = -1
@@ -317,9 +303,6 @@ type ColorTheme struct {
 	Disabled         ColorAttr
 	Fg               ColorAttr
 	Bg               ColorAttr
-	ListFg           ColorAttr
-	ListBg           ColorAttr
-	Nth              ColorAttr
 	SelectedFg       ColorAttr
 	SelectedBg       ColorAttr
 	SelectedMatch    ColorAttr
@@ -328,9 +311,6 @@ type ColorTheme struct {
 	DarkBg           ColorAttr
 	Gutter           ColorAttr
 	Prompt           ColorAttr
-	InputBg          ColorAttr
-	InputBorder      ColorAttr
-	InputLabel       ColorAttr
 	Match            ColorAttr
 	Current          ColorAttr
 	CurrentMatch     ColorAttr
@@ -339,19 +319,13 @@ type ColorTheme struct {
 	Cursor           ColorAttr
 	Marker           ColorAttr
 	Header           ColorAttr
-	HeaderBg         ColorAttr
-	HeaderBorder     ColorAttr
-	HeaderLabel      ColorAttr
 	Separator        ColorAttr
 	Scrollbar        ColorAttr
 	Border           ColorAttr
 	PreviewBorder    ColorAttr
-	PreviewLabel     ColorAttr
 	PreviewScrollbar ColorAttr
 	BorderLabel      ColorAttr
-	ListLabel        ColorAttr
-	ListBorder       ColorAttr
-	GapLine          ColorAttr
+	PreviewLabel     ColorAttr
 }

 type Event struct {
@@ -374,7 +348,6 @@ type BorderShape int

 const (
 	BorderUndefined BorderShape = iota
-	BorderLine
 	BorderNone
 	BorderRounded
 	BorderSharp
@@ -392,7 +365,7 @@ const (

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

 func (s BorderShape) HasRight() bool {
 	switch s {
-	case BorderNone, BorderLine, BorderLeft, BorderTop, BorderBottom, BorderHorizontal: // No right
+	case BorderNone, BorderLeft, BorderTop, BorderBottom, BorderHorizontal: // No right
 		return false
 	}
 	return true
@@ -408,24 +381,12 @@ func (s BorderShape) HasRight() bool {

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

-func (s BorderShape) HasBottom() bool {
-	switch s {
-	case BorderNone, BorderLine, BorderLeft, BorderRight, BorderTop, BorderVertical: // No bottom
-		return false
-	}
-	return true
-}
-
-func (s BorderShape) Visible() bool {
-	return s != BorderNone
-}
-
 type BorderStyle struct {
 	shape       BorderShape
 	top         rune
@@ -441,18 +402,6 @@ type BorderStyle struct {
 type BorderCharacter int

 func MakeBorderStyle(shape BorderShape, unicode bool) BorderStyle {
-	if shape == BorderNone {
-		return BorderStyle{
-			shape:       shape,
-			top:         ' ',
-			bottom:      ' ',
-			left:        ' ',
-			right:       ' ',
-			topLeft:     ' ',
-			topRight:    ' ',
-			bottomLeft:  ' ',
-			bottomRight: ' '}
-	}
 	if !unicode {
 		return BorderStyle{
 			shape:       shape,
@@ -549,6 +498,19 @@ func MakeBorderStyle(shape BorderShape, unicode bool) BorderStyle {
 	}
 }

+func MakeTransparentBorder() BorderStyle {
+	return BorderStyle{
+		shape:       BorderRounded,
+		top:         ' ',
+		bottom:      ' ',
+		left:        ' ',
+		right:       ' ',
+		topLeft:     ' ',
+		topRight:    ' ',
+		bottomLeft:  ' ',
+		bottomRight: ' '}
+}
+
 type TermSize struct {
 	Lines    int
 	Columns  int
@@ -556,18 +518,7 @@ type TermSize struct {
 	PxHeight int
 }

-type WindowType int
-
-const (
-	WindowBase WindowType = iota
-	WindowList
-	WindowPreview
-	WindowInput
-	WindowHeader
-)
-
 type Renderer interface {
-	DefaultTheme() *ColorTheme
 	Init() error
 	Resize(maxHeightFunc func(int) int)
 	Pause(clear bool)
@@ -588,7 +539,7 @@ type Renderer interface {

 	Size() TermSize

-	NewWindow(top int, left int, width int, height int, windowType WindowType, borderStyle BorderStyle, erase bool) Window
+	NewWindow(top int, left int, width int, height int, preview bool, borderStyle BorderStyle) Window
 }

 type Window interface {
@@ -601,11 +552,10 @@ type Window interface {
 	DrawHBorder()
 	Refresh()
 	FinishFill()
+	Close()

 	X() int
 	Y() int
-	EncloseX(x int) bool
-	EncloseY(y int) bool
 	Enclose(y int, x int) bool

 	Move(y int, x int)
@@ -662,11 +612,8 @@ var (
 	ColSpinner              ColorPair
 	ColInfo                 ColorPair
 	ColHeader               ColorPair
-	ColHeaderBorder         ColorPair
-	ColHeaderLabel          ColorPair
 	ColSeparator            ColorPair
 	ColScrollbar            ColorPair
-	ColGapLine              ColorPair
 	ColBorder               ColorPair
 	ColPreview              ColorPair
 	ColPreviewBorder        ColorPair
@@ -674,10 +621,6 @@ var (
 	ColPreviewLabel         ColorPair
 	ColPreviewScrollbar     ColorPair
 	ColPreviewSpinner       ColorPair
-	ColListBorder           ColorPair
-	ColListLabel            ColorPair
-	ColInputBorder          ColorPair
-	ColInputLabel           ColorPair
 )

 func EmptyTheme() *ColorTheme {
@@ -686,8 +629,6 @@ func EmptyTheme() *ColorTheme {
 		Input:            ColorAttr{colUndefined, AttrUndefined},
 		Fg:               ColorAttr{colUndefined, AttrUndefined},
 		Bg:               ColorAttr{colUndefined, AttrUndefined},
-		ListFg:           ColorAttr{colUndefined, AttrUndefined},
-		ListBg:           ColorAttr{colUndefined, AttrUndefined},
 		SelectedFg:       ColorAttr{colUndefined, AttrUndefined},
 		SelectedBg:       ColorAttr{colUndefined, AttrUndefined},
 		SelectedMatch:    ColorAttr{colUndefined, AttrUndefined},
@@ -703,8 +644,6 @@ func EmptyTheme() *ColorTheme {
 		Header:           ColorAttr{colUndefined, AttrUndefined},
 		Border:           ColorAttr{colUndefined, AttrUndefined},
 		BorderLabel:      ColorAttr{colUndefined, AttrUndefined},
-		ListLabel:        ColorAttr{colUndefined, AttrUndefined},
-		ListBorder:       ColorAttr{colUndefined, AttrUndefined},
 		Disabled:         ColorAttr{colUndefined, AttrUndefined},
 		PreviewFg:        ColorAttr{colUndefined, AttrUndefined},
 		PreviewBg:        ColorAttr{colUndefined, AttrUndefined},
@@ -714,14 +653,6 @@ func EmptyTheme() *ColorTheme {
 		PreviewLabel:     ColorAttr{colUndefined, AttrUndefined},
 		Separator:        ColorAttr{colUndefined, AttrUndefined},
 		Scrollbar:        ColorAttr{colUndefined, AttrUndefined},
-		InputBg:          ColorAttr{colUndefined, AttrUndefined},
-		InputBorder:      ColorAttr{colUndefined, AttrUndefined},
-		InputLabel:       ColorAttr{colUndefined, AttrUndefined},
-		HeaderBg:         ColorAttr{colUndefined, AttrUndefined},
-		HeaderBorder:     ColorAttr{colUndefined, AttrUndefined},
-		HeaderLabel:      ColorAttr{colUndefined, AttrUndefined},
-		GapLine:          ColorAttr{colUndefined, AttrUndefined},
-		Nth:              ColorAttr{colUndefined, AttrUndefined},
 	}
 }

@@ -731,8 +662,6 @@ func NoColorTheme() *ColorTheme {
 		Input:            ColorAttr{colDefault, AttrUndefined},
 		Fg:               ColorAttr{colDefault, AttrUndefined},
 		Bg:               ColorAttr{colDefault, AttrUndefined},
-		ListFg:           ColorAttr{colDefault, AttrUndefined},
-		ListBg:           ColorAttr{colDefault, AttrUndefined},
 		SelectedFg:       ColorAttr{colDefault, AttrUndefined},
 		SelectedBg:       ColorAttr{colDefault, AttrUndefined},
 		SelectedMatch:    ColorAttr{colDefault, AttrUndefined},
@@ -755,18 +684,8 @@ func NoColorTheme() *ColorTheme {
 		PreviewBorder:    ColorAttr{colDefault, AttrUndefined},
 		PreviewScrollbar: ColorAttr{colDefault, AttrUndefined},
 		PreviewLabel:     ColorAttr{colDefault, AttrUndefined},
-		ListLabel:        ColorAttr{colDefault, AttrUndefined},
-		ListBorder:       ColorAttr{colDefault, AttrUndefined},
 		Separator:        ColorAttr{colDefault, AttrUndefined},
 		Scrollbar:        ColorAttr{colDefault, AttrUndefined},
-		InputBg:          ColorAttr{colDefault, AttrUndefined},
-		InputBorder:      ColorAttr{colDefault, AttrUndefined},
-		InputLabel:       ColorAttr{colDefault, AttrUndefined},
-		HeaderBg:         ColorAttr{colDefault, AttrUndefined},
-		HeaderBorder:     ColorAttr{colDefault, AttrUndefined},
-		HeaderLabel:      ColorAttr{colDefault, AttrUndefined},
-		GapLine:          ColorAttr{colDefault, AttrUndefined},
-		Nth:              ColorAttr{colUndefined, AttrUndefined},
 	}
 }

@@ -776,8 +695,6 @@ func init() {
 		Input:            ColorAttr{colDefault, AttrUndefined},
 		Fg:               ColorAttr{colDefault, AttrUndefined},
 		Bg:               ColorAttr{colDefault, AttrUndefined},
-		ListFg:           ColorAttr{colUndefined, AttrUndefined},
-		ListBg:           ColorAttr{colUndefined, AttrUndefined},
 		SelectedFg:       ColorAttr{colUndefined, AttrUndefined},
 		SelectedBg:       ColorAttr{colUndefined, AttrUndefined},
 		SelectedMatch:    ColorAttr{colUndefined, AttrUndefined},
@@ -800,23 +717,14 @@ func init() {
 		PreviewBorder:    ColorAttr{colUndefined, AttrUndefined},
 		PreviewScrollbar: ColorAttr{colUndefined, AttrUndefined},
 		PreviewLabel:     ColorAttr{colUndefined, AttrUndefined},
-		ListLabel:        ColorAttr{colUndefined, AttrUndefined},
-		ListBorder:       ColorAttr{colUndefined, AttrUndefined},
 		Separator:        ColorAttr{colUndefined, AttrUndefined},
 		Scrollbar:        ColorAttr{colUndefined, AttrUndefined},
-		InputBg:          ColorAttr{colUndefined, AttrUndefined},
-		InputBorder:      ColorAttr{colUndefined, AttrUndefined},
-		InputLabel:       ColorAttr{colUndefined, AttrUndefined},
-		GapLine:          ColorAttr{colUndefined, AttrUndefined},
-		Nth:              ColorAttr{colUndefined, AttrUndefined},
 	}
 	Dark256 = &ColorTheme{
 		Colored:          true,
 		Input:            ColorAttr{colDefault, AttrUndefined},
 		Fg:               ColorAttr{colDefault, AttrUndefined},
 		Bg:               ColorAttr{colDefault, AttrUndefined},
-		ListFg:           ColorAttr{colUndefined, AttrUndefined},
-		ListBg:           ColorAttr{colUndefined, AttrUndefined},
 		SelectedFg:       ColorAttr{colUndefined, AttrUndefined},
 		SelectedBg:       ColorAttr{colUndefined, AttrUndefined},
 		SelectedMatch:    ColorAttr{colUndefined, AttrUndefined},
@@ -839,23 +747,14 @@ func init() {
 		PreviewBorder:    ColorAttr{colUndefined, AttrUndefined},
 		PreviewScrollbar: ColorAttr{colUndefined, AttrUndefined},
 		PreviewLabel:     ColorAttr{colUndefined, AttrUndefined},
-		ListLabel:        ColorAttr{colUndefined, AttrUndefined},
-		ListBorder:       ColorAttr{colUndefined, AttrUndefined},
 		Separator:        ColorAttr{colUndefined, AttrUndefined},
 		Scrollbar:        ColorAttr{colUndefined, AttrUndefined},
-		InputBg:          ColorAttr{colUndefined, AttrUndefined},
-		InputBorder:      ColorAttr{colUndefined, AttrUndefined},
-		InputLabel:       ColorAttr{colUndefined, AttrUndefined},
-		GapLine:          ColorAttr{colUndefined, AttrUndefined},
-		Nth:              ColorAttr{colUndefined, AttrUndefined},
 	}
 	Light256 = &ColorTheme{
 		Colored:          true,
 		Input:            ColorAttr{colDefault, AttrUndefined},
 		Fg:               ColorAttr{colDefault, AttrUndefined},
 		Bg:               ColorAttr{colDefault, AttrUndefined},
-		ListFg:           ColorAttr{colUndefined, AttrUndefined},
-		ListBg:           ColorAttr{colUndefined, AttrUndefined},
 		SelectedFg:       ColorAttr{colUndefined, AttrUndefined},
 		SelectedBg:       ColorAttr{colUndefined, AttrUndefined},
 		SelectedMatch:    ColorAttr{colUndefined, AttrUndefined},
@@ -878,22 +777,12 @@ func init() {
 		PreviewBorder:    ColorAttr{colUndefined, AttrUndefined},
 		PreviewScrollbar: ColorAttr{colUndefined, AttrUndefined},
 		PreviewLabel:     ColorAttr{colUndefined, AttrUndefined},
-		ListLabel:        ColorAttr{colUndefined, AttrUndefined},
-		ListBorder:       ColorAttr{colUndefined, AttrUndefined},
 		Separator:        ColorAttr{colUndefined, AttrUndefined},
 		Scrollbar:        ColorAttr{colUndefined, AttrUndefined},
-		InputBg:          ColorAttr{colUndefined, AttrUndefined},
-		InputBorder:      ColorAttr{colUndefined, AttrUndefined},
-		InputLabel:       ColorAttr{colUndefined, AttrUndefined},
-		HeaderBg:         ColorAttr{colUndefined, AttrUndefined},
-		HeaderBorder:     ColorAttr{colUndefined, AttrUndefined},
-		HeaderLabel:      ColorAttr{colUndefined, AttrUndefined},
-		GapLine:          ColorAttr{colUndefined, AttrUndefined},
-		Nth:              ColorAttr{colUndefined, AttrUndefined},
 	}
 }

-func InitTheme(theme *ColorTheme, baseTheme *ColorTheme, forceBlack bool, hasInputWindow bool, hasHeaderWindow bool) {
+func initTheme(theme *ColorTheme, baseTheme *ColorTheme, forceBlack bool) {
 	if forceBlack {
 		theme.Bg = ColorAttr{colBlack, AttrUndefined}
 	}
@@ -914,9 +803,7 @@ func InitTheme(theme *ColorTheme, baseTheme *ColorTheme, forceBlack bool, hasInp
 	theme.DarkBg = o(baseTheme.DarkBg, theme.DarkBg)
 	theme.Prompt = o(baseTheme.Prompt, theme.Prompt)
 	theme.Match = o(baseTheme.Match, theme.Match)
-	// 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
-	theme.Current = theme.Fg.Merge(o(baseTheme.Current, theme.Current))
+	theme.Current = o(baseTheme.Current, theme.Current)
 	theme.CurrentMatch = o(baseTheme.CurrentMatch, theme.CurrentMatch)
 	theme.Spinner = o(baseTheme.Spinner, theme.Spinner)
 	theme.Info = o(baseTheme.Info, theme.Info)
@@ -926,15 +813,9 @@ func InitTheme(theme *ColorTheme, baseTheme *ColorTheme, forceBlack bool, hasInp
 	theme.Border = o(baseTheme.Border, theme.Border)
 	theme.BorderLabel = o(baseTheme.BorderLabel, theme.BorderLabel)

-	undefined := NewColorAttr()
-	scrollbarDefined := theme.Scrollbar != undefined
-	previewBorderDefined := theme.PreviewBorder != undefined
-
 	// 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.SelectedFg = o(theme.Fg, theme.SelectedFg)
+	theme.SelectedBg = o(theme.Bg, theme.SelectedBg)
 	theme.SelectedMatch = o(theme.Match, theme.SelectedMatch)
 	theme.Disabled = o(theme.Input, theme.Disabled)
 	theme.Gutter = o(theme.DarkBg, theme.Gutter)
@@ -942,38 +823,9 @@ func InitTheme(theme *ColorTheme, baseTheme *ColorTheme, forceBlack bool, hasInp
 	theme.PreviewBg = o(theme.Bg, theme.PreviewBg)
 	theme.PreviewLabel = o(theme.BorderLabel, theme.PreviewLabel)
 	theme.PreviewBorder = o(theme.Border, theme.PreviewBorder)
-	theme.ListLabel = o(theme.BorderLabel, theme.ListLabel)
-	theme.ListBorder = o(theme.Border, theme.ListBorder)
-	theme.Separator = o(theme.ListBorder, theme.Separator)
-	theme.Scrollbar = o(theme.ListBorder, theme.Scrollbar)
-	theme.GapLine = o(theme.ListBorder, theme.GapLine)
-	/*
-		--color list-border:green
-		--color scrollbar:red
-		--color scrollbar:red,list-border:green
-		--color scrollbar:red,preview-border:green
-	*/
-	if scrollbarDefined && !previewBorderDefined {
-		theme.PreviewScrollbar = o(theme.Scrollbar, theme.PreviewScrollbar)
-	} else {
+	theme.Separator = o(theme.Border, theme.Separator)
+	theme.Scrollbar = o(theme.Border, theme.Scrollbar)
 	theme.PreviewScrollbar = o(theme.PreviewBorder, theme.PreviewScrollbar)
-	}
-	if hasInputWindow {
-		theme.InputBg = o(theme.Bg, theme.InputBg)
-	} else {
-		// We shouldn't use input-bg if there's no separate input window
-		// e.g. fzf --color 'list-bg:green,input-bg:red' --no-input-border
-		theme.InputBg = o(theme.Bg, theme.ListBg)
-	}
-	theme.InputBorder = o(theme.Border, theme.InputBorder)
-	theme.InputLabel = o(theme.BorderLabel, theme.InputLabel)
-	if hasHeaderWindow {
-		theme.HeaderBg = o(theme.Bg, theme.HeaderBg)
-	} else {
-		theme.HeaderBg = o(theme.Bg, theme.ListBg)
-	}
-	theme.HeaderBorder = o(theme.Border, theme.HeaderBorder)
-	theme.HeaderLabel = o(theme.BorderLabel, theme.HeaderLabel)

 	initPalette(theme)
 }
@@ -985,19 +837,19 @@ func initPalette(theme *ColorTheme) {
 		}
 		return ColorPair{fg.Color, bg.Color, fg.Attr}
 	}
-	blank := theme.ListFg
+	blank := theme.Fg
 	blank.Attr = AttrRegular

-	ColPrompt = pair(theme.Prompt, theme.InputBg)
-	ColNormal = pair(theme.ListFg, theme.ListBg)
+	ColPrompt = pair(theme.Prompt, theme.Bg)
+	ColNormal = pair(theme.Fg, theme.Bg)
 	ColSelected = pair(theme.SelectedFg, theme.SelectedBg)
-	ColInput = pair(theme.Input, theme.InputBg)
-	ColDisabled = pair(theme.Disabled, theme.ListBg)
-	ColMatch = pair(theme.Match, theme.ListBg)
+	ColInput = pair(theme.Input, theme.Bg)
+	ColDisabled = pair(theme.Disabled, theme.Bg)
+	ColMatch = pair(theme.Match, theme.Bg)
 	ColSelectedMatch = pair(theme.SelectedMatch, theme.SelectedBg)
 	ColCursor = pair(theme.Cursor, theme.Gutter)
 	ColCursorEmpty = pair(blank, theme.Gutter)
-	if theme.SelectedBg.Color != theme.ListBg.Color {
+	if theme.SelectedBg.Color != theme.Bg.Color {
 		ColMarker = pair(theme.Marker, theme.SelectedBg)
 	} else {
 		ColMarker = pair(theme.Marker, theme.Gutter)
@@ -1008,11 +860,11 @@ func initPalette(theme *ColorTheme) {
 	ColCurrentCursorEmpty = pair(blank, theme.DarkBg)
 	ColCurrentMarker = pair(theme.Marker, theme.DarkBg)
 	ColCurrentSelectedEmpty = pair(blank, theme.DarkBg)
-	ColSpinner = pair(theme.Spinner, theme.InputBg)
-	ColInfo = pair(theme.Info, theme.InputBg)
-	ColSeparator = pair(theme.Separator, theme.InputBg)
-	ColScrollbar = pair(theme.Scrollbar, theme.ListBg)
-	ColGapLine = pair(theme.GapLine, theme.ListBg)
+	ColSpinner = pair(theme.Spinner, theme.Bg)
+	ColInfo = pair(theme.Info, theme.Bg)
+	ColHeader = pair(theme.Header, theme.Bg)
+	ColSeparator = pair(theme.Separator, theme.Bg)
+	ColScrollbar = pair(theme.Scrollbar, theme.Bg)
 	ColBorder = pair(theme.Border, theme.Bg)
 	ColBorderLabel = pair(theme.BorderLabel, theme.Bg)
 	ColPreviewLabel = pair(theme.PreviewLabel, theme.PreviewBg)
@@ -1020,13 +872,6 @@ func initPalette(theme *ColorTheme) {
 	ColPreviewBorder = pair(theme.PreviewBorder, theme.PreviewBg)
 	ColPreviewScrollbar = pair(theme.PreviewScrollbar, theme.PreviewBg)
 	ColPreviewSpinner = pair(theme.Spinner, theme.PreviewBg)
-	ColListLabel = pair(theme.ListLabel, theme.ListBg)
-	ColListBorder = pair(theme.ListBorder, theme.ListBg)
-	ColInputBorder = pair(theme.InputBorder, theme.InputBg)
-	ColInputLabel = pair(theme.InputLabel, theme.InputBg)
-	ColHeader = pair(theme.Header, theme.HeaderBg)
-	ColHeaderBorder = pair(theme.HeaderBorder, theme.HeaderBg)
-	ColHeaderLabel = pair(theme.HeaderLabel, theme.HeaderBg)
 }

 func runeWidth(r rune) int {
--- a/src/util/chars.go
+++ b/src/util/chars.go
@@ -306,5 +306,5 @@ func (chars *Chars) Lines(multiLine bool, maxLines int, wrapCols int, wrapSignWi
 		}
 	}

-	return wrapped, overflow
+	return wrapped, false
 }
--- a/test/test_go.rb
+++ b/test/test_go.rb
@@ -1442,14 +1442,10 @@ class TestGoFZF < TestBase
    writelines(['=' * 10_000 + '0123456789'])
    [0, 3, 6].each do |off|
      tmux.prepare
-      tmux.send_keys "#{FZF} --hscroll-off=#{off} -q 0 --bind space:toggle-hscroll < #{tempname}", :Enter
+      tmux.send_keys "#{FZF} --hscroll-off=#{off} -q 0 < #{tempname}", :Enter
      tmux.until { |lines| assert lines[-3]&.end_with?((0..off).to_a.join + '··') }
      tmux.send_keys '9'
      tmux.until { |lines| assert lines[-3]&.end_with?('789') }
-      tmux.send_keys :Space
-      tmux.until { |lines| assert lines[-3]&.end_with?('=··') }
-      tmux.send_keys :Space
-      tmux.until { |lines| assert lines[-3]&.end_with?('789') }
      tmux.send_keys :Enter
    end
  end
@@ -2137,11 +2133,7 @@ class TestGoFZF < TestBase
  end

  def test_keep_right
-    tmux.send_keys "seq 10000 | #{FZF} --read0 --keep-right --no-multi-line --bind space:toggle-multi-line", :Enter
-    tmux.until { |lines| assert lines.any_include?('9999␊10000') }
-    tmux.send_keys :Space
-    tmux.until { |lines| assert lines.any_include?('> 1') }
-    tmux.send_keys :Space
+    tmux.send_keys "seq 10000 | #{FZF} --read0 --keep-right --no-multi-line", :Enter
    tmux.until { |lines| assert lines.any_include?('9999␊10000') }
  end

@@ -2646,7 +2638,7 @@ class TestGoFZF < TestBase
  end

  def test_change_preview_window
-    tmux.send_keys "seq 1000 | #{FZF} --preview 'echo [[{}]]' --no-preview-border --bind '" \
+    tmux.send_keys "seq 1000 | #{FZF} --preview 'echo [[{}]]' --preview-window border-none --bind '" \
      'a:change-preview(echo __{}__),' \
      'b:change-preview-window(down)+change-preview(echo =={}==)+change-preview-window(up),' \
      'c:change-preview(),d:change-preview-window(hidden),' \
@@ -3081,21 +3073,6 @@ class TestGoFZF < TestBase
    tmux.until { |lines| assert_includes lines, '/1/1/' }
  end

-  def test_alternative_preview_window_opts
-    tmux.send_keys "seq 10 | #{FZF} --preview-window '~5,2,+0,<100000(~0,+100,wrap,noinfo)' --preview 'seq 1000'", :Enter
-    tmux.until { |lines| assert_equal 10, lines.item_count }
-    tmux.until do |lines|
-      assert_equal ['╭────╮', '│ 10 │', '│ 0  │', '│ 10 │', '│ 1  │'], lines.take(5).map(&:strip)
-    end
-  end
-
-  def test_preview_window_width_exception
-    tmux.send_keys "seq 10 | #{FZF} --scrollbar --preview-window border-left --border --preview 'seq 1000'", :Enter
-    tmux.until do |lines|
-      assert lines[1]&.end_with?(' 1/1000││')
-    end
-  end
-
  def test_become
    tmux.send_keys "seq 100 | #{FZF} --bind 'enter:become:seq {} | #{FZF}'", :Enter
    tmux.until { |lines| assert_equal 100, lines.item_count }
@@ -3415,371 +3392,6 @@ class TestGoFZF < TestBase
      assert lines[1]&.end_with?('1000││')
    end
  end
-
-  def test_gap
-    tmux.send_keys %(seq 100 | #{FZF} --gap --border --reverse), :Enter
-    block = <<~BLOCK
-      ╭─────────────────
-      │ >
-      │   100/100 ──────
-      │ > 1
-      │   ┈┈┈┈┈┈┈┈┈┈┈┈┈┈
-      │   2
-      │   ┈┈┈┈┈┈┈┈┈┈┈┈┈┈
-      │   3
-      │   ┈┈┈┈┈┈┈┈┈┈┈┈┈┈
-      │   4
-    BLOCK
-    tmux.until { assert_block(block, _1) }
-  end
-
-  def test_gap_2
-    tmux.send_keys %(seq 100 | #{FZF} --gap=2 --gap-line xyz --border --reverse), :Enter
-    block = <<~BLOCK
-      ╭─────────────────
-      │ >
-      │   100/100 ──────
-      │ > 1
-      │
-      │   xyzxyzxyzxyzxy
-      │   2
-      │
-      │   xyzxyzxyzxyzxy
-      │   3
-    BLOCK
-    tmux.until { assert_block(block, _1) }
-  end
-
-  def test_list_border_and_label
-    tmux.send_keys %(seq 100 | #{FZF} --border rounded --list-border double --list-label list --list-label-pos 2:bottom --header-lines 3 --query 1 --padding 1,2), :Enter
-    block = <<~BLOCK
-      │   ║   11
-      │   ║ > 10
-      │   ║   3
-      │   ║   2
-      │   ║   1
-      │   ║   19/97 ─
-      │   ║ > 1
-      │   ╚list══════
-      │
-      ╰──────────────
-    BLOCK
-    tmux.until { assert_block(block, _1) }
-  end
-
-  def test_input_border_and_label
-    tmux.send_keys %(seq 100 | #{FZF} --border rounded --input-border bold --input-label input --input-label-pos 2 --header-lines 3 --query 1 --padding 1,2), :Enter
-    block = <<~BLOCK
-      │     11
-      │   > 10
-      │     3
-      │     2
-      │     1
-      │   ┏input━━━━━
-      │   ┃   19/97
-      │   ┃ > 1
-      │   ┗━━━━━━━━━━
-      │
-      ╰──────────────
-    BLOCK
-    tmux.until { assert_block(block, _1) }
-  end
-
-  def test_input_border_and_label_header_first
-    tmux.send_keys %(seq 100 | #{FZF} --border rounded --input-border bold --input-label input --input-label-pos 2 --header-lines 3 --query 1 --padding 1,2 --header-first), :Enter
-    block = <<~BLOCK
-      │     11
-      │   > 10
-      │   ┏input━━━━━
-      │   ┃   19/97
-      │   ┃ > 1
-      │   ┗━━━━━━━━━━
-      │     3
-      │     2
-      │     1
-      │
-      ╰──────────────
-    BLOCK
-    tmux.until { assert_block(block, _1) }
-  end
-
-  def test_list_input_border_and_label
-    tmux.send_keys %(
-      seq 100 | #{FZF} --border rounded --list-border double --input-border bold --list-label-pos 2:bottom --input-label-pos 2 --header-lines 3 --query 1 --padding 1,2 \
-      --bind 'start:transform-input-label(echo INPUT)+transform-list-label(echo LIST)' \
-      --bind 'space:change-input-label( input )+change-list-label( list )'
-    ).strip, :Enter
-    block = <<~BLOCK
-      │   ║   11
-      │   ║ > 10
-      │   ╚LIST══════
-      │       3
-      │       2
-      │       1
-      │   ┏INPUT━━━━━
-      │   ┃   19/97
-      │   ┃ > 1
-      │   ┗━━━━━━━━━━
-      │
-      ╰──────────────
-    BLOCK
-    tmux.until { assert_block(block, _1) }
-    tmux.send_keys :Space
-    block = <<~BLOCK
-      │   ║   11
-      │   ║ > 10
-      │   ╚ list ════
-      │       3
-      │       2
-      │       1
-      │   ┏ input ━━━
-      │   ┃   19/97
-      │   ┃ > 1
-      │   ┗━━━━━━━━━━
-      │
-      ╰──────────────
-    BLOCK
-    tmux.until { assert_block(block, _1) }
-  end
-
-  def test_list_input_border_and_label_header_first
-    tmux.send_keys %(
-      seq 100 | #{FZF} --border rounded --list-border double --input-border bold --list-label-pos 2:bottom --input-label-pos 2 --header-lines 3 --query 1 --padding 1,2 \
-      --bind 'start:transform-input-label(echo INPUT)+transform-list-label(echo LIST)' \
-      --bind 'space:change-input-label( input )+change-list-label( list )' --header-first
-    ).strip, :Enter
-    block = <<~BLOCK
-      │   ║   11
-      │   ║ > 10
-      │   ╚LIST══════
-      │   ┏INPUT━━━━━
-      │   ┃   19/97
-      │   ┃ > 1
-      │   ┗━━━━━━━━━━
-      │       3
-      │       2
-      │       1
-      │
-      ╰──────────────
-    BLOCK
-    tmux.until { assert_block(block, _1) }
-    tmux.send_keys :Space
-    block = <<~BLOCK
-      │   ║   11
-      │   ║ > 10
-      │   ╚ list ════
-      │   ┏ input ━━━
-      │   ┃   19/97
-      │   ┃ > 1
-      │   ┗━━━━━━━━━━
-      │       3
-      │       2
-      │       1
-      │
-      ╰──────────────
-    BLOCK
-    tmux.until { assert_block(block, _1) }
-  end
-
-  def test_header_border_and_label
-    tmux.send_keys %(seq 100 | #{FZF} --border rounded --header-lines 3 --header-border sharp --header-label header --header-label-pos 2:bottom --query 1 --padding 1,2), :Enter
-    block = <<~BLOCK
-      │     12
-      │     11
-      │   > 10
-      │   ┌────────
-      │   │ 3
-      │   │ 2
-      │   │ 1
-      │   └header──
-      │     19/97 ─
-      │   > 1
-      │
-      ╰────────────
-    BLOCK
-    tmux.until { assert_block(block, _1) }
-  end
-
-  def test_header_border_and_label_header_first
-    tmux.send_keys %(seq 100 | #{FZF} --border rounded --header-lines 3 --header-border sharp --header-label header --header-label-pos 2:bottom --query 1 --padding 1,2 --header-first), :Enter
-    block = <<~BLOCK
-      │     12
-      │     11
-      │   > 10
-      │     19/97 ─
-      │   > 1
-      │   ┌────────
-      │   │ 3
-      │   │ 2
-      │   │ 1
-      │   └header──
-      │
-      ╰────────────
-    BLOCK
-    tmux.until { assert_block(block, _1) }
-  end
-
-  def test_header_border_and_label_with_list_border
-    tmux.send_keys %(seq 100 | #{FZF} --border rounded --list-border double --list-label list --list-label-pos 2:bottom --header-lines 3 --header-border sharp --header-label header --header-label-pos 2:bottom --query 1 --padding 1,2), :Enter
-    block = <<~BLOCK
-      │   ║   12
-      │   ║   11
-      │   ║ > 10
-      │   ╚list════
-      │   ┌────────
-      │   │   3
-      │   │   2
-      │   │   1
-      │   └header──
-      │     19/97 ─
-      │   > 1
-      │
-      ╰────────────
-    BLOCK
-    tmux.until { assert_block(block, _1) }
-  end
-
-  def test_header_border_and_label_with_list_border_header_first
-    tmux.send_keys %(seq 100 | #{FZF} --border rounded --list-border double --list-label list --list-label-pos 2:bottom --header-lines 3 --header-border sharp --header-label header --header-label-pos 2:bottom --query 1 --padding 1,2 --header-first), :Enter
-    block = <<~BLOCK
-      │   ║   12
-      │   ║   11
-      │   ║ > 10
-      │   ╚list════
-      │     19/97 ─
-      │   > 1
-      │   ┌────────
-      │   │   3
-      │   │   2
-      │   │   1
-      │   └header──
-      │
-      ╰────────────
-    BLOCK
-    tmux.until { assert_block(block, _1) }
-  end
-
-  def test_all_borders
-    tmux.send_keys %(seq 100 | #{FZF} --border rounded --list-border double --list-label list --list-label-pos 2:bottom --header-lines 3 --header-border sharp --header-label header --header-label-pos 2:bottom --query 1 --padding 1,2 --input-border bold --input-label input --input-label-pos 2:bottom), :Enter
-    block = <<~BLOCK
-      │   ║   12
-      │   ║   11
-      │   ║ > 10
-      │   ╚list══════
-      │   ┌──────────
-      │   │   3
-      │   │   2
-      │   │   1
-      │   └header────
-      │   ┏━━━━━━━━━━
-      │   ┃   19/97
-      │   ┃ > 1
-      │   ┗input━━━━━
-      │
-      ╰──────────────
-    BLOCK
-    tmux.until { assert_block(block, _1) }
-  end
-
-  def test_all_borders_header_first
-    tmux.send_keys %(seq 100 | #{FZF} --border rounded --list-border double --list-label list --list-label-pos 2:bottom --header-lines 3 --header-border sharp --header-label header --header-label-pos 2:bottom --query 1 --padding 1,2 --input-border bold --input-label input --input-label-pos 2:bottom --header-first), :Enter
-    block = <<~BLOCK
-      │   ║   12
-      │   ║   11
-      │   ║ > 10
-      │   ╚list══════
-      │   ┏━━━━━━━━━━
-      │   ┃   19/97
-      │   ┃ > 1
-      │   ┗input━━━━━
-      │   ┌──────────
-      │   │   3
-      │   │   2
-      │   │   1
-      │   └header────
-      │
-      ╰──────────────
-    BLOCK
-    tmux.until { assert_block(block, _1) }
-  end
-
-  def test_style_full_adaptive_height
-    tmux.send_keys %(seq 1| #{FZF} --style=full --height=~100% --header-lines=1 --info=default), :Enter
-    block = <<~BLOCK
-      ╭────────
-      ╰────────
-      ╭────────
-      │   1
-      ╰────────
-      ╭────────
-      │   0/0
-      │ >
-      ╰────────
-    BLOCK
-    tmux.until { assert_block(block, _1) }
-  end
-
-  def test_style_full_adaptive_height_double
-    tmux.send_keys %(seq 1| #{FZF} --style=full:double --border --height=~100% --header-lines=1 --info=default), :Enter
-    block = <<~BLOCK
-      ╔══════════
-      ║ ╔════════
-      ║ ╚════════
-      ║ ╔════════
-      ║ ║   1
-      ║ ╚════════
-      ║ ╔════════
-      ║ ║   0/0
-      ║ ║ >
-      ║ ╚════════
-      ╚══════════
-    BLOCK
-    tmux.until { assert_block(block, _1) }
-  end
-
-  def test_change_nth
-    input = [
-      *[''] * 1000,
-      'foo bar bar bar bar',
-      'foo foo bar bar bar',
-      'foo foo foo bar bar',
-      'foo foo foo foo bar',
-      *[''] * 1000
-    ]
-    writelines(input)
-    nths = '1,2..4,-1,-3..,..2'
-    tmux.send_keys %(#{FZF} -qfoo -n#{nths} --bind 'space:change-nth(2|3|4|5|),result:transform-prompt:echo "[$FZF_NTH] "' < #{tempname}), :Enter
-
-    tmux.until do |lines|
-      assert lines.any_include?("[#{nths}] foo")
-      assert_equal 4, lines.match_count
-    end
-    tmux.send_keys :Space
-    tmux.until do |lines|
-      assert lines.any_include?('[2] foo')
-      assert_equal 3, lines.match_count
-    end
-    tmux.send_keys :Space
-    tmux.until do |lines|
-      assert lines.any_include?('[3] foo')
-      assert_equal 2, lines.match_count
-    end
-    tmux.send_keys :Space
-    tmux.until do |lines|
-      assert lines.any_include?('[4] foo')
-      assert_equal 1, lines.match_count
-    end
-    tmux.send_keys :Space
-    tmux.until do |lines|
-      assert lines.any_include?('[5] foo')
-      assert_equal 0, lines.match_count
-    end
-    tmux.send_keys :Space
-    tmux.until do |lines|
-      assert lines.any_include?("[#{nths}] foo")
-      assert_equal 4, lines.match_count
-    end
-  end
 end

 module TestShell
@@ -4091,23 +3703,6 @@ module CompletionTest
    tmux.until { |lines| assert_equal 'unset FZFFOOBAR', lines[-1] }
  end

-  def test_completion_in_command_sequence
-    tmux.send_keys 'export FZFFOOBAR=BAZ', :Enter
-    tmux.prepare
-
-    triggers = ['**', '~~', '++', 'ff', '/']
-    triggers.concat(['&', '[', ';', '`']) 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 'echo foo; QUX=THUD unset FZFFOOBAR', lines[-1] }
-    end
-  end
-
  def test_file_completion_unicode
    FileUtils.mkdir_p('/tmp/fzf-test')
    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'"