Don't emit OSC notifications

See #11442, #11427
2026-05-11 11:11:13 -03:00 · 2025-05-01 07:05:35 +02:00
241 changed files with 744263 additions and 550885 deletions
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -26,7 +26,7 @@ linux_task:
        - lscpu || true
        - (cat /proc/meminfo | grep MemTotal) || true
        - mkdir build && cd build
-        - FISH_TEST_MAX_CONCURRENCY=6 cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug ..
+        - cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCTEST_PARALLEL_LEVEL=6 ..
        - ninja -j 6 fish
        - ninja fish_run_tests
    only_if: $CIRRUS_REPO_OWNER == 'fish-shell'
@@ -45,7 +45,7 @@ linux_arm_task:
        - lscpu || true
        - (cat /proc/meminfo | grep MemTotal) || true
        - mkdir build && cd build
-        - FISH_TEST_MAX_CONCURRENCY=6 cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug ..
+        - cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCTEST_PARALLEL_LEVEL=6 ..
        - ninja -j 6 fish
        - file ./fish
        - ninja fish_run_tests
@@ -54,11 +54,17 @@ linux_arm_task:

 freebsd_task:
    matrix:
-        - name: FreeBSD 14
+        # - name: FreeBSD 14
+        #   freebsd_instance:
+        #       image_family: freebsd-14-0-snap
+        - name: FreeBSD 13
          freebsd_instance:
-              image: freebsd-14-3-release-amd64-ufs
+              image: freebsd-13-2-release-amd64
+        # - name: FreeBSD 12.3
+        #   freebsd_instance:
+        #       image: freebsd-12-3-release-amd64
    tests_script:
-        - pkg install -y cmake-core devel/pcre2 devel/ninja lang/rust misc/py-pexpect git-lite
+        - pkg install -y cmake-core devel/pcre2 devel/ninja misc/py-pexpect git-lite terminfo-db
        # libclang.so is a required build dependency for rust-c++ ffi bridge
        - pkg install -y llvm
        # BSDs have the following behavior: root may open or access files even if
@@ -71,7 +77,15 @@ freebsd_task:
        - mkdir build && cd build
        - chown -R fish-user ..
        - sudo -u fish-user -s whoami
-        - sudo -u fish-user -s FISH_TEST_MAX_CONCURRENCY=1 cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug ..
-        - sudo -u fish-user -s ninja -j 6 fish
-        - sudo -u fish-user -s ninja fish_run_tests
+        # FreeBSD's pkg currently has rust 1.66.0 while we need rust 1.70.0+. Use rustup to install
+        # the latest, but note that it only installs rust per-user.
+        - sudo -u fish-user -s fetch -qo - https://sh.rustup.rs > rustup.sh
+        - sudo -u fish-user -s sh ./rustup.sh -y --profile=minimal
+        # `sudo -s ...` does not invoke a login shell so we need a workaround to make sure the
+        # rustup environment is configured for subsequent `sudo -s ...` commands.
+        # For some reason, this doesn't do the job:
+        # - sudo -u fish-user sh -c 'echo source \$HOME/.cargo/env >> $HOME/.cshrc'
+        - sudo -u fish-user -s cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCTEST_PARALLEL_LEVEL=1 ..
+        - sudo -u fish-user sh -c '. $HOME/.cargo/env; ninja -j 6 fish'
+        - sudo -u fish-user sh -c '. $HOME/.cargo/env; ninja fish_run_tests'
    only_if: $CIRRUS_REPO_OWNER == 'fish-shell'
--- a/.editorconfig
+++ b/.editorconfig
@@ -15,8 +15,8 @@ indent_style = tab
 [*.{md,rst}]
 trim_trailing_whitespace = false

-[*.sh]
-indent_size = 4
+[*.{sh,ac}]
+indent_size = 2

 [Dockerfile]
 indent_size = 2
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,7 +3,7 @@ name: make fish_run_tests
 on: [push, pull_request]

 env:
-  FISH_TEST_MAX_CONCURRENCY: "4"
+  CTEST_PARALLEL_LEVEL: "4"
  CMAKE_BUILD_PARALLEL_LEVEL: "4"

 permissions:
@@ -19,7 +19,7 @@ jobs:
    - uses: dtolnay/rust-toolchain@1.70
    - name: Install deps
      run: |
-        sudo apt install gettext libpcre2-dev python3-pexpect python3-sphinx tmux
+        sudo apt install gettext libpcre2-dev python3-pexpect tmux
        # Generate a locale that uses a comma as decimal separator.
        sudo locale-gen fr_FR.UTF-8
    - name: cmake
@@ -32,14 +32,6 @@ jobs:
    - name: make fish_run_tests
      run: |
        make -C build VERBOSE=1 fish_run_tests
-    - name: translation updates
-      run: |
-        # Generate PO files. This should not result it a change in the repo if all translations are
-        # up to date.
-        # Ensure that fish is available as an executable.
-        PATH="$PWD/build:$PATH" build_tools/update_translations.fish --no-mo
-        # Show diff output. Fail if there is any.
-        git --no-pager diff --exit-code || { echo 'There are uncommitted changes after regenerating the gettext PO files. Make sure to update them via `build_tools/update_translations.fish --no-mo` after changing source files.'; exit 1; }

  ubuntu-32bit-static-pcre2:

@@ -90,14 +82,13 @@ jobs:
    - name: Install deps
      run: |
        sudo apt install gettext libpcre2-dev python3-pexpect tmux
-        sudo apt install llvm # for llvm-symbolizer
    - name: cmake
      env:
          CC: clang
      run: |
        mkdir build && cd build
        # Rust's ASAN requires the build system to explicitly pass a --target triple. We read that
-        # value from CMake variable Rust_CARGO_TARGET.
+        # value from CMake variable Rust_CARGO_TARGET (shared with corrosion).
        cmake .. -DASAN=1 -DRust_CARGO_TARGET=x86_64-unknown-linux-gnu -DCMAKE_BUILD_TYPE=Debug
    - name: make
      run: |
@@ -113,8 +104,8 @@ jobs:
          # UPDATE: this can cause spurious leak reports for __cxa_thread_atexit_impl() under glibc.
          LSAN_OPTIONS: verbosity=0:log_threads=0:use_tls=1:print_suppressions=0
      run: |
-        set -x
-        export ASAN_SYMBOLIZER_PATH=$(command -v /usr/bin/llvm-symbolizer* | sort -n | head -1)
+        llvm_version=$(clang --version | awk 'NR==1 { split($NF, version, "."); print version[1] }')
+        export ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer-$llvm_version
        export LSAN_OPTIONS="$LSAN_OPTIONS:suppressions=$PWD/build_tools/lsan_suppressions.txt"
        make -C build VERBOSE=1 fish_run_tests

--- a/.github/workflows/rust_checks.yml
+++ b/.github/workflows/rust_checks.yml
@@ -13,7 +13,7 @@ jobs:
    - uses: actions/checkout@v3
    - uses: dtolnay/rust-toolchain@stable
    - name: cargo fmt
-      run: cargo fmt --check
+      run: cargo fmt --check --all

  clippy:
    runs-on: ubuntu-latest
@@ -32,19 +32,6 @@ jobs:
      # into automatic CI failure day, so we don't do that.
      run: cargo clippy --workspace --all-targets

-  rustdoc:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - uses: dtolnay/rust-toolchain@stable
-    - name: cargo doc
-      run: |
-        RUSTDOCFLAGS='-D warnings' cargo doc --workspace
-    - name: cargo doctest
-      run: |
-        cargo test --doc --workspace
-
  # Disabling for now because it also checks "advisories",
  # making CI fail for reasons unrelated to the patch
  # cargo-deny:
--- a/.github/workflows/staticbuild.yml
+++ b/.github/workflows/staticbuild.yml
@@ -7,6 +7,10 @@ on:
    # - cron: "14 13 * * *"
    workflow_dispatch:

+env:
+  CTEST_PARALLEL_LEVEL: "1"
+  CMAKE_BUILD_PARALLEL_LEVEL: "4"
+
 jobs:
  staticbuilds-linux:

@@ -32,7 +36,7 @@ jobs:
           cargo build --release --target x86_64-unknown-linux-musl
    - name: Test
      run: |
-           tests/test_driver.py target/x86_64-unknown-linux-musl/release/
+           test -e tests/test_driver.py && tests/test_driver.py -f /tmp target/x86_64-unknown-linux-musl/release/
    - name: Compress
      run: |
           tar -cazf fish-static-x86_64-$(git describe).tar.xz -C target/x86_64-unknown-linux-musl/release/ fish
--- a/.gitignore
+++ b/.gitignore
@@ -38,7 +38,7 @@ Desktop.ini
 Thumbs.db
 ehthumbs.db

-*.mo
+messages.pot
 .directory
 .fuse_hidden*

@@ -77,7 +77,6 @@ __pycache__
 /share/__fish_build_paths.fish
 /share/pkgconfig
 /tests/*.tmp.*
-/tests/.last-check-all-files

 # xcode
 ## Build generated
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,8 +1,6 @@
 fish 4.1.0 (released ???)
 =========================

-.. ignore for 4.1: 10929 10940 10948 10955 10965 10975 10989 10990 10998 11028 11052 11055 11069 11071 11079 11092 11098 11104 11106 11110 11140 11146 11148 11150 11214 11218 11259 11288 11299 11328 11350 11373 11395 11417 11419  
-
 Notable improvements and fixes
 ------------------------------
 - Compound commands (``begin; echo 1; echo 2; end``) can now be now be abbreviated using braces (``{ echo1; echo 2 }``), like in other shells.
@@ -21,7 +19,7 @@ Notable improvements and fixes

 Deprecations and removed features
 ---------------------------------
- Tokens like ``{echo,echo}`` or ``{ echo, echo }`` in command position are no longer interpreted as brace expansion but as compound command.
+- Tokens like ``{ echo, echo }`` in command position are no longer interpreted as brace expansion but as compound command.
 - Terminfo-style key names (``bind -k``) are no longer supported. They had been superseded by the native notation since 4.0,
  and currently they would map back to information from terminfo, which does not match what terminals would send with the kitty keyboard protocol (:issue:`11342`).
 - fish no longer reads the terminfo database, so its behavior is no longer affected by the :envvar:`TERM` environment variable (:issue:`11344`).
@@ -50,7 +48,6 @@ Interactive improvements
 - Left mouse click (as requested by `click_events <terminal-compatibility.html#click-events>`__) can now select pager items (:issue:`10932`).
 - Instead of flashing all the text to the left of the cursor, fish now flashes the matched token during history token search, the completed token during completion (:issue:`11050`), the autosuggestion when deleting it, and the full command line in all other cases.
 - Pasted commands are now stripped of any ``$`` prefix.
- The :kbd:`alt-s` binding will now also use ``run0`` if available.

 New or improved bindings
 ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -67,12 +64,10 @@ New or improved bindings

 Completions
 ^^^^^^^^^^^
- ``git`` completions now show the remote url as a description when completing remotes.
- ``systemctl`` completions no longer print escape codes if ``SYSTEMD_COLORS`` is set (:issue:`11465`).

 Improved terminal support
 ^^^^^^^^^^^^^^^^^^^^^^^^^
- Support for double, curly, dotted and dashed underlines in `fish_color_*` variables and :doc:`set_color <cmds/set_color>` (:issue:`10957`).
+- Support for curly underlines in `fish_color_*` variables and :doc:`set_color <cmds/set_color>` (:issue:`10957`).
 - Underlines can now be colored independent of text (:issue:`7619`).
 - New documentation page `Terminal Compatibility <terminal-compatibility.html>`_ (also accessible via ``man fish-terminal-compatibility``) lists required and optional terminal control sequences used by fish.

--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -219,10 +219,12 @@ Or you can run them on a fish, without involving cmake::

  cargo build
  cargo test # for the unit tests
-  tests/test_driver.py target/debug # for the script and interactive tests
+  tests/test_driver.py --cachedir=/tmp target/debug # for the script and interactive tests

 Here, the first argument to test_driver.py refers to a directory with ``fish``, ``fish_indent`` and ``fish_key_reader`` in it.
 In this example we're in the root of the git repo and have run ``cargo build`` without ``--release``, so it's a debug build.
+The ``--cachedir /tmp`` argument means it will keep the fish_test_helper binary in /tmp instead of recompiling it for every test.
+This saves some time, but isn't strictly necessary.

 Git hooks
 ---------
@@ -284,62 +286,37 @@ Contributing Translations
 Fish uses the GNU gettext library to translate messages from English to
 other languages.

-Translation sources are
+Creating and updating translations requires the Gettext tools, including
+``xgettext``, ``msgfmt`` and ``msgmerge``. Translation sources are
 stored in the ``po`` directory, named ``LANG.po``, where ``LANG`` is the
-two letter ISO 639-1 language code of the target language (e.g. ``de`` for
-German). A region specifier can also be used (e.g. ``pt_BR`` for Brazilian Portuguese).
+two letter ISO 639-1 language code of the target language (eg ``de`` for
+German).

-Adding translations for a new language
--------------------------------------
+To create a new translation:

-Creating new translations requires the Gettext tools.
-More specifically, you will need ``msguniq`` and ``msgmerge`` for creating translations for a new
-language.
-To create a new translation, run::
+* generate a ``messages.pot`` file by running ``build_tools/fish_xgettext.fish`` from
+  the source tree
+* copy ``messages.pot`` to ``po/LANG.po``

-    build_tools/update_translations.fish po/LANG.po
+To update a translation:

-By default, this also creates ``mo`` files, which contain the information from the ``po`` files in a
-binary format.
-Fish uses these files for translating at runtime.
-They are not tracked in version control, but they can help translators check if their translations
-show up correctly.
-If you build fish locally (``cargo build``), and then run the resulting binary,
-it will make use of the ``mo`` files generated by the script.
-Use the ``LANG`` environment variable to tell fish which language to use, e.g.::
+* generate a ``messages.pot`` file by running
+  ``build_tools/fish_xgettext.fish`` from the source tree

-  LANG=pt_BR.utf8 target/debug/fish
+* update the existing translation by running
+  ``msgmerge --update --no-fuzzy-matching po/LANG.po messages.pot``

-If you do not care about the ``mo`` files you can pass the ``--no-mo`` flag to the
-``update_translations.fish`` script.
-
-Modifying existing translations
-------------------------------
-
-If you want to work on translations for a language which already has a corresponding ``po`` file, it
-is sufficient to edit this file. No other changes are necessary.
-
-To see your translations in action you can run::
-
-  build_tools/update_translations.fish --only-mo po/LANG.po
-
-to update the binary ``mo`` used by fish. Check the information for adding new languages for a
-description on how you can get fish to use these files.
-Running this script requires a fish executable and the gettext ``msgfmt`` tool.
-
-Editing PO files
----------------
+The ``--no-fuzzy-matching`` is important as we have had terrible experiences with gettext's "fuzzy" translations in the past.

 Many tools are available for editing translation files, including
-command-line and graphical user interface programs. For simple use, you can use your text editor.
+command-line and graphical user interface programs. For simple use, you can just use your text editor.

 Open up the po file, for example ``po/sv.po``, and you'll see something like::

  msgid "%ls: No suitable job\n"
-  msgstr ""
+  msgstr "" 

-The ``msgid`` here is the "name" of the string to translate, typically the English string to translate.
-The second line (``msgstr``) is where your translation goes.
+The ``msgid`` here is the "name" of the string to translate, typically the english string to translate. The second line (``msgstr``) is where your translation goes.

 For example::

@@ -352,17 +329,11 @@ Also any escaped characters, like that ``\n`` newline at the end, should be kept

 Our tests run ``msgfmt --check-format /path/to/file``, so they would catch mismatched placeholders - otherwise fish would crash at runtime when the string is about to be used.

-Be cautious about blindly updating an existing translation file.
-``msgid`` strings should never be updated manually, only by running the appropriate script.
-
-Modifications to strings in source files
----------------------------------------
-
-If a string changes in the sources, the old translations will no longer work.
-They will be preserved in the ``po`` files, but commented-out (starting with ``#~``).
-If you add/remove/change a translatable strings in a source file,
-run ``build_tools/update_translations.fish`` to propagate this to all translation files (``po/*.po``).
-This is only relevant for developers modifying the source files of fish or fish scripts.
+Be cautious about blindly updating an existing translation file. Trivial
+changes to an existing message (eg changing the punctuation) will cause
+existing translations to be removed, since the tools do literal string
+matching. Therefore, in general, you need to carefully review any
+recommended deletions.

 Setting Code Up For Translations
 --------------------------------
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -89,9 +89,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"

 [[package]]
 name = "errno"
-version = "0.3.11"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
 "libc",
 "windows-sys",
@@ -104,7 +104,6 @@ dependencies = [
 "bitflags",
 "cc",
 "errno",
- "fish-gettext-extraction",
 "fish-printf",
 "libc",
 "lru",
@@ -122,20 +121,11 @@ dependencies = [
 "widestring",
 ]

-[[package]]
-name = "fish-gettext-extraction"
-version = "0.0.1"
-dependencies = [
- "proc-macro2",
-]
-
 [[package]]
 name = "fish-printf"
 version = "0.2.1"
 dependencies = [
 "libc",
- "unicode-segmentation",
- "unicode-width",
 "widestring",
 ]

@@ -183,9 +173,9 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.172"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"

 [[package]]
 name = "lock_api"
@@ -226,9 +216,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"

 [[package]]
 name = "nix"
-version = "0.30.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
 "bitflags",
 "cfg-if",
@@ -356,18 +346,18 @@ checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"

 [[package]]
 name = "proc-macro2"
-version = "1.0.95"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
 "unicode-ident",
 ]

 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
 "proc-macro2",
 ]
@@ -556,18 +546,6 @@ version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"

-[[package]]
-name = "unicode-segmentation"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
-
-[[package]]
-name = "unicode-width"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
-
 [[package]]
 name = "unix_path"
 version = "1.0.1"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,12 +1,11 @@
 [workspace]
 resolver = "2"
-members = ["printf", "gettext-extraction"]
+members = ["printf"]

 [workspace.package]
 # To build revisions that use Corrosion (those before 2024-01), use CMake 3.19, Rustc 1.78 and Rustup 1.27.
 rust-version = "1.70"
 edition = "2021"
-repository = "https://github.com/fish-shell/fish-shell"

 [profile.release]
 overflow-checks = true
@@ -25,6 +24,7 @@ default-run = "fish"
 # see doc_src/license.rst for details
 # don't forget to update COPYING and debian/copyright too
 license = "GPL-2.0-only AND LGPL-2.0-or-later AND MIT AND PSF-2.0"
+repository = "https://github.com/fish-shell/fish-shell"
 homepage = "https://fishshell.com"
 readme = "README.rst"

@@ -40,7 +40,7 @@ libc = "0.2"
 # disabling default features uses the stdlib instead, but it doubles the time to rewrite the history
 # files as of 22 April 2024.
 lru = "0.13.0"
-nix = { version = "0.30.1", default-features = false, features = [
+nix = { version = "0.29.0", default-features = false, features = [
    "event",
    "inotify",
    "resource",
@@ -49,7 +49,6 @@ nix = { version = "0.30.1", default-features = false, features = [
 num-traits = "0.2.19"
 once_cell = "1.19.0"
 fish-printf = { path = "./printf", features = ["widestring"] }
-fish-gettext-extraction = { path = "./gettext-extraction" }

 # Don't use the "getrandom" feature as it requires "getentropy" which was not
 # available on macOS < 10.12. We can enable "getrandom" when we raise the
@@ -100,7 +99,7 @@ embed-data = ["dep:rust-embed"]
 asan = []
 tsan = []

-[workspace.lints]
+[lints]
 rust.non_camel_case_types = "allow"
 rust.non_upper_case_globals = "allow"
 rust.unknown_lints = "allow"
@@ -114,6 +113,3 @@ clippy.needless_lifetimes = "allow"
 # In the future, they might change to flag other methods of printing.
 clippy.print_stdout = "deny"
 clippy.print_stderr = "deny"
-
-[lints]
-workspace = true
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,35 +0,0 @@
-# Security Reporting
-
-If you wish to report a security vulnerability privately, we appreciate your diligence. Please follow the guidelines below to submit your report.
-
-## Reporting
-
-To report a security vulnerability, please provide the following information:
-
-1. **PROJECT**
-
-    - Include the URL of the project repository - Example: <https://github.com/fish-shell/fish-shell>
-
-2. **PUBLIC**
-
-    - Indicate whether this vulnerability has already been publicly discussed or disclosed.
-    - If so, provide relevant links.
-
-3. **DESCRIPTION**
-    - Provide a detailed description of the security vulnerability.
-    - Include as much information as possible to help us understand and address the issue.
-
-Send this information, along with any additional relevant details, to <rf@fishshell.com>.
-
-## Confidentiality
-
-We kindly ask you to keep the report confidential until a public announcement is made.
-
-## Notes
-
-   Vulnerabilities will be handled on a best-effort basis.
-   You may request an advance copy of the patched release, but we cannot guarantee early access before the public release.
-   You will be notified via email simultaneously with the public announcement.
-   We will respond within a few weeks to confirm whether your report has been accepted or rejected.
-
-Thank you for helping to improve the security of our project!
--- a/build.rs
+++ b/build.rs
@@ -3,16 +3,7 @@
 use rsconf::{LinkType, Target};
 use std::env;
 use std::error::Error;
-use std::path::{Path, PathBuf};
-
-fn canonicalize<P: AsRef<Path>>(path: P) -> PathBuf {
-    std::fs::canonicalize(path).unwrap()
-}
-fn canonicalize_str<P: AsRef<Path>>(path: P) -> String {
-    canonicalize(path).to_str().unwrap().to_owned()
-}
-
-const MANIFEST_DIR: &str = env!("CARGO_MANIFEST_DIR");
+use std::path::Path;

 fn main() {
    setup_paths();
@@ -20,19 +11,23 @@ fn main() {
    // Add our default to enable tools that don't go through CMake, like "cargo test" and the
    // language server.

-    let cargo_target_dir: PathBuf = option_env!("CARGO_TARGET_DIR")
-        .map(canonicalize)
-        .unwrap_or(canonicalize(MANIFEST_DIR).join("target"));
-
    // FISH_BUILD_DIR is set by CMake, if we are using it.
-    rsconf::set_env_value(
-        "FISH_BUILD_DIR",
-        option_env!("FISH_BUILD_DIR").unwrap_or(cargo_target_dir.to_str().unwrap()),
-    );
-
+    // OUT_DIR is set by Cargo when the build script is running (not compiling)
+    let default_build_dir = env::var("OUT_DIR").unwrap();
+    let build_dir = option_env!("FISH_BUILD_DIR").unwrap_or(&default_build_dir);
+    let build_dir = std::fs::canonicalize(build_dir).unwrap();
+    let build_dir = build_dir.to_str().unwrap();
+    rsconf::set_env_value("FISH_BUILD_DIR", build_dir);
    // We need to canonicalize (i.e. realpath) the manifest dir because we want to be able to
    // compare it directly as a string at runtime.
-    rsconf::set_env_value("CARGO_MANIFEST_DIR", &canonicalize_str(MANIFEST_DIR));
+    rsconf::set_env_value(
+        "CARGO_MANIFEST_DIR",
+        std::fs::canonicalize(env!("CARGO_MANIFEST_DIR"))
+            .unwrap()
+            .as_path()
+            .to_str()
+            .unwrap(),
+    );

    // Some build info
    rsconf::set_env_value("BUILD_TARGET_TRIPLE", &env::var("TARGET").unwrap());
@@ -46,7 +41,8 @@ fn main() {

    std::env::set_var("FISH_BUILD_VERSION", version);

-    let targetman = cargo_target_dir.join("fish-man");
+    let cman = std::fs::canonicalize(env!("CARGO_MANIFEST_DIR")).unwrap();
+    let targetman = cman.as_path().join("target").join("man");

    #[cfg(feature = "embed-data")]
    #[cfg(not(clippy))]
@@ -67,9 +63,10 @@ fn main() {
    #[cfg(not(debug_assertions))]
    rsconf::rebuild_if_paths_changed(&["doc_src", "share"]);

-    rsconf::rebuild_if_env_changed("FISH_GETTEXT_EXTRACTION_FILE");
-
-    cc::Build::new().file("src/libc.c").compile("flibc.a");
+    cc::Build::new()
+        .file("src/libc.c")
+        .include(build_dir)
+        .compile("flibc.a");

    let mut build = cc::Build::new();
    // Add to the default library search path
@@ -146,9 +143,9 @@ fn detect_apple(_: &Target) -> Result<bool, Box<dyn Error>> {
    Ok(cfg!(any(target_os = "ios", target_os = "macos")))
 }

+#[allow(unexpected_cfgs)]
 fn detect_cygwin(_: &Target) -> Result<bool, Box<dyn Error>> {
-    // Cygwin target is usually cross-compiled.
-    Ok(std::env::var("CARGO_CFG_TARGET_OS").unwrap() == "cygwin")
+    Ok(cfg!(target_os = "cygwin"))
 }

 /// Detect if we're being compiled for a BSD-derived OS, allowing targeting code conditionally with
@@ -255,6 +252,8 @@ fn has_small_stack(_: &Target) -> Result<bool, Box<dyn Error>> {
 }

 fn setup_paths() {
+    #[cfg(unix)]
+    use std::path::PathBuf;
    #[cfg(windows)]
    use unix_path::{Path, PathBuf};

@@ -352,8 +351,8 @@ fn get_version(src_dir: &Path) -> String {
    // or because it refused (safe.directory applies to `git describe`!)
    // So we read the SHA ourselves.
    fn get_git_hash() -> Result<String, Box<dyn std::error::Error>> {
-        let gitdir = Path::new(MANIFEST_DIR).join(".git");
-        let jjdir = Path::new(MANIFEST_DIR).join(".jj");
+        let gitdir = Path::new(env!("CARGO_MANIFEST_DIR")).join(".git");
+        let jjdir = Path::new(env!("CARGO_MANIFEST_DIR")).join(".jj");
        let commit_id = if gitdir.exists() {
            // .git/HEAD contains ref: refs/heads/branch
            let headpath = gitdir.join("HEAD");
@@ -398,7 +397,10 @@ fn build_man(build_dir: &Path) {
    use std::process::Command;
    let mandir = build_dir;
    let sec1dir = mandir.join("man1");
-    let docsrc_path = canonicalize(MANIFEST_DIR).join("doc_src");
+    let docsrc_path = std::fs::canonicalize(env!("CARGO_MANIFEST_DIR"))
+        .unwrap()
+        .as_path()
+        .join("doc_src");
    let docsrc = docsrc_path.to_str().unwrap();
    let args = &[
        "-j",
--- a/build_tools/check.sh
+++ b/build_tools/check.sh
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-{
-set -ex
-
-lint=true
-if [ "$FISH_CHECK_LINT" = false ]; then
-    lint=false
-fi
-
-cargo_args=$FISH_CHECK_CARGO_ARGS
-target_triple=$FISH_CHECK_TARGET_TRIPLE
-if [ -n "$target_triple" ]; then
-    cargo_args="$cargo_args --target=$FISH_CHECK_TARGET_TRIPLE"
-fi
-
-cargo() {
-    subcmd=$1
-    shift
-    # shellcheck disable=2086
-    command cargo "$subcmd" $cargo_args "$@"
-}
-
-cleanup () {
-    if [ -n "$template_file" ] && [ -e "$template_file" ]; then
-        rm "$template_file"
-    fi
-}
-
-trap cleanup EXIT INT TERM HUP
-
-if $lint; then
-    export RUSTFLAGS="--deny=warnings ${RUSTFLAGS}"
-    export RUSTDOCFLAGS="--deny=warnings ${RUSTDOCFLAGS}"
-fi
-
-repo_root="$(dirname "$0")/.."
-build_dir="${CARGO_TARGET_DIR:-$repo_root/target}/${target_triple}/debug"
-
-template_file=$(mktemp)
-FISH_GETTEXT_EXTRACTION_FILE=$template_file cargo build --workspace --all-targets
-if $lint; then
-    PATH="$build_dir:$PATH" "$repo_root/build_tools/style.fish" --all --check
-    cargo clippy --workspace --all-targets
-fi
-cargo test --no-default-features --workspace --all-targets
-cargo test --doc --workspace
-if $lint; then
-    cargo doc --workspace
-fi
-FISH_GETTEXT_EXTRACTION_FILE=$template_file "$repo_root/tests/test_driver.py" "$build_dir"
-
-exit
-}
--- a/build_tools/diff_profiles.fish
+++ b/build_tools/diff_profiles.fish
@@ -5,13 +5,6 @@
 #
 # Usage: ./diff_profiles.fish profile1.log profile2.log > profile_diff.log

-if test (count $argv) -ne 2
-
-    echo "Incorrect number of arguments."
-    echo "Usage: "(status filename)" profile1.log profile2.log"
-    exit 1
-end
-
 set -l profile1 (cat $argv[1])
 set -l profile2 (cat $argv[2])

@@ -22,13 +15,13 @@ while set -l next_line_no (math $line_no + 1) && set -q profile1[$next_line_no]
    set -l line1 $profile1[$line_no]
    set -l line2 $profile2[$line_no]

-    if not string match -qr '^\s*\d+\s+\d+' $line1
+    if not string match -qr '^\d+\t\d+' $line1
        echo $line1
        continue
    end

-    set -l results1 (string match -r '^\s*(\d+)\s+(\d+)\s+(.*)' $line1)
-    set -l results2 (string match -r '^\s*(\d+)\s+(\d+)\s+(.*)' $line2)
+    set -l results1 (string match -r '^(\d+)\t(\d+)\s+(.*)' $line1)
+    set -l results2 (string match -r '^(\d+)\t(\d+)\s+(.*)' $line2)

    # times from both files
    set -l time1 $results1[2..3]
@@ -49,5 +42,5 @@ while set -l next_line_no (math $line_no + 1) && set -q profile1[$next_line_no]
    set diff[1] (math $time1[1] - $time2[1])
    set diff[2] (math $time1[2] - $time2[2])

-    printf '%10d %10d %s\n' $diff[1] $diff[2] $remainder1
+    echo $diff[1] $diff[2] $remainder1
 end
--- a/build_tools/fish_xgettext.fish
+++ b/build_tools/fish_xgettext.fish
@@ -1,87 +1,68 @@
 #!/usr/bin/env fish
 #
-# Tool to generate gettext messages template file.
-# Writes to stdout.
-# Intended to be called from `update_translations.fish`.
+# Tool to generate messages.pot

-argparse use-existing-template= -- $argv
-or exit $status
+# Create temporary directory for these operations. OS X `mktemp` is somewhat restricted, so this block
+# works around that - based on share/functions/funced.fish.
+set -q TMPDIR
+or set -l TMPDIR /tmp
+set -l tmpdir (mktemp -d $TMPDIR/fish.XXXXXX)
+or exit 1

-begin
-    # Write header. This is required by msguniq.
-    # Note that this results in the file being overwritten.
-    # This is desired behavior, to get rid of the results of prior invocations
-    # of this script.
-    begin
-        echo 'msgid ""'
-        echo 'msgstr ""'
-        echo '"Content-Type: text/plain; charset=UTF-8\n"'
-        echo ""
-    end
+# This is a gigantic crime.
+# xgettext still does not support rust *at all*, so we use cargo-expand to get all our wgettext invocations.
+set -l expanded (cargo expand --lib; for f in fish{,_indent,_key_reader}; cargo expand --bin $f; end)

-    set -g repo_root (status dirname)/..
+# Extract any gettext call
+set -l strs (printf '%s\n' $expanded | grep -A1 wgettext_static_str |
+             grep 'widestring::internals::core::primitive::str =' |
+             string match -rg '"(.*)"' | string match -rv '^%ls$|^$' |
+             # escaping difference between gettext and cargo-expand: single-quotes
+             string replace -a "\'" "'" | sort -u)

-    set -l rust_extraction_file
-    if set -l --query _flag_use_existing_template
-        set rust_extraction_file $_flag_use_existing_template
-    else
-        set rust_extraction_file (mktemp)
-        # We need to build to ensure that the proc macro for extracting strings runs.
-        FISH_GETTEXT_EXTRACTION_FILE=$rust_extraction_file cargo check
-        or exit 1
-    end
+# Extract any constants
+set -a strs (string match -rv 'BUILD_VERSION:|PACKAGE_NAME' -- $expanded |
+             string match -rg 'const [A-Z_]*: &str = "(.*)"' | string replace -a "\'" "'")

-    # Get rid of duplicates and sort.
-    msguniq --no-wrap --strict --sort-output $rust_extraction_file
-    or exit 1
+# We construct messages.pot ourselves instead of forcing this into msgmerge or whatever.
+# The escaping so far works out okay.
+for str in $strs
+    # grep -P needed for string escape to be compatible (PCRE-style),
+    # -H gives the filename, -n the line number.
+    # If you want to run this on non-GNU grep: Don't.
+    echo "#:" (grep -PHn -r -- (string escape --style=regex -- $str) src/ |
+    head -n1 | string replace -r ':\s.*' '')
+    echo "msgid \"$str\""
+    echo 'msgstr ""'
+end >messages.pot

-    if not set -l --query _flag_use_existing_template
-        rm $rust_extraction_file
-    end
+# This regex handles descriptions for `complete` and `function` statements. These messages are not
+# particularly important to translate. Hence the "implicit" label.
+set -l implicit_regex '(?:^| +)(?:complete|function).*? (?:-d|--description) (([\'"]).+?(?<!\\\\)\\2).*'

-    function extract_fish_script_messages --argument-names regex
+# This regex handles explicit requests to translate a message. These are more important to translate
+# than messages which should be implicitly translated.
+set -l explicit_regex '.*\( *_ (([\'"]).+?(?<!\\\\)\\2) *\).*'

-        # Using xgettext causes more trouble than it helps.
-        # This is due to handling of escaping in fish differing from formats xgettext understands
-        # (e.g. POSIX shell strings).
-        # We work around this issue by manually writing the file content.
+mkdir -p $tmpdir/implicit/share/completions $tmpdir/implicit/share/functions
+mkdir -p $tmpdir/explicit/share/completions $tmpdir/explicit/share/functions

-        # Steps:
-        # 1. We extract strings to be translated from the relevant files and drop the rest. This step
-        #    depends on the regex matching the entire line, and the first capture group matching the
-        #    string.
-        # 2. We unescape. This gets rid of some escaping necessary in fish strings.
-        # 3. The resulting strings are sorted alphabetically. This step is optional. Not sorting would
-        #    result in strings from the same file appearing together. Removing duplicates is also
-        #    optional, since msguniq takes care of that later on as well.
-        # 4. Single backslashes are replaced by double backslashes. This results in the backslashes
-        #    being interpreted as literal backslashes by gettext tooling.
-        # 5. Double quotes are escaped, such that they are not interpreted as the start or end of
-        #    a msgid.
-        # 6. We transform the string into the format expected in a PO file.
-        cat $share_dir/config.fish $share_dir/completions/*.fish $share_dir/functions/*.fish |
-            string replace --filter --regex $regex '$1' |
-            string unescape |
-            sort -u |
-            sed -E -e 's_\\\\_\\\\\\\\_g' -e 's_"_\\\\"_g' -e 's_^(.*)$_msgid "\1"\nmsgstr ""\n_'
-    end
+for f in share/config.fish share/completions/*.fish share/functions/*.fish
+    # Extract explicit attempts to translate a message. That is, those that are of the form
+    # `(_ "message")`.
+    string replace --filter --regex $explicit_regex '$1' <$f | string unescape \
+        | string replace --all '"' '\\"' | string replace -r '(.*)' 'N_ "$1"' >$tmpdir/explicit/$f

-    set -g share_dir $repo_root/share
+    # Handle `complete` / `function` description messages. The `| fish` is subtle. It basically
+    # avoids the need to use `source` with a command substitution that could affect the current
+    # shell.
+    string replace --filter --regex $implicit_regex '$1' <$f | string unescape \
+        | string replace --all '"' '\\"' | string replace -r '(.*)' 'N_ "$1"' >$tmpdir/implicit/$f
+end

-    # This regex handles explicit requests to translate a message. These are more important to translate
-    # than messages which should be implicitly translated.
-    set -l explicit_regex '.*\( *_ (([\'"]).+?(?<!\\\\)\\2) *\).*'
-    extract_fish_script_messages $explicit_regex
+xgettext -j -k -kN_ -LShell --from-code=UTF-8 -cDescription --no-wrap -o messages.pot $tmpdir/{ex,im}plicit/share/*/*.fish

-    # This regex handles descriptions for `complete` and `function` statements. These messages are not
-    # particularly important to translate. Hence the "implicit" label.
-    set -l implicit_regex '^(?:\s|and |or )*(?:complete|function).*? (?:-d|--description) (([\'"]).+?(?<!\\\\)\\2).*'
-    extract_fish_script_messages $implicit_regex
-end |
-    # At this point, all extracted strings have been written to stdout,
-    # starting with the ones taken from the Rust sources,
-    # followed by strings explicitly marked for translation in fish scripts,
-    # and finally the strings from fish scripts which get translated implicitly.
-    # Because we do not eliminate duplicates across these categories,
-    # we do it here, since other gettext tools expect no duplicates.
-    msguniq --no-wrap
+# Remove the tmpdir from the location to avoid churn
+sed -i 's_^#: /.*/share/_#: share/_' messages.pot
+
+rm -r $tmpdir
--- a/build_tools/make_pkg.sh
+++ b/build_tools/make_pkg.sh
@@ -3,18 +3,18 @@
 # Script to produce an OS X installer .pkg and .app(.zip)

 usage() {
-    echo "Build macOS packages, optionally signing and notarizing them."
-    echo "Usage: $0 options"
-    echo "Options:"
-    echo "  -s                            Enables code signing"
-    echo "  -f <APP_KEY.p12>              Path to .p12 file for application signing"
-    echo "  -i <INSTALLER_KEY.p12>        Path to .p12 file for installer signing"
-    echo "  -p <PASSWORD>                 Password for the .p12 files (necessary to access the certificates)"
-    echo "  -e <entitlements file>        (Optional) Path to an entitlements XML file"
-    echo "  -n                            Enables notarization. This will fail if code signing is not also enabled."
-    echo "  -j <API_KEY.JSON>             Path to JSON file generated with \`rcodesign encode-app-store-connect-api-key\` (required for notarization)"
-    echo
-    exit 1
+  echo "Build macOS packages, optionally signing and notarizing them."
+  echo "Usage: $0 options"
+  echo "Options:"
+  echo "  -s                            Enables code signing"
+  echo "  -f <APP_KEY.p12>              Path to .p12 file for application signing"
+  echo "  -i <INSTALLER_KEY.p12>        Path to .p12 file for installer signing"
+  echo "  -p <PASSWORD>                 Password for the .p12 files (necessary to access the certificates)"
+  echo "  -e <entitlements file>        (Optional) Path to an entitlements XML file"
+  echo "  -n                            Enables notarization. This will fail if code signing is not also enabled."
+  echo "  -j <API_KEY.JSON>             Path to JSON file generated with \`rcodesign encode-app-store-connect-api-key\` (required for notarization)"
+  echo
+  exit 1
 }

 set -x
@@ -33,32 +33,32 @@ X86_64_DEPLOY_TARGET='MACOSX_DEPLOYMENT_TARGET=10.9'
 RUST_VERSION_X86_64=1.73.0

 while getopts "sf:i:p:e:nj:" opt; do
-    case $opt in
-        s) SIGN=1;;
-        f) P12_APP_FILE=$(realpath "$OPTARG");;
-        i) P12_INSTALL_FILE=$(realpath "$OPTARG");;
-        p) P12_PASSWORD="$OPTARG";;
-        e) ENTITLEMENTS_FILE=$(realpath "$OPTARG");;
-        n) NOTARIZE=1;;
-        j) API_KEY_FILE=$(realpath "$OPTARG");;
-        \?) usage;;
-    esac
+  case $opt in
+    s) SIGN=1;;
+    f) P12_APP_FILE=$(realpath "$OPTARG");;
+    i) P12_INSTALL_FILE=$(realpath "$OPTARG");;
+    p) P12_PASSWORD="$OPTARG";;
+    e) ENTITLEMENTS_FILE=$(realpath "$OPTARG");;
+    n) NOTARIZE=1;;
+    j) API_KEY_FILE=$(realpath "$OPTARG");;
+    \?) usage;;
+  esac
 done

 if [ -n "$SIGN" ] && { [ -z "$P12_APP_FILE" ] || [ -z "$P12_INSTALL_FILE" ] || [ -z "$P12_PASSWORD" ]; }; then
-    usage
+  usage
 fi

 if [ -n "$NOTARIZE" ] && [ -z "$API_KEY_FILE" ]; then
-    usage
+  usage
 fi

 VERSION=$(git describe --always --dirty 2>/dev/null)
 if test -z "$VERSION" ; then
-    echo "Could not get version from git"
-    if test -f version; then
-        VERSION=$(cat version)
-    fi
+  echo "Could not get version from git"
+  if test -f version; then
+    VERSION=$(cat version)
+  fi
 fi

 echo "Version is $VERSION"
@@ -76,7 +76,7 @@ mkdir -p "$PKGDIR/build_x86_64" "$PKGDIR/build_arm64" "$PKGDIR/root" "$PKGDIR/in
 # and will probably not be built universal, so the package will fail to validate/run on other systems.
 # Note CMAKE_OSX_ARCHITECTURES is still relevant for the Mac app.
 { cd "$PKGDIR/build_arm64" \
-    && cmake \
+  && cmake \
        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
        -DCMAKE_EXE_LINKER_FLAGS="-Wl,-ld_classic" \
        -DWITH_GETTEXT=OFF \
@@ -91,7 +91,7 @@ mkdir -p "$PKGDIR/build_x86_64" "$PKGDIR/build_arm64" "$PKGDIR/root" "$PKGDIR/in
 # Build for x86-64 but do not install; instead we will make some fat binaries inside the root.
 # Set RUST_VERSION_X86_64 to the last version of Rust that supports macOS 10.9.
 { cd "$PKGDIR/build_x86_64" \
-    && cmake \
+  && cmake \
        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
        -DCMAKE_EXE_LINKER_FLAGS="-Wl,-ld_classic" \
        -DWITH_GETTEXT=OFF \
@@ -99,7 +99,7 @@ mkdir -p "$PKGDIR/build_x86_64" "$PKGDIR/build_arm64" "$PKGDIR/root" "$PKGDIR/in
        -DRust_CARGO_TARGET=x86_64-apple-darwin \
        -DCMAKE_OSX_ARCHITECTURES='arm64;x86_64' \
        -DFISH_USE_SYSTEM_PCRE2=OFF "$SRC_DIR" \
-    && env $X86_64_DEPLOY_TARGET make VERBOSE=1 -j 12; }
+  && env $X86_64_DEPLOY_TARGET make VERBOSE=1 -j 12; }

 # Fatten them up.
 for FILE in "$PKGDIR"/root/usr/local/bin/*; do
--- a/build_tools/make_tarball.sh
+++ b/build_tools/make_tarball.sh
@@ -18,22 +18,22 @@ set -e
 BUILD_TOOL="make"
 BUILD_GENERATOR="Unix Makefiles"
 if command -v ninja >/dev/null; then
-    BUILD_TOOL="ninja"
-    BUILD_GENERATOR="Ninja"
+  BUILD_TOOL="ninja"
+  BUILD_GENERATOR="Ninja"
 fi

 # We need GNU tar as that supports the --mtime and --transform options
 TAR=notfound
 for try in tar gtar gnutar; do
-    if $try -Pcf /dev/null --mtime now /dev/null >/dev/null 2>&1; then
-        TAR=$try
-        break
-    fi
+  if $try -Pcf /dev/null --mtime now /dev/null >/dev/null 2>&1; then
+    TAR=$try
+    break
+  fi
 done

 if [ "$TAR" = "notfound" ]; then
-    echo 'No suitable tar (supporting --mtime) found as tar/gtar/gnutar in PATH'
-    exit 1
+  echo 'No suitable tar (supporting --mtime) found as tar/gtar/gnutar in PATH'
+  exit 1
 fi

 # Get the current directory, which we'll use for symlinks
@@ -63,7 +63,7 @@ cmake -G "$BUILD_GENERATOR" -DCMAKE_BUILD_TYPE=Debug "$wd"
 $BUILD_TOOL doc

 TAR_APPEND="$TAR --append --file=$path --mtime=now --owner=0 --group=0 \
-    --mode=g+w,a+rX --transform s/^/$prefix\//"
+  --mode=g+w,a+rX --transform s/^/$prefix\//"
 $TAR_APPEND --no-recursion user_doc
 $TAR_APPEND user_doc/html user_doc/man
 $TAR_APPEND version
--- a/build_tools/make_vendor_tarball.sh
+++ b/build_tools/make_vendor_tarball.sh
@@ -11,15 +11,15 @@ set -e
 # We need GNU tar as that supports the --mtime and --transform options
 TAR=notfound
 for try in tar gtar gnutar; do
-    if $try -Pcf /dev/null --mtime now /dev/null >/dev/null 2>&1; then
-        TAR=$try
-        break
-    fi
+  if $try -Pcf /dev/null --mtime now /dev/null >/dev/null 2>&1; then
+    TAR=$try
+    break
+  fi
 done

 if [ "$TAR" = "notfound" ]; then
-    echo 'No suitable tar (supporting --mtime) found as tar/gtar/gnutar in PATH'
-    exit 1
+  echo 'No suitable tar (supporting --mtime) found as tar/gtar/gnutar in PATH'
+  exit 1
 fi

 # Get the current directory, which we'll use for telling Cargo where to find the sources
--- a/build_tools/style.fish
+++ b/build_tools/style.fish
@@ -1,53 +1,38 @@
 #!/usr/bin/env fish
 #
-# This runs Python files, fish scripts (*.fish), and Rust files
-# through their respective code formatting programs.
+# This runs C++ files and fish scripts (*.fish) through their respective code
+# formatting programs.
 #
-# `--all`: Format all eligible files instead of the ones specified as arguments.
-# `--check`: Instead of reformatting, fail if a file is not formatted correctly.
-# `--force`: Proceed without asking if uncommitted changes are detected.
-#            Only relevant if `--all` is specified but `--check` is not specified.
-
 set -l fish_files
 set -l python_files
 set -l rust_files
 set -l all no

-argparse all check force -- $argv
-or exit $status
-
-if set -l -q _flag_all
+if test "$argv[1]" = --all
    set all yes
-    if set -q argv[1]
-        echo "Unexpected arguments: '$argv'"
-        exit 1
-    end
+    set -e argv[1]
 end

-set -l repo_root (status dirname)/..
+if set -q argv[1]
+    echo "Unexpected arguments: '$argv'"
+    exit 1
+end

 if test $all = yes
-    if not set -l -q _flag_force; and not set -l -q _flag_check
-        # Potential for false positives: Not all fish files are formatted, see the `fish_files`
-        # definition below.
-        set -l relevant_uncommitted_changes (git status --porcelain --short --untracked-files=all | sed -e 's/^ *[^ ]* *//' | grep -E '.*\.(fish|py|rs)$')
-        if set -q relevant_uncommitted_changes[1]
-            for changed_file in $relevant_uncommitted_changes
-                echo $changed_file
-            end
-            echo
-            echo 'You have uncommitted changes (listed above). Are you sure you want to restyle?'
-            read -P 'y/N? ' -n1 -l ans
-            if not string match -qi y -- $ans
-                exit 1
-            end
+    set -l files (git status --porcelain --short --untracked-files=all | sed -e 's/^ *[^ ]* *//')
+    if set -q files[1]
+        echo
+        echo 'You have uncommitted changes. Are you sure you want to restyle?'
+        read -P 'y/N? ' -n1 -l ans
+        if not string match -qi y -- $ans
+            exit 1
        end
    end
-    set fish_files $repo_root/{benchmarks,build_tools,etc,share}/**.fish
+    set fish_files share/**.fish
    set python_files {doc_src,share,tests}/**.py
+    set rust_files fish-rust/src/**.rs
 else
-    # Format the files specified as arguments.
-    set -l files $argv
+    # Extract just the fish files.
    set fish_files (string match -r '^.*\.fish$' -- $files)
    set python_files (string match -r '^.*\.py$' -- $files)
    set rust_files (string match -r '^.*\.rs$' -- $files)
@@ -55,73 +40,37 @@ end

 set -l red (set_color red)
 set -l green (set_color green)
-set -l yellow (set_color yellow)
+set -l blue (set_color blue)
 set -l normal (set_color normal)

+# Run the fish reformatter if we have any fish files.
 if set -q fish_files[1]
    if not type -q fish_indent
-        echo
-        echo $yellow'Could not find `fish_indent` in `$PATH`.'$normal
-        echo
-    else
-        echo === Running "$green"fish_indent"$normal"
-        if set -l -q _flag_check
-            if not fish_indent --check -- $fish_files
-                echo $red"Fish files are not formatted correctly."$normal
-                exit 1
-            end
-        else
-            fish_indent -w -- $fish_files
-        end
+        make fish_indent
+        set PATH . $PATH
    end
+    echo === Running "$green"fish_indent"$normal"
+    fish_indent -w -- $fish_files
 end

 if set -q python_files[1]
    if not type -q black
        echo
-        echo $yellow'Please install `black` to style python'$normal
+        echo Please install "`black`" to style python
        echo
    else
-        echo === Running "$green"black"$normal"
-        if set -l -q _flag_check
-            if not black --check $python_files
-                echo $red"Python files are not formatted correctly."$normal
-                exit 1
-            end
-        else
-            black $python_files
-        end
+        echo === Running "$blue"black"$normal"
+        black $python_files
    end
 end

-if not cargo fmt --version >/dev/null
-    echo
-    echo $yellow'Please install "rustfmt" to style Rust, e.g. via:'
-    echo "rustup component add rustfmt"$normal
-    echo
-else
-    echo === Running "$green"rustfmt"$normal"
-    if set -l -q _flag_check
-        if set -l -q _flag_all
-            if not cargo fmt --check
-                echo $red"Rust files are not formatted correctly."$normal
-                exit 1
-            end
-        else
-            if set -q rust_files[1]
-                if not rustfmt --check --files-with-diff $rust_files
-                    echo $red"Rust files are not formatted correctly."
-                    exit 1
-                end
-            end
-        end
+if set -q rust_files[1]
+    if not type -q rustfmt
+        echo
+        echo Please install "`rustfmt`" to style rust
+        echo
    else
-        if set -l -q _flag_all
-            cargo fmt
-        else
-            if set -q rust_files[1]
-                rustfmt $rust_files
-            end
-        end
+        echo === Running "$blue"rustfmt"$normal"
+        rustfmt $rust_files
    end
 end
--- a/build_tools/update_translations.fish
+++ b/build_tools/update_translations.fish
@@ -1,145 +0,0 @@
-#!/usr/bin/env fish
-
-# Updates the files used for gettext translations.
-# By default, the whole xgettext, msgmerge, msgfmt pipeline runs,
-# which extracts the messages from the source files into $template_file,
-# updates the PO files for each language from that
-# (changed line numbers, added messages, removed messages),
-# and finally generates a machine-readable MO file for each language,
-# which is stored in share/locale/$LANG/LC_MESSAGES/fish.mo (relative to the repo root).
-#
-# Use cases:
-# For developers:
-#   - Run with args `--no-mo` to update all PO files after making changes to Rust/fish
-#     sources.
-# For translators:
-#   - Run with `--no-mo` first, to ensure that the strings you are translating are up to date.
-#   - Specify the language you want to work on as an argument, which must be a file in the po/
-#     directory. You can specify a language which does not have translations yet by specifying the
-#     name of a file which does not yet exist. Make sure to follow the naming convention.
-# For testing:
-#   - Specify `--dry-run` to see if any updates to the PO files would by applied by this script.
-#     If this flag is specified, the script will exit with an error if there are outstanding
-#     changes, and will display the diff. Do not specify other flags if `--dry-run` is specified.
-#
-# Specify `--use-existing-template=FILE` to prevent running cargo for extracting an up-to-date
-# version of the localized strings. This flag is intended for testing setups which make it
-# inconvenient to run cargo here, but run it in an earlier step to ensure up-to-date values.
-# This argument is passed on to the `fish_xgettext.fish` script and has no other uses.
-# `FILE` must be the path to a gettext template file generated from our compilation process.
-# It can be obtained by running:
-#   set -l FILE (mktemp)
-#   FISH_GETTEXT_EXTRACTION_FILE=$FILE cargo check
-
-# The sort utility is locale-sensitive.
-# Ensure that sorting output is consistent by setting LC_ALL here.
-set -gx LC_ALL C.UTF-8
-
-set -l build_tools (status dirname)
-set -g tmpdir
-set -l po_dir $build_tools/../po
-
-set -l extract
-set -l po
-set -l mo
-
-argparse --exclusive 'no-mo,only-mo,dry-run' no-mo only-mo dry-run use-existing-template= -- $argv
-or exit $status
-
-if test -z $argv[1]
-    # Update everything if not specified otherwise.
-    set -g po_files $po_dir/*.po
-else
-    set -l po_dir_id (stat --format='%d:%i' -- $po_dir)
-    for arg in $argv
-        set -l arg_dir_id (stat --format='%d:%i' -- (dirname $arg))
-        if test $po_dir_id != $arg_dir_id
-            echo "Argument $arg is not a file in the directory $(realpath $po_dir)."
-            echo "Non-option arguments must specify paths to files in this directory."
-            echo ""
-            echo "If you want to add a new language to the translations not the following:"
-            echo "The filename must identify a language, with a two letter ISO 639-1 language code of the target language (e.g. 'pt' for Portuguese), and use the file extension '.po'."
-            echo "Optionally, you can specify a regional variant (e.g. 'pt_BR')."
-            echo "So valid filenames are of the shape 'll.po' or 'll_CC.po'."
-            exit 1
-        end
-        if not basename $arg | grep -qE '^[a-z]{2}(_[A-Z]{2})?\.po$'
-            echo "Filename does not match the expected format ('ll.po' or 'll_CC.po')."
-            exit 1
-        end
-    end
-    set -g po_files $argv
-end
-
-if set -l --query _flag_no_mo
-    set -l --erase mo
-end
-if set -l --query _flag_only_mo
-    set -l --erase extract
-    set -l --erase po
-end
-
-set -g template_file (mktemp)
-# Protect from externally set $tmpdir leaking into this script.
-set -g tmpdir
-
-function cleanup_exit
-    set -l exit_status $status
-
-    rm $template_file
-
-    if set -g --query tmpdir[1]
-        rm -r $tmpdir
-    end
-
-    exit $exit_status
-end
-
-if set -l --query extract
-    set -l xgettext_args
-    if set -l --query _flag_use_existing_template
-        set xgettext_args --use-existing-template=$_flag_use_existing_template
-    end
-    $build_tools/fish_xgettext.fish $xgettext_args >$template_file
-    or cleanup_exit
-end
-
-if set -l --query _flag_dry_run
-    # On a dry run, we do not modify po/ but write to a temporary directory instead and check if
-    # there is a difference between po/ and the tmpdir after re-generating the PO files.
-    set -g tmpdir (mktemp -d)
-
-    # On a dry-run, we do not update the MO files.
-    set -l --erase mo
-
-    # Ensure tmpdir has the same initial state as the po dir.
-    cp -r $po_dir/* $tmpdir
-end
-
-for po_file in $po_files
-    if set --query tmpdir[1]
-        set po_file $tmpdir/(basename $po_file)
-    end
-    if set -l --query po
-        if test -e $po_file
-            msgmerge --no-wrap --update --no-fuzzy-matching --backup=none --quiet $po_file $template_file
-            and msgattrib --no-wrap --no-obsolete -o $po_file $po_file
-            or cleanup_exit
-        else
-            cp $template_file $po_file
-        end
-    end
-    if set -l --query mo
-        set -l locale_dir $build_tools/../share/locale
-        set -l out_dir $locale_dir/(basename $po_file .po)/LC_MESSAGES
-        mkdir -p $out_dir
-        msgfmt --check-format --output-file=$out_dir/fish.mo $po_file
-    end
-end
-
-if set -g --query tmpdir[1]
-    diff -ur $po_dir $tmpdir
-    or cleanup_exit
-end
-
-cleanup_exit
--- a/cmake/Tests.cmake
+++ b/cmake/Tests.cmake
@@ -1,33 +1,92 @@
+# This adds ctest support to the project
+enable_testing()
+
+# By default, ctest runs tests serially
+# Support CTEST_PARALLEL_LEVEL as an environment variable in addition to a CMake variable
+if(NOT CTEST_PARALLEL_LEVEL)
+  set(CTEST_PARALLEL_LEVEL $ENV{CTEST_PARALLEL_LEVEL})
+  if(NOT CTEST_PARALLEL_LEVEL)
+    include(ProcessorCount)
+    ProcessorCount(CORES)
+    math(EXPR halfcores "${CORES} / 2")
+    set(CTEST_PARALLEL_LEVEL ${halfcores})
+  endif()
+endif()
+
+
+# Put in a tests folder to reduce the top level targets in IDEs.
+set(CMAKE_FOLDER tests)
+
+# We will use 125 as a reserved exit code to indicate that a test has been skipped, i.e. it did not
+# pass but it should not be considered a failed test run, either.
+set(SKIP_RETURN_CODE 125)
+
+# Even though we are using CMake's ctest for testing, we still define our own `make fish_run_tests` target
+# rather than use its default for many reasons:
+#  * CMake doesn't run tests in-proc or even add each tests as an individual node in the ninja
+#    dependency tree, instead it just bundles all tests into a target called `test` that always just
+#    shells out to `ctest`, so there are no build-related benefits to not doing that ourselves.
+#  * CMake devs insist that it is appropriate for `make fish_run_tests` to never depend on `make all`, i.e.
+#    running `make fish_run_tests` does not require any of the binaries to be built before testing.
+#  * It is not possible to set top-level CTest options/settings such as CTEST_PARALLEL_LEVEL from
+#    within the CMake configuration file.
+#  * The only way to have a test depend on a binary is to add a fake test with a name like
+#    "build_fish" that executes CMake recursively to build the `fish` target.
+#  * Circling back to the point about individual tests not being actual Makefile targets, CMake does
+#    not offer any way to execute a named test via the `make`/`ninja`/whatever interface; the only
+#    way to manually invoke test `foo` is to to manually run `ctest` and specify a regex matching
+#    `foo` as an argument, e.g. `ctest -R ^foo$`... which is really crazy.
+
+# The top-level test target is "fish_run_tests".
+add_custom_target(fish_run_tests
+  COMMAND env CTEST_PARALLEL_LEVEL=${CTEST_PARALLEL_LEVEL} FISH_FORCE_COLOR=1
+          ${CMAKE_CTEST_COMMAND} --force-new-ctest-process # --verbose
+          --output-on-failure --progress
+  DEPENDS fish fish_indent fish_key_reader fish_test_helper
+  USES_TERMINAL
+)
+
+# CMake being CMake, you can't just add a DEPENDS argument to add_test to make it depend on any of
+# your binaries actually being built before `make fish_run_tests` is executed (requiring `make all` first),
+# and the only dependency a test can have is on another test. So we make building fish
+# prerequisites to our entire top-level `test` target.
+function(add_test_target NAME)
+  string(REPLACE "/" "-" NAME ${NAME})
+  add_custom_target("test_${NAME}" COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -R "^${NAME}$$"
+    DEPENDS fish fish_indent fish_key_reader fish_test_helper USES_TERMINAL)
+endfunction()
+
 add_executable(fish_test_helper tests/fish_test_helper.c)

 FILE(GLOB FISH_CHECKS CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/tests/checks/*.fish)
 foreach(CHECK ${FISH_CHECKS})
  get_filename_component(CHECK_NAME ${CHECK} NAME)
-  add_custom_target(
-    test_${CHECK_NAME}
-    COMMAND ${CMAKE_SOURCE_DIR}/tests/test_driver.py ${CMAKE_CURRENT_BINARY_DIR}
-                checks/${CHECK_NAME}
+  get_filename_component(CHECK ${CHECK} NAME_WE)
+  add_test(NAME ${CHECK_NAME}
+    COMMAND ${CMAKE_SOURCE_DIR}/tests/test_driver.py --cachedir=${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
+                checks/${CHECK}.fish
    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests
-    DEPENDS fish fish_indent fish_key_reader fish_test_helper
-    USES_TERMINAL
  )
+  set_tests_properties(${CHECK_NAME} PROPERTIES SKIP_RETURN_CODE ${SKIP_RETURN_CODE})
+  set_tests_properties(${CHECK_NAME} PROPERTIES ENVIRONMENT FISH_FORCE_COLOR=1)
+  add_test_target("${CHECK_NAME}")
 endforeach(CHECK)

 FILE(GLOB PEXPECTS CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/tests/pexpects/*.py)
 foreach(PEXPECT ${PEXPECTS})
  get_filename_component(PEXPECT ${PEXPECT} NAME)
-  add_custom_target(
-    test_${PEXPECT}
-    COMMAND ${CMAKE_SOURCE_DIR}/tests/test_driver.py ${CMAKE_CURRENT_BINARY_DIR}
+  add_test(NAME ${PEXPECT}
+    COMMAND ${CMAKE_SOURCE_DIR}/tests/test_driver.py --cachedir=${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
                pexpects/${PEXPECT}
    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests
-    DEPENDS fish fish_indent fish_key_reader fish_test_helper
-    USES_TERMINAL
  )
+  set_tests_properties(${PEXPECT} PROPERTIES SKIP_RETURN_CODE ${SKIP_RETURN_CODE})
+  set_tests_properties(${PEXPECT} PROPERTIES ENVIRONMENT FISH_FORCE_COLOR=1)
+  add_test_target("${PEXPECT}")
 endforeach(PEXPECT)

-# Rust stuff.
 set(cargo_test_flags)
+# Rust stuff.
 if(DEFINED ASAN)
    # Rust w/ -Zsanitizer=address requires explicitly specifying the --target triple or else linker
    # errors pertaining to asan symbols will ensue.
@@ -48,17 +107,10 @@ if(DEFINED Rust_CARGO_TARGET)
    list(APPEND cargo_test_flags "--lib")
 endif()

-set(max_concurrency_flag)
-if(DEFINED ENV{FISH_TEST_MAX_CONCURRENCY})
-    list(APPEND max_concurrency_flag "--max-concurrency" $ENV{FISH_TEST_MAX_CONCURRENCY})
-endif()
-
-# The top-level test target is "fish_run_tests".
-add_custom_target(fish_run_tests
-  # TODO: This should be replaced with a unified solution, possibly build_tools/check.sh.
-  COMMAND ${CMAKE_SOURCE_DIR}/tests/test_driver.py ${max_concurrency_flag} ${CMAKE_CURRENT_BINARY_DIR}
-  COMMAND env ${VARS_FOR_CARGO} cargo test --no-default-features ${CARGO_FLAGS} --workspace --target-dir ${rust_target_dir} ${cargo_test_flags}
-  WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-  DEPENDS fish fish_indent fish_key_reader fish_test_helper
-  USES_TERMINAL
+add_test(
+    NAME "cargo-test"
+    COMMAND env ${VARS_FOR_CARGO} cargo test --no-default-features ${CARGO_FLAGS} --workspace --target-dir ${rust_target_dir} ${cargo_test_flags}
+    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
 )
+set_tests_properties("cargo-test" PROPERTIES SKIP_RETURN_CODE ${SKIP_RETURN_CODE})
+add_test_target("cargo-test")
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,7 @@ Depends: bsdextrautils | bsdmainutils,
 gettext-base,
 # for nroff and preconv
 groff-base,
+ man-db,
 # for terminal definitions
 ncurses-base,
 # for kill
--- a/doc_src/cmds/bind.rst
+++ b/doc_src/cmds/bind.rst
@@ -425,24 +425,6 @@ Launch ``git diff`` and repaint the commandline afterwards when :kbd:`ctrl-g` is

   bind ctrl-g 'git diff' repaint

-Swap :kbd:`tab` and :kbd:`shift-tab`, making tab focus the search field.
-But if the search field is already active, keep the behavior (:kbd:`tab` cycles forward, :kbd:`shift-tab` backward).::
-
-   bind tab '
-       if commandline --search-field >/dev/null
-           commandline -f complete
-       else
-           commandline -f complete-and-search
-       end
-   '
-   bind shift-tab '
-       if commandline --search-field >/dev/null
-           commandline -f complete-and-search
-       else
-           commandline -f complete
-       end
-   '
-
 .. _cmd-bind-termlimits:

 Terminal Limitations
--- a/doc_src/cmds/commandline.rst
+++ b/doc_src/cmds/commandline.rst
@@ -74,9 +74,6 @@ The following options change what part of the commandline is printed or updated:
 **--search-field**
    Use the pager search field instead of the command line. Returns false if the search field is not shown.

-**--input=INPUT**
-    Operate on this string instead of the commandline. Useful for using options like **--tokens-expanded**.
-
 The following options change the way ``commandline`` prints the current commandline buffer:

 **-c** or **--cut-at-cursor**
@@ -90,7 +87,10 @@ The following options change the way ``commandline`` prints the current commandl
    Perform argument expansion on the selection and print one argument per line.
    Command substitutions are not expanded but forwarded as-is.

-**-o**, **tokenize**, **--tokens-raw**
+**--tokens-raw**
+    Print arguments in the selection as they appear on the command line, one per line.
+
+**-o** or **tokenize**
    Deprecated; do not use.

 If ``commandline`` is called during a call to complete a given string using ``complete -C STRING``, ``commandline`` will consider the specified string to be the current contents of the command line.
--- a/doc_src/cmds/fish_git_prompt.rst
+++ b/doc_src/cmds/fish_git_prompt.rst
@@ -8,7 +8,7 @@ Synopsis

 .. synopsis::

-    fish_git_prompt [FORMAT]
+    fish_git_prompt

 ::

@@ -24,8 +24,6 @@ The ``fish_git_prompt`` function displays information about the current git repo

 `Git <https://git-scm.com>`_ must be installed.

-It is possible to modify the output format by passing an argument. The default value is ``" (%s)"``.
-
 There are numerous customization options, which can be controlled with git options or fish variables. git options, where available, take precedence over the fish variable with the same function. git options can be set on a per-repository or global basis. git options can be set with the ``git config`` command, while fish variables can be set as usual with the :doc:`set <set>` command.

 Boolean options (those which enable or disable something) understand "1", "yes" or "true" to mean true and every other value to mean false.
--- a/doc_src/cmds/fish_mode_prompt.rst
+++ b/doc_src/cmds/fish_mode_prompt.rst
@@ -22,7 +22,7 @@ Description

 The ``fish_mode_prompt`` function outputs the mode indicator for use in vi mode.

-The default ``fish_mode_prompt`` function will output indicators about the current vi editor mode displayed to the left of the regular prompt. Define your own function to customize the appearance of the mode indicator. The ``$fish_bind_mode variable`` can be used to determine the current mode. It will be one of ``default``, ``insert``, ``replace_one``, ``replace``, or ``visual``.
+The default ``fish_mode_prompt`` function will output indicators about the current vi editor mode displayed to the left of the regular prompt. Define your own function to customize the appearance of the mode indicator. The ``$fish_bind_mode variable`` can be used to determine the current mode. It will be one of ``default``, ``insert``, ``replace_one``, or ``visual``.

 You can also define an empty ``fish_mode_prompt`` function to remove the vi mode indicators::

@@ -51,9 +51,6 @@ Example
        case replace_one
          set_color --bold green
          echo 'R'
-        case replace
-          set_color --bold bryellow
-          echo 'R'
        case visual
          set_color --bold brmagenta
          echo 'V'
--- a/doc_src/cmds/path.rst
+++ b/doc_src/cmds/path.rst
@@ -13,7 +13,7 @@ Synopsis
    path extension GENERAL_OPTIONS [PATH ...]
    path filter GENERAL_OPTIONS [-v | --invert]
        [-d] [-f] [-l] [-r] [-w] [-x]
-        [(-t | --type) TYPE] [(-p | --perm) PERMISSION] [--all] [PATH ...]
+        [(-t | --type) TYPE] [(-p | --perm) PERMISSION] [PATH ...]
    path is GENERAL_OPTIONS [(-v | --invert)] [(-t | --type) TYPE]
        [-d] [-f] [-l] [-r] [-w] [-x]
        [(-p | --perm) PERMISSION] [PATH ...]
@@ -22,7 +22,7 @@ Synopsis
    path resolve GENERAL_OPTIONS [PATH ...]
    path change-extension GENERAL_OPTIONS EXTENSION [PATH ...]
    path sort GENERAL_OPTIONS [-r | --reverse]
-        [-u | --unique] [--key=(basename | dirname | path)] [PATH ...]
+        [-u | --unique] [--key=basename|dirname|path] [PATH ...]

    GENERAL_OPTIONS
        [-z | --null-in] [-Z | --null-out] [-q | --quiet]
@@ -148,7 +148,7 @@ Examples
   > echo $path$extension
   # reconstructs the original path again.
   ./foo.mp4
-
+   
 .. _cmd-path-filter:

 "filter" subcommand
@@ -158,7 +158,7 @@ Examples

    path filter [-z | --null-in] [-Z | --null-out] [-q | --quiet] \
        [-d] [-f] [-l] [-r] [-w] [-x] \
-        [-v | --invert] [(-t | --type) TYPE] [(-p | --perm) PERMISSION] [--all] [PATH ...]
+        [-v | --invert] [(-t | --type) TYPE] [(-p | --perm) PERMISSION] [PATH ...]

 ``path filter`` returns all of the given paths that match the given checks. In all cases, the paths need to exist, nonexistent paths are always filtered.

@@ -180,10 +180,6 @@ When a path starts with ``-``, ``path filter`` will prepend ``./`` to avoid it b

 It returns 0 if at least one path passed the filter.

-With ``--all``, return status 0 (true) if all paths pass the filter, and status 1 (false) if any path fails. This is equivalent to ``not path filter -v``. It produces no output, only a status.
-
-When ``--all`` combined with ``--invert``, it returns status 0 (true) if all paths fail the filter and status 1 (false) if any path passes.
-
 ``path is`` is shorthand for ``path filter -q``, i.e. just checking without producing output, see :ref:`The is subcommand <cmd-path-is>`.

 Examples
@@ -215,9 +211,6 @@ Examples
   >_ path filter -fx $PATH/*
   # Prints all possible commands - the first entry of each name is what fish would execute!

-   >_ path filter --all /usr/bin /usr/argagagji
-   # This returns 1 (false) because not all paths pass the filter.
-
 .. _cmd-path-is:

 "is" subcommand
--- a/doc_src/cmds/read.rst
+++ b/doc_src/cmds/read.rst
@@ -83,14 +83,7 @@ The following options control how much is read and how it is stored:
 **-n** or **--nchars** *NCHARS*
    Makes ``read`` return after reading *NCHARS* characters or the end of the line, whichever comes first.

-**-t** -or **--tokenize** or **--tokenize-raw**
-    Causes read to split the input into variables by the shell's tokenization rules.
-    This means it will honor quotes and escaping.
-    This option is of course incompatible with other options to control splitting like **--delimiter** and does not honor :envvar:`IFS` (like fish's tokenizer).
-    The **-t** -or **--tokenize** variants perform quote removal, so e.g. ``a\ b`` is stored as ``a b``.
-    However variables and command substitutions are not expanded.
-
-**--tokenize-raw**
+**-t** -or **--tokenize**
    Causes read to split the input into variables by the shell's tokenization rules. This means it will honor quotes and escaping. This option is of course incompatible with other options to control splitting like **--delimiter** and does not honor :envvar:`IFS` (like fish's tokenizer). It saves the tokens in the manner they'd be passed to commands on the commandline, so e.g. ``a\ b`` is stored as ``a b``. Note that currently it leaves command substitutions intact along with the parentheses.

 **-a** or **--list**
--- a/doc_src/cmds/set_color.rst
+++ b/doc_src/cmds/set_color.rst
@@ -57,7 +57,7 @@ The following options are available:
    Sets reverse mode.

 **-u** or **--underline**, or **-uSTYLE** or **--underline=STYLE**
-    Set the underline mode; supported styles are **single** (default), **double**, **curly**, **dotted** and **dashed**.
+    Set the underline mode; supported styles are **single** (default) and **curly**.

 **-h** or **--help**
    Displays help about using this command.
--- a/doc_src/cmds/string-join.rst
+++ b/doc_src/cmds/string-join.rst
@@ -8,8 +8,8 @@ Synopsis

 .. synopsis::

-    string join [-q | --quiet] [-n | --no-empty] [--] SEP [STRING ...]
-    string join0 [-q | --quiet] [-n | --no-empty] [--] [STRING ...]
+    string join [-q | --quiet] SEP [STRING ...]
+    string join0 [-q | --quiet] [STRING ...]

 .. END SYNOPSIS

@@ -18,28 +18,11 @@ Description

 .. BEGIN DESCRIPTION

-Joins its *STRING* arguments into a single string separated by *SEP* (for ``string join``) or by the
-zero byte (NUL) (for ``string join0``).
-Exit status: 0 if at least one join was performed, or 1 otherwise.
+``string join`` joins its *STRING* arguments into a single string separated by *SEP*, which can be an empty string. Exit status: 0 if at least one join was performed, or 1 otherwise. If ``-n`` or ``--no-empty`` is specified, empty strings are excluded from consideration (e.g. ``string join -n + a b "" c`` would expand to ``a+b+c`` not ``a+b++c``).

-**-n**, **--no-empty**
-    Exclude empty strings from consideration (e.g. ``string join -n + a b "" c`` would expand to ``a+b+c`` not ``a+b++c``).
+``string join0`` joins its *STRING* arguments into a single string separated by the zero byte (NUL), and adds a trailing NUL. This is most useful in conjunction with tools that accept NUL-delimited input, such as ``sort -z``. Exit status: 0 if at least one join was performed, or 1 otherwise.

-**-q**, **--quiet**
-    Do not print the strings, only set the exit status as described above.
-
-**WARNING**:
-Insert a  ``--`` before positional arguments to prevent them from being interpreted as flags.
-Otherwise, any strings starting with ``-`` will be treated as flag arguments, meaning they will most likely result in the command failing.
-This is also true if you specify a variable which expands to such a string instead of a literal string.
-If you don't need to append flag arguments at the end of the command,
-just always use ``--`` to avoid unwelcome surprises.
-
-``string join0`` adds a trailing NUL. This is most useful in conjunction with tools that accept NUL-delimited input, such as ``sort -z``.
-
-Because Unix uses NUL as the string terminator, passing the output of ``string join0`` as an *argument* to a command (via a :ref:`command substitution <expand-command-substitution>`) won't actually work.
-Fish will pass the correct bytes along, but the command won't be able to tell where the argument ends.
-This is a limitation of Unix' argument passing.
+Because Unix uses NUL as the string terminator, passing the output of ``string join0`` as an *argument* to a command (via a :ref:`command substitution <expand-command-substitution>`) won't actually work. Fish will pass the correct bytes along, but the command won't be able to tell where the argument ends. This is a limitation of Unix' argument passing.

 .. END DESCRIPTION

@@ -60,14 +43,4 @@ Examples
    >_ string join '' a b c
    abc

-    >_ set -l markdown_list '- first' '- second' '- third'
-    # Strings with leading hyphens (also in variable expansions) are interpreted as flag arguments by default.
-    >_ string join \n $markdown_list
-    string join: - first: unknown option
-    # Use '--' to prevent this.
-    >_ string join -- \n $markdown_list
-    - first
-    - second
-    - third
-
 .. END EXAMPLES
--- a/doc_src/cmds/string.rst
+++ b/doc_src/cmds/string.rst
@@ -11,7 +11,7 @@ Synopsis
    string collect [-a | --allow-empty] [-N | --no-trim-newlines] [STRING ...]
    string escape [-n | --no-quoted] [--style=] [STRING ...]
    string join [-q | --quiet] [-n | --no-empty] SEP [STRING ...]
-    string join0 [-q | --quiet] [-n | --no-empty] [STRING ...]
+    string join0 [-q | --quiet] [STRING ...]
    string length [-q | --quiet] [STRING ...]
    string lower [-q | --quiet] [STRING ...]
    string match [-a | --all] [-e | --entire] [-i | --ignore-case]
@@ -27,7 +27,7 @@ Synopsis
                   [-r | --regex] [-q | --quiet] PATTERN REPLACE [STRING ...]
    string shorten [(-c | --char) CHARS] [(-m | --max) INTEGER]
                   [-N | --no-newline] [-l | --left] [-q | --quiet] [STRING ...]
-    string split [(-f | --fields) FIELDS] [(-m | --max) MAX] [-n | --no-empty]
+    string split [(-f | --fields) FIELDS] [(-m | --max) MAX] [-n | --no-empty] 
                 [-q | --quiet] [-r | --right] SEP [STRING ...]
    string split0 [(-f | --fields) FIELDS] [(-m | --max) MAX] [-n | --no-empty]
                  [-q | --quiet] [-r | --right] [STRING ...]
--- a/doc_src/interactive.rst
+++ b/doc_src/interactive.rst
@@ -354,7 +354,7 @@ Some bindings are common across Emacs and vi mode, because they aren't text edit

 - :kbd:`alt-o` opens the file at the cursor in a pager. If the cursor is in command position and the command is a script, it will instead open that script in your editor. The editor is chosen from the first available of the ``$VISUAL`` or ``$EDITOR`` variables.

- :kbd:`alt-p` adds the string ``&| less;`` to the end of the job under the cursor. The result is that the output of the command will be paged. If you set the ``PAGER`` variable, its value is used instead of ``less``.
+- :kbd:`alt-p` adds the string ``&| less;`` to the end of the job under the cursor. The result is that the output of the command will be paged.

 - :kbd:`alt-w` prints a short description of the command under the cursor.

@@ -362,7 +362,7 @@ Some bindings are common across Emacs and vi mode, because they aren't text edit

 - :kbd:`alt-v` Same as :kbd:`alt-e`.

- :kbd:`alt-s` Prepends ``sudo`` to the current commandline. If the commandline is empty, prepend ``sudo`` to the last commandline. If ``sudo`` is not installed, various similar commands are tried: ``doas``, ``please``, and ``run0``.
+- :kbd:`alt-s` Prepends ``sudo`` to the current commandline. If the commandline is empty, prepend ``sudo`` to the last commandline.

 - :kbd:`ctrl-space` Inserts a space without expanding an :ref:`abbreviation <abbreviations>`. For vi mode, this only applies to insert-mode.

--- a/doc_src/language.rst
+++ b/doc_src/language.rst
@@ -917,12 +917,6 @@ If there is nothing between a brace and a comma or two commas, it's interpreted

 To use a "," as an element, :ref:`quote <quotes>` or :ref:`escape <escapes>` it.

-The very first character of a command token is never interpreted as expanding brace, because it's the beginning of a :ref:`compound statement <cmd-begin>`::
-
-    > {echo hello, && echo world}
-    hello,
-    world
-
 .. _cartesian-product:

 Combining lists
--- a/doc_src/terminal-compatibility.rst
+++ b/doc_src/terminal-compatibility.rst
@@ -120,22 +120,10 @@ Optional Commands
     - smul
     - Enter underline mode.
     -
-   * - ``\e[4:2m``
-     - Su
-     - Enter double underline mode.
-     - kitty
   * - ``\e[4:3m``
     - Su
     - Enter curly underline mode.
     - kitty
-   * - ``\e[4:4m``
-     - Su
-     - Enter dotted underline mode.
-     - kitty
-   * - ``\e[4:5m``
-     - Su
-     - Enter dashed underline mode.
-     - kitty
   * - ``\e[7m``
     - rev
     - Enter reverse video mode (swap foreground and background colors).
--- a/doc_src/tutorial.rst
+++ b/doc_src/tutorial.rst
@@ -115,7 +115,7 @@ These colors, and many more, can be changed by running ``fish_config``, or by mo

 For example, if you want to disable (almost) all coloring::

-  fish_config theme choose None
+  fish_config theme choose none

 This picks the "none" theme. To see all themes::

@@ -631,12 +631,12 @@ You can define your own prompt from the command line:

 Then, if you are happy with it, you can save it to disk by typing ``funcsave fish_prompt``. This saves the prompt in ``~/.config/fish/functions/fish_prompt.fish``. (Or, if you want, you can create that file manually from the start.)

-Multiple lines are OK. Colors can be set via :doc:`set_color <cmds/set_color>` by passing it named ANSI colors, or hex RGB values::
+Multiple lines are OK. Colors can be set via :doc:`set_color <cmds/set_color>`, passing it named ANSI colors, or hex RGB values::

    function fish_prompt
        set_color purple
        date "+%m/%d/%y"
-        set_color FF0000
+        set_color F00
        echo (pwd) '>' (set_color normal)
    end

--- a/docker/alpine.Dockerfile
+++ b/docker/alpine.Dockerfile
@@ -1,17 +1,19 @@
 FROM alpine:3.19
 LABEL org.opencontainers.image.source=https://github.com/fish-shell/fish-shell

-ENV LANG=C.UTF-8
-ENV LC_ALL=C.UTF-8
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8

 RUN apk add --no-cache \
    bash \
    cargo \
+    cmake \
    g++ \
    gettext-dev \
    git \
    libintl \
    musl-dev \
+    ninja \
    pcre2-dev \
    py3-pexpect \
    python3 \
@@ -38,6 +40,4 @@ WORKDIR /home/fishuser

 COPY fish_run_tests.sh /

-ENV FISH_CHECK_LINT=false
-
 CMD /fish_run_tests.sh
--- a/docker/centos9.Dockerfile
+++ b/docker/centos9.Dockerfile
@@ -8,13 +8,17 @@ RUN cd /etc/yum.repos.d/ && \
  sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*


+# install powertools to get ninja-build
 RUN dnf -y install dnf-plugins-core \
+  && dnf config-manager --set-enabled powertools \
  && yum install --assumeyes epel-release \
  && yum install --assumeyes \
    cargo \
+    cmake \
    diffutils \
    gcc-c++ \
    git \
+    ninja-build \
    python3 \
    python3-pexpect \
    openssl \
@@ -35,6 +39,4 @@ WORKDIR /home/fishuser

 COPY fish_run_tests.sh /

-ENV FISH_CHECK_LINT=false
-
 CMD /fish_run_tests.sh
--- a/docker/context/fish_run_tests.sh
+++ b/docker/context/fish_run_tests.sh
@@ -5,34 +5,22 @@ set -e
 # This script is copied into the root directory of our Docker tests.
 # It is the entry point for running Docker-based tests.

-echo build_tools/check.sh >>~/.bash_history
-
-cd /fish-source
+cd ~/fish-build
 git config --global --add safe.directory /fish-source
-
-export CARGO_TARGET_DIR="$HOME"/fish-build
-
-interactive_shell() {
-    echo
-    echo "+ export=CARGO_TARGET_DIR=$CARGO_TARGET_DIR"
-    echo
-    bash -i
-}
+cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug /fish-source "$@"

 # Spawn a shell if FISH_RUN_SHELL_BEFORE_TESTS is set.
 if test -n "$FISH_RUN_SHELL_BEFORE_TESTS"
 then
-    interactive_shell
+    bash -i
 fi

-set +e
-build_tools/check.sh
+(set +e; ninja && ninja fish_run_tests)
 RES=$?
-set -e

 # Drop the user into a shell if FISH_RUN_SHELL_AFTER_TESTS is set.
 if test -n "$FISH_RUN_SHELL_AFTER_TESTS"; then
-    interactive_shell
+    bash -i
 fi

 exit $RES
--- a/docker/docker_run_tests.sh
+++ b/docker/docker_run_tests.sh
@@ -4,9 +4,8 @@ usage() {
    cat << EOF
 Usage: $(basename "$0") [--shell-before] [--shell-after] DOCKERFILE
 Options:
-    --shell-before    Before the tests start, run a bash shell
-    --shell-after     After the tests end, run a bash shell
-    --lint, --no-lint Enable/disable linting and failure on warnings
+    --shell-before   Before the tests start, run a bash shell
+    --shell-after    After the tests end, run a bash shell
 EOF
    exit 1
 }
@@ -30,12 +29,6 @@ while [ $# -gt 1 ]; do
        --shell-after)
            DOCKER_EXTRA_ARGS="$DOCKER_EXTRA_ARGS --env FISH_RUN_SHELL_AFTER_TESTS=1"
            ;;
-        --lint)
-            DOCKER_EXTRA_ARGS="$DOCKER_EXTRA_ARGS --env FISH_CHECK_LINT=true"
-            ;;
-        --no-lint)
-            DOCKER_EXTRA_ARGS="$DOCKER_EXTRA_ARGS --env FISH_CHECK_LINT=false"
-            ;;
        *)
            usage
            ;;
--- a/docker/fedora.Dockerfile
+++ b/docker/fedora.Dockerfile
@@ -2,9 +2,11 @@ FROM fedora:latest
 LABEL org.opencontainers.image.source=https://github.com/fish-shell/fish-shell

 RUN dnf install --assumeyes \
+      cmake \
      diffutils \
      gcc-c++ \
      git-core \
+      ninja-build \
      pcre2-devel \
      python3 \
      python3-pip \
@@ -26,6 +28,4 @@ WORKDIR /home/fishuser

 COPY fish_run_tests.sh /

-ENV FISH_CHECK_LINT=false
-
 CMD /fish_run_tests.sh
--- a/docker/focal-32bit.Dockerfile
+++ b/docker/focal-32bit.Dockerfile
@@ -1,17 +1,20 @@
 FROM ubuntu:20.04
 LABEL org.opencontainers.image.source=https://github.com/fish-shell/fish-shell

-ENV LANG=C.UTF-8
-ENV LC_ALL=C.UTF-8
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
+ENV CFLAGS="-m32"
 ENV DEBIAN_FRONTEND=noninteractive

 RUN apt-get update \
  && apt-get -y install \
    build-essential \
+    cmake \
    g++-multilib \
    gettext \
    git \
    locales \
+    ninja-build \
    pkg-config \
    python3 \
    python3-pexpect \
@@ -35,13 +38,6 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rustup.sh \

 COPY fish_run_tests.sh /

-ENV \
-    CFLAGS=-m32 \
-    PCRE2_SYS_STATIC=1 \
-    FISH_CHECK_TARGET_TRIPLE=i686-unknown-linux-gnu
-
-ENV FISH_CHECK_LINT=false
-
 CMD . ~/.cargo/env \
-    && rustup target add ${FISH_CHECK_TARGET_TRIPLE} \
-    && /fish_run_tests.sh
+    && rustup target add i686-unknown-linux-gnu \
+    && /fish_run_tests.sh -DFISH_USE_SYSTEM_PCRE2=OFF -DRust_CARGO_TARGET=i686-unknown-linux-gnu
--- a/docker/focal-arm64.Dockerfile
+++ b/docker/focal-arm64.Dockerfile
@@ -1,19 +1,21 @@
 FROM arm64v8/ubuntu:focal
 LABEL org.opencontainers.image.source=https://github.com/fish-shell/fish-shell

-ENV LANG=C.UTF-8
-ENV LC_ALL=C.UTF-8
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
 ENV DEBIAN_FRONTEND=noninteractive

 RUN apt-get update \
  && apt-get -y install \
    build-essential \
    cargo \
+    cmake \
    clang \
    gettext \
    git \
    libpcre2-dev \
    locales \
+    ninja-build \
    python3 \
    python3-pexpect \
    rustc \
@@ -34,6 +36,4 @@ WORKDIR /home/fishuser

 COPY fish_run_tests.sh /

-ENV FISH_CHECK_LINT=false
-
 CMD /fish_run_tests.sh
--- a/docker/focal.Dockerfile
+++ b/docker/focal.Dockerfile
@@ -1,17 +1,19 @@
 FROM ubuntu:20.04
 LABEL org.opencontainers.image.source=https://github.com/fish-shell/fish-shell

-ENV LANG=C.UTF-8
-ENV LC_ALL=C.UTF-8
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
 ENV DEBIAN_FRONTEND=noninteractive

 RUN apt-get update \
  && apt-get -y install \
    build-essential \
    cargo \
+    cmake \
    gettext \
    git \
    locales \
+    ninja-build \
    pkg-config \
    python3 \
    python3-pexpect \
@@ -33,6 +35,4 @@ WORKDIR /home/fishuser

 COPY fish_run_tests.sh /

-ENV FISH_CHECK_LINT=false
-
 CMD /fish_run_tests.sh
--- a/docker/jammy-armv7-32bit.Dockerfile
+++ b/docker/jammy-armv7-32bit.Dockerfile
@@ -1,20 +1,22 @@
 FROM arm32v7/ubuntu:jammy
 LABEL org.opencontainers.image.source=https://github.com/fish-shell/fish-shell

-ENV LANG=C.UTF-8
-ENV LC_ALL=C.UTF-8
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
 ENV DEBIAN_FRONTEND=noninteractive

 RUN apt-get update \
  && apt-get -y install \
    build-essential \
    cargo \
+    cmake \
    file \
    g++ \
    gettext \
    git \
    libpcre2-dev \
    locales \
+    ninja-build \
    pkg-config \
    python3 \
    python3-pexpect \
@@ -36,6 +38,4 @@ WORKDIR /home/fishuser

 COPY fish_run_tests.sh /

-ENV FISH_CHECK_LINT=false
-
 CMD /fish_run_tests.sh
--- a/docker/jammy-asan.Dockerfile
+++ b/docker/jammy-asan.Dockerfile
@@ -1,17 +1,19 @@
 FROM ubuntu:jammy
 LABEL org.opencontainers.image.source=https://github.com/fish-shell/fish-shell

-ENV LANG=C.UTF-8
-ENV LC_ALL=C.UTF-8
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8

 RUN apt-get update \
  && apt-get -y install \
    build-essential \
+    cmake \
    clang \
    gettext \
    git \
    libpcre2-dev \
    locales \
+    ninja-build \
    python3 \
    python3-pexpect \
    sudo \
@@ -40,17 +42,12 @@ COPY fish_run_tests.sh /
 ENV \
    RUSTFLAGS=-Zsanitizer=address \
    RUSTDOCFLAGS=-Zsanitizer=address \
-    FISH_CHECK_CARGO_ARGS='-Zbuild-std --features=tsan' \
-    FISH_CHECK_TARGET_TRIPLE=x86_64-unknown-linux-gnu \
-    FISH_CI_SAN=1 \
-    FISH_TEST_MAX_CONCURRENCY=4 \
    CC=clang \
    CXX=clang++ \
    ASAN_OPTIONS=check_initialization_order=1:detect_stack_use_after_return=1:detect_leaks=1 \
-    LSAN_OPTIONS=verbosity=0:log_threads=0:use_tls=1:print_suppressions=0:suppressions=/fish-source/build_tools/lsan_suppressions.txt
-
-ENV FISH_CHECK_LINT=false
+    LSAN_OPTIONS=verbosity=0:log_threads=0:use_tls=1:print_suppressions=0:suppressions=/fish-source/build_tools/lsan_suppressions.txt \
+    FISH_CI_SAN=1

 CMD . ~/.cargo/env \
-    && ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer-$(cat /.llvm-version) \
-    && /fish_run_tests.sh
+  && ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer-$(cat /.llvm-version) \
+       /fish_run_tests.sh -DASAN=1 -DRust_CARGO_TARGET=x86_64-unknown-linux-gnu
--- a/docker/jammy-tsan.Dockerfile
+++ b/docker/jammy-tsan.Dockerfile
@@ -1,17 +1,19 @@
 FROM ubuntu:jammy
 LABEL org.opencontainers.image.source=https://github.com/fish-shell/fish-shell

-ENV LANG=C.UTF-8
-ENV LC_ALL=C.UTF-8
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8

 RUN apt-get update \
  && apt-get -y install \
    build-essential \
+    cmake \
    clang \
    gettext \
    git \
    libpcre2-dev \
    locales \
+    ninja-build \
    python3 \
    python3-pexpect \
    sudo \
@@ -37,11 +39,7 @@ COPY fish_run_tests.sh /
 ENV \
    RUSTFLAGS=-Zsanitizer=thread \
    RUSTDOCFLAGS=-Zsanitizer=thread \
-    FISH_CHECK_CARGO_ARGS='-Zbuild-std --features=tsan' \
-    FISH_CHECK_TARGET_TRIPLE=x86_64-unknown-linux-gnu \
-    FISH_CI_SAN=1 \
-    FISH_TEST_MAX_CONCURRENCY=4
+    FISH_CI_SAN=1

-ENV FISH_CHECK_LINT=false
-
-CMD . ~/.cargo/env && /fish_run_tests.sh
+CMD . ~/.cargo/env \
+  && /fish_run_tests.sh -DTSAN=1 -DRust_CARGO_TARGET=x86_64-unknown-linux-gnu
--- a/docker/jammy.Dockerfile
+++ b/docker/jammy.Dockerfile
@@ -1,18 +1,20 @@
 FROM ubuntu:jammy
 LABEL org.opencontainers.image.source=https://github.com/fish-shell/fish-shell

-ENV LANG=C.UTF-8
-ENV LC_ALL=C.UTF-8
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8

 RUN apt-get update \
  && apt-get -y install \
    build-essential \
    cargo \
+    cmake \
    clang \
    gettext \
    git \
    libpcre2-dev \
    locales \
+    ninja-build \
    python3 \
    python3-pexpect \
    rustc \
@@ -33,6 +35,4 @@ WORKDIR /home/fishuser

 COPY fish_run_tests.sh /

-ENV FISH_CHECK_LINT=false
-
 CMD /fish_run_tests.sh
--- a/docker/noble.Dockerfile
+++ b/docker/noble.Dockerfile
@@ -1,16 +1,18 @@
 FROM ubuntu:noble
 LABEL org.opencontainers.image.source=https://github.com/fish-shell/fish-shell

-ENV LANG=C.UTF-8
-ENV LC_ALL=C.UTF-8
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8

 RUN apt-get update \
  && apt-get -y install \
    build-essential \
+    cmake \
    gettext \
    git \
    libpcre2-dev \
    locales \
+    ninja-build \
    python3 \
    python3-pexpect \
    tmux \
@@ -34,7 +36,5 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rustup.sh \

 COPY fish_run_tests.sh /

-ENV FISH_CHECK_LINT=false
-
 CMD . ~/.cargo/env \
  && /fish_run_tests.sh
--- a/docker/opensuse-tumbleweed.docker
+++ b/docker/opensuse-tumbleweed.docker
@@ -1,8 +1,8 @@
 FROM opensuse/tumbleweed:latest
 LABEL org.opencontainers.image.source=https://github.com/fish-shell/fish-shell

-ENV LANG=C.UTF-8
-ENV LC_ALL=C.UTF-8
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8

 RUN zypper --non-interactive install \
  bash \
--- a/fish.spec.in
+++ b/fish.spec.in
@@ -31,12 +31,13 @@ BuildRequires: glibc-langpack-en
 BuildRequires: python3 procps

 %if 0%{?suse_version}
-Requires:      terminfo-base groff
+Requires:      terminfo-base
 %else
-Requires:      ncurses-base groff-base
+Requires:      ncurses-base
 %endif
 Requires:      file
 Requires:      python3
+Requires:      man
 Requires:      procps

 # Although the build scripts mangle the version number to be RPM compatible
--- a/gettext-extraction/Cargo.toml
+++ b/gettext-extraction/Cargo.toml
@@ -1,16 +0,0 @@
-[package]
-name = "fish-gettext-extraction"
-edition.workspace = true
-rust-version.workspace = true
-version = "0.0.1"
-repository.workspace = true
-description = "proc-macro for extracting strings for gettext translation"
-
-[lib]
-proc-macro = true
-
-[dependencies]
-proc-macro2 = "1.0"
-
-[lints]
-workspace = true
--- a/gettext-extraction/src/lib.rs
+++ b/gettext-extraction/src/lib.rs
@@ -1,67 +0,0 @@
-extern crate proc_macro;
-use proc_macro::TokenStream;
-use std::{ffi::OsString, fs::OpenOptions, io::Write};
-
-fn append_po_entry_to_file(message: &TokenStream, file_name: &OsString) {
-    let mut file = OpenOptions::new()
-        .create(true)
-        .append(true)
-        .open(file_name)
-        .unwrap_or_else(|e| panic!("Could not open file {file_name:?}: {e}"));
-    let message_string = message.to_string();
-    if message_string.contains('\n') {
-        panic!("Gettext strings may not contain unescaped newlines. Unescaped newline found in '{message_string}'")
-    }
-    // Crude check for format strings. This might result in false positives.
-    let format_string_annotation = if message_string.contains('%') {
-        "#, c-format\n"
-    } else {
-        ""
-    };
-    let po_entry = format!("{format_string_annotation}msgid {message_string}\nmsgstr \"\"\n\n");
-    file.write_all(po_entry.as_bytes()).unwrap();
-}
-
-/// The `message` is passed through unmodified.
-/// If `FISH_GETTEXT_EXTRACTION_FILE` is defined in the environment,
-/// this file is used to write the message,
-/// so that it can then be used for generating gettext PO files.
-/// The `message` must be a string literal.
-///
-/// # Panics
-///
-/// This macro panics if the `FISH_GETTEXT_EXTRACTION_FILE` variable is set and `message` has an
-/// unexpected format.
-/// Note that for example `concat!(...)` cannot be passed to this macro, because expansion works
-/// outside in, meaning this macro would still see the `concat!` macro invocation, instead of a
-/// string literal.
-#[proc_macro]
-pub fn gettext_extract(message: TokenStream) -> TokenStream {
-    if let Some(file_path) = std::env::var_os("FISH_GETTEXT_EXTRACTION_FILE") {
-        let pm2_message = proc_macro2::TokenStream::from(message.clone());
-        let mut token_trees = pm2_message.into_iter();
-        let first_token = token_trees
-            .next()
-            .expect("gettext_extract got empty token stream. Expected one token.");
-        if token_trees.next().is_some() {
-            panic!("Invalid number of tokens passed to gettext_extract. Expected one token, but got more.")
-        }
-        if let proc_macro2::TokenTree::Group(group) = first_token {
-            let mut group_tokens = group.stream().into_iter();
-            let first_group_token = group_tokens
-                .next()
-                .expect("gettext_extract expected one group token but got none.");
-            if group_tokens.next().is_some() {
-                panic!("Invalid number of tokens in group passed to gettext_extract. Expected one token, but got more.")
-            }
-            if let proc_macro2::TokenTree::Literal(_) = first_group_token {
-                append_po_entry_to_file(&message, &file_path);
-            } else {
-                panic!("Expected literal in gettext_extract, but got: {first_group_token:?}");
-            }
-        } else {
-            panic!("Expected group in gettext_extract, but got: {first_token:?}");
-        }
-    }
-    message
-}
--- a/po/de.po
+++ b/po/de.po
--- a/po/en.po
+++ b/po/en.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/pl.po
+++ b/po/pl.po
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
--- a/po/sv.po
+++ b/po/sv.po
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
--- a/printf/Cargo.toml
+++ b/printf/Cargo.toml
@@ -1,17 +1,11 @@
 [package]
 name = "fish-printf"
-edition.workspace = true
-rust-version.workspace = true
+edition = "2021"
 version = "0.2.1"
-repository.workspace = true
+repository = "https://github.com/fish-shell/fish-shell"
 description = "printf implementation, based on musl"
 license = "MIT"

 [dependencies]
 libc = "0.2.155"
 widestring = { version = "1.0.2", optional = true }
-unicode-segmentation = "1.12.0"
-unicode-width = "0.2.0"
-
-[lints]
-workspace = true
--- a/printf/clippy.toml
+++ b/printf/clippy.toml
@@ -1 +0,0 @@
-allow-print-in-tests = true
--- a/printf/src/lib.rs
+++ b/printf/src/lib.rs
@@ -71,7 +71,7 @@ macro_rules! sprintf {
 /// - `args`: Iterator over the arguments to format.
 ///
 /// # Returns
-/// A `Result` which is `Ok` containing the width of the string written on success, or an `Error`.
+/// A `Result` which is `Ok` containing the number of characters written on success, or an `Error`.
 ///
 /// # Example
 ///
--- a/printf/src/printf_impl.rs
+++ b/printf/src/printf_impl.rs
@@ -5,8 +5,6 @@
 use std::fmt::{self, Write};
 use std::mem;
 use std::result::Result;
-use unicode_segmentation::UnicodeSegmentation;
-use unicode_width::UnicodeWidthStr;

 #[cfg(feature = "widestring")]
 use widestring::Utf32Str as wstr;
@@ -384,7 +382,7 @@ pub fn sprintf_locale(
        }

        // Read field width. We do not support $.
-        let desired_width = if s.at(0) == Some('*') {
+        let width = if s.at(0) == Some('*') {
            let arg_width = args.next().ok_or(Error::MissingArg)?.as_sint()?;
            s.advance_by(1);
            if arg_width < 0 {
@@ -399,7 +397,7 @@ pub fn sprintf_locale(
        };

        // Optionally read precision. We do not support $.
-        let mut desired_precision: Option<usize> = if s.at(0) == Some('.') && s.at(1) == Some('*') {
+        let mut prec: Option<usize> = if s.at(0) == Some('.') && s.at(1) == Some('*') {
            // "A negative precision is treated as though it were missing."
            // Here we assume the precision is always signed.
            s.advance_by(2);
@@ -412,7 +410,7 @@ pub fn sprintf_locale(
            None
        };
        // Disallow precisions larger than i32::MAX, in keeping with C.
-        if desired_precision.unwrap_or(0) > i32::MAX as usize {
+        if prec.unwrap_or(0) > i32::MAX as usize {
            return Err(Error::Overflow);
        }

@@ -431,7 +429,7 @@ pub fn sprintf_locale(
        // "If a precision is given with a numeric conversion (d, i, o, u, i, x, and X),
        // the 0 flag is ignored." p is included here.
        let spec_is_numeric = matches!(conv_spec, CS::d | CS::u | CS::o | CS::p | CS::x | CS::X);
-        if spec_is_numeric && desired_precision.is_some() {
+        if spec_is_numeric && prec.is_some() {
            flags.zero_pad = false;
        }

@@ -445,22 +443,13 @@ pub fn sprintf_locale(
            CS::e | CS::f | CS::g | CS::a | CS::E | CS::F | CS::G | CS::A => {
                // Floating point types handle output on their own.
                let float = arg.as_float()?;
-                let len = format_float(
-                    f,
-                    float,
-                    desired_width,
-                    desired_precision,
-                    flags,
-                    locale,
-                    conv_spec,
-                    buf,
-                )?;
+                let len = format_float(f, float, width, prec, flags, locale, conv_spec, buf)?;
                out_len = out_len.checked_add(len).ok_or(Error::Overflow)?;
                continue 'main;
            }
            CS::p => {
                const PTR_HEX_DIGITS: usize = 2 * mem::size_of::<*const u8>();
-                desired_precision = desired_precision.map(|p| p.max(PTR_HEX_DIGITS));
+                prec = prec.map(|p| p.max(PTR_HEX_DIGITS));
                let uint = arg.as_uint()?;
                if uint != 0 {
                    prefix = "0x";
@@ -490,8 +479,8 @@ pub fn sprintf_locale(
                if uint != 0 {
                    write!(buf, "{:o}", uint)?;
                }
-                if flags.alt_form && desired_precision.unwrap_or(0) <= buf.len() + 1 {
-                    desired_precision = Some(buf.len() + 1);
+                if flags.alt_form && prec.unwrap_or(0) <= buf.len() + 1 {
+                    prec = Some(buf.len() + 1);
                }
                buf
            }
@@ -525,38 +514,10 @@ pub fn sprintf_locale(
            CS::s => {
                // also 'S'
                let s = arg.as_str(buf)?;
+                let p = prec.unwrap_or(s.len()).min(s.len());
+                prec = Some(p);
                flags.zero_pad = false;
-                match desired_precision {
-                    Some(precision) => {
-                        // from man printf(3)
-                        // "the maximum number of characters to be printed from a string"
-                        // We interpret this to mean the maximum width when printed, as defined by
-                        // Unicode grapheme cluster width.
-                        let mut byte_len = 0;
-                        let mut width = 0;
-                        let mut graphemes = s.graphemes(true);
-                        // Iteratively add single grapheme clusters as long as the fit within the
-                        // width limited by precision.
-                        while width < precision {
-                            match graphemes.next() {
-                                Some(grapheme) => {
-                                    let grapheme_width = grapheme.width();
-                                    if width + grapheme_width <= precision {
-                                        byte_len += grapheme.len();
-                                        width += grapheme_width;
-                                    } else {
-                                        break;
-                                    }
-                                }
-                                None => break,
-                            }
-                        }
-                        let p = precision.min(width);
-                        desired_precision = Some(p);
-                        &s[..byte_len]
-                    }
-                    None => s,
-                }
+                &s[..p]
            }
        };
        // Numeric output should be empty iff the value is 0.
@@ -567,26 +528,23 @@ pub fn sprintf_locale(
        // Decide if we want to apply thousands grouping to the body, and compute its size.
        // Note we have already errored out if grouped is set and this is non-numeric.
        let wants_grouping = flags.grouped && locale.thousands_sep.is_some();
-        let body_width = match wants_grouping {
-            // We assume that text representing numbers is ASCII, so len == width.
+        let body_len = match wants_grouping {
            true => body.len() + locale.separator_count(body.len()),
-            false => body.width(),
+            false => body.len(),
        };

        // Resolve the precision.
        // In the case of a non-numeric conversion, update the precision to at least the
        // length of the string.
-        let desired_precision = if !spec_is_numeric {
-            desired_precision.unwrap_or(body_width)
+        let prec = if !spec_is_numeric {
+            prec.unwrap_or(body_len)
        } else {
-            desired_precision.unwrap_or(1).max(body_width)
+            prec.unwrap_or(1).max(body_len)
        };

-        let prefix_width = prefix.width();
-        let unpadded_width = prefix_width
-            .checked_add(desired_precision)
-            .ok_or(Error::Overflow)?;
-        let width = desired_width.max(unpadded_width);
+        let prefix_len = prefix.len();
+        let unpadded_width = prefix_len.checked_add(prec).ok_or(Error::Overflow)?;
+        let width = width.max(unpadded_width);

        // Pad on the left with spaces to the desired width?
        if !flags.left_adj && !flags.zero_pad {
@@ -602,8 +560,7 @@ pub fn sprintf_locale(
        }

        // Pad on the left to the given precision?
-        // TODO: why pad with 0 here?
-        pad(f, '0', desired_precision, body_width)?;
+        pad(f, '0', prec, body_len)?;

        // Output the actual value, perhaps with grouping.
        if wants_grouping {
--- a/printf/src/tests.rs
+++ b/printf/src/tests.rs
@@ -13,7 +13,6 @@ macro_rules! sprintf_check {
        $(,)? // optional trailing comma
    ) => {
        {
-            use unicode_width::UnicodeWidthStr;
            let mut target = String::new();
            let mut args = [$($arg.to_arg()),*];
            let len = $crate::printf_c_locale(
@@ -21,7 +20,7 @@ macro_rules! sprintf_check {
                $fmt.as_ref() as &str,
                &mut args,
            ).expect("printf failed");
-            assert_eq!(len, target.width(), "Wrong length returned");
+            assert!(len == target.len(), "Wrong length returned: {} vs {}", len, target.len());
            target
        }
    };
@@ -736,18 +735,6 @@ fn test_huge_precision_g() {
    sprintf_err!("%.2147483648g", f => Error::Overflow);
 }

-#[test]
-fn test_non_ascii() {
-    assert_fmt!("%3s", "ö" => "  ö");
-    assert_fmt!("%3s", "🇺🇳" => " 🇺🇳");
-    assert_fmt!("%.3s", "🇺🇳🇺🇳" => "🇺🇳");
-    assert_fmt!("%.3s", "a🇺🇳" => "a🇺🇳");
-    assert_fmt!("%.3s", "aa🇺🇳" => "aa");
-    assert_fmt!("%3.3s", "aa🇺🇳" => " aa");
-    assert_fmt!("%.1s", "𒈙a" => "𒈙");
-    assert_fmt!("%3.3s", "👨‍👨‍👧‍👧" => " 👨‍👨‍👧‍👧");
-}
-
 #[test]
 fn test_errors() {
    use Error::*;
--- a/share/completions/adb.fish
+++ b/share/completions/adb.fish
@@ -195,7 +195,6 @@ complete -n '__fish_seen_subcommand_from sideload' -c adb -k -xa '(__fish_comple
 complete -n '__fish_seen_subcommand_from reconnect' -c adb -x -a device -d 'Kick current connection from device side and make it reconnect.'

 # commands that accept listing device files
-complete -n '__fish_seen_subcommand_from exec-out' -c adb -f -a "(__fish_adb_list_files)" -d 'File on device'
 complete -n '__fish_seen_subcommand_from shell' -c adb -f -a "(__fish_adb_list_files)" -d 'File on device'
 complete -n '__fish_seen_subcommand_from pull' -c adb -F -a "(__fish_adb_list_files)" -d 'File on device'
 complete -n '__fish_seen_subcommand_from push' -c adb -ka "(__fish_adb_list_files)" -d 'File on device'
--- a/share/completions/apt-get.fish
+++ b/share/completions/apt-get.fish
@@ -2,7 +2,7 @@

 function __fish_apt_no_subcommand -d 'Test if apt has yet to be given the subcommand'
    for i in (commandline -xpc)
-        if contains -- $i update upgrade dselect-upgrade dist-upgrade install remove purge autoremove autopurge source build-dep check clean autoclean changelog
+        if contains -- $i update upgrade dselect-upgrade dist-upgrade install remove purge source build-dep check clean autoclean changelog
            return 1
        end
    end
@@ -11,7 +11,7 @@ end

 function __fish_apt_use_package -d 'Test if apt command should have packages as potential completion'
    for i in (commandline -xpc)
-        if contains -- $i contains install remove purge autoremove autopurge build-dep changelog
+        if contains -- $i contains install remove purge build-dep changelog
            return 0
        end
    end
@@ -34,8 +34,7 @@ complete -f -n __fish_apt_no_subcommand -c apt-get -a build-dep -d 'Install/remo
 complete -f -n __fish_apt_no_subcommand -c apt-get -a check -d 'Update cache and check dependencies'
 complete -f -n __fish_apt_no_subcommand -c apt-get -a clean -d 'Clean local caches and packages'
 complete -f -n __fish_apt_no_subcommand -c apt-get -a autoclean -d 'Clean packages no longer be downloaded'
-complete -f -n __fish_apt_no_subcommand -c apt-get -a autoremove -d 'Remove packages no longer needed as dependencies'
-complete -f -n __fish_apt_no_subcommand -c apt-get -a autopurge -d 'Remove packages no longer needed as dependencies and delete their config files'
+complete -f -n __fish_apt_no_subcommand -c apt-get -a autoremove -d 'Remove automatically installed packages'
 complete -c apt-get -l no-install-recommends -d 'Do not install recommended packages'
 complete -c apt-get -l no-install-suggests -d 'Do not install suggested packages'
 complete -c apt-get -s d -l download-only -d 'Download Only'
--- a/share/completions/apt.fish
+++ b/share/completions/apt.fish
@@ -6,8 +6,8 @@ if [ "$(uname -s)" = Darwin -a "$(command -s apt)" = /usr/bin/apt ]
    exit 1
 end

-set -l all_subcmds update upgrade full-upgrade search list install show remove edit-sources purge changelog autoremove autopurge depends rdepends
-set -l pkg_subcmds install upgrade full-upgrade show search purge changelog policy depends rdepends autoremove autopurge
+set -l all_subcmds update upgrade full-upgrade search list install show remove edit-sources purge changelog autoremove depends rdepends
+set -l pkg_subcmds install upgrade full-upgrade show search purge changelog policy depends rdepends autoremove
 set -l installed_pkg_subcmds remove
 set -l handle_file_pkg_subcmds install

@@ -114,7 +114,7 @@ __fish_apt_subcommand changelog -r -d 'Download and display package changelog'
 # Autoremove
 __fish_apt_subcommand autoremove -d 'Remove packages no longer needed as dependencies'

-# Autopurge
+# Autoremove
 __fish_apt_subcommand autopurge -d 'Remove packages no longer needed as dependencies and delete their config files'

 # Clean
--- a/share/completions/aptitude.fish
+++ b/share/completions/aptitude.fish
@@ -11,7 +11,7 @@ end

 function __fish_apt_use_package -d 'Test if aptitude command should have packages as potential completion'
    for i in (commandline -xpc)
-        if contains -- $i changelog full-upgrade download forbid-version hold install keep-all markauto purge reinstall remove show showrc unhold unmarkauto why why-not versions
+        if contains -- $i changelog full-upgrade download forbid-version hold install keep-all markauto purge reinstall remove show unhold unmarkauto
            return 0
        end
    end
@@ -38,19 +38,15 @@ complete -f -n __fish_apt_no_subcommand -c aptitude -a markauto -d 'Mark package
 complete -f -n __fish_apt_no_subcommand -c aptitude -a purge -d 'Remove and delete all associated configuration and data files'
 complete -f -n __fish_apt_no_subcommand -c aptitude -a reinstall -d 'Reinstall the packages'
 complete -f -n __fish_apt_no_subcommand -c aptitude -a remove -d 'Remove the packages'
-complete -f -n __fish_apt_no_subcommand -c aptitude -a showsrc -d 'Display detailed information about the source packages (apt wrapper)'
 complete -f -n __fish_apt_no_subcommand -c aptitude -a show -d 'Display detailed information about the packages'
 complete -f -n __fish_apt_no_subcommand -c aptitude -a unhold -d 'Consider the packages by future upgrade commands'
 complete -f -n __fish_apt_no_subcommand -c aptitude -a unmarkauto -d 'Mark packages as manually installed'
 complete -f -n __fish_apt_no_subcommand -c aptitude -a search -d 'Search for packages matching one of the patterns'
 complete -f -n __fish_apt_no_subcommand -c aptitude -a help -d 'Display brief summary of the available commands and options'
-complete -f -n __fish_apt_no_subcommand -c aptitude -a why -d 'Explain why a particular package should be installed'
-complete -f -n __fish_apt_no_subcommand -c aptitude -a why-not -d 'Explain why a particular package cannot be installed'
-complete -f -n __fish_apt_no_subcommand -c aptitude -a versions -d 'Displays the versions of specified packages'

 complete -c aptitude -s D -l show-deps -d 'Show explanations of automatic installations and removals'
-complete -c aptitude -s d -l download-only -d 'Download only'
-complete -c aptitude -s f -l fix-broken -d 'Aggressively try to fix broken packages'
+complete -c aptitude -s d -l download-only -d 'Download Only'
+complete -c aptitude -s f -l fix-broken -d 'Correct broken dependencies'
 complete -c aptitude -l purge-unused -d 'Purge packages that are not required by any installed package'
 complete -c aptitude -s P -l prompt -d 'Always display a prompt'
 complete -c aptitude -s R -l without-recommends -d 'Do not treat recommendations as dependencies'
@@ -64,7 +60,6 @@ complete -c aptitude -l version -d 'Display the version of aptitude and compile
 complete -c aptitude -l visual-preview -d 'Start up the visual interface and display its preview screen'
 complete -c aptitude -s y -l assume-yes -d 'Assume the answer yes for all question prompts'
 complete -c aptitude -s Z -d 'Show how much disk space will be used or freed'
-complete -c aptitude -s u -d 'Download new package lists on startup (terminal interface only)'
 complete -r -c aptitude -s F -l display-format -d 'Specify the format to be used by the search command'
 complete -r -c aptitude -s t -l target-release -d 'Set the release from which packages should be installed'
 complete -r -c aptitude -s O -l sort -d 'Specify the order for the output from the search command'
--- a/share/completions/cargo.fish
+++ b/share/completions/cargo.fish
@@ -1,25 +1,20 @@
 # Tab completion for cargo (https://github.com/rust-lang/cargo).

 ## --- WRITTEN MANUALLY ---
-
-function __fish_cargo
-    cargo --color=never $argv
-end
-
-set -l __fish_cargo_subcommands (__fish_cargo --list 2>&1 | string replace -rf '^\s+([^\s]+)\s*(.*)' '$1\t$2' | string escape)
+set -l __fish_cargo_subcommands (cargo --list 2>&1 | string replace -rf '^\s+([^\s]+)\s*(.*)' '$1\t$2' | string escape)

 complete -c cargo -f -c cargo -n __fish_use_subcommand -a "$__fish_cargo_subcommands"
 complete -c cargo -x -c cargo -n '__fish_seen_subcommand_from help' -a "$__fish_cargo_subcommands"

 for x in bench b build c check rustc t test
-    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l bench -a "(__fish_cargo bench --bench 2>&1 | string replace -rf '^\s+' '')"
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l bench -a "(cargo bench --bench 2>&1 | string replace -rf '^\s+' '')"
    complete -c cargo -n "__fish_seen_subcommand_from $x" -l lib -d 'Only this package\'s library'
-    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l test -a "(__fish_cargo test --test 2>&1 | string replace -rf '^\s+' '')"
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l test -a "(cargo test --test 2>&1 | string replace -rf '^\s+' '')"
 end

 for x in bench b build c check r run rustc t test
-    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l bin -a "(__fish_cargo run --bin 2>&1 | string replace -rf '^\s+' '')"
-    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l example -a "(__fish_cargo run --example 2>&1 | string replace -rf '^\s+' '')"
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l bin -a "(cargo run --bin 2>&1 | string replace -rf '^\s+' '')"
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l example -a "(cargo run --example 2>&1 | string replace -rf '^\s+' '')"
 end

 # If using rustup, get the list of installed targets from there. Otherwise print all targets.
@@ -43,18 +38,18 @@ end

 function __fish_cargo_features
    if command -q jq
-        __fish_cargo read-manifest | jq -r '.features | keys | .[]' | __fish_concat_completions
+        cargo read-manifest | jq -r '.features | keys | .[]' | __fish_concat_completions
    else if set -l python (__fish_anypython)
-        __fish_cargo read-manifest | command $python -Sc "import sys, json"\n"print(*json.load(sys.stdin)['features'].keys(), sep='\n')" | __fish_concat_completions
+        cargo read-manifest | command $python -Sc "import sys, json"\n"print(*json.load(sys.stdin)['features'].keys(), sep='\n')" | __fish_concat_completions
    end
 end

 function __fish_cargo_packages
    if command -q jq
-        __fish_cargo metadata --no-deps --format-version 1 | jq -r '.packages | .[] | .name' | __fish_concat_completions
+        cargo metadata --no-deps --format-version 1 | jq -r '.packages | .[] | .name' | __fish_concat_completions
    else if set -l python (__fish_anypython)
-        __fish_cargo metadata --no-deps --format-version 1 |
-            command $python -Sc "import sys, json"\n"print(*[x['name'] for x in json.load(sys.stdin)['packages']], sep='\n')"
+        cargo metadata --no-deps --format-version 1 |
+        command $python -Sc "import sys, json"\n"print(*[x['name'] for x in json.load(sys.stdin)['packages']], sep='\n')"
    end
 end
 complete -c cargo -n '__fish_seen_subcommand_from run test build debug check clippy' -s p -l package \
@@ -65,7 +60,7 @@ complete -c cargo -n '__fish_seen_subcommand_from run test build debug check cli
 complete -c cargo -n __fish_use_subcommand -l explain -d 'Run `rustc --explain CODE`'
 complete -c cargo -n __fish_use_subcommand -l color -d 'Coloring: auto, always, never'
 complete -c cargo -n __fish_use_subcommand -l config -d 'Override a configuration value (unstable)'
-complete -c cargo -n __fish_use_subcommand -s Z -d 'Unstable (nightly-only) flags to Cargo, see \'cargo -Z help\' for details' -xa '(__fish_cargo -Z help | string replace -rf \'^\s*-Z (\S+)\s+(.*)\' \'$1\t$2\')'
+complete -c cargo -n __fish_use_subcommand -s Z -d 'Unstable (nightly-only) flags to Cargo, see \'cargo -Z help\' for details' -xa '(cargo -Z help | string replace -rf \'^\s*-Z (\S+)\s+(.*)\' \'$1\t$2\')'
 complete -c cargo -n __fish_use_subcommand -s V -l version -d 'Print version info and exit'
 complete -c cargo -n __fish_use_subcommand -l list -d 'List installed commands'
 complete -c cargo -n __fish_use_subcommand -s v -l verbose -d 'Use verbose output (-vv very verbose/build.rs output)'
@@ -723,7 +718,7 @@ complete -c cargo -n "__fish_seen_subcommand_from tree" -s v -l verbose -d 'Use
 complete -c cargo -n "__fish_seen_subcommand_from tree" -l frozen -d 'Require Cargo.lock and cache are up to date'
 complete -c cargo -n "__fish_seen_subcommand_from tree" -l locked -d 'Require Cargo.lock is up to date'
 complete -c cargo -n "__fish_seen_subcommand_from tree" -l offline -d 'Run without accessing the network'
-complete -c cargo -n "__fish_seen_subcommand_from uninstall" -fa '(__fish_cargo install --list | string replace -rf "(\S+) (.*):" \'$1\t$2\')'
+complete -c cargo -n "__fish_seen_subcommand_from uninstall" -fa '(cargo install --list | string replace -rf "(\S+) (.*):" \'$1\t$2\')'
 complete -c cargo -n "__fish_seen_subcommand_from uninstall" -s p -l package -d 'Package to uninstall'
 complete -c cargo -n "__fish_seen_subcommand_from uninstall" -l bin -d 'Only uninstall the binary NAME'
 complete -c cargo -n "__fish_seen_subcommand_from uninstall" -l root -d 'Directory to uninstall packages from'
@@ -846,8 +841,8 @@ if command -q cargo-asm
    # Warning: this will build the project and can take time! We make sure to only call it if it's not a switch so completions
    # for --foo will always be fast.
    if command -q timeout
-        complete -c cargo -n "__fish_seen_subcommand_from asm; and not __fish_is_switch" -xa "(timeout 1 __fish_cargo asm)"
+        complete -c cargo -n "__fish_seen_subcommand_from asm; and not __fish_is_switch" -xa "(timeout 1 cargo asm)"
    else
-        complete -c cargo -n "__fish_seen_subcommand_from asm; and not __fish_is_switch" -xa "(__fish_cargo asm)"
+        complete -c cargo -n "__fish_seen_subcommand_from asm; and not __fish_is_switch" -xa "(cargo asm)"
    end
 end
--- a/share/completions/clj.fish
+++ b/share/completions/clj.fish
@@ -49,10 +49,10 @@ function __fish_clj_tools -V bb_helper
    bb -e "$bb_helper" tools
 end

-complete -c clj -s X -x -r -k -a "(__fish_stripprefix='^-\w*X' __fish_complete_list : __fish_clj_aliases)" -d "Use concatenated aliases to modify classpath or supply exec fn/args"
-complete -c clj -s A -x -r -k -a "(__fish_stripprefix='^-\w*A' __fish_complete_list : __fish_clj_aliases)" -d "Use concatenated aliases to modify classpath"
-complete -c clj -s M -x -r -k -a "(__fish_stripprefix='^-\w*M' __fish_complete_list : __fish_clj_aliases)" -d "Use concatenated aliases to modify classpath or supply main opts"
-complete -c clj -s T -x -r -k -a "(__fish_stripprefix='^-\w*T' __fish_complete_list : __fish_clj_tools)" -d "Invoke tool by name or via aliases ala -X"
+complete -c clj -s X -x -r -k -a "(__fish_complete_list : __fish_clj_aliases)" -d "Use concatenated aliases to modify classpath or supply exec fn/args"
+complete -c clj -s A -x -r -k -a "(__fish_complete_list : __fish_clj_aliases)" -d "Use concatenated aliases to modify classpath"
+complete -c clj -s M -x -r -k -a "(__fish_complete_list : __fish_clj_aliases)" -d "Use concatenated aliases to modify classpath or supply main opts"
+complete -c clj -s T -x -r -k -a "(__fish_complete_list : __fish_clj_tools)" -d "Invoke tool by name or via aliases ala -X"

 complete -c clj -f -o Sdeps -r -d "Deps data to use as the last deps file to be merged"
 complete -c clj -f -o Spath -d "Compute classpath and echo to stdout only"
--- a/share/completions/commandline.fish
+++ b/share/completions/commandline.fish
@@ -13,6 +13,7 @@ complete -c commandline -s b -l current-buffer -d "Select entire command line (d
 complete -c commandline -s c -l cut-at-cursor -d "Only return that part of the command line before the cursor"
 complete -c commandline -s f -l function -d "Inject readline functions to reader"
 complete -c commandline -s x -l tokens-expanded -d "Print a list of expanded tokens"
+complete -c commandline -l tokens-raw -d "Print a list of raw tokens"

 complete -c commandline -s I -l input -d "Specify command to operate on"
 complete -c commandline -s C -l cursor -d "Set/get cursor position, not buffer contents"
--- a/share/completions/equery.fish
+++ b/share/completions/equery.fish
@@ -85,7 +85,7 @@ complete -c equery -n '__fish_seen_subcommand_from f files' -s s -l timestamp -d
 complete -c equery -n '__fish_seen_subcommand_from f files' -s t -l type -d "Include file type in output"
 complete -c equery -n '__fish_seen_subcommand_from f files' -l tree -d "Display results in a tree"
 complete -c equery -n '__fish_seen_subcommand_from f files' -s f -l filter -d "Filter output by file type" \
-    -xa "(__fish_stripprefix='^(--filter=|-\w*f)' __fish_complete_list , __fish_equery_files_filter_args)"
+    -xa "(__fish_complete_list , __fish_equery_files_filter_args)"

 # has + hasuse
 complete -c equery -n '__fish_seen_subcommand_from a has h hasuse' -s I -l exclude-installed -d "Exclude installed pkgs from search path"
--- a/share/completions/flatpak.fish
+++ b/share/completions/flatpak.fish
@@ -58,12 +58,29 @@ function __fish_flatpak
    flatpak $argv | string replace -rf '^([^A-Z].*?)(?: +|\t)(.*?)\s*$' '$1\t$2'
 end

+function __fish_print_flatpak_packages
+    set -l xdg_cache_home (__fish_make_cache_dir)
+    or return
+    set -l cache_file $xdg_cache_home/flatpak
+    if test -f $cache_file
+        cat $cache_file
+        set -l age (path mtime -R -- $cache_file)
+        set -l max_age 250
+        if test $age -lt $max_age
+            return
+        end
+    end
+    __fish_cache_put $cache_file
+    __fish_flatpak remote-ls --columns=application,name >$cache_file &
+    return 0
+end
+
 complete -f -c flatpak -n "__fish_seen_subcommand_from run" -a "(__fish_flatpak list --app --columns=application,name)"
 complete -f -c flatpak -n "__fish_seen_subcommand_from info uninstall" -a "(__fish_flatpak list --columns=application,name)"
 complete -f -c flatpak -n "__fish_seen_subcommand_from enter kill" -a "(__fish_flatpak ps --columns=instance,application)"
 complete -f -c flatpak -n "__fish_seen_subcommand_from remote-info remote-ls remote-modify remote-delete" -a "(__fish_flatpak remotes --columns=name,title)"

-complete -c flatpak -n '__fish_seen_subcommand_from install' -xa "(__fish_cached -t 250 -- '__fish_flatpak remote-ls --columns=application,name')"
+complete -c flatpak -n '__fish_seen_subcommand_from install' -xa "(__fish_print_flatpak_packages)"

 # Plenty of the other stuff is too free-form to complete (e.g. remote-add).
 complete -f -c flatpak -s h -l help
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -52,8 +52,8 @@ end
 function __fish_git_branches
    # This is much faster than using `git branch` and avoids dealing with localized "detached HEAD" messages.
    # We intentionally only sort local branches by recency. See discussion in #9248.
-    __fish_git_local_branches
-    __fish_git_remote_branches
+    __fish_git for-each-ref --format='%(refname:strip=2)%09Local Branch' --sort=-committerdate refs/heads/ 2>/dev/null
+    __fish_git for-each-ref --format='%(refname:strip=2)%09Remote Branch' refs/remotes/ 2>/dev/null
 end

 function __fish_git_submodules
@@ -65,10 +65,6 @@ function __fish_git_local_branches
    __fish_git for-each-ref --format='%(refname:strip=2)%09Local Branch' --sort=-committerdate refs/heads/ 2>/dev/null
 end

-function __fish_git_remote_branches
-    __fish_git for-each-ref --format='%(refname:strip=2)%09Remote Branch' refs/remotes/ 2>/dev/null
-end
-
 function __fish_git_unique_remote_branches
    # `git checkout` accepts remote branches without the remote part
    # if they are unambiguous.
@@ -76,7 +72,7 @@ function __fish_git_unique_remote_branches
    # `git checkout frobulate` is equivalent to `git checkout -b frobulate --track alice/frobulate`.
    __fish_git for-each-ref --format="%(refname:strip=3)" \
        --sort="refname:strip=3" \
-        refs/remotes/ 2>/dev/null | uniq -u
+        "refs/remotes/*/$match*" "refs/remotes/*/*/**" 2>/dev/null | uniq -u
 end

 function __fish_git_tags
@@ -86,20 +82,13 @@ end
 function __fish_git_heads
    set -l gitdir (__fish_git rev-parse --git-dir 2>/dev/null)
    or return # No git dir, no need to even test.
-    for head in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD REBASE_HEAD REVERT_HEAD \
-        CHERRY_PICK_HEAD BISECT_HEAD AUTO_MERGE
+    for head in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD
        if test -f $gitdir/$head
            echo $head
        end
    end
 end

-function __fish_git_remote_heads
-    # Example of output parsed:
-    # "remote.upstream.url git@github.com:fish-shell/fish-shell.git" -> "upstream\tgit@github.com:fish-shell/fish-shell.git"
-    __fish_git for-each-ref --format="%(refname:strip=2)" 'refs/remotes/*/HEAD' | path dirname
-end
-
 function __fish_git_refs
    __fish_git_branches
    __fish_git_tags
@@ -107,27 +96,7 @@ function __fish_git_refs
 end

 function __fish_git_remotes
-    # Example of output parsed:
-    # "remote.upstream.url git@github.com:fish-shell/fish-shell.git" -> "upstream\tgit@github.com:fish-shell/fish-shell.git"
-    __fish_git config --get-regexp 'remote\.[a-z]+\.url' | string replace -rf 'remote\.(.*)\.url (.*)' '$1\t$2'
-end
-
-set -g __fish_git_recent_commits_arg
-set -g __fish_git_unqualified_unique_remote_branches false
-set -g __fish_git_filter_non_pushable ''
-
-function __fish_git_add_revision_completion
-    set -l c complete -f -c git $argv -n 'not contains -- -- (commandline -xpc)' -ka
-    # The following dynamic, order-preserved (-k) completions will be shown in reverse order (see #9221)
-    $c "(__fish_git_recent_commits $__fish_git_recent_commits_arg $__fish_git_filter_non_pushable)"
-    $c "(__fish_git_tags)" -d Tag
-    $c "(__fish_git_remote_heads $__fish_git_filter_non_pushable)" -d 'Remote alias'
-    $c "(__fish_git_heads $__fish_git_filter_non_pushable)" -d Head
-    $c "(__fish_git_remote_branches $__fish_git_filter_non_pushable)"
-    if $__fish_git_unqualified_unique_remote_branches
-        $c "(__fish_git_unique_remote_branches $__fish_git_filter_non_pushable)" -d 'Unique Remote Branch'
-    end
-    $c "(__fish_git_local_branches)" -d 'Local Branch'
+    __fish_git remote 2>/dev/null
 end

 function __fish_git_files
@@ -678,7 +647,6 @@ function __fish_git_aliased_command
    end
 end

-set -g __fish_git_aliases
 git config -z --get-regexp 'alias\..*' | while read -lz alias cmdline
    set -l command (__fish_git_aliased_command $cmdline)
    string match -q --regex '\w+' -- $command; or continue
@@ -804,8 +772,7 @@ function __fish_git_custom_commands
    # if any of these completion results match the name of the builtin git commands,
    # but it's simpler just to blacklist these names. They're unlikely to change,
    # and the failure mode is we accidentally complete a plumbing command.
-    set -l git_subcommands $PATH/git-*
-    for name in (string replace -r "^.*/git-([^/]*)" '$1' $git_subcommands)
+    for name in (string replace -r "^.*/git-([^/]*)" '$1' $PATH/git-*)
        switch $name
            case cvsserver receive-pack shell upload-archive upload-pack
                # skip these
@@ -817,7 +784,7 @@ end

 # Suggest branches for the specified remote - returns 1 if no known remote is specified
 function __fish_git_branch_for_remote
-    set -l remotes (__fish_git remote 2>/dev/null)
+    set -l remotes (__fish_git_remotes)
    set -l remote
    set -l cmd (commandline -xpc)
    for r in $remotes
@@ -1067,7 +1034,7 @@ complete -f -c git -n '__fish_git_using_command fetch' -l shallow-since -d 'Deep
 complete -f -c git -n '__fish_git_using_command fetch' -l shallow-exclude -d 'Deepen history of shallow clone, excluding rev'
 complete -f -c git -n '__fish_git_using_command fetch' -l unshallow -d 'Convert to a complete repository'
 complete -f -c git -n '__fish_git_using_command fetch' -l refetch -d 'Re-fetch without negotiating common commits'
-__fish_git_add_revision_completion -n '__fish_git_using_command fetch' -l negotiation-tip -d 'Only report commits reachable from these tips' -x
+complete -f -c git -n '__fish_git_using_command fetch' -l negotiation-tip -d 'Only report commits reachable from these tips' -kxa '(__fish_git_commits; __fish_git_branches)'
 complete -f -c git -n '__fish_git_using_command fetch' -l negotiate-only -d "Don't fetch, only show commits in common with the server"
 complete -f -c git -n '__fish_git_using_command fetch' -l filter -ra '(__fish_git_filters)' -d 'Request a subset of objects from server'

@@ -1120,8 +1087,10 @@ complete -f -c git -n "__fish_git_using_command remote" -n "__fish_seen_subcomma

 ### show
 complete -f -c git -n __fish_git_needs_command -a show -d 'Show the last commit of a branch'
+complete -f -c git -n '__fish_git_using_command show' -n 'not contains -- -- (commandline -xpc)' -ka '(__fish_git_branches)'
+complete -f -c git -n '__fish_git_using_command show' -n 'not contains -- -- (commandline -xpc)' -ka '(__fish_git_tags)' -d Tag
+complete -f -c git -n '__fish_git_using_command show' -n 'not contains -- -- (commandline -xpc)' -ka '(__fish_git_commits)'
 complete -f -c git -n '__fish_git_using_command show' -n 'not contains -- -- (commandline -xpc)' -ka '(__fish_git_complete_stashes)'
-__fish_git_add_revision_completion -n '__fish_git_using_command show'
 complete -f -c git -n __fish_git_needs_rev_files -n 'not contains -- -- (commandline -xpc)' -xa '(__fish_git_complete_rev_files)'
 complete -F -c git -n '__fish_git_using_command show' -n 'contains -- -- (commandline -xpc)'
 complete -f -c git -n '__fish_git_using_command show' -l format -d 'Pretty-print the contents of the commit logs in a given format' -a '(__fish_git_show_opt format)'
@@ -1210,12 +1179,13 @@ complete -c git -n '__fish_git_using_command am' -l show-current-patch -a 'diff
 ### checkout
 complete -F -c git -n '__fish_git_using_command checkout' -n 'contains -- -- (commandline -xpc)'
 complete -f -c git -n __fish_git_needs_command -a checkout -d 'Checkout and switch to a branch'
-begin
-    set -lx __fish_git_recent_commits_arg --all
-    set -lx __fish_git_unqualified_unique_remote_branches true
-    __fish_git_add_revision_completion -n '__fish_git_using_command checkout'
-end

+# The following dynamic, order-preserved (-k) completions will be shown in reverse order (see #9221)
+complete -f -c git -n '__fish_git_using_command checkout' -n 'not contains -- -- (commandline -xpc)' -ka '(__fish_git_recent_commits --all)'
+complete -f -c git -n '__fish_git_using_command checkout' -n 'not contains -- -- (commandline -xpc)' -ka '(__fish_git_tags)' -d Tag
+complete -f -c git -n '__fish_git_using_command checkout' -n 'not contains -- -- (commandline -xpc)' -ka '(__fish_git_heads)' -d Head
+complete -f -c git -n '__fish_git_using_command checkout' -n 'not contains -- -- (commandline -xpc)' -ka '(__fish_git_unique_remote_branches)' -d 'Unique Remote Branch'
+complete -f -c git -n '__fish_git_using_command checkout' -n 'not contains -- -- (commandline -xpc)' -ka '(__fish_git_branches)'
 # In the presence of changed files, `git checkout ...` assumes highest likelihood is intent to restore so this comes last (aka shown first).
 complete -f -c git -n '__fish_git_using_command checkout' -ka '(__fish_git_files modified deleted modified-staged-deleted)'

@@ -1384,35 +1354,6 @@ complete -f -c git -n '__fish_git_using_command clone' -s b -l branch -d 'Use a
 complete -f -c git -n '__fish_git_using_command clone' -l depth -d 'Truncate the history to a specified number of revisions'
 complete -f -c git -n '__fish_git_using_command clone' -l recursive -d 'Initialize all submodules within the cloned repository'
 complete -f -c git -n '__fish_git_using_command clone' -l filter -ra '(__fish_git_filters)' -d 'Partial clone by requesting a subset of objects from server'
-complete -f -c git -n '__fish_git_using_command clone' -l single-branch -d 'Clone only the history leading to the tip of a single branch'
-complete -f -c git -n '__fish_git_using_command clone' -l no-single-branch -d 'Clone histories near the tips of all branches'
-complete -f -c git -n '__fish_git_using_command clone' -s l -l local -d 'Bypass transport mechanism for local repositories'
-complete -f -c git -n '__fish_git_using_command clone' -l no-local -d 'Use Git transport for local paths'
-complete -f -c git -n '__fish_git_using_command clone' -s s -l shared -d 'Setup .git/objects/info/alternates to share objects'
-complete -f -c git -n '__fish_git_using_command clone' -l dissociate -d 'Stop borrowing objects from reference repositories after clone'
-complete -f -c git -n '__fish_git_using_command clone' -l progress -d 'Force progress status'
-complete -f -c git -n '__fish_git_using_command clone' -l server-option -d 'Transmit string to the server when using protocol version 2'
-complete -f -c git -n '__fish_git_using_command clone' -l no-reject-shallow -d 'Do not fail if the source repository is a shallow repository'
-complete -f -c git -n '__fish_git_using_command clone' -l reject-shallow -d 'Fail if the source repository is a shallow repository'
-complete -f -c git -n '__fish_git_using_command clone' -l sparse -d 'Employ a sparse-checkout'
-complete -f -c git -n '__fish_git_using_command clone' -l also-filter-submodules -d 'Apply partial clone filter to submodules'
-complete -f -c git -n '__fish_git_using_command clone' -l revision -r -d 'Fetch history leading to the given revision'
-complete -f -c git -n '__fish_git_using_command clone' -s u -l upload-pack -r -d 'Specify a non-default path for the command on the other end'
-complete -f -c git -n '__fish_git_using_command clone' -l template -r -d 'Specify the directory from which templates will be used'
-complete -f -c git -n '__fish_git_using_command clone' -s c -l config -r -d 'Set a configuration variable in the new repository'
-complete -f -c git -n '__fish_git_using_command clone' -l shallow-since -r -d 'Create a shallow clone with a history after the specified time'
-complete -f -c git -n '__fish_git_using_command clone' -l shallow-exclude -r -d 'Create a shallow clone excluding commits from a specified ref'
-complete -f -c git -n '__fish_git_using_command clone' -l no-tags -d 'Do not clone tags'
-complete -f -c git -n '__fish_git_using_command clone' -l tags -d 'Clone tags'
-complete -f -c git -n '__fish_git_using_command clone' -l recurse-submodules -r -d 'Initialize and clone submodules'
-complete -f -c git -n '__fish_git_using_command clone' -l shallow-submodules -d 'Clone submodules with a depth of 1'
-complete -f -c git -n '__fish_git_using_command clone' -l no-shallow-submodules -d 'Do not clone submodules shallowly'
-complete -f -c git -n '__fish_git_using_command clone' -l remote-submodules -d 'Use submodule remote-tracking branch to update'
-complete -f -c git -n '__fish_git_using_command clone' -l no-remote-submodules -d 'Do not use submodule remote-tracking branch to update'
-complete -f -c git -n '__fish_git_using_command clone' -l separate-git-dir -r -d 'Place the cloned repository in a specified directory'
-complete -f -c git -n '__fish_git_using_command clone' -l ref-format -f -a "files reftable" -d 'Specify the ref storage format'
-complete -f -c git -n '__fish_git_using_command clone' -s j -l jobs -r -d 'Number of submodules fetched at the same time'
-complete -f -c git -n '__fish_git_using_command clone' -l bundle-uri -r -d 'Fetch a bundle from the given URI'

 ### commit
 complete -c git -n __fish_git_needs_command -a commit -d 'Record changes to the repository'
@@ -1481,7 +1422,9 @@ complete -x -c git -n '__fish_git_using_command daemon' -l access-hook -d 'Hook

 ### describe
 complete -c git -n __fish_git_needs_command -a describe -d 'Give an object a human readable name'
-__fish_git_add_revision_completion -n '__fish_git_using_command describe'
+complete -f -c git -n '__fish_git_using_command describe' -ka '(__fish_git_tags)' -d Tag
+complete -f -c git -n '__fish_git_using_command describe' -ka '(__fish_git_branches)'
+complete -f -c git -n '__fish_git_using_command describe' -ka '(__fish_git_heads)' -d Head
 complete -f -c git -n '__fish_git_using_command describe' -l dirty -d 'Describe the state of the working tree, append dirty if there are local changes'
 complete -f -c git -n '__fish_git_using_command describe' -l broken -d 'Describe the state of the working tree, append -broken instead of erroring'
 complete -f -c git -n '__fish_git_using_command describe' -l all -d 'Use all tags, not just annotated'
@@ -1501,10 +1444,7 @@ complete -f -c git -n '__fish_git_using_command describe' -l first-parent -d 'Fo
 complete -c git -n __fish_git_needs_command -a diff -d 'Show changes between commits and working tree'
 complete -c git -n '__fish_git_using_command diff' -n 'not contains -- -- (commandline -xpc)' -ka '(__fish_git_ranges)'
 complete -c git -n '__fish_git_using_command diff' -n 'not contains -- -- (commandline -xpc)' -ka '(__fish_git_complete_stashes)'
-begin
-    set -lx __fish_git_recent_commits_arg --all
-    __fish_git_add_revision_completion -n '__fish_git_using_command diff'
-end
+complete -c git -n '__fish_git_using_command diff' -n 'not contains -- -- (commandline -xpc)' -ka '(__fish_git_recent_commits --all)'
 complete -c git -n '__fish_git_using_command diff' -l cached -d 'Show diff of changes in the index'
 complete -c git -n '__fish_git_using_command diff' -l staged -d 'Show diff of changes in the index'
 complete -c git -n '__fish_git_using_command diff' -l no-index -d 'Compare two paths on the filesystem'
@@ -1835,7 +1775,7 @@ complete -f -c git -n '__fish_git_using_command maintenance' -l schedule -d 'Run

 ### merge
 complete -f -c git -n __fish_git_needs_command -a merge -d 'Join multiple development histories'
-__fish_git_add_revision_completion -n '__fish_git_using_command merge'
+complete -f -c git -n '__fish_git_using_command merge' -ka '(__fish_git_branches)'
 complete -f -c git -n '__fish_git_using_command merge' -l commit -d "Autocommit the merge"
 complete -f -c git -n '__fish_git_using_command merge' -l no-commit -d "Don't autocommit the merge"
 complete -f -c git -n '__fish_git_using_command merge' -s e -l edit -d 'Edit auto-generated merge message'
@@ -1871,7 +1811,7 @@ complete -f -c git -n '__fish_git_using_command merge' -l no-autostash -d 'Do no

 ### merge-base
 complete -f -c git -n __fish_git_needs_command -a merge-base -d 'Find a common ancestor for a merge'
-__fish_git_add_revision_completion -n '__fish_git_using_command merge-base'
+complete -f -c git -n '__fish_git_using_command merge-base' -ka '(__fish_git_branches)'
 complete -f -c git -n '__fish_git_using_command merge-base' -s a -l all -d 'Output all merge bases for the commits, instead of just one'
 complete -f -c git -n '__fish_git_using_command merge-base' -l octopus -d 'Compute the best common ancestors of all supplied commits'
 complete -f -c git -n '__fish_git_using_command merge-base' -l independent -d 'Print a minimal subset of the supplied commits with the same ancestors'
@@ -1989,10 +1929,9 @@ complete -f -c git -n '__fish_git_using_command range-diff' -l no-dual-color -d
 ### push
 complete -f -c git -n __fish_git_needs_command -a push -d 'Push changes elsewhere'
 complete -f -c git -n '__fish_git_using_command push' -n 'not __fish_git_branch_for_remote' -a '(__fish_git_remotes)' -d 'Remote alias'
-begin
-    set -lx __fish_git_filter_non_pushable '| string replace -r "(\t.*)?\$" ":\$1"'
-    __fish_git_add_revision_completion -n '__fish_git_using_command push' -n __fish_git_branch_for_remote
-end
+complete -f -c git -n '__fish_git_using_command push' -n __fish_git_branch_for_remote -ka '(__fish_git_tags)' -d Tag
+complete -f -c git -n '__fish_git_using_command push' -n __fish_git_branch_for_remote -ka '(__fish_git_branches)'
+complete -f -c git -n '__fish_git_using_command push' -n __fish_git_branch_for_remote -ka '(__fish_git_heads)'
 # The "refspec" here is an optional "+" to signify a force-push
 complete -f -c git -n '__fish_git_using_command push' -n __fish_git_branch_for_remote -n 'string match -q "+*" -- (commandline -ct)' -ka '+(__fish_git_branches | string replace -r \t".*" "")' -d 'Force-push branch'
 # git push REMOTE :BRANCH deletes BRANCH on remote REMOTE
@@ -2019,7 +1958,11 @@ complete -f -c git -n '__fish_git_using_command push' -l progress -d 'Force prog

 ### rebase
 complete -f -c git -n __fish_git_needs_command -a rebase -d 'Reapply commit sequence on a new base'
-__fish_git_add_revision_completion -n '__fish_git_using_command rebase'
+complete -f -c git -n '__fish_git_using_command rebase' -a '(__fish_git_remotes)' -d 'Remote alias'
+complete -f -c git -n '__fish_git_using_command rebase' -ka '(__fish_git_branches)'
+complete -f -c git -n '__fish_git_using_command rebase' -a '(__fish_git_heads)' -d Head
+complete -f -c git -n '__fish_git_using_command rebase' -ka '(__fish_git_tags)' -d Tag -k
+complete -f -c git -n '__fish_git_using_command rebase' -a '(__fish_git_recent_commits)' -k
 complete -f -c git -n '__fish_git_using_command rebase' -n __fish_git_is_rebasing -l continue -d 'Restart the rebasing process'
 complete -f -c git -n '__fish_git_using_command rebase' -n __fish_git_is_rebasing -l abort -d 'Abort the rebase operation'
 complete -f -c git -n '__fish_git_using_command rebase' -n __fish_git_is_rebasing -l edit-todo -d 'Edit the todo list'
@@ -2044,7 +1987,7 @@ complete -f -c git -n '__fish_git_using_command rebase' -l no-autosquash -d 'No
 complete -f -c git -n '__fish_git_using_command rebase' -l autostash -d 'Before starting rebase, stash local changes, and apply stash when done'
 complete -f -c git -n '__fish_git_using_command rebase' -l no-autostash -d 'Do not stash local changes before starting rebase'
 complete -f -c git -n '__fish_git_using_command rebase' -l no-ff -d 'No fast-forward'
-__fish_git_add_revision_completion -n '__fish_git_using_command rebase' -l onto -d 'Rebase current branch onto given upstream or newbase' -r
+complete -f -c git -n '__fish_git_using_command rebase' -l onto -d 'Rebase current branch onto given upstream or newbase' -ka '(__fish_git_branches)'
 complete -f -c git -n '__fish_git_using_command rebase' -l update-refs -d 'Update any branches that point to commits being rebased'
 complete -f -c git -n '__fish_git_using_command rebase' -l no-update-refs -d 'Don\'t update any branches that point to commits being rebased'
 # This actually takes script for $SHELL, but completing that is... complicated.
@@ -2063,7 +2006,7 @@ complete -c git -n __fish_git_needs_command -a reset -d 'Reset current HEAD to t
 complete -f -c git -n '__fish_git_using_command reset' -l hard -d 'Reset the index and the working tree'
 complete -f -c git -n '__fish_git_using_command reset' -l soft -d 'Reset head without touching the index or the working tree'
 complete -f -c git -n '__fish_git_using_command reset' -l mixed -d 'The default: reset the index but not the working tree'
-__fish_git_add_revision_completion -n '__fish_git_using_command reset'
+complete -c git -n '__fish_git_using_command reset' -n 'not contains -- -- (commandline -xpc)' -ka '(__fish_git_branches)'
 # reset can either undo changes to versioned modified files,
 # or remove files from the staging area.
 # Deleted files seem to need a "--" separator.
@@ -2095,10 +2038,7 @@ complete -f -c git -n '__fish_git_using_command switch' -ka '(__fish_git_unique_
 complete -f -c git -n '__fish_git_using_command switch' -ka '(__fish_git_branches)'
 complete -f -c git -n '__fish_git_using_command switch' -s c -l create -d 'Create a new branch'
 complete -f -c git -n '__fish_git_using_command switch' -s C -l force-create -d 'Force create a new branch'
-begin
-    set -lx __fish_git_recent_commits_arg --all
-    __fish_git_add_revision_completion -n '__fish_git_using_command switch' -s d -l detach -r
-end
+complete -f -c git -n '__fish_git_using_command switch' -s d -l detach -rka '(__fish_git_recent_commits --all)'
 complete -f -c git -n '__fish_git_using_command switch' -s d -l detach -d 'Switch to a commit for inspection and discardable experiment' -rka '(__fish_git_refs)'
 complete -f -c git -n '__fish_git_using_command switch' -l guess -d 'Guess branch name from remote branch (default)'
 complete -f -c git -n '__fish_git_using_command switch' -l no-guess -d 'Do not guess branch name from remote branch'
@@ -2123,7 +2063,9 @@ complete -f -c git -n __fish_git_needs_command -a rev-list -d 'List commits in c

 ### rev-parse
 complete -f -c git -n __fish_git_needs_command -a rev-parse -d 'Parse revision names or give repo information'
-__fish_git_add_revision_completion -n '__fish_git_using_command rev-parse'
+complete -f -c git -n '__fish_git_using_command rev-parse' -ka '(__fish_git_branches)'
+complete -f -c git -n '__fish_git_using_command rev-parse' -a '(__fish_git_heads)' -d Head
+complete -c git -n '__fish_git_using_command rev-parse' -ka '(__fish_git_tags)' -d Tag
 complete -c git -n '__fish_git_using_command rev-parse' -l abbrev-ref -d 'Output non-ambiguous short object names'

 ### revert
@@ -2173,7 +2115,7 @@ complete -f -c git -n '__fish_git_using_command stripspace' -s c -l comment-line

 ### tag
 complete -f -c git -n __fish_git_needs_command -a tag -d 'Create, list, delete or verify a tag object signed with GPG'
-__fish_git_add_revision_completion -n '__fish_git_using_command tag' -n '__fish_not_contain_opt -s d' -n '__fish_not_contain_opt -s v' -n 'test (count (commandline -xpc | string match -r -v \'^-\')) -eq 3'
+complete -f -c git -n '__fish_git_using_command tag' -n '__fish_not_contain_opt -s d' -n '__fish_not_contain_opt -s v' -n 'test (count (commandline -xpc | string match -r -v \'^-\')) -eq 3' -ka '(__fish_git_branches)'
 complete -f -c git -n '__fish_git_using_command tag' -s a -l annotate -d 'Make an unsigned, annotated tag object'
 complete -f -c git -n '__fish_git_using_command tag' -s s -l sign -d 'Make a GPG-signed tag'
 complete -f -c git -n '__fish_git_using_command tag' -s d -l delete -d 'Remove a tag'
@@ -2234,10 +2176,11 @@ complete -f -c git -n "__fish_git_using_command worktree" -n "not __fish_seen_su
 complete -f -c git -n '__fish_git_using_command worktree' -n '__fish_seen_subcommand_from add move remove' -s f -l force -d 'Override safeguards'

 complete -c git -n '__fish_git_using_command worktree' -n '__fish_seen_subcommand_from add'
-begin
-    set -lx __fish_git_unqualified_unique_remote_branches true
-    __fish_git_add_revision_completion -n '__fish_git_using_command worktree' -n '__fish_seen_subcommand_from add'
-end
+complete -c git -n '__fish_git_using_command worktree' -n '__fish_seen_subcommand_from add' -ka '(__fish_git_branches)'
+complete -c git -n '__fish_git_using_command worktree' -n '__fish_seen_subcommand_from add' -ka '(__fish_git_heads)' -d Head
+complete -c git -n '__fish_git_using_command worktree' -n '__fish_seen_subcommand_from add' -ka '(__fish_git_tags)' -d Tag
+complete -c git -n '__fish_git_using_command worktree' -n '__fish_seen_subcommand_from add' -ka '(__fish_git_unique_remote_branches)' -d 'Unique Remote Branch'
+complete -c git -n '__fish_git_using_command worktree' -n '__fish_seen_subcommand_from add' -ka '(__fish_git_local_branches)'
 complete -x -c git -n '__fish_git_using_command worktree' -n '__fish_seen_subcommand_from add' -s b -d 'Create a new branch'
 complete -x -c git -n '__fish_git_using_command worktree' -n '__fish_seen_subcommand_from add' -s B -d 'Create a new branch even if it already exists'
 complete -f -c git -n '__fish_git_using_command worktree' -n '__fish_seen_subcommand_from add' -l detach -d 'Detach HEAD in the new working tree'
@@ -2273,7 +2216,11 @@ complete -f -c git -n '__fish_git_using_command stash' -n __fish_git_stash_not_u
 complete -f -c git -n '__fish_git_using_command stash' -n __fish_git_stash_not_using_subcommand -a branch -d 'Create a new branch from a stash'
 complete -f -c git -n '__fish_git_using_command stash' -n __fish_git_stash_not_using_subcommand -a push -d 'Create a new stash with given files'

-complete -f -c git -n '__fish_git_using_command stash' -n '__fish_git_stash_using_command apply branch drop pop show' -ka '(__fish_git_complete_stashes)'
+complete -f -c git -n '__fish_git_using_command stash' -n '__fish_git_stash_using_command apply' -ka '(__fish_git_complete_stashes)'
+complete -f -c git -n '__fish_git_using_command stash' -n '__fish_git_stash_using_command branch' -ka '(__fish_git_complete_stashes)'
+complete -f -c git -n '__fish_git_using_command stash' -n '__fish_git_stash_using_command drop' -ka '(__fish_git_complete_stashes)'
+complete -f -c git -n '__fish_git_using_command stash' -n '__fish_git_stash_using_command pop' -ka '(__fish_git_complete_stashes)'
+complete -f -c git -n '__fish_git_using_command stash' -n '__fish_git_stash_using_command show' -ka '(__fish_git_complete_stashes)'

 complete -f -c git -n '__fish_git_using_command stash' -n '__fish_git_stash_using_command push' -a '(__fish_git_files modified deleted modified-staged-deleted)'
 complete -f -c git -n '__fish_git_using_command stash' -n '__fish_git_stash_using_command push' -s a -l all -d 'Stash ignored and untracked files'
@@ -2290,7 +2237,7 @@ complete -f -c git -n __fish_git_needs_command -a config -d 'Set and read git co

 ### format-patch
 complete -f -c git -n __fish_git_needs_command -a format-patch -d 'Generate patch series to send upstream'
-__fish_git_add_revision_completion -n '__fish_git_using_command format-patch'
+complete -f -c git -n '__fish_git_using_command format-patch' -ka '(__fish_git_branches)'
 complete -c git -n '__fish_git_using_command format-patch' -s o -l output-directory -xa '(__fish_complete_directories)'
 complete -f -c git -n '__fish_git_using_command format-patch' -s p -l no-stat -d "Generate plain patches without diffstat"
 complete -f -c git -n '__fish_git_using_command format-patch' -s s -l no-patch -d "Suppress diff output"
@@ -2642,8 +2589,7 @@ end

 # source git-* commands' autocompletion file if exists
 set -l __fish_git_custom_commands_completion
-set -l git_subcommands $PATH/git-*
-for file in (path filter -xZ $git_subcommands | path basename)
+for file in (path filter -xZ $PATH/git-* | path basename)
    # Already seen this command earlier in $PATH.
    contains -- $file $__fish_git_custom_commands_completion
    and continue
@@ -2653,8 +2599,3 @@ for file in (path filter -xZ $git_subcommands | path basename)
    complete -c git -f -n "__fish_git_using_command $cmd" -a "(__fish_git_complete_custom_command $cmd)"
    set -a __fish_git_custom_commands_completion $file
 end
-
-functions --erase __fish_git_add_revision_completion
-set -eg __fish_git_recent_commits_arg
-set -eg __fish_git_unqualified_unique_remote_branches
-set -eg __fish_git_filter_non_pushable
--- a/share/completions/gpasswd.fish
+++ b/share/completions/gpasswd.fish
@@ -4,5 +4,5 @@ complete -c gpasswd -s d -l delete -d 'Remove user from group' -xa '(__fish_comp
 complete -c gpasswd -s h -l help -d 'Print help'
 complete -c gpasswd -s r -l remove-password -d 'Remove the GROUP\'s password'
 complete -c gpasswd -s R -l restrict -d 'Restrict access to GROUP to its members'
-complete -c gpasswd -s M -l members -d 'Set the list of members of GROUP' -xa "(__fish_stripprefix='^(--members=|-\w*M)' __fish_complete_list , __fish_complete_users)"
-complete -c gpasswd -s A -l administrators -d 'set the list of administrators for GROUP' -xa "(__fish_stripprefix='^(--administrators=|-\w*A)' __fish_complete_list , __fish_complete_users)"
+complete -c gpasswd -s M -l members -d 'Set the list of members of GROUP' -xa '(__fish_complete_list , __fish_complete_users)'
+complete -c gpasswd -s A -l administrators -d 'set the list of administrators for GROUP' -xa '(__fish_complete_list , __fish_complete_users)'
--- a/share/completions/guild.fish
+++ b/share/completions/guild.fish
@@ -36,7 +36,7 @@ complete -c $command -s x -x \
    -n $compile_condition

 complete -c $command -s W -l warning \
-    -a "(__fish_stripprefix='^(--warning=|-\w*W)' __fish_complete_list , __fish_guild__complete_warnings)" \
+    -a '(__fish_complete_list , __fish_guild__complete_warnings)' \
    -d 'Specify the warning level for a compilation' \
    -n $compile_condition

--- a/share/completions/guile.fish
+++ b/share/completions/guile.fish
@@ -85,7 +85,7 @@ complete -c $command -o ds \
    -d 'Treat the last -s option as if it occurred at this point'

 complete -c $command -l use-srfi \
-    -a "(__fish_stripprefix='^--use-srfi=' __fish_complete_list , __fish_guile__complete_srfis)" \
+    -a '(__fish_complete_list , __fish_guile__complete_srfis)' \
    -d 'Specify the SRFI modules to load'

 for standard in 6 7
--- a/share/completions/gzip.fish
+++ b/share/completions/gzip.fish
@@ -1,5 +1,5 @@
 complete -c gzip -s c -l stdout -d "Compress to stdout"
-complete -c gzip -s d -l decompress -d Decompress -k -x -a "(__fish_complete_suffix .gz .tgz)"
+complete -c gzip -s d -l decompress -k -x -a "(__fish_complete_suffix .gz .tgz)"

 complete -c gzip -s f -l force -d Overwrite
 complete -c gzip -s h -l help -d "Display help and exit"
--- a/share/completions/hashcat.fish
+++ b/share/completions/hashcat.fish
@@ -58,7 +58,7 @@ complete -c hashcat -l restore -d "Restore session from --session"
 complete -c hashcat -l restore-disable -d "Do not write restore file"
 complete -c hashcat -l restore-file-path -rF -d "Specific path to restore file"
 complete -c hashcat -s o -l outfile -rF -d "Define outfile for recovered hash"
-complete -c hashcat -l outfile-format -xa "(__fish_stripprefix='^--outfile-format=' __fish_complete_list , __fish_hashcat_outfile_formats)" -d "Outfile formats to use"
+complete -c hashcat -l outfile-format -xa "(__fish_complete_list , __fish_hashcat_outfile_formats)" -d "Outfile formats to use"
 complete -c hashcat -l outfile-autohex-disable -d "Disable the use of \$HEX[] in output plains"
 complete -c hashcat -l outfile-check-timer -x -d "Sets seconds between outfile checks"
 complete -c hashcat -l wordlist-autohex-disable -d "Disable the conversion of \$HEX[] from the wordlist"
@@ -106,7 +106,7 @@ complete -c hashcat -l backend-ignore-metal -d "Do not try to open Metal interfa
 complete -c hashcat -l backend-ignore-opencl -d "Do not try to open OpenCL interface on startup"
 complete -c hashcat -s I -l backend-info -d "Show info about detected backend API devices"
 complete -c hashcat -s d -l backend-devices -x -d "Backend devices to use"
-complete -c hashcat -s D -l opencl-device-types -xa "(__fish_stripprefix='^(--opencl-device-types=|-\w*D)' __fish_complete_list , __fish_hashcat_device_types)" -d "OpenCL device-types to use"
+complete -c hashcat -s D -l opencl-device-types -xa "(__fish_complete_list , __fish_hashcat_device_types)" -d "OpenCL device-types to use"
 complete -c hashcat -s O -l optimized-kernel-enable -d "Enable optimized kernels (limits password length)"
 complete -c hashcat -s M -l multiply-accel-disable -d "Disable multiply kernel-accel with processor count"
 complete -c hashcat -s w -l workload-profile -d "Enable a specific workload profile" -xa "
--- a/share/completions/ip.fish
+++ b/share/completions/ip.fish
@@ -260,12 +260,10 @@ function __fish_complete_ip
        case address
            # We're still _on_ the second word, which is the subcommand
            if not set -q cmd[3]
-                printf '%s\t%s\n' \
-                    add "Add new protocol address" \
+                printf '%s\t%s\n' add "Add new protocol address" \
                    delete "Delete protocol address" \
                    show "Look at protocol addresses" \
-                    flush "Flush protocol addresses" \
-                    help "Display help"
+                    flush "Flush protocol addresses"
            else
                switch $cmd[2]
                    # Change and replace are undocumented (apart from mentions in the BNF)
@@ -341,8 +339,7 @@ function __fish_complete_ip
            end
        case link
            if not set -q cmd[3]
-                printf '%s\t%s\n' \
-                    add "Add virtual link" \
+                printf '%s\t%s\n' add "Add virtual link" \
                    delete "Delete virtual link" \
                    set "Change device attributes" \
                    show "Display device attributes" \
@@ -433,20 +430,18 @@ function __fish_complete_ip
                        end
                    case show
                    case help
-                        __fish_ip_types
                end
            end
        case neighbour
            if not set -q cmd[3]
-                printf '%s\t%s\n' \
+                printf '%s\t%s\n' help "Show help" \
                    add "Add new neighbour entry" \
                    delete "Delete neighbour entry" \
                    change "Change neighbour entry" \
                    replace "Add or change neighbour entry" \
                    show "List neighbour entries" \
                    flush "Flush neighbour entries" \
-                    get "Lookup neighbour entry" \
-                    help "Display help"
+                    get "Lookup neighbour entry"
            else
                switch $cmd[2]
                    case add del delete change replace
@@ -510,8 +505,7 @@ function __fish_complete_ip
                    get "Get a single route" \
                    save "Save routing table to stdout" \
                    showdump "Show saved routing table from stdin" \
-                    restore "Restore routing table from stdin" \
-                    help "Display help"
+                    restore "Restore routing table from stdin"
            else
                # TODO: switch on $cmd[2] and complete subcommand specific arguments
                # for now just complete most useful arguments for the last token
@@ -530,8 +524,7 @@ function __fish_complete_ip
                    flush "Flush rules" \
                    show "List rules" \
                    save "Save rules to stdout" \
-                    restore "Restore rules from stdin" \
-                    help "Display help"
+                    restore "Restore rules from stdin"
            else
                # TODO: switch on $cmd[2] and complete subcommand specific arguments
                # for now just complete most useful arguments for the last token
@@ -586,27 +579,6 @@ function __fish_complete_ip
                        end
                end
            end
-        case tuntap
-            if not set -q cmd[3]
-                printf '%s\t%s\n' \
-                    add "Add a new tun or tap device" \
-                    del "Delete a tun or tap device" \
-                    show "Show tun and tap devices" \
-                    help "Display help"
-            else
-                switch $cmd[-2]
-                    case dev
-                        __fish_ip_device
-                    case mode
-                        printf '%s\n' tun tap
-                    case user
-                        __fish_complete_users
-                    case group
-                        __fish_complete_groups
-                    case '*'
-                        printf '%s\n' dev mode user group one_queue pi vnet_hdr multi_queue name
-                end
-            end
    end
 end

--- a/share/completions/john.fish
+++ b/share/completions/john.fish
@@ -9,7 +9,7 @@ function __fish_john_formats --description "Print JohnTheRipper hash formats"
 end

 complete -c john -l help -d "print usage summary"
-complete -c john -l single -fa "(__fish_stripprefix='^--single=' __fish_complete_list , __fish_john_rules)" -d "single crack mode"
+complete -c john -l single -fa "(__fish_complete_list , __fish_john_rules)" -d "single crack mode"
 complete -c john -l single-seed -rf -d "add static seed word(s) for all salts in single mode"
 complete -c john -l single-wordlist -rF -d "short wordlist with static seed words/morphemes"
 complete -c john -l single-user-seed -rF -d "wordlist with seeds per username"
@@ -35,8 +35,8 @@ complete -c john -l prince-case-permute -d "permute case of first letter"
 complete -c john -l prince-mmap -d "memory-map infile"
 complete -c john -l prince-keyspace -d "just show total keyspace that would be produced"
 complete -c john -l encoding -l input-encoding -fa "$__fish_john_encodings" -d "input encoding"
-complete -c john -l rules -fa "(__fish_stripprefix='^--rules=' __fish_complete_list , __fish_john_rules)" -d "enable word mangling rules"
-complete -c john -l rules-stack -fa "(__fish_stripprefix='^--rules-stack=' __fish_complete_list , __fish_john_rules)" -d "stacked rules"
+complete -c john -l rules -fa "(__fish_complete_list , __fish_john_rules)" -d "enable word mangling rules"
+complete -c john -l rules-stack -fa "(__fish_complete_list , __fish_john_rules)" -d "stacked rules"
 complete -c john -l rules-skip-nop -d "skip any NOP rules"
 complete -c john -l incremental -fa "(john --list=inc-modes 2>/dev/null)" -d "incremental mode"
 complete -c john -l incremental-charcount -rf -d "override CharCount for incremental mode"
@@ -97,4 +97,4 @@ complete -c john -l internal-codepage -fa "$__fish_john_encodings" -d "codepage
 complete -c john -l target-encoding -fa "$__fish_john_encodings" -d "output encoding"
 complete -c john -l tune -fa "auto report N" -d "tuning options"
 complete -c john -l force-tty -d "set up terminal for reading keystrokes"
-complete -c john -l format -fa "(__fish_stripprefix='^--format=' __fish_complete_list , __fish_john_formats)" -d "force hash type"
+complete -c john -l format -fa "(__fish_complete_list , __fish_john_formats)" -d "force hash type"
--- a/share/completions/journalctl.fish
+++ b/share/completions/journalctl.fish
@@ -30,7 +30,6 @@ complete -c journalctl -f -l version -d 'Prints a short version string and exits
 complete -c journalctl -f -l no-pager -d 'Do not pipe output into a pager'
 complete -c journalctl -f -s a -l all -d 'Show all fields in full'
 complete -c journalctl -f -s f -l follow -d 'Show live tail of entries'
-complete -c journalctl -f -s e -l pager-end -d 'Skip to the end of the journal'
 complete -c journalctl -f -s n -l lines -d 'Controls the number of journal lines'
 complete -c journalctl -f -l no-tail -d 'Show all lines, even in follow mode'
 complete -c journalctl -f -s o -l output -d 'Controls the formatting' -xa '(printf %s\t\n (command journalctl --output=help))'
--- a/share/completions/keybase.fish
+++ b/share/completions/keybase.fish
@@ -1,4 +1,4 @@
-# Keybase 6.4.0
+#Keybase 5.6.1

 function __fish_keybase_line_ends_with
    set -l line (commandline -pxc | string match -v -r '^-')
@@ -9,132 +9,123 @@ function __fish_keybase_line_ends_with
    end
 end

-# variables
+#variables
 set -l ends __fish_keybase_line_ends_with
-# 1
-set -l keybase account apicall audit base62 blocks bot btc ca chat config ctl currency db decrypt deprovision device dir dismiss dismiss-category dump-keyfamily dump-push-notifications encrypt fnmr follow fs git h help home id interesting-people kvstore list-followers list-following log login logout network-stats oneshot paperkey passphrase pgp ping pprof prove push rekey riit script selfprovision service sign signup sigs status team track unfollow unlock untrack upak update upload-avatar verify version wallet web-auth-token whoami wot
-# 2
-set -l keybase_account contact-settings delete email h help lockdown phonenumber recover-username reset-cancel upload-avatar
-set -l keybase_audit box h help
-set -l keybase_base62 decode encode h help
-set -l keybase_blocks h help list-teams list-users
+set -l seen __fish_seen_subcommand_from
+#L1
+set -l keybase account blocks bot chat config ctl currency decrypt deprovision device encrypt follow fs git h help id kvstore list-followers list-following log login logout oneshot paperkey passphrase pgp ping prove rekey selfprovision service sign signup sigs status team track unfollow untrack update verify version wallet whoami
+#L2
+set -l keybase_account contact-settings delete email h help lockdown recover-username upload-avatar
+set -l keybase_blocks h help list-users list-teams
 set -l keybase_bot h help signup token
-set -l keybase_chat add-bot-member add-to-channel api api-listen archive archive-delete archive-list archive-pause archive-resume bot-member-settings clear-commands conv-info create-channel default-channels delete-channel delete-history download edit-bot-member emoji-add emoji-addalias emoji-list emoji-remove featured-bots forward-message h help hide join-channel leave-channel list list-channels list-members list-unread ls lsur mark-as-read min-writer-role mute notification-settings read readd-member remove-bot-member remove-from-channel rename-channel report retention-policy search search-bots search-regexp send upload
+set -l keybase_chat add-bot-member add-to-channel api api-listen bot-member-settings clear-commands conv-info create-channel default-channels delete-channel delete-history download edit-bot-member featured-bots h help hide join-channel leave-channel list list-channels list-members list-unread ls lsur min-writer-role mute notification-settings read readd-member remove-bot-member rename-channel report retention-policy search search-bots search-regexp send upload
 set -l keybase_config get h help info set
-set -l keybase_ctl app-exit autostart h help init log-rotate redirector reload restart start stop wait wants-systemd watchdog watchdog2
+set -l keybase_ctl app-exit autostart h help init log-rotate redirector reload restart start stop wait watchdog watchdog2
 set -l keybase_currency add h help
-set -l keybase_db clean delete get h help keys-with-prefix nuke put
 set -l keybase_device add h help list remove
-set -l keybase_fs archive cancel-uploads clear-conflicts cp debug finish-resolving-conflicts get-status h help history index-progress kill ln ls mkdir mv ps quota read recover reset reset-index rm search set-debug-level stat sync uploads write
-set -l keybase_git archive create delete gc h help lfs-config list settings
+set -l keybase_fs clear-conflicts cp debug finish-resolving-conflicts get-status h help history kill ln ls mkdir mv ps quota read recover reset rm set-debug-level stat sync uploads write
+set -l keybase_git create delete gc h help lfs-config list settings
 set -l keybase_help advanced gpg keyring tor
 set -l keybase_kvstore api h help
-set -l keybase_log h help profile send
+set -l keybase_log h help send
 set -l keybase_passphrase change check h help recover remember set
 set -l keybase_pgp decrypt drop encrypt export gen h help import list pull pull-private purge push-private select sign update verify
-set -l keybase_pprof cpu h heap help trace
 set -l keybase_rekey h help paper status
 set -l keybase_sigs h help list revoke
-set -l keybase_team accept-invite add-member add-members-bulk api bot-settings create delete edit-member ftl generate-invite-token generate-invitelink h help ignore-request leave list-members list-memberships list-requests profile-load remove-member rename request-access search settings show-tree
+set -l keybase_team accept-invite add-member add-members-bulk api bot-settings create delete edit-member h help ignore-request leave list-members list-memberships list-requests remove-member rename request-access search settings show-tree
 set -l keybase_update check check-in-use notify
-set -l keybase_wallet accounts balances detail details export h help list
-set -l keybase_wot accept h help list reject vouch
-# 3
+set -l keybase_wallet accounts add-trustline api asset-search balances cancel cancel-request change-trustline-limit delete-trustline detail details export get-inflation get-started h help history import list lookup merge popular-assets reclaim rename request send send-path-payment set-currency set-inflation set-primary sign
+#L3
 set -l keybase_account_email add delete edit h help list send-verification-email set-primary set-visibility
-set -l keybase_account_phonenumber add delete edit h help list set-visibility verify
-set -l keybase_bot_token create delete h help list
-set -l keybase_fs_archive cancel check check dismiss h help start status
 set -l keybase_fs_debug deobfuscate dump h help obfuscate
 set -l keybase_fs_sync disable enable h help show
+#...

-# global options
-complete -c keybase -f -n "$ends keybase" -l api-dump-unsafe -d "Dump API call internals (may leak secrets)"
-complete -c keybase -f -n "$ends keybase" -l api-timeout -d "Set the HTTP timeout for API calls to the keybase API server"
-complete -c keybase -f -n "$ends keybase" -l api-uri-path-prefix -d "Specify an alternate API URI path prefix"
-complete -c keybase -f -n "$ends keybase" -l app-start-mode -d "Specify 'service' to auto-start UI app, or anything else to disable"
-complete -c keybase -f -n "$ends keybase" -l auto-fork -d "Enable auto-fork of background service"
-complete -c keybase -f -n "$ends keybase" -l bg-identifier-disabled -d "Supply to disable the BG identifier loop"
-complete -c keybase -f -n "$ends keybase" -l chat-db -d "Specify an alternate local Chat DB location"
-complete -c keybase -f -n "$ends keybase" -l code-signing-kids -d "Set of code signing key IDs (colon-separated)"
-complete -c keybase -f -n "$ends keybase" -l config-file -s c -d "Specify an (alternate) master config file"
-complete -c keybase -f -n "$ends keybase" -l db -d "Specify an alternate local DB location"
-complete -c keybase -f -n "$ends keybase" -l debug -s d -d "Enable debugging mode"
-complete -c keybase -f -n "$ends keybase" -l debug-journeycard -d "Enable experimental journey cards"
-complete -c keybase -f -n "$ends keybase" -l disable-bg-conv-loader -d "Disable background conversation loading"
-complete -c keybase -f -n "$ends keybase" -l disable-cert-pinning -d "WARNING: Do not use unless necessary!"
-complete -c keybase -f -n "$ends keybase" -l disable-merkle-auditor -d "Disable background probabilistic merkle audit"
-complete -c keybase -f -n "$ends keybase" -l disable-search-indexer -d "Disable chat search background indexer"
-complete -c keybase -f -n "$ends keybase" -l disable-team-auditor -d "Disable auditing of teams"
-complete -c keybase -f -n "$ends keybase" -l disable-team-box-auditor -d "Disable box auditing of teams"
-complete -c keybase -f -n "$ends keybase" -l display-raw-untrusted-output -d "Display output from users without escaping terminal codes"
-complete -c keybase -f -n "$ends keybase" -l ek-log-file -d "Specify a log file for the keybase ephemeral key log"
-complete -c keybase -f -n "$ends keybase" -l enable-bot-lite-mode -d "Enable bot lite mode. Disables non-critical background services"
-complete -c keybase -f -n "$ends keybase" -l extra-net-logging -d "Do additional debug logging during network requests"
-complete -c keybase -f -n "$ends keybase" -l features -d "Specify experimental feature flags"
-complete -c keybase -f -n "$ends keybase" -l force-linux-keyring -d "Require the use of the OS keyring"
-complete -c keybase -f -n "$ends keybase" -l generate-bash-completion -d ""
-complete -c keybase -f -n "$ends keybase" -l gpg -d "Path to GPG client (optional for exporting keys)"
-complete -c keybase -f -n "$ends keybase" -l gpg-options -d "Options to use when calling GPG"
-complete -c keybase -f -n "$ends keybase" -l gpgdir -d "Specify a PGP directory (default is ~/.gnupg)"
-complete -c keybase -f -n "$ends keybase" -l gui-config-file -d "Specify a path to the GUI config file"
-complete -c keybase -f -n "$ends keybase" -l help -s h -d "Show help"
-complete -c keybase -f -n "$ends keybase" -l home -s H -d "Specify an (alternate) home directory"
-complete -c keybase -f -n "$ends keybase" -l leveldb-num-files -d "Specify the max number of files LevelDB may open"
-complete -c keybase -f -n "$ends keybase" -l local-rpc-debug-unsafe -d "Use to debug local RPC (may leak secrets)"
-complete -c keybase -f -n "$ends keybase" -l log-file -d "Specify a log file for the keybase service"
-complete -c keybase -f -n "$ends keybase" -l log-format -d "Log format (default, plain, file, fancy)"
-complete -c keybase -f -n "$ends keybase" -l log-prefix -d "Specify a prefix for a unique log file name"
-complete -c keybase -f -n "$ends keybase" -l merkle-kids -d "Set of admissible Merkle Tree fingerprints (colon-separated)"
-complete -c keybase -f -n "$ends keybase" -l no-auto-fork -s F -d "Disable auto-fork of background service"
-complete -c keybase -f -n "$ends keybase" -l no-debug -d "Suppress debugging mode; takes precedence over --debug"
-complete -c keybase -f -n "$ends keybase" -l paramproof-kit -d "Specify an alternate local parameterized proof kit file location"
-complete -c keybase -f -n "$ends keybase" -l pgpdir -d "Specify a PGP directory (default is ~/.gnupg)"
-complete -c keybase -f -n "$ends keybase" -l pid-file -d "Location of the keybased pid-file (to ensure only one running daemon)"
-complete -c keybase -f -n "$ends keybase" -l pinentry -d "Specify a path to find a pinentry program"
-complete -c keybase -f -n "$ends keybase" -l proof-cache-size -d "Number of proof entries to cache"
-complete -c keybase -f -n "$ends keybase" -l prove-bypass -d "Prove even disabled proof services"
-complete -c keybase -f -n "$ends keybase" -l proxy -d "Specify a proxy to ship all Web requests over"
-complete -c keybase -f -n "$ends keybase" -l proxy-type -d "Set the proxy type; One of: socks,http_connect"
-complete -c keybase -f -n "$ends keybase" -l push-disabled -d "Disable push server connection (which is on by default)"
-complete -c keybase -f -n "$ends keybase" -l push-save-interval -d "Set the interval between saves of the push cache (in seconds)"
-complete -c keybase -f -n "$ends keybase" -l push-server-uri -d "Specify a URI for contacting the Keybase push server"
-complete -c keybase -f -n "$ends keybase" -l pvl-kit -d "Specify an alternate local PVL kit file location"
-complete -c keybase -f -n "$ends keybase" -l read-deleted-sigchain -d "Allow admins to read deleted sigchains for debugging"
-complete -c keybase -f -n "$ends keybase" -l remember-passphrase -d "Remember keybase passphrase"
-complete -c keybase -f -n "$ends keybase" -l run-mode -d "Run mode (devel, staging, prod)"
-complete -c keybase -f -n "$ends keybase" -l scraper-timeout -d "Set the HTTP timeout for external proof scrapers"
-complete -c keybase -f -n "$ends keybase" -l secret-keyring -d "Location of the Keybase secret-keyring (P3SKB-encoded)"
-complete -c keybase -f -n "$ends keybase" -l server -s s -d "Specify server API"
-complete -c keybase -f -n "$ends keybase" -l session-file -d "Specify an alternate session data file"
-complete -c keybase -f -n "$ends keybase" -l slow-gregor-conn -d "Slow responses from gregor for testing"
-complete -c keybase -f -n "$ends keybase" -l socket-file -d "Location of the keybased socket-file"
-complete -c keybase -f -n "$ends keybase" -l standalone -d "Use the client without any daemon support"
-complete -c keybase -f -n "$ends keybase" -l timers -d "Specify 'a' for API; 'r' for RPCs; and 'x' for eXternal API calls"
-complete -c keybase -f -n "$ends keybase" -l tor-hidden-address -d "Set TOR address of keybase server"
-complete -c keybase -f -n "$ends keybase" -l tor-mode -d "Set TOR mode to be 'leaky', 'none', or 'strict'"
-complete -c keybase -f -n "$ends keybase" -l tor-proxy -d "Set TOR proxy; when Tor mode is on; defaults to localhost:9050"
-complete -c keybase -f -n "$ends keybase" -l updater-config-file -d "Specify a path to the updater config file"
-complete -c keybase -f -n "$ends keybase" -l use-default-log-file -d "Log to the default log file in $XDG_CACHE_HOME, or ~/.cache if unset"
-complete -c keybase -f -n "$ends keybase" -l use-root-config-file -d "Use the default root config on Linux only"
-complete -c keybase -f -n "$ends keybase" -l user-cache-size -d "Number of User entries to cache"
-complete -c keybase -f -n "$ends keybase" -l vdebug -d "Verbose debugging; takes a comma-joined list of levels and tags"
-complete -c keybase -f -n "$ends keybase" -l version -s v -d "Print the version"
+#global options
+complete -c keybase -f -n "$ends keybase" -l api-dump-unsafe
+complete -c keybase -f -n "$ends keybase" -l api-timeout
+complete -c keybase -f -n "$ends keybase" -l api-uri-path-prefix
+complete -c keybase -f -n "$ends keybase" -l app-start-mode
+complete -c keybase -f -n "$ends keybase" -l auto-fork
+complete -c keybase -f -n "$ends keybase" -l bg-identifier-disabled
+complete -c keybase -f -n "$ends keybase" -l chat-db
+complete -c keybase -f -n "$ends keybase" -l code-signing-kids
+complete -c keybase -f -n "$ends keybase" -l config-file -s c
+complete -c keybase -f -n "$ends keybase" -l db
+complete -c keybase -f -n "$ends keybase" -l debug -s d
+complete -c keybase -f -n "$ends keybase" -l debug-journeycard
+complete -c keybase -f -n "$ends keybase" -l disable-bg-conv-loader
+complete -c keybase -f -n "$ends keybase" -l disable-cert-pinning
+complete -c keybase -f -n "$ends keybase" -l disable-merkle-auditor
+complete -c keybase -f -n "$ends keybase" -l disable-search-indexer
+complete -c keybase -f -n "$ends keybase" -l disable-team-auditor
+complete -c keybase -f -n "$ends keybase" -l disable-team-box-auditor
+complete -c keybase -f -n "$ends keybase" -l display-raw-untrusted-output
+complete -c keybase -f -n "$ends keybase" -l ek-log-file
+complete -c keybase -f -n "$ends keybase" -l enable-bot-lite-mode
+complete -c keybase -f -n "$ends keybase" -l extra-net-logging
+complete -c keybase -f -n "$ends keybase" -l features
+complete -c keybase -f -n "$ends keybase" -l force-linux-keyring
+complete -c keybase -f -n "$ends keybase" -l generate-bash-completion
+complete -c keybase -f -n "$ends keybase" -l gpg
+complete -c keybase -f -n "$ends keybase" -l gpg-options
+complete -c keybase -f -n "$ends keybase" -l gpgdir
+complete -c keybase -f -n "$ends keybase" -l gui-config-file
+complete -c keybase -f -n "$ends keybase" -l help -s h
+complete -c keybase -f -n "$ends keybase" -l home -s H
+complete -c keybase -f -n "$ends keybase" -l leveldb-num-files
+complete -c keybase -f -n "$ends keybase" -l local-rpc-debug-unsafe
+complete -c keybase -f -n "$ends keybase" -l log-file
+complete -c keybase -f -n "$ends keybase" -l log-format
+complete -c keybase -f -n "$ends keybase" -l log-prefix
+complete -c keybase -f -n "$ends keybase" -l merkle-kids
+complete -c keybase -f -n "$ends keybase" -l no-auto-fork -s F
+complete -c keybase -f -n "$ends keybase" -l no-debug
+complete -c keybase -f -n "$ends keybase" -l paramproof-kit
+complete -c keybase -f -n "$ends keybase" -l pgpdir
+complete -c keybase -f -n "$ends keybase" -l pid-file
+complete -c keybase -f -n "$ends keybase" -l pinentry
+complete -c keybase -f -n "$ends keybase" -l proof-cache-size
+complete -c keybase -f -n "$ends keybase" -l prove-bypass
+complete -c keybase -f -n "$ends keybase" -l proxy
+complete -c keybase -f -n "$ends keybase" -l proxy-type
+complete -c keybase -f -n "$ends keybase" -l push-disabled
+complete -c keybase -f -n "$ends keybase" -l push-save-interval
+complete -c keybase -f -n "$ends keybase" -l push-server-uri
+complete -c keybase -f -n "$ends keybase" -l pvl-kit
+complete -c keybase -f -n "$ends keybase" -l read-deleted-sigchain
+complete -c keybase -f -n "$ends keybase" -l remember-passphrase
+complete -c keybase -f -n "$ends keybase" -l run-mode
+complete -c keybase -f -n "$ends keybase" -l scraper-timeout
+complete -c keybase -f -n "$ends keybase" -l secret-keyring
+complete -c keybase -f -n "$ends keybase" -l server -s s
+complete -c keybase -f -n "$ends keybase" -l session-file
+complete -c keybase -f -n "$ends keybase" -l slow-gregor-conn
+complete -c keybase -f -n "$ends keybase" -l socket-file
+complete -c keybase -f -n "$ends keybase" -l standalone
+complete -c keybase -f -n "$ends keybase" -l timers
+complete -c keybase -f -n "$ends keybase" -l tor-hidden-address
+complete -c keybase -f -n "$ends keybase" -l tor-mode
+complete -c keybase -f -n "$ends keybase" -l tor-proxy
+complete -c keybase -f -n "$ends keybase" -l updater-config-file
+complete -c keybase -f -n "$ends keybase" -l use-default-log-file
+complete -c keybase -f -n "$ends keybase" -l use-root-config-file
+complete -c keybase -f -n "$ends keybase" -l user-cache-size
+complete -c keybase -f -n "$ends keybase" -l vdebug
+complete -c keybase -f -n "$ends keybase" -l version -s v

-# commands
-# 1
+#commands
+#L1
 complete -c keybase -f -n "not $ends keybase"
 complete -c keybase -f -n "$ends keybase" -a "$keybase"
-# 2
+#L2
 complete -c keybase -f -n "$ends keybase account" -a "$keybase_account"
-complete -c keybase -f -n "$ends keybase audit" -a "$keybase_audit"
-complete -c keybase -f -n "$ends keybase base62" -a "$keybase_base62"
 complete -c keybase -f -n "$ends keybase blocks" -a "$keybase_blocks"
 complete -c keybase -f -n "$ends keybase bot" -a "$keybase_bot"
 complete -c keybase -f -n "$ends keybase chat" -a "$keybase_chat"
 complete -c keybase -f -n "$ends keybase config" -a "$keybase_config"
 complete -c keybase -f -n "$ends keybase ctl" -a "$keybase_ctl"
 complete -c keybase -f -n "$ends keybase currency" -a "$keybase_currency"
-complete -c keybase -f -n "$ends keybase db" -a "$keybase_db"
 complete -c keybase -f -n "$ends keybase device" -a "$keybase_device"
 complete -c keybase -f -n "$ends keybase fs" -a "$keybase_fs"
 complete -c keybase -f -n "$ends keybase git" -a "$keybase_git"
@@ -144,22 +135,19 @@ complete -c keybase -f -n "$ends keybase kvstore" -a "$keybase_kvstore"
 complete -c keybase -f -n "$ends keybase log" -a "$keybase_log"
 complete -c keybase -f -n "$ends keybase passphrase" -a "$keybase_passphrase"
 complete -c keybase -f -n "$ends keybase pgp" -a "$keybase_pgp"
-complete -c keybase -f -n "$ends keybase pprof" -a "$keybase_pprof"
 complete -c keybase -f -n "$ends keybase rekey" -a "$keybase_rekey"
 complete -c keybase -f -n "$ends keybase sigs" -a "$keybase_sigs"
 complete -c keybase -f -n "$ends keybase team" -a "$keybase_team"
 complete -c keybase -f -n "$ends keybase update" -a "$keybase_update"
 complete -c keybase -f -n "$ends keybase wallet" -a "$keybase_wallet"
-complete -c keybase -f -n "$ends keybase wot" -a "$keybase_wot"
-# 3
+#...
+#L3
 complete -c keybase -f -n "$ends keybase account email" -a "$keybase_account_email"
-complete -c keybase -f -n "$ends keybase account phonenumber" -a "$keybase_account_phonenumber"
-complete -c keybase -f -n "$ends keybase bot token" -a "$keybase_bot_token"
-complete -c keybase -f -n "$ends keybase fs archive" -a "$keybase_fs_archive"
 complete -c keybase -f -n "$ends keybase fs debug" -a "$keybase_fs_debug"
 complete -c keybase -f -n "$ends keybase fs sync" -a "$keybase_fs_sync"
+#...

-# command options
+#command options
 complete -c keybase -f -n "$ends keybase account upload-avatar" -l skip-chat-message -s s
 complete -c keybase -f -n "$ends keybase account upload-avatar" -l team
-# ...
+#...
--- a/share/completions/light.fish
+++ b/share/completions/light.fish
@@ -1,19 +1,24 @@
 # Light is a program to control backlight controllers under GNU/Linux.
 # See: https://github.com/haikarainen/light

-complete -c light -s h -s -H -d 'Print help and exit'
+function __fish_print_light_controllers
+    command light -L
+end
+
+complete -c light -s h -d 'Print help and exit'
 complete -c light -s V -d 'Print version info and exit'
-complete -c light -s L -d 'List controllers'
+complete -c light -s G -d 'Get value (default)'
+complete -c light -s S -x -d 'Set value'
 complete -c light -s A -x -d 'Add value'
 complete -c light -s U -x -d 'Subtract value'
-complete -c light -s T -d 'Save brightness'
-complete -c light -s S -x -d 'Set value'
-complete -c light -s G -d 'Get value (default)'
-complete -c light -s N -d 'Set minimum brightness'
-complete -c light -s P -d 'Get minimum brightness'
+complete -c light -s L -d 'List controllers'
+complete -c light -s I -d 'Restore brightness'
 complete -c light -s O -d 'Save brightness'
-complete -c light -s I -d 'Restore brightness after saving'
-
+complete -c light -s b -d 'Brightness (default)'
+complete -c light -s m -d 'Maximum brightness'
+complete -c light -s c -d 'Minimum cap'
+complete -c light -s a -d 'Selects controller automatically (default)'
+complete -c light -s s -a '(__fish_print_light_controllers)' -x -d 'Specify controller to use'
+complete -c light -s p -d 'Interpret & output values in percent'
 complete -c light -s r -d 'Interpret & output values in raw mode'
-complete -c light -s s -a '(command light -L)' -x -d 'Specify controller to use'
 complete -c light -s v -x -d 'Sets the verbosity level' -a '0\tRead\ values 1\tRead\ values\ \&\ errors 2\tRead\ values,\ errors\ \&\ warnings 3\tRead\ values,\ errors,\ warnings\ \&\ notices'
--- a/share/completions/losetup.fish
+++ b/share/completions/losetup.fish
@@ -41,7 +41,7 @@ complete -c losetup -s v -l verbose -d "Verbose mode"
 complete -c losetup -s J -l json -d "Use JSON --list output format"
 complete -c losetup -s l -l list -d "List info about all or specified"
 complete -c losetup -s n -l noheadings -d "Don't print headings for --list output"
-complete -c losetup -s O -l output -x -a "(__fish_stripprefix='^(--output=|-\w*O)' __fish_complete_list , __fish_print_losetup_list_output)" -d "Specify columns to output for --list"
+complete -c losetup -s O -l output -x -a "(__fish_complete_list , __fish_print_losetup_list_output)" -d "Specify columns to output for --list"
 complete -c losetup -l output-all -d "Output all columns"
 complete -c losetup -l raw -d "Use raw --list output format"
 complete -c losetup -s h -l help -d "Display help"
--- a/share/completions/lpadmin.fish
+++ b/share/completions/lpadmin.fish
@@ -25,7 +25,7 @@ complete -c lpadmin -s o -xa printer-is-shared=true -d 'Sets dest to shared/publ
 complete -c lpadmin -s o -xa printer-is-shared=false -d 'Sets dest to shared/published or unshared/unpublished'
 complete -c lpadmin -s o -d 'Set IPP operation policy associated with dest' -xa "printer-policy=(test -r /etc/cups/cupsd.conf; and string replace -r --filter '<Policy (.*)>' '$1' < /etc/cups/cupsd.conf)"

-complete -c lpadmin -s u -xa "allow:all allow:none (__fish_stripprefix='^-\w*u' __fish_complete_list , __fish_complete_users allow:)" -d 'Sets user-level access control on a destination'
-complete -c lpadmin -s u -xa "(__fish_stripprefix='^-\w*u' __fish_complete_list , __fish_complete_groups allow: @)" -d 'Sets user-level access control on a destination'
-complete -c lpadmin -s u -xa "deny:all deny:none (__fish_stripprefix='^-\w*u' __fish_complete_list , __fish_complete_users deny:)" -d 'Sets user-level access control on a destination'
-complete -c lpadmin -s u -xa "(__fish_stripprefix='^-\w*u' __fish_complete_list , __fish_complete_groups deny: @)" -d 'Sets user-level access control on a destination'
+complete -c lpadmin -s u -xa 'allow:all allow:none (__fish_complete_list , __fish_complete_users allow:)' -d 'Sets user-level access control on a destination'
+complete -c lpadmin -s u -xa '(__fish_complete_list , __fish_complete_groups allow: @)' -d 'Sets user-level access control on a destination'
+complete -c lpadmin -s u -xa 'deny:all deny:none (__fish_complete_list , __fish_complete_users deny:)' -d 'Sets user-level access control on a destination'
+complete -c lpadmin -s u -xa '(__fish_complete_list , __fish_complete_groups deny: @)' -d 'Sets user-level access control on a destination'
--- a/share/completions/lsblk.fish
+++ b/share/completions/lsblk.fish
@@ -12,7 +12,7 @@ complete -c lsblk -s h -l help -d "usage information (this)"
 complete -c lsblk -s i -l ascii -d "use ascii characters only"
 complete -c lsblk -s m -l perms -d "output info about permissions"
 complete -c lsblk -s n -l noheadings -d "don't print headings"
-complete -c lsblk -s o -l output -d "output columns" -xa "(__fish_stripprefix='^(--output=|-\w*o)' __fish_complete_list , __fish_print_lsblk_columns)"
+complete -c lsblk -s o -l output -d "output columns" -xa '( __fish_complete_list , __fish_print_lsblk_columns )'
 complete -c lsblk -s P -l pairs -d "use key='value' output format"
 complete -c lsblk -s r -l raw -d "use raw output format"
 complete -c lsblk -s t -l topology -d "output info about topology"
--- a/share/completions/lsof.fish
+++ b/share/completions/lsof.fish
@@ -11,9 +11,9 @@ i\t"ignore the device cache file"
 r\t"read the device cache file"
 u\t"read and update the device cache file"'

-complete -c lsof -s g -d 'select by group (^ - negates)' -xa "(__fish_stripprefix='^-\w*g' __fish_complete_list , __fish_complete_groups)"
+complete -c lsof -s g -d 'select by group (^ - negates)' -xa '(__fish_complete_list , __fish_complete_groups)'
 complete -c lsof -s l -d 'Convert UIDs to login names'
-complete -c lsof -s p -d 'Select or exclude processes by pid' -xa "(__fish_stripprefix='^-\w*p' __fish_complete_list , __fish_complete_pids)"
+complete -c lsof -s p -d 'Select or exclude processes by pid' -xa '(__fish_complete_list , __fish_complete_pids)'
 complete -c lsof -s R -d 'Print PPID'
 complete -c lsof -s t -d 'Produce terse output (pids only, no header)'
-complete -c lsof -s u -d 'select by user (^ - negates)' -xa "(__fish_stripprefix='^-\w*u' __fish_complete_list , __fish_complete_users)"
+complete -c lsof -s u -d 'select by user (^ - negates)' -xa '(__fish_complete_list , __fish_complete_users)'
--- a/share/completions/ncat.fish
+++ b/share/completions/ncat.fish
@@ -35,7 +35,7 @@ function __fish_complete_openssl_ciphers
        printf "%s\tCipher String\n" $cs
    end
 end
-complete -c ncat -l ssl-ciphers -x -a "(__fish_stripprefix='^--ssl-ciphers=' __fish_complete_list : __fish_complete_openssl_ciphers)" -d "Specify SSL ciphersuites"
+complete -c ncat -l ssl-ciphers -x -a "(__fish_complete_list : __fish_complete_openssl_ciphers)" -d "Specify SSL ciphersuites"
 complete -c ncat -l ssl-servername -x -a "(__fish_print_hostnames)" -d "Request distinct server name"
 complete -c ncat -l ssl-alpn -x -d "Specify ALPN protocol list"

--- a/share/completions/nmap.fish
+++ b/share/completions/nmap.fish
@@ -92,11 +92,11 @@ function __fish_complete_nmap_script
    end
    echo -e $__fish_nmap_script_completion_cache
 end
-complete -c nmap -l script -r -a "(__fish_stripprefix='^--script=' __fish_complete_list , __fish_complete_nmap_script)"
+complete -c nmap -l script -r -a "(__fish_complete_list , __fish_complete_nmap_script)"
 complete -c nmap -l script -r -d 'Runs a script scan'
 complete -c nmap -l script-args -d 'provide arguments to NSE scripts'
 complete -c nmap -l script-args-file -r -d 'load arguments to NSE scripts from a file'
-complete -c nmap -l script-help -r -a "(__fish_stripprefix='^--script-help=' __fish_complete_list , __fish_complete_nmap_script)"
+complete -c nmap -l script-help -r -a "(__fish_complete_list , __fish_complete_nmap_script)"
 complete -c nmap -l script-help -r -d "Shows help about scripts"
 complete -c nmap -l script-trace
 complete -c nmap -l script-updatedb
--- a/share/completions/patch.fish
+++ b/share/completions/patch.fish
@@ -3,6 +3,7 @@
 # TODO: POSIX patch
 #

+
 # No effect on POSIX systems that don't use O_BINARY/O_TEXT
 uname -s | string match -q CYGWIN\*
 and complete -c patch -l binary -d "Read & write data in binary mode"
--- a/share/completions/ps.fish
+++ b/share/completions/ps.fish
@@ -10,7 +10,7 @@ if test "$gnu_linux" -eq 1
    # Some short options are GNU-only
    complete -c ps -s a -d "Select all processes except session leaders and terminal-less"
    complete -c ps -s A -d "Select all"
-    complete -c ps -s C -d "Select by command" -ra "(__fish_stripprefix='^-\w*C' __fish_complete_list , __fish_complete_proc)"
+    complete -c ps -s C -d "Select by command" -ra '(__fish_complete_list , __fish_complete_proc)'
    complete -c ps -s c -d 'Show different scheduler information for the -l option'
    complete -c ps -s d -d "Select all processes except session leaders"
    complete -c ps -s e -d "Select all"
@@ -24,9 +24,9 @@ if test "$gnu_linux" -eq 1
    complete -c ps -s m -d 'Show threads after processes'
    complete -c ps -s N -d "Invert selection"
    complete -c ps -s n -d "Set namelist file" -r
-    complete -c ps -s s -l sid -d "Select by session ID" -x -a "(__fish_stripprefix='^(--sid=|-\w*s)' __fish_complete_list , __fish_complete_pids)"
+    complete -c ps -s s -l sid -d "Select by session ID" -x -a "(__fish_complete_list , __fish_complete_pids)"
    complete -c ps -s T -d "Show threads. With SPID"
-    complete -c ps -s u -l user -d "Select by user" -x -a "(__fish_stripprefix='^(--script=|-\w*u)' __fish_complete_list , __fish_complete_users)"
+    complete -c ps -s u -l user -d "Select by user" -x -a "(__fish_complete_list , __fish_complete_users)"
    complete -c ps -s V -l version -d "Display version and exit"
    complete -c ps -s y -d "Do not show flags"

@@ -39,7 +39,7 @@ if test "$gnu_linux" -eq 1
    complete -c ps -l info -d "Display debug info"
    complete -c ps -l lines -l rows -d "Set screen height" -r
    complete -c ps -l no-headers -d 'Print no headers'
-    complete -c ps -l ppid -d "Select by parent PID" -x -a "(__fish_stripprefix='^--ppid=' __fish_complete_list , __fish_complete_pids)"
+    complete -c ps -l ppid -d "Select by parent PID" -x -a "(__fish_complete_list , __fish_complete_pids)"
    complete -c ps -l sort -d 'Specify sort order' -r
 else
    # Assume BSD options otherwise
@@ -81,6 +81,6 @@ end
 complete -c ps -s o -lformat$bsd_null -d "User defined format" -x
 complete -c ps -s Z -lcontext$bsd_null -d "Include security info"
 complete -c ps -s t -ltty$bsd_null -d "Select by tty" -r
-complete -c ps -s G -lgroup$bsd_null -d "Select by group" -x -a "(__fish_stripprefix='^(--group=|-\w*G)' __fish_complete_list , __fish_complete_groups)"
-complete -c ps -s U -luser$bsd_null -d "Select by user" -x -a "(__fish_stripprefix='^(--user=|-\w*U)' __fish_complete_list , __fish_complete_users)"
-complete -c ps -s p -lpid$bsd_null -d "Select by PID" -x -a "(__fish_stripprefix='^(--pid=|-\w*p)' __fish_complete_list , __fish_complete_pids)"
+complete -c ps -s G -lgroup$bsd_null -d "Select by group" -x -a "(__fish_complete_list , __fish_complete_groups)"
+complete -c ps -s U -luser$bsd_null -d "Select by user" -x -a "(__fish_complete_list , __fish_complete_users)"
+complete -c ps -s p -lpid$bsd_null -d "Select by PID" -x -a "(__fish_complete_list , __fish_complete_pids)"
--- a/share/completions/set.fish
+++ b/share/completions/set.fish
@@ -133,7 +133,7 @@ complete -c set -n '__fish_set_is_color true false' -a --dim -x
 complete -c set -n '__fish_set_is_color true false' -a --italics -x
 complete -c set -n '__fish_set_is_color true true' -a --reverse -x
 complete -c set -n '__fish_set_is_color true false' -a --underline -x
-complete -c set -n '__fish_set_is_color true false' -a--underline={double,curly,dotted,dashed} -x
+complete -c set -n '__fish_set_is_color true false' -a --underline=curly -x

 # Locale completions
 complete -c set -n '__fish_set_is_locale; and not __fish_seen_argument -s e -l erase' -x -a '(command -sq locale; and locale -a)' -d Locale
--- a/share/completions/set_color.fish
+++ b/share/completions/set_color.fish
@@ -5,6 +5,6 @@ complete -c set_color -s o -l bold -d 'Make font bold'
 complete -c set_color -s i -l italics -d Italicise
 complete -c set_color -s d -l dim -d 'Dim text'
 complete -c set_color -s r -l reverse -d 'Reverse color text'
-complete -c set_color -s u -l underline -d 'Underline style' -a 'single double curly dotted dashed'
+complete -c set_color -s u -l underline -d 'Underline style' -a 'single curly'
 complete -c set_color -s h -l help -d 'Display help and exit'
 complete -c set_color -s c -l print-colors -d 'Print a list of all accepted color names'
--- a/share/completions/setxkbmap.fish
+++ b/share/completions/setxkbmap.fish
@@ -15,7 +15,7 @@ complete -c setxkbmap -o keycodes -d 'Specifies keycodes component name' -xa "(s
 complete -c setxkbmap -o keymap -d 'Specifies name of keymap to load' -xa "(sed -r $filter /usr/share/X11/xkb/keymap.dir)"
 complete -c setxkbmap -o layout -d 'Specifies layout used to choose component names' -xa "(__fish_complete_setxkbmap layout)"
 complete -c setxkbmap -o model -d 'Specifies model used to choose component names' -xa "(__fish_complete_setxkbmap model)"
-complete -c setxkbmap -o option -d 'Adds an option used to choose component names' -xa "(__fish_stripprefix='^--option=' __fish_complete_list , '__fish_complete_setxkbmap option')"
+complete -c setxkbmap -o option -d 'Adds an option used to choose component names' -xa "(__fish_complete_list , '__fish_complete_setxkbmap option')"
 complete -c setxkbmap -o print -d 'Print a complete xkb_keymap description and exit'
 complete -c setxkbmap -o query -d 'Print the current layout settings and exit'
 complete -c setxkbmap -o rules -d 'Name of rules file to use' -x
--- a/share/completions/ssh.fish
+++ b/share/completions/ssh.fish
@@ -25,7 +25,7 @@ complete -c ssh -s k -d "Disables forwarding of GSSAPI credentials"
 complete -c ssh -s L -d "Specify local port forwarding" -x
 complete -c ssh -s l -x -a "(__fish_complete_users)" -d User
 complete -c ssh -s M -d "Places the ssh client into master mode"
-complete -c ssh -s m -d "MAC algorithm" -xa "(__fish_stripprefix='^-\w*m' __fish_complete_list , __fish_ssh_macs)"
+complete -c ssh -s m -d "MAC algorithm" -xa "(__fish_complete_list , __fish_ssh_macs)"
 complete -c ssh -s N -d "Do not execute remote command"
 complete -c ssh -s n -d "Prevent reading from stdin"
 complete -c ssh -s O -d "Control an active connection multiplexing master process" -x
--- a/share/completions/su.fish
+++ b/share/completions/su.fish
@@ -12,6 +12,6 @@ complete -c su -s G -l supp-group -x -a "(__fish_complete_groups)" -d "Specify a
 complete -c su -s m -s p -l preserve_environment -d "Preserve environment"
 complete -c su -s P -l pty -d "Create pseudo-terminal for the session"
 complete -c su -s s -l shell -x -a "(cat /etc/shells)" -d "Run the specified shell"
-complete -c su -s w -l whitelist-environment -x -a "(__fish_stripprefix='^(--whitelist-environment=|-\w*w)' __fish_complete_list , __fish_complete_su_env_whitelist)" -d "Don't reset these environment variables"
+complete -c su -s w -l whitelist-environment -x -a "(__fish_complete_list , __fish_complete_su_env_whitelist)" -d "Don't reset these environment variables"
 complete -c su -s h -l help -d "Display help and exit"
 complete -c su -s V -l version -d "Display version and exit"
--- a/share/completions/systemd-cryptenroll.fish
+++ b/share/completions/systemd-cryptenroll.fish
@@ -40,6 +40,6 @@ complete -c systemd-cryptenroll -l fido2-with-user-presence -xa "yes no" -d "Req
 complete -c systemd-cryptenroll -l fido2-with-user-verification -xa "yes no" -d "Require user verification when unlocking the volume"
 complete -c systemd-cryptenroll -l tpm2-device -kxa "(__fish_cryptenroll_tpm2_devices)" -d "Enroll a TPM2 security chip"
 complete -c systemd-cryptenroll -l tpm2-pcrs -x -d "Bind the enrollment of TPM2 device to specified PCRs"
-complete -c systemd-cryptenroll -l wipe-slot -kxa "(__fish_stripprefix='^--wipe-slot=' __fish_complete_list , __fish_cryptenroll_complete_wipe)" -d "Wipes one or more LUKS2 key slots"
+complete -c systemd-cryptenroll -l wipe-slot -kxa "(__fish_complete_list , __fish_cryptenroll_complete_wipe)" -d "Wipes one or more LUKS2 key slots"
 complete -c systemd-cryptenroll -l help -s h -d "Print a short help"
 complete -c systemd-cryptenroll -l version -d "Print a short version string"
--- a/share/completions/tmutil.fish
+++ b/share/completions/tmutil.fish
@@ -1,135 +1,61 @@
 # completion for tmutil (macOS)

-function __fish_tmutil_destination_ids
-    for line in $(tmutil destinationinfo)
-        if string match -q '*===*' -- $line
-            # New section so clear out variables
-            set -f name ''
-            set -f kind ''
-            continue
-        end
+complete -f -c tmutil -n __fish_use_subcommand -a addexclusion -d 'Add an exclusion not to back up a file'
+complete -f -c tmutil -n '__fish_seen_subcommand_from addexclusion' -s v -d 'Volume exclusion'
+complete -f -c tmutil -n '__fish_seen_subcommand_from addexclusion' -s p -d 'Path exclusion'
+complete -r -c tmutil -n __fish_use_subcommand -a associatedisk -d 'Bind a snapshot volume directory to the specified local disk'
+complete -r -c tmutil -n __fish_use_subcommand -a calculatedrift -d 'Determine the amount of change between snapshots'
+complete -r -c tmutil -n __fish_use_subcommand -a compare -d 'Perform a backup diff'
+complete -f -c tmutil -n '__fish_seen_subcommand_from compare' -s a -d 'Compare all supported metadata'
+complete -f -c tmutil -n '__fish_seen_subcommand_from compare' -s n -d 'No metadata comparison'
+complete -f -c tmutil -n '__fish_seen_subcommand_from compare' -s @ -d 'Compare extended attributes'
+complete -f -c tmutil -n '__fish_seen_subcommand_from compare' -s c -d 'Compare creation times'
+complete -f -c tmutil -n '__fish_seen_subcommand_from compare' -s d -d 'Compare file data forks'
+complete -f -c tmutil -n '__fish_seen_subcommand_from compare' -s e -d 'Compare ACLs'
+complete -f -c tmutil -n '__fish_seen_subcommand_from compare' -s f -d 'Compare file flags'
+complete -f -c tmutil -n '__fish_seen_subcommand_from compare' -s g -d 'Compare GIDs'
+complete -f -c tmutil -n '__fish_seen_subcommand_from compare' -s m -d 'Compare file modes'
+complete -f -c tmutil -n '__fish_seen_subcommand_from compare' -s s -d 'Compare sizes'
+complete -f -c tmutil -n '__fish_seen_subcommand_from compare' -s t -d 'Compare modification times'
+complete -f -c tmutil -n '__fish_seen_subcommand_from compare' -s u -d 'Compare UIDs'
+complete -r -c tmutil -n '__fish_seen_subcommand_from compare' -s D -d 'Limit traversal depth to depth levels from the beginning of iteration'
+complete -f -c tmutil -n '__fish_seen_subcommand_from compare' -s E -d 'Dont take exclusions into account'
+complete -r -c tmutil -n '__fish_seen_subcommand_from compare' -s I -d 'Ignore path'
+complete -f -c tmutil -n '__fish_seen_subcommand_from compare' -s U -d 'Ignore logical volume identity'
+complete -r -c tmutil -n __fish_use_subcommand -a delete -d 'Delete one or more snapshots'
+complete -r -c tmutil -n __fish_use_subcommand -a deletelocalsnapshots -d 'Delete all local Time Machine snapshots for the specified date (formatted YYYY-MM-DD-HHMMSS)'
+complete -f -c tmutil -n __fish_use_subcommand -a destinationinfo -d 'Print information about destinations'
+complete -f -c tmutil -n __fish_use_subcommand -a disable -d 'Turn off automatic backups'
+complete -f -c tmutil -n __fish_use_subcommand -a disablelocal -d 'Turn off local Time Machine snapshots'
+complete -f -c tmutil -n __fish_use_subcommand -a enable -d 'Turn on automatic backups'
+complete -f -c tmutil -n __fish_use_subcommand -a enablelocal -d 'Turn on local Time Machine snapshots'
+complete -r -c tmutil -n __fish_use_subcommand -a inheritbackup -d 'Claim a machine directory or sparsebundle for use by the current machine'
+complete -f -c tmutil -n __fish_use_subcommand -a isexcluded -d 'Determine if a file, directory, or volume are excluded from backups'
+complete -f -c tmutil -n __fish_use_subcommand -a latestbackup -d 'Print the path to the latest snapshot'
+complete -c tmutil -n __fish_use_subcommand -a listlocalsnapshotdates -d 'List the creation dates of all local Time Machine snapshots'
+complete -r -c tmutil -n __fish_use_subcommand -a listlocalsnapshots -d 'List local Time Machine snapshots of the specified volume'
+complete -f -c tmutil -n __fish_use_subcommand -a listbackups -d 'Print paths for all snapshots'
+complete -f -c tmutil -n __fish_use_subcommand -a localsnapshot -d 'Create new local Time Machine snapshot of APFS volume in TM backup'
+complete -f -c tmutil -n __fish_use_subcommand -a machinedirectory -d 'Print the path to the current machine directory'
+complete -f -c tmutil -n __fish_use_subcommand -a removedestination -d 'Removes a backup destination'
+complete -f -c tmutil -n __fish_use_subcommand -a removeexclusion -d 'Remove an exclusion'
+complete -f -c tmutil -n '__fish_seen_subcommand_from removeexclusion' -s v -d 'Volume exclusion'
+complete -f -c tmutil -n '__fish_seen_subcommand_from removeexclusion' -s p -d 'Path exclusion'
+complete -f -c tmutil -n __fish_use_subcommand -a restore -d 'Restore an item'
+complete -r -c tmutil -n '__fish_seen_subcommand_from restore' -s v
+complete -r -c tmutil -n __fish_use_subcommand -a setdestination -d 'Set a backup destination'
+complete -f -c tmutil -n '__fish_seen_subcommand_from setdestination' -s a -d 'Add to the list of destinations'
+complete -f -c tmutil -n '__fish_seen_subcommand_from setdestination' -s p -d 'Enter the password at a non-echoing interactive prompt'
+complete -f -c tmutil -n __fish_use_subcommand -a snapshot -d 'Create new local Time Machine snapshot'
+complete -f -c tmutil -n __fish_use_subcommand -a startbackup -d 'Begin a backup if one is not already running'
+complete -f -c tmutil -n '__fish_seen_subcommand_from startbackup' -s a -l auto -d 'Automatic mode'
+complete -f -c tmutil -n '__fish_seen_subcommand_from startbackup' -s b -l block -d 'Block until finished'
+complete -f -c tmutil -n '__fish_seen_subcommand_from startbackup' -s r -l rotation -d 'Automatic rotation'
+complete -r -c tmutil -n '__fish_seen_subcommand_from startbackup' -s d -l destination -d 'Backup destination'
+complete -f -c tmutil -n __fish_use_subcommand -a stopbackup -d 'Cancel a backup currently in progress'
+complete -r -c tmutil -n __fish_use_subcommand -a thinlocalsnapshots -d 'Thin local Time Machine snapshots for the specified volume'
+complete -r -c tmutil -n __fish_use_subcommand -a uniquesize -d 'Analyze the specified path and determine its unique size'
+complete -r -c tmutil -n __fish_use_subcommand -a verifychecksums -d 'Verify snapshot'
+complete -f -c tmutil -n __fish_use_subcommand -a version -d 'Print version'

-        if string match -q -r '^Name' -- $line
-            # Got the destination name
-            set -f name "$(string match -r -g '^Name\s+:\s+(.*)$' $line | string trim)"
-            continue
-        end
-
-        if string match -q -r '^Kind' -- $line
-            # Got the destination name
-            set -f kind "$(string match -r -g '^Kind\s+:\s+(\w+)' $line | string trim)"
-            continue
-        end
-
-        if string match -q -r '^ID' -- $line
-            # Got the destination ID
-            set -f ID "$(string match -r -g '^ID\s+:\s+(.*)$' $line | string trim)"
-            echo $ID\t$name $kind
-            continue
-        end
-    end
-end
-
-complete -c tmutil -n __fish_use_subcommand -a status -d 'Display Time Machine status'
-complete -c tmutil -f -n '__fish_seen_subcommand_from status'
-
-complete -c tmutil -f -n __fish_use_subcommand -a addexclusion -d 'Add an exclusion not to back up a file'
-complete -c tmutil -r -n '__fish_seen_subcommand_from addexclusion' -s v -d 'Volume exclusion'
-complete -c tmutil -r -n '__fish_seen_subcommand_from addexclusion' -s p -d 'Path exclusion'
-
-complete -c tmutil -r -n __fish_use_subcommand -a associatedisk -d 'Bind a snapshot volume directory to the specified local disk'
-
-complete -c tmutil -r -n __fish_use_subcommand -a calculatedrift -d 'Determine the amount of change between snapshots'
-
-complete -c tmutil -r -n __fish_use_subcommand -a compare -d 'Perform a backup diff'
-complete -c tmutil -f -n '__fish_seen_subcommand_from compare' -s a -d 'Compare all supported metadata'
-complete -c tmutil -f -n '__fish_seen_subcommand_from compare' -s n -d 'No metadata comparison'
-complete -c tmutil -f -n '__fish_seen_subcommand_from compare' -s @ -d 'Compare extended attributes'
-complete -c tmutil -f -n '__fish_seen_subcommand_from compare' -s c -d 'Compare creation times'
-complete -c tmutil -f -n '__fish_seen_subcommand_from compare' -s d -d 'Compare file data forks'
-complete -c tmutil -f -n '__fish_seen_subcommand_from compare' -s e -d 'Compare ACLs'
-complete -c tmutil -f -n '__fish_seen_subcommand_from compare' -s f -d 'Compare file flags'
-complete -c tmutil -f -n '__fish_seen_subcommand_from compare' -s g -d 'Compare GIDs'
-complete -c tmutil -f -n '__fish_seen_subcommand_from compare' -s m -d 'Compare file modes'
-complete -c tmutil -f -n '__fish_seen_subcommand_from compare' -s s -d 'Compare sizes'
-complete -c tmutil -f -n '__fish_seen_subcommand_from compare' -s t -d 'Compare modification times'
-complete -c tmutil -f -n '__fish_seen_subcommand_from compare' -s u -d 'Compare UIDs'
-complete -c tmutil -r -n '__fish_seen_subcommand_from compare' -s D -d 'Limit traversal depth to depth levels from the beginning of iteration'
-complete -c tmutil -f -n '__fish_seen_subcommand_from compare' -s E -d 'Dont take exclusions into account'
-complete -c tmutil -r -n '__fish_seen_subcommand_from compare' -s I -d 'Ignore path'
-complete -c tmutil -f -n '__fish_seen_subcommand_from compare' -s U -d 'Ignore logical volume identity'
-
-complete -c tmutil -r -n __fish_use_subcommand -a delete -d 'Delete one or more snapshots'
-complete -c tmutil -r -n '__fish_seen_subcommand_from delete' -s d -d 'Backup mount point'
-complete -c tmutil -r -f -n '__fish_seen_subcommand_from delete' -s t -d Timestamp
-complete -c tmutil -r -n '__fish_seen_subcommand_from delete' -s p -d Path
-
-complete -c tmutil -r -n __fish_use_subcommand -a deletelocalsnapshots -d 'Delete all local Time Machine snapshots for the specified date (formatted YYYY-MM-DD-HHMMSS)'
-
-complete -c tmutil -r -n __fish_use_subcommand -a deleteinprogress -d 'Delete all in-progress backups for a machine directory'
-
-complete -c tmutil -f -n __fish_use_subcommand -a destinationinfo -d 'Print information about destinations'
-
-complete -c tmutil -f -n __fish_use_subcommand -a disable -d 'Turn off automatic backups'
-
-complete -c tmutil -f -n __fish_use_subcommand -a disablelocal -d 'Turn off local Time Machine snapshots'
-
-complete -c tmutil -f -n __fish_use_subcommand -a enable -d 'Turn on automatic backups'
-
-complete -c tmutil -f -n __fish_use_subcommand -a enablelocal -d 'Turn on local Time Machine snapshots'
-
-complete -c tmutil -r -n __fish_use_subcommand -a inheritbackup -d 'Claim a machine directory or sparsebundle for use by the current machine'
-
-complete -c tmutil -r -n __fish_use_subcommand -a isexcluded -d 'Determine if a file, directory, or volume are excluded from backups'
-
-complete -c tmutil -f -n __fish_use_subcommand -a latestbackup -d 'Print the path to the latest snapshot'
-
-complete -c tmutil -f -n __fish_use_subcommand -a listlocalsnapshotdates -d 'List the creation dates of all local Time Machine snapshots'
-
-complete -c tmutil -r -n __fish_use_subcommand -a listlocalsnapshots -d 'List local Time Machine snapshots of the specified volume'
-
-complete -c tmutil -f -n __fish_use_subcommand -a listbackups -d 'Print paths for all snapshots'
-
-complete -c tmutil -f -n __fish_use_subcommand -a localsnapshot -d 'Create new local Time Machine snapshot of APFS volume in TM backup'
-
-complete -c tmutil -f -n __fish_use_subcommand -a machinedirectory -d 'Print the path to the current machine directory'
-
-complete -c tmutil -f -n __fish_use_subcommand -a removedestination -d 'Removes a backup destination'
-complete -c tmutil -f -n '__fish_seen_subcommand_from removedestination' -a '$(__fish_tmutil_destination_ids)'
-
-complete -c tmutil -f -n __fish_use_subcommand -a removeexclusion -d 'Remove an exclusion'
-complete -c tmutil -f -n '__fish_seen_subcommand_from removeexclusion' -s v -d 'Volume exclusion'
-complete -c tmutil -f -n '__fish_seen_subcommand_from removeexclusion' -s p -d 'Path exclusion'
-
-complete -c tmutil -f -n __fish_use_subcommand -a restore -d 'Restore an item'
-complete -c tmutil -r -n '__fish_seen_subcommand_from restore' -s v
-
-complete -c tmutil -r -n __fish_use_subcommand -a setdestination -d 'Set a backup destination'
-complete -c tmutil -f -n '__fish_seen_subcommand_from setdestination' -s a -d 'Add to the list of destinations'
-complete -c tmutil -f -n '__fish_seen_subcommand_from setdestination' -s p -d 'Enter the password at a non-echoing interactive prompt'
-
-complete -c tmutil -f -n __fish_use_subcommand -a snapshot -f -d 'Create new local Time Machine snapshot'
-
-complete -c tmutil -f -n __fish_use_subcommand -a startbackup -d 'Begin a backup if one is not already running'
-complete -c tmutil -f -n '__fish_seen_subcommand_from startbackup' -s a -l auto -d 'Automatic mode'
-complete -c tmutil -f -n '__fish_seen_subcommand_from startbackup' -s b -l block -d 'Block until finished'
-complete -c tmutil -f -n '__fish_seen_subcommand_from startbackup' -s r -l rotation -d 'Automatic rotation'
-complete -c tmutil -f -n '__fish_seen_subcommand_from startbackup' -s d -l destination -r -a '$(__fish_tmutil_destination_ids)' -d 'Backup destination'
-
-complete -c tmutil -f -n __fish_use_subcommand -a stopbackup -d 'Cancel a backup currently in progress'
-
-complete -c tmutil -r -n __fish_use_subcommand -a thinlocalsnapshots -d 'Thin local Time Machine snapshots for the specified volume'
-
-complete -c tmutil -r -n __fish_use_subcommand -a uniquesize -d 'Analyze the specified path and determine its unique size'
-
-complete -c tmutil -r -n __fish_use_subcommand -a verifychecksums -d 'Verify snapshot'
-
-complete -c tmutil -f -n __fish_use_subcommand -a version -d 'Print version'
-
-complete -c tmutil -f -n __fish_use_subcommand -a setquota -d 'Set the quota for the destination in gigabytes'
-complete -c tmutil -f -n '__fish_seen_subcommand_from setquota' -r -a '$(__fish_tmutil_destination_ids)'
-
-complete -c tmutil -f -n '__fish_seen_subcommand_from destinationinfo isexcluded compare status' -s X -d 'Print as XML'
-complete -c tmutil -f -n '__fish_seen_subcommand_from latestbackup listbackups' -s m -d 'Destination volume to list backups from'
-complete -c tmutil -f -n '__fish_seen_subcommand_from latestbackup listbackups' -s t -d 'Attempt to mount the backups and list their mounted paths'
-complete -c tmutil -f -n '__fish_seen_subcommand_from latestbackup listbackups' -s d -d 'Backup mount point'
+complete -f -c tmutil -n '__fish_seen_subcommand_from destinationinfo isexcluded compare' -s X -d 'Print as XML'
--- a/share/completions/tofu.fish
+++ b/share/completions/tofu.fish
@@ -1,6 +1,6 @@
 # Returns 0 if the command has not had a subcommand yet
 # Does not currently account for -chdir
-function __fish_tofu_needs_command
+function __fish_terraform_needs_command
    set -l cmd (commandline -xpc)

    if test (count $cmd) -eq 1
@@ -10,19 +10,19 @@ function __fish_tofu_needs_command
    return 1
 end

-function __fish_tofu_workspaces
+function __fish_terraform_workspaces
    tofu workspace list | string replace -r "^[\s\*]*" ""
 end

 # general options
-complete -f -c tofu -n "not __fish_tofu_needs_command" -o version -d "Print version information"
+complete -f -c tofu -n "not __fish_terraform_needs_command" -o version -d "Print version information"
 complete -f -c tofu -o help -d "Show help"

 ### apply/destroy
 set -l apply apply destroy

-complete -f -c tofu -n __fish_tofu_needs_command -a apply -d "Build or change infrastructure"
-complete -f -c tofu -n __fish_tofu_needs_command -a destroy -d "Destroy infrastructure"
+complete -f -c tofu -n __fish_terraform_needs_command -a apply -d "Build or change infrastructure"
+complete -f -c tofu -n __fish_terraform_needs_command -a destroy -d "Destroy infrastructure"
 complete -f -c tofu -n "__fish_seen_subcommand_from $apply" -o auto-approve -d "Skip interactive approval"
 complete -r -c tofu -n "__fish_seen_subcommand_from $apply" -o backup -d "Path to backup the existing state file"
 complete -f -c tofu -n "__fish_seen_subcommand_from $apply" -o compact-warnings -d "Show only error summaries"
@@ -31,17 +31,17 @@ complete -f -c tofu -n "__fish_seen_subcommand_from $apply" -o lock-timeout -d "
 complete -f -c tofu -n "__fish_seen_subcommand_from $apply" -o input=true -d "Ask for input for variables if not directly set"
 complete -f -c tofu -n "__fish_seen_subcommand_from $apply" -o no-color -d "If specified, output won't contain any color"
 complete -f -c tofu -n "__fish_seen_subcommand_from $apply" -o parallelism -d "Limit the number of concurrent operations"
-complete -r -c tofu -n "__fish_seen_subcommand_from $apply" -o state -d "Path to a OpenTofu state file"
+complete -r -c tofu -n "__fish_seen_subcommand_from $apply" -o state -d "Path to a Terraform state file"
 complete -r -c tofu -n "__fish_seen_subcommand_from $apply" -o state-out -d "Path to write state"

 ### console
-complete -f -c tofu -n __fish_tofu_needs_command -a console -d "Interactive console for OpenTofu interpolations"
-complete -r -c tofu -n "__fish_seen_subcommand_from console" -o state -d "Path to a OpenTofu state file"
-complete -f -c tofu -n "__fish_seen_subcommand_from console" -o var -d "Set a variable in the OpenTofu configuration"
+complete -f -c tofu -n __fish_terraform_needs_command -a console -d "Interactive console for Terraform interpolations"
+complete -r -c tofu -n "__fish_seen_subcommand_from console" -o state -d "Path to a Terraform state file"
+complete -f -c tofu -n "__fish_seen_subcommand_from console" -o var -d "Set a variable in the Terraform configuration"
 complete -r -c tofu -n "__fish_seen_subcommand_from console" -o var-file -d "Set variables from a file"

 ### fmt
-complete -f -c tofu -n __fish_tofu_needs_command -a fmt -d "Rewrite config files to canonical format"
+complete -f -c tofu -n __fish_terraform_needs_command -a fmt -d "Rewrite config files to canonical format"
 complete -f -c tofu -n "__fish_seen_subcommand_from fmt" -o list=false -d "Don't list files whose formatting differs"
 complete -f -c tofu -n "__fish_seen_subcommand_from fmt" -o write=false -d "Don't write to source files"
 complete -f -c tofu -n "__fish_seen_subcommand_from fmt" -o diff -d "Display diffs of formatting changes"
@@ -50,22 +50,21 @@ complete -f -c tofu -n "__fish_seen_subcommand_from fmt" -o no-color -d "If spec
 complete -f -c tofu -n "__fish_seen_subcommand_from fmt" -o recursive -d "Also process files in subdirectories"

 ### get
-complete -f -c tofu -n __fish_tofu_needs_command -a get -d "Download and install modules for the configuration"
+complete -f -c tofu -n __fish_terraform_needs_command -a get -d "Download and install modules for the configuration"
 complete -f -c tofu -n "__fish_seen_subcommand_from get" -o update -d "Check modules for updates"
 complete -f -c tofu -n "__fish_seen_subcommand_from get" -o no-color -d "If specified, output won't contain any color"

 ### graph
-complete -f -c tofu -n __fish_tofu_needs_command -a graph -d "Create a visual graph of OpenTofu resources"
+complete -f -c tofu -n __fish_terraform_needs_command -a graph -d "Create a visual graph of Terraform resources"
 complete -f -c tofu -n "__fish_seen_subcommand_from graph" -o plan -d "Use specified plan file instead of current directory"
 complete -f -c tofu -n "__fish_seen_subcommand_from graph" -o draw-cycles -d "Highlight any cycles in the graph"
 complete -f -c tofu -n "__fish_seen_subcommand_from graph" -o type=plan -d "Output plan graph"
 complete -f -c tofu -n "__fish_seen_subcommand_from graph" -o type=plan-refresh-only -d "Output plan graph assuming refresh only"
 complete -f -c tofu -n "__fish_seen_subcommand_from graph" -o type=plan-destroy -d "Output plan graph assuming destroy"
 complete -f -c tofu -n "__fish_seen_subcommand_from graph" -o type=apply -d "Output apply graph"
-complete -f -c tofu -n "__fish_seen_subcommand_from graph" -o consice -d "Shorten the plan output"

 ### import
-complete -f -c tofu -n __fish_tofu_needs_command -a import -d "Import existing infrastructure into OpenTofu"
+complete -f -c tofu -n __fish_terraform_needs_command -a import -d "Import existing infrastructure into Terraform"
 complete -r -c tofu -n "__fish_seen_subcommand_from import" -o backup -d "Path to backup the existing state file"
 complete -f -c tofu -n "__fish_seen_subcommand_from import" -o config -d "Path to a directory of configuration files"
 complete -f -c tofu -n "__fish_seen_subcommand_from import" -o allow-missing-config -d "Allow import without resource block"
@@ -73,13 +72,13 @@ complete -f -c tofu -n "__fish_seen_subcommand_from import" -o input=false -d "D
 complete -f -c tofu -n "__fish_seen_subcommand_from import" -o lock=false -d "Don't hold a state lock"
 complete -f -c tofu -n "__fish_seen_subcommand_from import" -o lock-timeout -d "Duration to retry a state lock"
 complete -f -c tofu -n "__fish_seen_subcommand_from import" -o no-color -d "If specified, output won't contain any color"
-complete -r -c tofu -n "__fish_seen_subcommand_from import" -o state -d "Path to a OpenTofu state file"
+complete -r -c tofu -n "__fish_seen_subcommand_from import" -o state -d "Path to a Terraform state file"
 complete -r -c tofu -n "__fish_seen_subcommand_from import" -o state-out -d "Path to write state"
-complete -f -c tofu -n "__fish_seen_subcommand_from import" -o var -d "Set a variable in the OpenTofu configuration"
+complete -f -c tofu -n "__fish_seen_subcommand_from import" -o var -d "Set a variable in the Terraform configuration"
 complete -r -c tofu -n "__fish_seen_subcommand_from import" -o var-file -d "Set variables from a file"

 ### init
-complete -f -c tofu -n __fish_tofu_needs_command -a init -d "Initialize a new or existing OpenTofu configuration"
+complete -f -c tofu -n __fish_terraform_needs_command -a init -d "Initialize a new or existing Terraform configuration"
 complete -f -c tofu -n "__fish_seen_subcommand_from init" -o backend=false -d "Disable backend initialization"
 complete -f -c tofu -n "__fish_seen_subcommand_from init" -o cloud=false -d "Disable backend initialization"
 complete -r -c tofu -n "__fish_seen_subcommand_from init" -o backend-config -d "Backend configuration"
@@ -96,25 +95,24 @@ complete -r -c tofu -n "__fish_seen_subcommand_from init" -o migrate-state -d "R
 complete -f -c tofu -n "__fish_seen_subcommand_from init" -o upgrade -d "Install latest dependencies, ignoring lockfile"
 complete -f -c tofu -n "__fish_seen_subcommand_from init" -o lockfile=readonly -d "Set dependency lockfile mode to readonly"
 complete -f -c tofu -n "__fish_seen_subcommand_from init" -o ignore-remote-version -d "Ignore local and remote backend compatibility check"
-complete -f -c tofu -n "__fish_seen_subcommand_from init" -o json -d "Print output in JSON"

 ### login
-complete -f -c tofu -n __fish_tofu_needs_command -a login -d "Retrieves auth token for the given hostname"
+complete -f -c tofu -n __fish_terraform_needs_command -a login -d "Retrieves auth token for the given hostname"
 complete -f -c tofu -n "__fish_seen_subcommand_from login" -a "(__fish_print_hostnames)"

 ### logout
-complete -f -c tofu -n __fish_tofu_needs_command -a logout -d "Removes auth token for the given hostname"
+complete -f -c tofu -n __fish_terraform_needs_command -a logout -d "Removes auth token for the given hostname"
 complete -f -c tofu -n "__fish_seen_subcommand_from logout" -a "(__fish_print_hostnames)"

 ### output
-complete -f -c tofu -n __fish_tofu_needs_command -a output -d "Read an output from a state file"
+complete -f -c tofu -n __fish_terraform_needs_command -a output -d "Read an output from a state file"
 complete -r -c tofu -n "__fish_seen_subcommand_from output" -o state -d "Path to the state file to read"
 complete -f -c tofu -n "__fish_seen_subcommand_from output" -o no-color -d "If specified, output won't contain any color"
 complete -f -c tofu -n "__fish_seen_subcommand_from output" -o json -d "Print output in JSON format"
 complete -f -c tofu -n "__fish_seen_subcommand_from output" -o raw -d "Print raw strings directly"

 ### plan
-complete -f -c tofu -n __fish_tofu_needs_command -a plan -d "Generate and show an execution plan"
+complete -f -c tofu -n __fish_terraform_needs_command -a plan -d "Generate and show an execution plan"
 complete -f -c tofu -n "__fish_seen_subcommand_from plan" -o compact-warnings -d "Show only error summaries"
 complete -f -c tofu -n "__fish_seen_subcommand_from plan" -o detailed-exitcode -d "Return detailed exit codes"
 complete -f -c tofu -n "__fish_seen_subcommand_from plan" -o input=true -d "Ask for input for variables if not directly set"
@@ -123,7 +121,7 @@ complete -f -c tofu -n "__fish_seen_subcommand_from plan" -o lock-timeout -d "Du
 complete -f -c tofu -n "__fish_seen_subcommand_from plan" -o no-color -d "If specified, output won't contain any color"
 complete -f -c tofu -n "__fish_seen_subcommand_from plan" -o out -d "Write a plan file to the given path"
 complete -f -c tofu -n "__fish_seen_subcommand_from plan" -o parallelism -d "Limit the number of concurrent operations"
-complete -r -c tofu -n "__fish_seen_subcommand_from plan" -o state -d "Path to a OpenTofu state file"
+complete -r -c tofu -n "__fish_seen_subcommand_from plan" -o state -d "Path to a Terraform state file"

 ### plan customization options are reusable across apply, destroy, and plan
 set -l plan apply destroy plan
@@ -133,86 +131,82 @@ complete -f -c tofu -n "__fish_seen_subcommand_from $plan" -o refresh-only -d "S
 complete -f -c tofu -n "__fish_seen_subcommand_from $plan" -o refresh=false -d "Skip checking for external changes"
 complete -f -c tofu -n "__fish_seen_subcommand_from $plan" -o replace -d "Force replacement of resource using its address"
 complete -f -c tofu -n "__fish_seen_subcommand_from $plan" -o target -d "Resource to target"
-complete -f -c tofu -n "__fish_seen_subcommand_from $plan" -o exclude -d "Resource to ignore during plan"
-complete -f -c tofu -n "__fish_seen_subcommand_from $plan" -o var -d "Set a variable in the OpenTofu configuration"
+complete -f -c tofu -n "__fish_seen_subcommand_from $plan" -o var -d "Set a variable in the Terraform configuration"
 complete -r -c tofu -n "__fish_seen_subcommand_from $plan" -o var-file -d "Set variables from a file"

 ### providers
-complete -f -c tofu -n __fish_tofu_needs_command -a providers -d "Print tree of modules with their provider requirements"
+complete -f -c tofu -n __fish_terraform_needs_command -a providers -d "Print tree of modules with their provider requirements"
 complete -f -c tofu -n "__fish_seen_subcommand_from providers" -a "lock mirror schema"

 ### refresh
-complete -f -c tofu -n __fish_tofu_needs_command -a refresh -d "Update local state file against real resources"
+complete -f -c tofu -n __fish_terraform_needs_command -a refresh -d "Update local state file against real resources"
 complete -f -c tofu -n "__fish_seen_subcommand_from $apply" -o compact-warnings -d "Show only error summaries"
 complete -r -c tofu -n "__fish_seen_subcommand_from refresh" -o backup -d "Path to backup the existing state file"
 complete -f -c tofu -n "__fish_seen_subcommand_from refresh" -o input=true -d "Ask for input for variables if not directly set"
 complete -f -c tofu -n "__fish_seen_subcommand_from refresh" -o lock=false -d "Don't hold a state lock"
 complete -f -c tofu -n "__fish_seen_subcommand_from refresh" -o lock-timeout -d "Duration to retry a state lock"
 complete -f -c tofu -n "__fish_seen_subcommand_from refresh" -o no-color -d "If specified, output won't contain any color"
-complete -r -c tofu -n "__fish_seen_subcommand_from refresh" -o state -d "Path to a OpenTofu state file"
+complete -r -c tofu -n "__fish_seen_subcommand_from refresh" -o state -d "Path to a Terraform state file"
 complete -r -c tofu -n "__fish_seen_subcommand_from refresh" -o state-out -d "Path to write state"
 complete -f -c tofu -n "__fish_seen_subcommand_from refresh" -o target -d "Resource to target"
-complete -f -c tofu -n "__fish_seen_subcommand_from refresh" -o var -d "Set a variable in the OpenTofu configuration"
+complete -f -c tofu -n "__fish_seen_subcommand_from refresh" -o var -d "Set a variable in the Terraform configuration"
 complete -r -c tofu -n "__fish_seen_subcommand_from refresh" -o var-file -d "Set variables from a file"

 ### show
-complete -f -c tofu -n __fish_tofu_needs_command -a show -d "Inspect OpenTofu state or plan"
+complete -f -c tofu -n __fish_terraform_needs_command -a show -d "Inspect Terraform state or plan"
 complete -f -c tofu -n "__fish_seen_subcommand_from show" -o no-color -d "If specified, output won't contain any color"
 complete -f -c tofu -n "__fish_seen_subcommand_from validate" -o json -d "Produce output in JSON format"

 ### state
-complete -r -c tofu -n __fish_tofu_needs_command -a state -d "Advanced state management"
+complete -r -c tofu -n __fish_terraform_needs_command -a state -d "Advanced state management"
 complete -f -c tofu -n "__fish_seen_subcommand_from state" -a list -d "List resources in state"
-complete -f -c tofu -n "__fish_seen_subcommand_from state" -a ls -d "List resources in state"
 complete -f -c tofu -n "__fish_seen_subcommand_from state" -a mv -d "Move an item in the state"
-complete -f -c tofu -n "__fish_seen_subcommand_from state" -a move -d "Move an item in the state"
 complete -f -c tofu -n "__fish_seen_subcommand_from state" -a pull -d "Pull current state and output to stdout"
 complete -f -c tofu -n "__fish_seen_subcommand_from state" -a push -d "Update remote state from local state"
 complete -f -c tofu -n "__fish_seen_subcommand_from state" -a replace-provider -d "Replace provider in the state"
 complete -f -c tofu -n "__fish_seen_subcommand_from state" -a rm -d "Remove instance from the state"
-complete -f -c tofu -n "__fish_seen_subcommand_from state" -a remove -d "Remove instance from the state"
 complete -f -c tofu -n "__fish_seen_subcommand_from state" -a show -d "Show a resource in the state"

 ### taint
-complete -f -c tofu -n __fish_tofu_needs_command -a taint -d "Manually mark a resource for recreation"
+complete -f -c tofu -n __fish_terraform_needs_command -a taint -d "Manually mark a resource for recreation"
 complete -f -c tofu -n "__fish_seen_subcommand_from taint" -o allow-missing -d "Succeed even if resource is missing"
 complete -r -c tofu -n "__fish_seen_subcommand_from taint" -o backup -d "Path to backup the existing state file"
 complete -f -c tofu -n "__fish_seen_subcommand_from taint" -o lock=false -d "Don't hold a state lock"
 complete -f -c tofu -n "__fish_seen_subcommand_from taint" -o lock-timeout -d "Duration to retry a state lock"
 complete -f -c tofu -n "__fish_seen_subcommand_from taint" -o ignore-remote-version -d "Ignore local and remote backend compatibility check"
-complete -r -c tofu -n "__fish_seen_subcommand_from taint" -o state -d "Path to a OpenTofu state file"
+complete -r -c tofu -n "__fish_seen_subcommand_from taint" -o state -d "Path to a Terraform state file"
 complete -r -c tofu -n "__fish_seen_subcommand_from taint" -o state-out -d "Path to write state"

 ### test
-complete -f -c tofu -n __fish_tofu_needs_command -a test -d "Runs automated test of shared modules"
+complete -f -c tofu -n __fish_terraform_needs_command -a test -d "Runs automated test of shared modules"
 complete -f -c tofu -n "__fish_seen_subcommand_from test" -o compact-warnings -d "Show only error summaries"
 complete -f -c tofu -n "__fish_seen_subcommand_from test" -o junit-xml -d "Also write test results to provided JUnit XML file"
 complete -f -c tofu -n "__fish_seen_subcommand_from test" -o no-color -d "If specified, output won't contain any color"

 ### untaint
-complete -f -c tofu -n __fish_tofu_needs_command -a untaint -d "Manually unmark a resource as tainted"
+complete -f -c tofu -n __fish_terraform_needs_command -a untaint -d "Manually unmark a resource as tainted"
 complete -f -c tofu -n "__fish_seen_subcommand_from untaint" -o allow-missing -d "Succeed even if resource is missing"
 complete -r -c tofu -n "__fish_seen_subcommand_from untaint" -o backup -d "Path to backup the existing state file"
 complete -f -c tofu -n "__fish_seen_subcommand_from untaint" -o lock=false -d "Don't hold a state lock"
 complete -f -c tofu -n "__fish_seen_subcommand_from untaint" -o lock-timeout -d "Duration to retry a state lock"
 complete -f -c tofu -n "__fish_seen_subcommand_from untaint" -o ignore-remote-version -d "Ignore local and remote backend compatibility check"
-complete -r -c tofu -n "__fish_seen_subcommand_from untaint" -o state -d "Path to a OpenTofu state file"
+complete -r -c tofu -n "__fish_seen_subcommand_from untaint" -o state -d "Path to a Terraform state file"
 complete -r -c tofu -n "__fish_seen_subcommand_from untaint" -o state-out -d "Path to write state"

 ### validate
-complete -f -c tofu -n __fish_tofu_needs_command -a validate -d "Validate the OpenTofu files"
+complete -f -c tofu -n __fish_terraform_needs_command -a validate -d "Validate the Terraform files"
 complete -f -c tofu -n "__fish_seen_subcommand_from validate" -o json -d "Produce output in JSON format"
 complete -f -c tofu -n "__fish_seen_subcommand_from validate" -o no-color -d "If specified, output won't contain any color"

 ### version
-complete -f -c tofu -n __fish_tofu_needs_command -a version -d "Print the OpenTofu version"
+complete -f -c tofu -n __fish_terraform_needs_command -a version -d "Print the Terraform version"

 ### workspace
 set -l workspace_commands list select new delete

-complete -f -c tofu -n __fish_tofu_needs_command -a workspace -d "Workspace management"
+complete -f -c tofu -n __fish_terraform_needs_command -a workspace -d "Workspace management"
 complete -f -c tofu -n "__fish_seen_subcommand_from workspace && not __fish_seen_subcommand_from $workspace_commands" -a list -d "List workspaces"
 complete -f -c tofu -n "__fish_seen_subcommand_from workspace && not __fish_seen_subcommand_from $workspace_commands" -a select -d "Select an workspace"
 complete -f -c tofu -n "__fish_seen_subcommand_from workspace && not __fish_seen_subcommand_from $workspace_commands" -a new -d "Create a new workspace"
 complete -f -c tofu -n "__fish_seen_subcommand_from workspace && not __fish_seen_subcommand_from $workspace_commands" -a delete -d "Delete an existing workspace"
-complete -f -c tofu -n "__fish_seen_subcommand_from workspace && __fish_seen_subcommand_from select delete" -a "(__fish_tofu_workspaces)"
+complete -f -c tofu -n "__fish_seen_subcommand_from workspace && __fish_seen_subcommand_from select delete" -a "(__fish_terraform_workspaces)"
--- a/Show More
+++ b/Show More