__fish_apropos: assume only /usr/bin/apropos is broken

Also, remove a macOS version check that's doom to obsolescence, and extract a function (WIP).
2026-05-10 01:21:16 -03:00 · 2025-11-15 14:33:55 +01:00
571 changed files with 15818 additions and 33972 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,2 +1,8 @@
-[alias]
-xtask = "run --package xtask --"
+# This file is _not_ included in the tarballs for now
+# Binary builds on Linux packaging infrastructure need to overwrite it to make `cargo vendor` work
+# Releases and development builds made using OBS/Launchpad will _not_ reflect the contents of this
+# file
+
+[resolver]
+# Make cargo 1.84+ respect MSRV (rust-version in Cargo.toml)
+incompatible-rust-versions = "fallback"
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -27,9 +27,8 @@ freebsd_task:
    matrix:
        - name: FreeBSD Stable
          freebsd_instance:
-              image: freebsd-15-0-release-amd64-ufs # updatecli.d/cirrus-freebsd.yml
+              image: freebsd-14-3-release-amd64-ufs # updatecli.d/cirrus-freebsd.yml
    tests_script:
-        - pkg update
        - pkg install -y cmake-core devel/pcre2 devel/ninja gettext git-lite lang/rust misc/py-pexpect
        # libclang.so is a required build dependency for rust-c++ ffi bridge
        - pkg install -y llvm
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,11 +9,12 @@ trim_trailing_whitespace = true
 insert_final_newline = true
 max_line_length = 100

-[{Makefile,{BSD,GNU}makefile}]
+[{Makefile,*.in}]
 indent_style = tab

 [*.{md,rst}]
 max_line_length = unset
+trim_trailing_whitespace = false

 [*.sh]
 indent_size = 4
@@ -21,7 +22,7 @@ indent_size = 4
 [build_tools/release.sh]
 max_line_length = 72

-[{Dockerfile,Vagrantfile}]
+[Dockerfile]
 indent_size = 2

 [share/{completions,functions}/**.fish]
@@ -29,6 +30,3 @@ max_line_length = unset

 [{COMMIT_EDITMSG,git-revise-todo,*.jjdescription}]
 max_line_length = 72
-
-[*.yml]
-indent_size = 2
--- a/.gitattributes
+++ b/.gitattributes
@@ -14,10 +14,15 @@
 .gitattributes export-ignore
 .gitignore export-ignore
 /build_tools/make_tarball.sh export-ignore
+/debian export-ignore
+/debian/* export-ignore
 /.github export-ignore
 /.github/* export-ignore
 /.builds export-ignore
 /.builds/* export-ignore
+# to make cargo vendor work correctly
+/.cargo/ export-ignore
+/.cargo/config.toml export-ignore

 # for linguist, which drives GitHub's language statistics
 alpine.js linguist-vendored
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,8 +1,11 @@
+## Description

+Talk about your changes here.
+
+Fixes issue #

 ## TODOs:
-<!-- Check off what what has been done so far. -->
- [ ] If addressing an issue, a commit message mentions `Fixes issue #<issue-number>`
+<!-- Just check off what what we know been done so far. We can help you with this stuff. -->
 - [ ] Changes to fish usage are reflected in user documentation/manpages.
 - [ ] Tests have been added for regressions fixed
- [ ] User-visible changes noted in CHANGELOG.rst <!-- Usually skipped for changes to completions -->
+- [ ] User-visible changes noted in CHANGELOG.rst <!-- Don't document changes for completions inside CHANGELOG.rst, there are lot of such edits -->
--- a/.github/actions/install-sphinx/action.yml
+++ b/.github/actions/install-sphinx/action.yml
@@ -10,13 +10,11 @@ runs:
      run: |
        set -x
        sudo pip install uv --break-system-packages
-        command -v uv
-        command -v uvx
        # Check that pyproject.toml and the lock file are in sync.
        # TODO Use "uv" to install Python as well.
        : 'Note that --no-managed-python below would be implied but be explicit'
        uv='env UV_PYTHON=python uv --no-managed-python'
-        $uv lock --check --exclude-newer="$(awk -F'"' <uv.lock '/^exclude-newer[[:space:]]*=/ {print $2}')"
+        $uv lock --check
        # Install globally.
        sudo $uv pip install --group=dev --system --break-system-packages
        # Smoke test.
--- a/.github/actions/rust-toolchain/action.yml
+++ b/.github/actions/rust-toolchain/action.yml
@@ -25,7 +25,7 @@ runs:
        set -x
        toolchain=$(
          case "$toolchain_channel" in
-            (stable) echo 1.93 ;; # updatecli.d/rust.yml
+            (stable) echo 1.91 ;; # updatecli.d/rust.yml
            (msrv)   echo 1.85 ;; # updatecli.d/rust.yml
            (*)
              printf >&2 "error: unsupported toolchain channel %s" "$toolchain_channel"
--- a/.github/workflows/build_docker_images.yml
+++ b/.github/workflows/build_docker_images.yml
@@ -37,7 +37,7 @@ jobs:
    steps:
      -
        name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
      -
        name: Login to Container registry
        uses: docker/login-action@v3
--- a/.github/workflows/lint-dependencies.yml
+++ b/.github/workflows/lint-dependencies.yml
@@ -1,24 +0,0 @@
-name: Lint Dependencies
-on:
-  push:
-    paths:
-      - '.github/workflows/lint-dependencies.yml'
-      - 'Cargo.lock'
-      - '**/Cargo.toml'
-      - 'deny.toml'
-  pull_request:
-    paths:
-      - '.github/workflows/lint-dependencies.yml'
-      - 'Cargo.lock'
-      - '**/Cargo.toml'
-      - 'deny.toml'
-jobs:
-  cargo-deny:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v6
-    - uses: EmbarkStudios/cargo-deny-action@v2
-      with:
-        command: check licenses
-        arguments: --all-features --locked --exclude-dev
-        rust-version: 1.93 # updatecli.d/rust.yml
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -9,7 +9,7 @@ jobs:
  format:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v3
    - uses: ./.github/actions/rust-toolchain@stable
      with:
        components: rustfmt
@@ -35,7 +35,7 @@ jobs:
          - rust_version: "msrv"
            features: ""
    steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v3
    - uses: ./.github/actions/rust-toolchain
      with:
        toolchain_channel: ${{ matrix.rust_version }}
@@ -49,7 +49,7 @@ jobs:
  rustdoc:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v3
    - uses: ./.github/actions/rust-toolchain@stable
    - name: Install deps
      run: |
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
    name: Pre-release checks
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
        with:
          # Workaround for https://github.com/actions/checkout/issues/882
          ref: ${{ inputs.version }}
@@ -36,7 +36,7 @@ jobs:
      version: ${{ steps.version.outputs.version }}
      tarball-name: ${{ steps.version.outputs.tarball-name }}
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
        with:
          # Workaround for https://github.com/actions/checkout/issues/882
          ref: ${{ inputs.version }}
@@ -74,7 +74,7 @@ jobs:
    name: Build single-file fish for Linux
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
        with:
          # Workaround for https://github.com/actions/checkout/issues/882
          ref: ${{ inputs.version }}
@@ -114,7 +114,7 @@ jobs:
    name: Create release draft
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
        with:
          # Workaround for https://github.com/actions/checkout/issues/882
          ref: ${{ inputs.version }}
@@ -142,7 +142,7 @@ jobs:
    runs-on: macos-latest
    environment: macos-codesign
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
        with:
          # Workaround for https://github.com/actions/checkout/issues/882
          ref: ${{ inputs.version }}
@@ -172,7 +172,7 @@ jobs:
          echo "$MACOS_NOTARIZE_JSON" >/tmp/notarize.json
          ./build_tools/make_macos_pkg.sh -s -f /tmp/app.p12 \
            -i /tmp/installer.p12 -p "$MAC_CODESIGN_PASSWORD" \
-            -n -j /tmp/notarize.json -- -c "-DWITH_DOCS=ON"
+            -n -j /tmp/notarize.json
          version=$(git describe)
          [ -f "${FISH_ARTEFACT_PATH}/fish-$version.app.zip" ]
          [ -f "${FISH_ARTEFACT_PATH}/fish-$version.pkg" ]
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,7 +13,7 @@ jobs:
  ubuntu:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
    - uses: ./.github/actions/rust-toolchain@oldest-supported
    - name: Install deps
      uses: ./.github/actions/install-dependencies
@@ -44,7 +44,7 @@ jobs:
  ubuntu-32bit-static-pcre2:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
    - uses: ./.github/actions/rust-toolchain@oldest-supported
      with:
        targets: "i586-unknown-linux-gnu"
@@ -80,7 +80,7 @@ jobs:
        RUSTFLAGS: "-Zsanitizer=address"
        # RUSTFLAGS: "-Zsanitizer=memory -Zsanitizer-memory-track-origins"
    steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
    # All -Z options require running nightly
    - uses: dtolnay/rust-toolchain@nightly
      with:
@@ -128,7 +128,7 @@ jobs:
      # of crates.io, so give this a try. It's also sometimes significantly faster on all platforms.
      CARGO_NET_GIT_FETCH_WITH_CLI: true
    steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
    - uses: ./.github/actions/rust-toolchain@oldest-supported
    - name: Install deps
      run: |
@@ -155,7 +155,7 @@ jobs:
      run:
        shell: msys2 {0}
    steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
    - uses: msys2/setup-msys2@v2
      with:
        update: true
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,140 +1,5 @@
-fish 4.4.0 (released February 03, 2026)
-=======================================
-
-Deprecations and removed features
---------------------------------
- The default fossil prompt has been disabled (:issue:`12342`).
-
-Interactive improvements
------------------------
- The ``bind`` builtin lists mappings from all modes if ``--mode`` is not provided (:issue:`12214`).
- Line-wise autosuggestions that don't start a command are no longer shown (739b82c34db, 58e7a50de8a).
- Builtin ``history`` now assumes that :envvar:`PAGER` supports ANSI color sequences.
- fish now clears the terminal's ``FLUSHO`` flag when acquiring control of the terminal, to fix an issue caused by pressing :kbd:`ctrl-o` on macOS (:issue:`12304`).
-
-New or improved bindings
------------------------
- Vi mode word movements (``w``, ``W``, ``e``, and ``E``) are now largely in line with Vim. The only exception is that underscores are treated as word separators (:issue:`12269`).
- New special input functions to support these movements: ``forward-word-vi``, ``kill-word-vi``, ``forward-bigword-vi``, ``kill-bigword-vi``, ````forward-word-end``, ``backward-word-end``, ``forward-bigword-end``, ``backward-bigword-end``, ````kill-a-word``, ``kill-inner-word``, ``kill-a-bigword``, and ``kill-inner-bigword``.
- Vi mode key bindings now support counts for movement and deletion commands (e.g. `d3w` or `3l`), via a new operator mode (:issue:`2192`).
- New ``catpuccin-*`` color themes.
-
-Improved terminal support
-------------------------
- ``set_color`` learned the strikethrough (``--strikethrough`` or ``-s``) modifier.
-
-For distributors and developers
-------------------------------
- The CMake option ``WITH_GETTEXT`` has been renamed to ``WITH_MESSAGE_LOCALIZATION``, to reflect that it toggles localization independently of the backend used in the implementation.
- New ``cargo xtask`` commands can replace some CMake workflows.
-
-Regression fixes:
-----------------
- (from 4.1.0) Crash when autosuggesting Unicode characters with nontrivial lowercase mapping (:issue:`12326`, 78f4541116e).
- (from 4.3.0) Glitch on ``read --prompt-str ""`` (:issue:`12296`).
-
-fish 4.3.3 (released January 07, 2026)
-======================================
-
-This release fixes the following problems identified in fish 4.3.0:
-
- Selecting a completion could insert only part of the token (:issue:`12249`).
- Glitch with soft-wrapped autosuggestions and :doc:`fish_right_prompt <cmds/fish_right_prompt>` (:issue:`12255`).
- Spurious echo in tmux when typing a command really fast (:issue:`12261`).
- ``tomorrow`` theme always using the light variant (:issue:`12266`).
- ``fish_config theme choose`` sometimes not shadowing themes set by e.g. webconfig (:issue:`12278`).
- The sample prompts and themes are correctly installed (:issue:`12241`).
- Last line of command output could be hidden when missing newline (:issue:`12246`).
-
-Other improvements include:
-
- The ``abbr``, ``bind``, ``complete``, ``functions``, ``history`` and ``type`` commands now support a ``--color`` option to control syntax highlighting in their output. Valid values are ``auto`` (default), ``always``, or ``never``.
- Existing file paths in redirection targets such as ``> file.txt`` are now highlighted using :envvar:`fish_color_valid_path`, indicating that ``file.txt`` will be clobbered (:issue:`12260`).
-
-fish 4.3.2 (released December 30, 2025)
-=======================================
-
-This release fixes the following problems identified in 4.3.0:
-
- Pre-built macOS packages failed to start due to a ``Malformed Mach-O file`` error (:issue:`12224`).
- ``extra_functionsdir`` (usually ``vendor_functions.d``) and friends were not used (:issue:`12226`).
- Sample config file ``~/.config/fish/config.fish/`` and config directories ``~/.config/fish/conf.d/``, ``~/.config/fish/completions/`` and ``~/.config/fish/functions/`` were recreated on every startup instead of only the first time fish runs on a system (:issue:`12230`).
- Spurious echo of ``^[[I`` in some scenarios (:issue:`12232`).
- Infinite prompt redraw loop on some prompts (:issue:`12233`).
- The removal of pre-built HTML docs from tarballs revealed that cross compilation is broken because we use ``${CMAKE_BINARY_DIR}/fish_indent`` for building HTML docs.
-  As a workaround, the new CMake build option ``FISH_INDENT_FOR_BUILDING_DOCS`` can be set to the path of a runnable ``fish_indent`` binary.
-
-fish 4.3.1 (released December 28, 2025)
-=======================================
-
-This release fixes the following problem identified in 4.3.0:
-
- Possible crash after expanding an abbreviation (:issue:`12223`).
-
-fish 4.3.0 (released December 28, 2025)
-=======================================
-
-Deprecations and removed features
---------------------------------
- fish no longer sets user-facing :ref:`universal variables <variables-universal>` by default, making the configuration easier to understand.
-  Specifically, the ``fish_color_*``, ``fish_pager_color_*`` and ``fish_key_bindings`` variables are now set in the global scope by default.
-  After upgrading to 4.3.0, fish will (once and never again) migrate these universals to globals set at startup in the
-  ``~/.config/fish/conf.d/fish_frozen_theme.fish`` and
-  ``~/.config/fish/conf.d/fish_frozen_key_bindings.fish`` files.
-  We suggest that you delete those files and :ref:`set your theme <syntax-highlighting>` in ``~/.config/fish/config.fish``.
-
-  - You can still configure fish to propagate theme changes instantly; see :ref:`here <syntax-highlighting-instant-update>` for an example.
-  - You can still opt into storing color variables in the universal scope
-    via ``fish_config theme save`` though unlike ``fish_config theme choose``,
-    it does not support dynamic theme switching based on the terminal's color theme (see below).
- In addition to setting the variables which are explicitly defined in the given theme,
-  ``fish_config theme choose`` now clears only color variables that were set by earlier invocations of a ``fish_config theme choose`` command
-  (which is how fish's default theme is set).
-
-Scripting improvements
----------------------
- New :ref:`status language <status-language>` command allows showing and modifying language settings for fish messages without having to modify environment variables.
- When using a noninteractive fish instance to compute completions, ``commandline --cursor`` works as expected instead of throwing an error (:issue:`11993`).
- :envvar:`fish_trace` can now be set to ``all`` to also trace execution of key bindings, event handlers as well as prompt and title functions.
-
-Interactive improvements
------------------------
- When typing immediately after starting fish, the first prompt is now rendered correctly.
- Completion accuracy was improved for file paths containing ``=`` or ``:`` (:issue:`5363`).
- Prefix-matching completions are now shown even if they don't match the case typed by the user (:issue:`7944`).
- On Cygwin/MSYS, command name completion will favor the non-exe name (``foo``) unless the user started typing the extension.
- When using the exe name (``foo.exe``), fish will use the description and completions for ``foo`` if there are none for ``foo.exe``.
- Autosuggestions now also show soft-wrapped portions (:issue:`12045`).
-
-New or improved bindings
------------------------
- :kbd:`ctrl-w` (``backward-kill-path-component``) also deletes escaped spaces (:issue:`2016`).
- New special input functions ``backward-path-component``, ``forward-path-component`` and ``kill-path-component`` (:issue:`12127`).
-
-Improved terminal support
-------------------------
- Themes can now be made color-theme-aware by including both ``[light]`` and ``[dark]`` sections in the :ref:`theme file <fish-config-theme-files>`.
-  Some default themes have been made color-theme-aware, meaning they dynamically adjust as your terminal's background color switches between light and dark colors (:issue:`11580`).
- The working directory is now reported on every fresh prompt (via OSC 7), fixing scenarios where a child process (like ``ssh``) left behind a stale working directory (:issue:`12191`).
- OSC 133 prompt markers now also mark the prompt end, which improves shell integration with terminals like iTerm2 (:issue:`11837`).
- Operating-system-specific key bindings are now decided based on the :ref:`terminal's host OS <status-terminal-os>`.
- New :ref:`feature flag <featureflags>` ``omit-term-workarounds`` can be turned on to prevent fish from trying to work around some incompatible terminals.
-
-For distributors and developers
-------------------------------
- Tarballs no longer contain prebuilt documentation,
-  so building and installing documentation requires Sphinx.
-  To avoid users accidentally losing docs, the ``BUILD_DOCS`` and ``INSTALL_DOCS`` configuration options have been replaced with a new ``WITH_DOCS`` option.
- ``fish_key_reader`` and ``fish_indent`` are now installed as hardlinks to ``fish``, to save some space.
-
-Regression fixes:
-----------------
- (from 4.1.0) Crash on incorrectly-set color variables (:issue:`12078`).
- (from 4.1.0) Crash when autosuggesting Unicode characters with nontrivial lowercase mapping.
- (from 4.2.0) Incorrect emoji width computation on macOS.
- (from 4.2.0) Mouse clicks and :kbd:`ctrl-l` edge cases in multiline command lines (:issue:`12121`).
- (from 4.2.0) Completions for Git remote names on some non-glibc systems.
- (from 4.2.0) Expansion of ``~$USER``.
+fish ?.?.? (released ???)
+=========================

 fish 4.2.1 (released November 13, 2025)
 =======================================
@@ -240,13 +105,15 @@ This release fixes the following regressions identified in 4.1.0:
  This will not affect fish's child processes unless ``LC_MESSAGES`` was already exported.

 - Some :doc:`fish_config <cmds/fish_config>` subcommands for showing prompts and themes had been broken in standalone Linux builds (those using the ``embed-data`` cargo feature), which has been fixed (:issue:`11832`).
- On Windows Terminal, we observed an issue where fish would fail to read the terminal's response to our new startup queries, causing noticeable lags and a misleading error message. A workaround has been added (:issue:`11841`).
+- On Windows Terminal, we observed an issue where fish would fail to read the terminal's response to our new startup queries, causing noticeable lags and a misleading error message. A workaround has been added (:issue:`11841`). 
 - A WezTerm `issue breaking shifted key input <https://github.com/wezterm/wezterm/issues/6087>`__ has resurfaced on some versions of WezTerm; our workaround has been extended to cover all versions for now (:issue:`11204`).
 - Fixed a crash in :doc:`the web-based configuration tool <cmds/fish_config>` when using the new underline styles (:issue:`11840`).

 fish 4.1.0 (released September 27, 2025)
 ========================================

+.. 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 written using braces (``{ echo1; echo 2 }``), like in other shells.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,12 +24,12 @@ include(cmake/Rust.cmake)
 # Work around issue where archive-built libs go in the wrong place.
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})

-find_program(SPHINX_EXECUTABLE NAMES sphinx-build
-    HINTS
-    $ENV{SPHINX_DIR}
-    PATH_SUFFIXES bin
-    DOC "Sphinx documentation generator")
+# Set up the machinery around FISH-BUILD-VERSION-FILE
+# This defines the FBVF variable.
+include(Version)

+# Set up the docs.
+include(cmake/Docs.cmake)

 # Tell Cargo where our build directory is so it can find Cargo.toml.
 set(VARS_FOR_CARGO
@@ -42,7 +42,9 @@ set(VARS_FOR_CARGO
    "CARGO_TARGET_DIR=${FISH_RUST_BUILD_DIR}"
    "CARGO_BUILD_RUSTC=${Rust_COMPILER}"
    "${FISH_PCRE2_BUILDFLAG}"
+    "RUSTFLAGS=$ENV{RUSTFLAGS} ${rust_debugflags}"
    "FISH_SPHINX=${SPHINX_EXECUTABLE}"
+    "FISH_USE_PREBUILT_DOCS=${USE_PREBUILT_DOCS}"
 )

 # Let fish pick up when we're running out of the build directory without installing
@@ -56,43 +58,37 @@ if(NOT "${CMAKE_BUILD_TYPE}" IN_LIST build_types)
  message(WARNING "Unsupported build type ${CMAKE_BUILD_TYPE}. If this doesn't build, try one of Release, RelWithDebInfo or Debug")
 endif()

-add_custom_target(
-  fish ALL
-  COMMAND
-    "${CMAKE_COMMAND}" -E
-      env ${VARS_FOR_CARGO}
-        ${Rust_CARGO}
-          build --bin fish
-          $<$<CONFIG:Release>:--release>
-          $<$<CONFIG:RelWithDebInfo>:--profile=release-with-debug>
-          --target ${Rust_CARGO_TARGET}
-          --no-default-features
-          --features=${FISH_CARGO_FEATURES}
-          ${CARGO_FLAGS}
-    &&
-    "${CMAKE_COMMAND}" -E
-      copy "${rust_target_dir}/${rust_profile}/fish" "${CMAKE_CURRENT_BINARY_DIR}"
-  WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-  USES_TERMINAL
-)
-
-function(CREATE_LINK target)
+# Define a function to build and link dependencies.
+function(CREATE_TARGET target)
  add_custom_target(
    ${target} ALL
-    DEPENDS fish
-    COMMAND ln -f fish ${target}
-    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+    COMMAND
+      "${CMAKE_COMMAND}" -E
+        env ${VARS_FOR_CARGO}
+          ${Rust_CARGO}
+            build --bin ${target}
+            $<$<CONFIG:Release>:--release>
+            $<$<CONFIG:RelWithDebInfo>:--profile=release-with-debug>
+            --target ${Rust_CARGO_TARGET}
+            --no-default-features
+            --features=${FISH_CARGO_FEATURES}
+            ${CARGO_FLAGS}
+      &&
+      "${CMAKE_COMMAND}" -E
+        copy "${rust_target_dir}/${rust_profile}/${target}" "${CMAKE_CURRENT_BINARY_DIR}"
+    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+    USES_TERMINAL
  )
-endfunction(CREATE_LINK)
+endfunction(CREATE_TARGET)
+
+# Define fish.
+create_target(fish)

 # Define fish_indent.
-create_link(fish_indent)
+create_target(fish_indent)

 # Define fish_key_reader.
-create_link(fish_key_reader)
-
-# Set up the docs.
-include(cmake/Docs.cmake)
+create_target(fish_key_reader)

 # Set up tests.
 include(cmake/Tests.cmake)
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -21,10 +21,10 @@ Archives are available at https://lists.sr.ht/~krobelus/fish-shell/.
 GitHub
 ======

-Fish is available on GitHub, at https://github.com/fish-shell/fish-shell.
+Fish is available on Github, at https://github.com/fish-shell/fish-shell.

 First, you'll need an account there, and you'll need a git clone of fish.
-Fork it on GitHub and then run::
+Fork it on Github and then run::

  git clone https://github.com/<USERNAME>/fish-shell.git

@@ -50,24 +50,7 @@ Guidelines
 In short:

 - Be conservative in what you need (keep to the agreed minimum supported Rust version, limit new dependencies)
- Use automated tools to help you (``cargo xtask check``)
-
-Commit History
-==============
-
-We use a linear, `recipe-style <https://www.bitsnbites.eu/git-history-work-log-vs-recipe/>`__ history.
-Every commit should pass our checks.
-We do not want "fixup" commits in our history.
-If you notice an issue with a commit in a pull request, or get feedback suggesting changes,
-you should rewrite the commit history and fix the relevant commits directly,
-instead of adding new "fixup" commits.
-When a pull request is ready, we rebase it on top of the current master branch,
-so don't be shy about rewriting the history of commits which are not on master yet.
-Rebasing (not merging) your pull request on the latest version of master is also welcome, especially if it resolves conflicts.
-
-If you're using Git, consider using `jj <https://www.jj-vcs.dev/>`__ to make this easier.
-
-If a commit should close an issue, add a ``Fixes #<issue-number>`` line at the end of the commit description.
+- Use automated tools to help you (``build_tools/check.sh``)

 Contributing completions
 ========================
@@ -105,24 +88,14 @@ Contributing documentation
 ==========================

 The documentation is stored in ``doc_src/``, and written in ReStructured Text and built with Sphinx.
-The builtins and various functions shipped with fish are documented in ``doc_src/cmds/``.

-To build an HTML version of the docs locally, run::
+To build it locally, run from the main fish-shell directory::

-    cargo xtask html-docs
+    sphinx-build -j 8 -b html -n doc_src/ /tmp/fish-doc/

-will output to ``target/fish-docs/html`` or, if you use CMake::
-
-    cmake --build build -t sphinx-docs
-
-will output to ``build/cargo/fish-docs/html/``. You can also run ``sphinx-build`` directly, which allows choosing the output directory::
-
-    sphinx-build -j auto -b html doc_src/ /tmp/fish-doc/
-
-will output HTML docs to ``/tmp/fish-doc``.
-
-After building them, you can open the HTML docs in a browser and see that it looks okay.
+which will build the docs as html in /tmp/fish-doc. You can open it in a browser and see that it looks okay.

+The builtins and various functions shipped with fish are documented in doc_src/cmds/.

 Code Style
 ==========
@@ -202,7 +175,7 @@ The source code for fish includes a large collection of tests. If you
 are making any changes to fish, running these tests is a good way to make
 sure the behaviour remains consistent and regressions are not
 introduced. Even if you don’t run the tests on your machine, they will
-still be run via GitHub Actions.
+still be run via Github Actions.

 You are strongly encouraged to add tests when changing the functionality
 of fish, especially if you are fixing a bug to help ensure there are no
@@ -248,7 +221,7 @@ In this example we're in the root of the workspace and have run ``cargo build``

 To run all tests and linters, use::

-    cargo xtask check
+    build_tools/check.sh

 Contributing Translations
 =========================
@@ -260,8 +233,9 @@ It also means that some features are not supported, such as message context and
 We also expect all files to be UTF-8-encoded.
 In practice, this should not matter much for contributing translations.

-Translation sources are stored in the ``localization/po`` directory and named ``ll_CC.po``,
-where ``ll`` is the two (or possibly three) letter ISO 639-1 language code of the target language
+Translation sources are
+stored in the ``po`` directory, named ``ll_CC.po``, where ``ll`` is the
+two (or possibly three) letter ISO 639-1 language code of the target language
 (e.g. ``pt`` for Portuguese). ``CC`` is an ISO 3166 country/territory code,
 (e.g. ``BR`` for Brazil).
 An example for a valid name is ``pt_BR.po``, indicating Brazilian Portuguese.
@@ -275,7 +249,7 @@ More specifically, you will need ``msguniq`` and ``msgmerge`` for creating trans
 language.
 To create a new translation, run::

-    build_tools/update_translations.fish localization/po/ll_CC.po
+    build_tools/update_translations.fish po/ll_CC.po

 This will create a new PO file containing all messages available for translation.
 If the file already exists, it will be updated.
@@ -321,7 +295,7 @@ Editing PO files
 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.

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

    msgid "%s: No suitable job\n"
    msgstr ""
@@ -349,7 +323,7 @@ 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 (``localization/po/*.po``).
+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.

 Setting Code Up For Translations
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 4

 [[package]]
 name = "aho-corasick"
-version = "1.1.4"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
 "memchr",
 ]
@@ -17,62 +17,6 @@ version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"

-[[package]]
-name = "anstream"
-version = "0.6.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "is_terminal_polyfill",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
-dependencies = [
- "windows-sys",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
-dependencies = [
- "anstyle",
- "once_cell_polyfill",
- "windows-sys",
-]
-
-[[package]]
-name = "assert_matches"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
-
 [[package]]
 name = "autocfg"
 version = "1.5.0"
@@ -96,9 +40,9 @@ dependencies = [

 [[package]]
 name = "bstr"
-version = "1.12.1"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab"
+checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
 dependencies = [
 "memchr",
 "serde",
@@ -106,9 +50,9 @@ dependencies = [

 [[package]]
 name = "cc"
-version = "1.2.55"
+version = "1.2.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b26a0954ae34af09b50f0de26458fa95369a0d478d8236d3f93082b219bd29"
+checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7"
 dependencies = [
 "find-msvc-tools",
 "jobserver",
@@ -128,52 +72,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"

-[[package]]
-name = "clap"
-version = "4.5.56"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75ca66430e33a14957acc24c5077b503e7d374151b2b4b3a10c83b4ceb4be0e"
-dependencies = [
- "clap_builder",
- "clap_derive",
-]
-
-[[package]]
-name = "clap_builder"
-version = "4.5.56"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793207c7fa6300a0608d1080b858e5fdbe713cdc1c8db9fb17777d8a13e63df0"
-dependencies = [
- "anstream",
- "anstyle",
- "clap_lex",
- "strsim",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.5.55"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.7.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32"
-
-[[package]]
-name = "colorchoice"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
-
 [[package]]
 name = "cpufeatures"
 version = "0.2.17"
@@ -185,9 +83,9 @@ dependencies = [

 [[package]]
 name = "crypto-common"
-version = "0.1.7"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
 "generic-array",
 "typenum",
@@ -224,12 +122,6 @@ dependencies = [
 "windows-sys",
 ]

-[[package]]
-name = "either"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
-
 [[package]]
 name = "equivalent"
 version = "1.0.2"
@@ -254,35 +146,25 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"

 [[package]]
 name = "find-msvc-tools"
-version = "0.1.9"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
+checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"

 [[package]]
 name = "fish"
-version = "4.4.0"
+version = "4.2.1-snapshot"
 dependencies = [
- "assert_matches",
 "bitflags",
 "cc",
 "cfg-if",
 "errno",
 "fish-build-helper",
 "fish-build-man-pages",
- "fish-color",
- "fish-common",
- "fish-fallback",
- "fish-gettext",
 "fish-gettext-extraction",
+ "fish-gettext-maps",
 "fish-gettext-mo-file-parser",
 "fish-printf",
 "fish-tempfile",
- "fish-util",
- "fish-wcstringutil",
- "fish-wgetopt",
- "fish-widecharwidth",
- "fish-widestring",
- "itertools",
 "libc",
 "lru",
 "macro_rules_attribute",
@@ -290,15 +172,16 @@ dependencies = [
 "num-traits",
 "once_cell",
 "pcre2",
- "phf_codegen 0.13.1",
+ "phf 0.12.1",
+ "phf_codegen 0.12.1",
 "portable-atomic",
- "rand 0.9.2",
+ "rand",
 "rsconf",
 "rust-embed",
 "serial_test",
 "terminfo",
 "unix_path",
- "xterm-color",
+ "widestring",
 ]

 [[package]]
@@ -316,52 +199,11 @@ dependencies = [
 "rsconf",
 ]

-[[package]]
-name = "fish-color"
-version = "0.0.0"
-dependencies = [
- "fish-common",
- "fish-widestring",
-]
-
-[[package]]
-name = "fish-common"
-version = "0.0.0"
-dependencies = [
- "bitflags",
- "fish-widestring",
- "libc",
- "nix",
-]
-
-[[package]]
-name = "fish-fallback"
-version = "0.0.0"
-dependencies = [
- "fish-build-helper",
- "fish-common",
- "fish-widecharwidth",
- "fish-widestring",
- "libc",
- "rsconf",
- "widestring",
-]
-
-[[package]]
-name = "fish-gettext"
-version = "0.0.0"
-dependencies = [
- "fish-gettext-maps",
- "phf 0.13.1",
-]
-
 [[package]]
 name = "fish-gettext-extraction"
 version = "0.0.0"
 dependencies = [
- "fish-tempfile",
 "proc-macro2",
- "rsconf",
 ]

 [[package]]
@@ -370,8 +212,8 @@ version = "0.0.0"
 dependencies = [
 "fish-build-helper",
 "fish-gettext-mo-file-parser",
- "phf 0.13.1",
- "phf_codegen 0.13.1",
+ "phf 0.12.1",
+ "phf_codegen 0.12.1",
 "rsconf",
 ]

@@ -383,7 +225,6 @@ version = "0.0.0"
 name = "fish-printf"
 version = "0.2.1"
 dependencies = [
- "assert_matches",
 "libc",
 "unicode-segmentation",
 "unicode-width",
@@ -395,46 +236,6 @@ name = "fish-tempfile"
 version = "0.0.0"
 dependencies = [
 "nix",
- "rand 0.9.2",
-]
-
-[[package]]
-name = "fish-util"
-version = "0.0.0"
-dependencies = [
- "fish-widestring",
- "rand 0.9.2",
-]
-
-[[package]]
-name = "fish-wcstringutil"
-version = "0.0.0"
-dependencies = [
- "fish-build-helper",
- "fish-common",
- "fish-fallback",
- "fish-widestring",
- "rsconf",
-]
-
-[[package]]
-name = "fish-wgetopt"
-version = "0.0.0"
-dependencies = [
- "assert_matches",
- "fish-wcstringutil",
- "fish-widestring",
-]
-
-[[package]]
-name = "fish-widecharwidth"
-version = "0.0.0"
-
-[[package]]
-name = "fish-widestring"
-version = "0.0.0"
-dependencies = [
- "widestring",
 ]

 [[package]]
@@ -445,15 +246,15 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"

 [[package]]
 name = "foldhash"
-version = "0.2.0"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"

 [[package]]
 name = "generic-array"
-version = "0.14.7"
+version = "0.14.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2"
 dependencies = [
 "typenum",
 "version_check",
@@ -461,9 +262,9 @@ dependencies = [

 [[package]]
 name = "getrandom"
-version = "0.2.17"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
 "cfg-if",
 "libc",
@@ -484,9 +285,9 @@ dependencies = [

 [[package]]
 name = "globset"
-version = "0.4.18"
+version = "0.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52dfc19153a48bde0cbd630453615c8151bce3a5adfac7a0aebfbf0a1e1f57e3"
+checksum = "54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5"
 dependencies = [
 "aho-corasick",
 "bstr",
@@ -497,36 +298,15 @@ dependencies = [

 [[package]]
 name = "hashbrown"
-version = "0.16.1"
+version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
 dependencies = [
 "allocator-api2",
 "equivalent",
 "foldhash",
 ]

-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
-name = "is_terminal_polyfill"
-version = "1.70.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
-
-[[package]]
-name = "itertools"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "jobserver"
 version = "0.1.34"
@@ -539,15 +319,15 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.180"
+version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"

 [[package]]
 name = "libredox"
-version = "0.1.12"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616"
+checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
 dependencies = [
 "bitflags",
 "libc",
@@ -564,15 +344,15 @@ dependencies = [

 [[package]]
 name = "log"
-version = "0.4.29"
+version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"

 [[package]]
 name = "lru"
-version = "0.16.3"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1dc47f592c06f33f8e3aea9591776ec7c9f9e4124778ff8a3c3b87159f7e593"
+checksum = "227748d55f2f0ab4735d87fd623798cb6b664512fe979705f829c9f81c934465"
 dependencies = [
 "hashbrown",
 ]
@@ -607,9 +387,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"

 [[package]]
 name = "nix"
-version = "0.31.1"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225e7cfe711e0ba79a68baeddb2982723e4235247aefce1482f2f16c27865b66"
+checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
 dependencies = [
 "bitflags",
 "cfg-if",
@@ -642,12 +422,6 @@ version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"

-[[package]]
-name = "once_cell_polyfill"
-version = "1.70.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
-
 [[package]]
 name = "option-ext"
 version = "0.2.0"
@@ -714,11 +488,11 @@ dependencies = [

 [[package]]
 name = "phf"
-version = "0.13.1"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
+checksum = "913273894cec178f401a31ec4b656318d95473527be05c0752cc41cdc32be8b7"
 dependencies = [
- "phf_shared 0.13.1",
+ "phf_shared 0.12.1",
 ]

 [[package]]
@@ -733,12 +507,12 @@ dependencies = [

 [[package]]
 name = "phf_codegen"
-version = "0.13.1"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49aa7f9d80421bca176ca8dbfebe668cc7a2684708594ec9f3c0db0805d5d6e1"
+checksum = "efbdcb6f01d193b17f0b9c3360fa7e0e620991b193ff08702f78b3ce365d7e61"
 dependencies = [
- "phf_generator 0.13.1",
- "phf_shared 0.13.1",
+ "phf_generator 0.12.1",
+ "phf_shared 0.12.1",
 ]

 [[package]]
@@ -748,17 +522,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
 dependencies = [
 "phf_shared 0.11.3",
- "rand 0.8.5",
+ "rand",
 ]

 [[package]]
 name = "phf_generator"
-version = "0.13.1"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737"
+checksum = "2cbb1126afed61dd6368748dae63b1ee7dc480191c6262a3b4ff1e29d86a6c5b"
 dependencies = [
 "fastrand",
- "phf_shared 0.13.1",
+ "phf_shared 0.12.1",
 ]

 [[package]]
@@ -772,9 +546,9 @@ dependencies = [

 [[package]]
 name = "phf_shared"
-version = "0.13.1"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
+checksum = "06005508882fb681fd97892ecff4b7fd0fee13ef1aa569f8695dae7ab9099981"
 dependencies = [
 "siphasher",
 ]
@@ -787,33 +561,24 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"

 [[package]]
 name = "portable-atomic"
-version = "1.13.1"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
-dependencies = [
- "zerocopy",
-]
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"

 [[package]]
 name = "proc-macro2"
-version = "1.0.106"
+version = "1.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
 dependencies = [
 "unicode-ident",
 ]

 [[package]]
 name = "quote"
-version = "1.0.44"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
 dependencies = [
 "proc-macro2",
 ]
@@ -830,27 +595,7 @@ version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
-dependencies = [
- "rand_chacha",
- "rand_core 0.9.5",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.9.5",
+ "rand_core",
 ]

 [[package]]
@@ -859,15 +604,6 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"

-[[package]]
-name = "rand_core"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
-dependencies = [
- "getrandom 0.3.4",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.5.18"
@@ -883,7 +619,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
 dependencies = [
- "getrandom 0.2.17",
+ "getrandom 0.2.16",
 "libredox",
 "thiserror",
 ]
@@ -907,18 +643,18 @@ checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"

 [[package]]
 name = "rsconf"
-version = "0.3.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06cbd984e96cc891aa018958ac3d09986c0ea7635eedfff670b99a90970f159f"
+checksum = "bd2af859f1af0401e7fc7577739c87b0d239d8a5da400d717183bca92336bcdc"
 dependencies = [
 "cc",
 ]

 [[package]]
 name = "rust-embed"
-version = "8.11.0"
+version = "8.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04113cb9355a377d83f06ef1f0a45b8ab8cd7d8b1288160717d66df5c7988d27"
+checksum = "fb44e1917075637ee8c7bcb865cf8830e3a92b5b1189e44e3a0ab5a0d5be314b"
 dependencies = [
 "rust-embed-impl",
 "rust-embed-utils",
@@ -927,9 +663,9 @@ dependencies = [

 [[package]]
 name = "rust-embed-impl"
-version = "8.11.0"
+version = "8.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0902e4c7c8e997159ab384e6d0fc91c221375f6894346ae107f47dd0f3ccaa"
+checksum = "382499b49db77a7c19abd2a574f85ada7e9dbe125d5d1160fa5cad7c4cf71fc9"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -941,9 +677,9 @@ dependencies = [

 [[package]]
 name = "rust-embed-utils"
-version = "8.11.0"
+version = "8.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bcdef0be6fe7f6fa333b1073c949729274b05f123a0ad7efcb8efd878e5c3b1"
+checksum = "21fcbee55c2458836bcdbfffb6ec9ba74bbc23ca7aa6816015a3dd2c4d8fc185"
 dependencies = [
 "globset",
 "sha2",
@@ -1011,9 +747,9 @@ dependencies = [

 [[package]]
 name = "serial_test"
-version = "3.3.1"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d0b343e184fc3b7bb44dff0705fffcf4b3756ba6aff420dddd8b24ca145e555"
+checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9"
 dependencies = [
 "once_cell",
 "parking_lot",
@@ -1023,9 +759,9 @@ dependencies = [

 [[package]]
 name = "serial_test_derive"
-version = "3.3.1"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f50427f258fb77356e4cd4aa0e87e2bd2c66dbcee41dc405282cae2bfc26c83"
+checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1060,9 +796,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"

 [[package]]
 name = "siphasher"
-version = "1.0.2"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e"
+checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"

 [[package]]
 name = "smallvec"
@@ -1070,17 +806,11 @@ version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"

-[[package]]
-name = "strsim"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-
 [[package]]
 name = "syn"
-version = "2.0.114"
+version = "2.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
+checksum = "2a26dbd934e5451d21ef060c018dae56fc073894c5a7896f882928a76e6d081b"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1101,18 +831,18 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "2.0.18"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
+checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "2.0.18"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
+checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1127,9 +857,9 @@ checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"

 [[package]]
 name = "unicode-ident"
-version = "1.0.22"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
+checksum = "462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06"

 [[package]]
 name = "unicode-segmentation"
@@ -1158,12 +888,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2ace0b4755d0a2959962769239d56267f8a024fef2d9b32666b3dcd0946b0906"

-[[package]]
-name = "utf8parse"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
-
 [[package]]
 name = "version_check"
 version = "0.9.5"
@@ -1230,38 +954,3 @@ name = "wit-bindgen"
 version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
-
-[[package]]
-name = "xtask"
-version = "0.0.0"
-dependencies = [
- "clap",
- "fish-build-helper",
- "fish-tempfile",
-]
-
-[[package]]
-name = "xterm-color"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7008a9d8ba97a7e47d9b2df63fcdb8dade303010c5a7cd5bf2469d4da6eba673"
-
-[[package]]
-name = "zerocopy"
-version = "0.8.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7456cf00f0685ad319c5b1693f291a650eaf345e941d082fc4e03df8a03996ac"
-dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.8.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1328722bbf2115db7e19d69ebcc15e795719e2d66b60827c6a69a117365e37a0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,61 +6,52 @@ members = ["crates/*"]
 rust-version = "1.85"
 edition = "2024"
 repository = "https://github.com/fish-shell/fish-shell"
-# 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"

 [workspace.dependencies]
-assert_matches = "1.5.0"
 bitflags = "2.5.0"
 cc = "1.0.94"
 cfg-if = "1.0.3"
-clap = { version = "4.5.54", features = ["derive"] }
 errno = "0.3.0"
 fish-build-helper = { path = "crates/build-helper" }
 fish-build-man-pages = { path = "crates/build-man-pages" }
-fish-color = { path = "crates/color" }
-fish-common = { path = "crates/common" }
-fish-fallback = { path = "crates/fallback" }
-fish-gettext = { path = "crates/gettext" }
 fish-gettext-extraction = { path = "crates/gettext-extraction" }
 fish-gettext-maps = { path = "crates/gettext-maps" }
 fish-gettext-mo-file-parser = { path = "crates/gettext-mo-file-parser" }
 fish-printf = { path = "crates/printf", features = ["widestring"] }
 fish-tempfile = { path = "crates/tempfile" }
-fish-util = { path = "crates/util" }
-fish-wcstringutil = { path = "crates/wcstringutil" }
-fish-widecharwidth = { path = "crates/widecharwidth" }
-fish-widestring = { path = "crates/widestring" }
-fish-wgetopt = { path = "crates/wgetopt" }
-itertools = "0.14.0"
 libc = "0.2.177"
 # lru pulls in hashbrown by default, which uses a faster (though less DoS resistant) hashing algo.
 # disabling default features uses the stdlib instead, but it doubles the time to rewrite the history
 # files as of 22 April 2024.
-lru = "0.16.2"
-nix = { version = "0.31.1", default-features = false, features = ["event", "fs", "inotify", "hostname", "resource", "process", "signal", "term", "user"] }
+lru = "0.13.0"
+nix = { version = "0.30.1", default-features = false, features = [
+    "event",
+    "inotify",
+    "resource",
+    "fs",
+] }
 num-traits = "0.2.19"
 once_cell = "1.19.0"
 pcre2 = { git = "https://github.com/fish-shell/rust-pcre2", tag = "0.2.9-utf32", default-features = false, features = [
    "utf32",
 ] }
-phf = { version = "0.13", default-features = false }
-phf_codegen = "0.13"
+phf = { version = "0.12", default-features = false }
+phf_codegen = { version = "0.12" }
 portable-atomic = { version = "1", default-features = false, features = [
    "fallback",
 ] }
 proc-macro2 = "1.0"
-rand = { version = "0.9.2", default-features = false, features = [
-    "small_rng",
-    "thread_rng",
-] }
-rsconf = "0.3.0"
-rust-embed = { version = "8.11.0", features = [
+# 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
+# minimum supported version to 10.12.
+rand = { version = "0.8.5", default-features = false, features = ["small_rng"] }
+rsconf = "0.2.2"
+rust-embed = { version = "8.7.2", features = [
    "deterministic-timestamps",
    "include-exclude",
    "interpolate-folder-path",
 ] }
+
 serial_test = { version = "3", default-features = false }
 # We need 0.9.0 specifically for some crash fixes.
 terminfo = "0.9.0"
@@ -68,7 +59,6 @@ widestring = "1.2.0"
 unicode-segmentation = "1.12.0"
 unicode-width = "0.2.0"
 unix_path = "1.0.1"
-xterm-color = "1.0.1"

 [profile.release]
 overflow-checks = true
@@ -80,34 +70,26 @@ debug = true

 [package]
 name = "fish"
-version = "4.4.0"
+version = "4.2.1-snapshot"
 edition.workspace = true
 rust-version.workspace = true
 default-run = "fish"
-license.workspace = true
+# 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"
 homepage = "https://fishshell.com"
 readme = "README.rst"

 [dependencies]
-assert_matches.workspace = true
 bitflags.workspace = true
 cfg-if.workspace = true
 errno.workspace = true
 fish-build-helper.workspace = true
 fish-build-man-pages = { workspace = true, optional = true }
-fish-color.workspace = true
-fish-common.workspace = true
-fish-fallback.workspace = true
-fish-gettext = { workspace = true, optional = true }
 fish-gettext-extraction = { workspace = true, optional = true }
+fish-gettext-maps = { workspace = true, optional = true }
 fish-printf.workspace = true
 fish-tempfile.workspace = true
-fish-util.workspace = true
-fish-wcstringutil.workspace = true
-fish-wgetopt.workspace = true
-fish-widecharwidth.workspace = true
-fish-widestring.workspace = true
-itertools.workspace = true
 libc.workspace = true
 lru.workspace = true
 macro_rules_attribute = "0.2.2"
@@ -115,22 +97,23 @@ nix.workspace = true
 num-traits.workspace = true
 once_cell.workspace = true
 pcre2.workspace = true
+phf = { workspace = true, optional = true }
 rand.workspace = true
 terminfo.workspace = true
-xterm-color.workspace = true
+widestring.workspace = true

 [target.'cfg(not(target_has_atomic = "64"))'.dependencies]
 portable-atomic.workspace = true

 [target.'cfg(windows)'.dependencies]
-rust-embed = { workspace = true, features = [
+rust-embed = { workspace = true, optional = true, features = [
    "deterministic-timestamps",
    "debug-embed",
    "include-exclude",
    "interpolate-folder-path",
 ] }
 [target.'cfg(not(windows))'.dependencies]
-rust-embed = { workspace = true, features = [
+rust-embed = { workspace = true, optional = true, features = [
    "deterministic-timestamps",
    "include-exclude",
    "interpolate-folder-path",
@@ -166,19 +149,20 @@ name = "fish_key_reader"
 path = "src/bin/fish_key_reader.rs"

 [features]
-default = ["embed-manpages", "localize-messages"]
+default = ["embed-data", "localize-messages"]
 benchmark = []
-embed-manpages = ["dep:fish-build-man-pages"]
+embed-data = ["dep:rust-embed", "dep:fish-build-man-pages"]
 # Enable gettext localization at runtime. Requires the `msgfmt` tool to generate catalog data at
 # build time.
-localize-messages = ["dep:fish-gettext"]
+localize-messages = ["dep:phf", "dep:fish-gettext-maps"]
 # This feature is used to enable extracting messages from the source code for localization.
 # It only needs to be enabled if updating these messages (and the corresponding PO files) is
-# desired. This happens when running tests via `cargo xtask check` and when calling
+# desired. This happens when running tests via `build_tools/check.sh` and when calling
 # `build_tools/update_translations.fish`, so there should not be a need to enable it manually.
 gettext-extract = ["dep:fish-gettext-extraction"]

 # The following features are auto-detected by the build-script and should not be enabled manually.
+asan = []
 tsan = []

 [workspace.lints]
@@ -187,33 +171,19 @@ rust.non_upper_case_globals = "allow"
 rust.unknown_lints = "allow"
 rust.unstable_name_collisions = "allow"
 rustdoc.private_intra_doc_links = "allow"
-
-[workspace.lints.clippy]
-assigning_clones = "warn"
-cloned_instead_of_copied = "warn"
-explicit_into_iter_loop = "warn"
-format_push_string = "warn"
-implicit_clone = "warn"
-len_without_is_empty = "allow"    # we're not a library crate
-let_and_return = "allow"
-manual_assert = "warn"
-manual_range_contains = "allow"
-map_unwrap_or = "warn"
-mut_mut = "warn"
-needless_lifetimes = "allow"
-new_without_default = "allow"
-option_map_unit_fn = "allow"
-ptr_offset_by_literal = "warn"
-ref_option = "warn"
-semicolon_if_nothing_returned = "warn"
-stable_sort_primitive = "warn"
-unnecessary_semicolon = "warn"
+clippy.len_without_is_empty = "allow"     # we're not a library crate
+clippy.let_and_return = "allow"
+clippy.manual_range_contains = "allow"
+clippy.needless_lifetimes = "allow"
+clippy.needless_return = "allow"
+clippy.new_without_default = "allow"
+clippy.option_map_unit_fn = "allow"

 # We do not want to use the e?print(ln)?! macros.
 # These lints flag their use.
 # In the future, they might change to flag other methods of printing.
-print_stdout = "deny"
-print_stderr = "deny"
+clippy.print_stdout = "deny"
+clippy.print_stderr = "deny"

 [lints]
 workspace = true
--- a/4
+++ b/4
@@ -7,7 +7,7 @@
 CMAKE ?= cmake

 GENERATOR ?= $(shell (which ninja > /dev/null 2> /dev/null && echo Ninja) || \
-	echo 'Unix Makefiles')
+			 echo 'Unix Makefiles')
 prefix ?= /usr/local
 PREFIX ?= $(prefix)

@@ -34,7 +34,7 @@ all: .begin build/fish
 .PHONY: .begin
 .begin:
 	@which $(CMAKE) > /dev/null 2> /dev/null || \
-		(echo 'Please install CMake and then re-run the `make` command!' 1>&2 && false)
+		 (echo 'Please install CMake and then re-run the `make` command!' 1>&2 && false)

 .PHONY: build/fish
 build/fish: build/$(BUILDFILE)
--- a/README.rst
+++ b/README.rst
@@ -37,7 +37,7 @@ fish can be installed:
 -  using the `installer from fishshell.com <https://fishshell.com/>`__
 -  as a `standalone app from fishshell.com <https://fishshell.com/>`__

-Note: The minimum supported macOS version is 10.12.
+Note: The minimum supported macOS version is 10.10 "Yosemite".

 Packages for Linux
 ~~~~~~~~~~~~~~~~~~
@@ -117,7 +117,7 @@ Dependencies

 Compiling fish requires:

-  Rust (version 1.85 or later), including cargo
+-  Rust (version 1.85 or later)
 -  CMake (version 3.15 or later)
 -  a C compiler (for system feature detection and the test helper binary)
 -  PCRE2 (headers and libraries) - optional, this will be downloaded if missing
@@ -157,14 +157,11 @@ In addition to the normal CMake build options (like ``CMAKE_INSTALL_PREFIX``), f
 - Rust_COMPILER=path - the path to rustc. If not set, cmake will check $PATH and ~/.cargo/bin
 - Rust_CARGO=path - the path to cargo. If not set, cmake will check $PATH and ~/.cargo/bin
 - Rust_CARGO_TARGET=target - the target to pass to cargo. Set this for cross-compilation.
- WITH_DOCS=ON|OFF - whether to build the documentation. By default, this is ON when Sphinx is installed.
- FISH_INDENT_FOR_BUILDING_DOCS - useful for cross-compilation.
-  Set this to the path to the ``fish_indent`` executable to use for building HTML docs.
-  By default, ``${CMAKE_BINARY_DIR}/fish_indent`` will be used.
-  If that's not runnable on the compile host,
-  you can build a native one with ``cargo build --bin fish_indent`` and set this to ``$PWD/target/debug/fish_indent``.
+- BUILD_DOCS=ON|OFF - whether to build the documentation. This is automatically set to OFF when Sphinx isn't installed.
+- INSTALL_DOCS=ON|OFF - whether to install the docs. This is automatically set to on when BUILD_DOCS is or prebuilt documentation is available (like when building in-tree from a tarball).
 - FISH_USE_SYSTEM_PCRE2=ON|OFF - whether to use an installed pcre2. This is normally autodetected.
- WITH_MESSAGE_LOCALIZATION=ON|OFF - whether to include translations.
+- MAC_CODESIGN_ID=String|OFF - the codesign ID to use on Mac, or "OFF" to disable codesigning.
+- WITH_GETTEXT=ON|OFF - whether to include translations.
 - extra_functionsdir, extra_completionsdir and extra_confdir - to compile in an additional directory to be searched for functions, completions and configuration snippets

 Building fish with Cargo
@@ -188,14 +185,13 @@ You can also install Sphinx another way and drop the ``uv run --no-managed-pytho

 This will place standalone binaries in ``~/.cargo/bin/``, but you can move them wherever you want.

-To disable translations, disable the ``localize-messages`` feature by passing ``--no-default-features --features=embed-manpages`` to cargo.
+To disable translations, disable the ``localize-messages`` feature by passing ``--no-default-features --features=embed-data`` to cargo.

 You can also link this build statically (but not against glibc) and move it to other computers.

 Here are the remaining advantages of a full installation, as currently done by CMake:

 - Man pages like ``fish(1)`` installed in standard locations, easily accessible from outside fish.
- Separate files for builtins (e.g. ``$PREFIX/share/fish/man/man1/abbr.1``).
 - A local copy of the HTML documentation, typically accessed via the ``help`` fish function.
  In Cargo builds, ``help`` will redirect to `<https://fishshell.com/docs/current/>`__
 - Ability to use our CMake options extra_functionsdir, extra_completionsdir and extra_confdir,
--- a/build.rs
+++ b/build.rs
@@ -1,10 +1,12 @@
-use fish_build_helper::{
-    env_var, fish_build_dir, target_os, target_os_is_apple, target_os_is_bsd, target_os_is_cygwin,
-    workspace_root,
-};
+use fish_build_helper::{env_var, fish_build_dir, workspace_root};
 use rsconf::Target;
+use std::env;
 use std::path::{Path, PathBuf};

+fn canonicalize<P: AsRef<Path>>(path: P) -> PathBuf {
+    std::fs::canonicalize(path).unwrap()
+}
+
 fn main() {
    setup_paths();

@@ -15,14 +17,14 @@ fn main() {
        "FISH_RESOLVED_BUILD_DIR",
        // If set by CMake, this might include symlinks. Since we want to compare this to the
        // dir fish is executed in we need to canonicalize it.
-        fish_build_dir().canonicalize().unwrap().to_str().unwrap(),
+        canonicalize(fish_build_dir()).to_str().unwrap(),
    );

    // 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",
-        workspace_root().canonicalize().unwrap().to_str().unwrap(),
+        canonicalize(workspace_root()).to_str().unwrap(),
    );

    // Some build info
@@ -30,11 +32,22 @@ fn main() {
    rsconf::set_env_value("BUILD_HOST_TRIPLE", &env_var("HOST").unwrap());
    rsconf::set_env_value("BUILD_PROFILE", &env_var("PROFILE").unwrap());

+    let version = &get_version(&env::current_dir().unwrap());
    // Per https://doc.rust-lang.org/cargo/reference/build-scripts.html#inputs-to-the-build-script,
    // the source directory is the current working directory of the build script
-    rsconf::set_env_value("FISH_BUILD_VERSION", &get_version());
+    rsconf::set_env_value("FISH_BUILD_VERSION", version);

-    fish_build_helper::rebuild_if_embedded_path_changed("share");
+    // safety: single-threaded code.
+    unsafe { std::env::set_var("FISH_BUILD_VERSION", version) };
+
+    // These are necessary if built with embedded functions,
+    // but only in release builds (because rust-embed in debug builds reads from the filesystem).
+    #[cfg(feature = "embed-data")]
+    #[cfg(any(windows, not(debug_assertions)))]
+    rsconf::rebuild_if_path_changed("share");
+
+    #[cfg(feature = "gettext-extract")]
+    rsconf::rebuild_if_env_changed("FISH_GETTEXT_EXTRACTION_FILE");

    let build = cc::Build::new();
    let mut target = Target::new_from(build).unwrap();
@@ -60,48 +73,77 @@ fn main() {
 /// `Cargo.toml`) behind a feature we just enabled.
 ///
 /// [0]: https://github.com/rust-lang/cargo/issues/5499
+#[rustfmt::skip]
 fn detect_cfgs(target: &mut Target) {
    for (name, handler) in [
-        // Ignore the first entry, it just sets up the type inference.
+        // Ignore the first entry, it just sets up the type inference. Model new entries after the
+        // second line.
        ("", &(|_: &Target| false) as &dyn Fn(&Target) -> bool),
-        ("apple", &(|_| target_os_is_apple())),
-        ("bsd", &(|_| target_os_is_bsd())),
-        ("cygwin", &(|_| target_os_is_cygwin())),
-        ("have_eventfd", &|target| {
-            // FIXME: NetBSD 10 has eventfd, but the libc crate does not expose it.
-            if target_os() == "netbsd" {
-                false
-            } else {
-                target.has_header("sys/eventfd.h")
-            }
-        }),
-        ("have_localeconv_l", &|target| {
+        ("apple", &detect_apple),
+        ("bsd", &detect_bsd),
+        ("using_cmake", &|_| option_env!("FISH_CMAKE_BINARY_DIR").is_some()),
+        ("use_prebuilt_docs", &|_| env_var("FISH_USE_PREBUILT_DOCS").is_some_and(|v| v == "TRUE") ),
+        ("cygwin", &detect_cygwin),
+        ("small_main_stack", &has_small_stack),
+        // See if libc supports the thread-safe localeconv_l(3) alternative to localeconv(3).
+        ("localeconv_l", &|target| {
            target.has_symbol("localeconv_l")
        }),
-        ("have_pipe2", &|target| target.has_symbol("pipe2")),
-        ("have_posix_spawn", &|target| {
-            if matches!(target_os().as_str(), "openbsd" | "android") {
-                // OpenBSD's posix_spawn returns status 127 instead of erroring with ENOEXEC when faced with a
-                // shebang-less script. Disable posix_spawn on OpenBSD.
-                //
-                // Android is broken for unclear reasons
-                false
-            } else {
-                target.has_header("spawn.h")
+        ("FISH_USE_POSIX_SPAWN", &|target| {
+            target.has_header("spawn.h")
+        }),
+        ("HAVE_PIPE2", &|target| {
+            target.has_symbol("pipe2")
+        }),
+        ("HAVE_EVENTFD", &|target| {
+            // FIXME: NetBSD 10 has eventfd, but the libc crate does not expose it.
+            if cfg!(target_os = "netbsd") {
+                 false
+             } else {
+                 target.has_header("sys/eventfd.h")
            }
        }),
-        ("small_main_stack", &has_small_stack),
-        ("using_cmake", &|_| {
-            option_env!("FISH_CMAKE_BINARY_DIR").is_some()
-        }),
-        ("waitstatus_signal_ret", &|target| {
+        ("HAVE_WAITSTATUS_SIGNAL_RET", &|target| {
            target.r#if("WEXITSTATUS(0x007f) == 0x7f", &["sys/wait.h"])
        }),
    ] {
-        rsconf::declare_cfg(name, handler(target));
+        rsconf::declare_cfg(name, handler(target))
    }
 }

+fn detect_apple(_: &Target) -> bool {
+    cfg!(any(target_os = "ios", target_os = "macos"))
+}
+
+fn detect_cygwin(_: &Target) -> bool {
+    // Cygwin target is usually cross-compiled.
+    env_var("CARGO_CFG_TARGET_OS").unwrap() == "cygwin"
+}
+
+/// Detect if we're being compiled for a BSD-derived OS, allowing targeting code conditionally with
+/// `#[cfg(bsd)]`.
+///
+/// Rust offers fine-grained conditional compilation per-os for the popular operating systems, but
+/// doesn't necessarily include less-popular forks nor does it group them into families more
+/// specific than "windows" vs "unix" so we can conditionally compile code for BSD systems.
+fn detect_bsd(_: &Target) -> bool {
+    // Instead of using `uname`, we can inspect the TARGET env variable set by Cargo. This lets us
+    // support cross-compilation scenarios.
+    let mut target = env_var("TARGET").unwrap();
+    if !target.chars().all(|c| c.is_ascii_lowercase()) {
+        target = target.to_ascii_lowercase();
+    }
+    let is_bsd = target.ends_with("bsd") || target.ends_with("dragonfly");
+    #[cfg(any(
+        target_os = "dragonfly",
+        target_os = "freebsd",
+        target_os = "netbsd",
+        target_os = "openbsd",
+    ))]
+    assert!(is_bsd, "Target incorrectly detected as not BSD!");
+    is_bsd
+}
+
 /// Rust sets the stack size of newly created threads to a sane value, but is at at the mercy of the
 /// OS when it comes to the size of the main stack. Some platforms we support default to a tiny
 /// 0.5 MiB main stack, which is insufficient for fish's MAX_EVAL_DEPTH/MAX_STACK_DEPTH values.
@@ -168,18 +210,32 @@ fn join_if_relative(parent_if_relative: &Path, path: String) -> PathBuf {
    overridable_path("SYSCONFDIR", |env_sysconfdir| {
        Some(join_if_relative(
            &prefix,
-            env_sysconfdir.unwrap_or("/etc/".to_string()),
+            env_sysconfdir.unwrap_or(
+                // Embedded builds use "/etc," not "$PREFIX/etc".
+                if cfg!(feature = "embed-data") {
+                    "/etc/"
+                } else {
+                    "etc/"
+                }
+                .to_string(),
+            ),
        ))
    });

+    let default_ok = !cfg!(feature = "embed-data");
    let datadir = overridable_path("DATADIR", |env_datadir| {
-        env_datadir.map(|p| join_if_relative(&prefix, p))
+        let default = default_ok.then_some("share/".to_string());
+        env_datadir
+            .or(default)
+            .map(|p| join_if_relative(&prefix, p))
    });
    overridable_path("BINDIR", |env_bindir| {
-        env_bindir.map(|p| join_if_relative(&prefix, p))
+        let default = default_ok.then_some("bin/".to_string());
+        env_bindir.or(default).map(|p| join_if_relative(&prefix, p))
    });
    overridable_path("DOCDIR", |env_docdir| {
-        env_docdir.map(|p| {
+        let default = default_ok.then_some("doc/fish".to_string());
+        env_docdir.or(default).map(|p| {
            join_if_relative(
                &datadir
                    .expect("Setting DOCDIR without setting DATADIR is not currently supported"),
@@ -189,15 +245,79 @@ fn join_if_relative(parent_if_relative: &Path, path: String) -> PathBuf {
    });
 }

-fn get_version() -> String {
+fn get_version(src_dir: &Path) -> String {
+    use std::fs::read_to_string;
    use std::process::Command;
-    String::from_utf8(
-        Command::new("build_tools/git_version_gen.sh")
-            .output()
-            .unwrap()
-            .stdout,
-    )
-    .unwrap()
-    .trim_ascii_end()
-    .to_string()
+
+    if let Some(var) = env_var("FISH_BUILD_VERSION") {
+        return var;
+    }
+
+    let path = src_dir.join("version");
+    if let Ok(strver) = read_to_string(path) {
+        return strver;
+    }
+
+    let args = &["describe", "--always", "--dirty=-dirty"];
+    if let Ok(output) = Command::new("git").args(args).output() {
+        let rev = String::from_utf8_lossy(&output.stdout).trim().to_string();
+        if !rev.is_empty() {
+            // If it contains a ".", we have a proper version like "3.7",
+            // or "23.2.1-1234-gfab1234"
+            if rev.contains('.') {
+                return rev;
+            }
+            // If it doesn't, we probably got *just* the commit SHA,
+            // like "f1242abcdef".
+            // So we prepend the crate version so it at least looks like
+            // "3.8-gf1242abcdef"
+            // This lacks the commit *distance*, but that can't be helped without
+            // tags.
+            let version = env!("CARGO_PKG_VERSION").to_owned();
+            return version + "-g" + &rev;
+        }
+    }
+
+    // git did not tell us a SHA either because it isn't installed,
+    // 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 workspace_root = workspace_root();
+        let gitdir = workspace_root.join(".git");
+        let jjdir = workspace_root.join(".jj");
+        let commit_id = if gitdir.exists() {
+            // .git/HEAD contains ref: refs/heads/branch
+            let headpath = gitdir.join("HEAD");
+            let headstr = read_to_string(headpath)?;
+            let headref = headstr.split(' ').nth(1).unwrap().trim();
+
+            // .git/refs/heads/branch contains the SHA
+            let refpath = gitdir.join(headref);
+            // Shorten to 9 characters (what git describe does currently)
+            read_to_string(refpath)?
+        } else if jjdir.exists() {
+            let output = Command::new("jj")
+                .args([
+                    "log",
+                    "--revisions",
+                    "@",
+                    "--no-graph",
+                    "--ignore-working-copy",
+                    "--template",
+                    "commit_id",
+                ])
+                .output()
+                .unwrap();
+            String::from_utf8_lossy(&output.stdout).to_string()
+        } else {
+            return Err("did not find either of .git or .jj".into());
+        };
+        let refstr = &commit_id[0..9];
+        let refstr = refstr.trim();
+
+        let version = env!("CARGO_PKG_VERSION").to_owned();
+        Ok(version + "-g" + refstr)
+    }
+
+    get_git_hash().expect("Could not get a version. Either set $FISH_BUILD_VERSION or install git.")
 }
--- a/build_tools/check.sh
+++ b/build_tools/check.sh
@@ -33,18 +33,13 @@ fi
 cargo() {
    subcmd=$1
    shift
-    if [ -n "$FISH_CHECK_RUST_TOOLCHAIN" ]; then
-        # shellcheck disable=2086
-        command cargo "+$FISH_CHECK_RUST_TOOLCHAIN" "$subcmd" $cargo_args "$@"
-    else
-        # shellcheck disable=2086
-        command cargo "$subcmd" $cargo_args "$@"
-    fi
+    # shellcheck disable=2086
+    command cargo "$subcmd" $cargo_args "$@"
 }

 cleanup () {
-    if [ -n "$gettext_template_dir" ] && [ -e "$gettext_template_dir" ]; then
-        rm -r "$gettext_template_dir"
+    if [ -n "$template_file" ] && [ -e "$template_file" ]; then
+        rm "$template_file"
    fi
 }

@@ -69,15 +64,12 @@ if [ -n "$FISH_TEST_MAX_CONCURRENCY" ]; then
    export CARGO_BUILD_JOBS="$FISH_TEST_MAX_CONCURRENCY"
 fi

-gettext_template_dir=$(mktemp -d)
+template_file=$(mktemp)
 (
-    export FISH_GETTEXT_EXTRACTION_DIR="$gettext_template_dir"
+    export FISH_GETTEXT_EXTRACTION_FILE="$template_file"
    cargo build --workspace --all-targets --features=gettext-extract
 )
 if $lint; then
-    if command -v cargo-deny >/dev/null; then
-        cargo deny --all-features --locked --exclude-dev check licenses
-    fi
    PATH="$build_dir:$PATH" "$workspace_root/build_tools/style.fish" --all --check
    for features in "" --no-default-features; do
        cargo clippy --workspace --all-targets $features
@@ -86,9 +78,9 @@ fi
 cargo test --no-default-features --workspace --all-targets
 cargo test --doc --workspace
 if $lint; then
-    cargo doc --workspace --no-deps
+    cargo doc --workspace
 fi
-FISH_GETTEXT_EXTRACTION_DIR=$gettext_template_dir "$workspace_root/tests/test_driver.py" "$build_dir"
+FISH_GETTEXT_EXTRACTION_FILE=$template_file "$workspace_root/tests/test_driver.py" "$build_dir"

 exit
 }
--- a/build_tools/fish_xgettext.fish
+++ b/build_tools/fish_xgettext.fish
@@ -21,13 +21,13 @@ begin

    set -g workspace_root (path resolve (status dirname)/..)

-    set -l rust_extraction_dir
+    set -l rust_extraction_file
    if set -l --query _flag_use_existing_template
-        set rust_extraction_dir $_flag_use_existing_template
+        set rust_extraction_file $_flag_use_existing_template
    else
-        set rust_extraction_dir (mktemp -d)
+        set rust_extraction_file (mktemp)
        # We need to build to ensure that the proc macro for extracting strings runs.
-        FISH_GETTEXT_EXTRACTION_DIR=$rust_extraction_dir cargo check --features=gettext-extract
+        FISH_GETTEXT_EXTRACTION_FILE=$rust_extraction_file cargo check --no-default-features --features=gettext-extract
        or exit 1
    end

@@ -41,11 +41,11 @@ begin
    mark_section tier1-from-rust

    # Get rid of duplicates and sort.
-    find $rust_extraction_dir -type f -exec cat {} + | msguniq --no-wrap --sort-output
+    msguniq --no-wrap --sort-output $rust_extraction_file
    or exit 1

    if not set -l --query _flag_use_existing_template
-        rm -r $rust_extraction_dir
+        rm $rust_extraction_file
    end

    function extract_fish_script_messages_impl
--- a/build_tools/git_version_gen.sh
+++ b/build_tools/git_version_gen.sh
@@ -1,22 +1,70 @@
 #!/bin/sh
 # Originally from the git sources (GIT-VERSION-GEN)
+# Presumably (C) Junio C Hamano <junkio@cox.net>
+# Reused under GPL v2.0
+# Modified for fish by David Adam <zanchey@ucc.gu.uwa.edu.au>

 set -e

 # Find the fish directory as two levels up from script directory.
 FISH_BASE_DIR="$( cd "$( dirname "$( dirname "$0" )" )" && pwd )"
+DEF_VER=unknown
+git_permission_failed=0

-version=$(
-    awk <"$FISH_BASE_DIR/Cargo.toml" -F'"' '$1 == "version = " { print $2 }'
-)
-if git_version=$(
-    GIT_CEILING_DIRECTORIES=$FISH_BASE_DIR/.. \
-        git -C "$FISH_BASE_DIR" describe --always --dirty 2>/dev/null); then
-    if [ "$git_version" = "${git_version#"$version"}" ]; then
-        version=$version-g$git_version
+# First see if there is a version file (included in release tarballs),
+# then try git-describe, then default.
+if test -f version
+then
+	VN=$(cat version) || VN="$DEF_VER"
+else
+    if VN=$(git -C "$FISH_BASE_DIR" describe --always --dirty 2>/dev/null); then
+       :
    else
-        version=$git_version
+        if test $? = 128; then
+            # Current git versions return status 128
+            # when run in a repo owned by another user.
+            # Even for describe and everything.
+            # This occurs for `sudo make install`.
+            git_permission_failed=1
+        fi
+	    VN="$DEF_VER"
    fi
 fi

-echo "$version"
+# If the first param is --stdout, then output to stdout and exit.
+if test "$1" = '--stdout'
+then
+	echo $VN
+    exit 0
+fi
+
+# Set the output directory as either the first param or cwd.
+test -n "$1" && OUTPUT_DIR=$1/ || OUTPUT_DIR=
+FBVF="${OUTPUT_DIR}FISH-BUILD-VERSION-FILE"
+
+if test "$VN" = unknown && test -r "$FBVF" && test "$git_permission_failed" = 1
+then
+    # HACK: Git failed, so we keep the current version file.
+    # This helps in case you built fish as a normal user
+    # and then try to `sudo make install` it.
+    date +%s > "${OUTPUT_DIR}"fish-build-version-witness.txt
+    exit 0
+fi
+
+if test -r "$FBVF"
+then
+	VC=$(cat "$FBVF")
+else
+	VC="unset"
+fi
+
+# Maybe output the FBVF
+# It looks like "2.7.1-621-ga2f065e6"
+test "$VN" = "$VC" || {
+	echo >&2 "$VN"
+	echo "$VN" >"$FBVF"
+}
+
+# Output the fish-build-version-witness.txt
+# See https://cmake.org/cmake/help/v3.4/policy/CMP0058.html
+date +%s > "${OUTPUT_DIR}"fish-build-version-witness.txt
--- a/build_tools/lsan_suppressions.txt
+++ b/build_tools/lsan_suppressions.txt
@@ -0,0 +1,3 @@
+# LSAN can detect leaks tracing back to __asan::AsanThread::ThreadStart (probably caused by our
+# threads not exiting before their TLS dtors are called). Just ignore it.
+leak:AsanThread
--- a/build_tools/make_macos_pkg.sh
+++ b/build_tools/make_macos_pkg.sh
@@ -25,11 +25,9 @@ NOTARIZE=

 ARM64_DEPLOY_TARGET='MACOSX_DEPLOYMENT_TARGET=11.0'
 X86_64_DEPLOY_TARGET='MACOSX_DEPLOYMENT_TARGET=10.12'
-cmake_args=()

-while getopts "c:sf:i:p:e:nj:" opt; do
+while getopts "sf:i:p:e:nj:" opt; do
    case $opt in
-        c) cmake_args+=("$OPTARG");;
        s) SIGN=1;;
        f) P12_APP_FILE=$(realpath "$OPTARG");;
        i) P12_INSTALL_FILE=$(realpath "$OPTARG");;
@@ -49,7 +47,7 @@ if [ -n "$NOTARIZE" ] && [ -z "$API_KEY_FILE" ]; then
    usage
 fi

-VERSION=$(build_tools/git_version_gen.sh)
+VERSION=$(build_tools/git_version_gen.sh --stdout 2>/dev/null)

 echo "Version is $VERSION"

@@ -67,7 +65,6 @@ do_cmake() {
        -DCMAKE_EXE_LINKER_FLAGS="-Wl,-ld_classic" \
        -DCMAKE_OSX_ARCHITECTURES='arm64;x86_64' \
        -DFISH_USE_SYSTEM_PCRE2=OFF \
-        "${cmake_args[@]}" \
        "$@" \
        "$SRC_DIR"
 }
@@ -82,16 +79,17 @@ do_cmake() {
    && env DESTDIR="$PKGDIR/root/" $ARM64_DEPLOY_TARGET make install;
 }

-# Build for x86-64 but do not install; instead we will make a fat binary inside the root.
+# Build for x86-64 but do not install; instead we will make some fat binaries inside the root.
 { cd "$PKGDIR/build_x86_64" \
    && do_cmake -DRust_CARGO_TARGET=x86_64-apple-darwin \
    && env $X86_64_DEPLOY_TARGET make VERBOSE=1 -j 12; }

-# Fatten it up.
-FILE=$PKGDIR/root/usr/local/bin/fish
-X86_FILE=$PKGDIR/build_x86_64/$(basename "$FILE")
-rcodesign macho-universal-create --output "$FILE" "$FILE" "$X86_FILE"
-chmod 755 "$FILE"
+# Fatten them up.
+for FILE in "$PKGDIR"/root/usr/local/bin/*; do
+    X86_FILE="$PKGDIR/build_x86_64/$(basename "$FILE")"
+    rcodesign macho-universal-create --output "$FILE" "$FILE" "$X86_FILE"
+    chmod 755 "$FILE"
+done

 if test -n "$SIGN"; then
    echo "Signing executables"
@@ -104,7 +102,9 @@ if test -n "$SIGN"; then
    if [ -n "$ENTITLEMENTS_FILE" ]; then
        ARGS+=(--entitlements-xml-file "$ENTITLEMENTS_FILE")
    fi
-    (set +x; rcodesign sign "${ARGS[@]}" "$PKGDIR"/root/usr/local/bin/fish)
+    for FILE in "$PKGDIR"/root/usr/local/bin/*; do
+        (set +x; rcodesign sign "${ARGS[@]}" "$FILE")
+    done
 fi

 pkgbuild --scripts "$SRC_DIR/build_tools/osx_package_scripts" --root "$PKGDIR/root/" --identifier 'com.ridiculousfish.fish-shell-pkg' --version "$VERSION" "$PKGDIR/intermediates/fish.pkg"
@@ -125,13 +125,15 @@ fi
 (cd "$PKGDIR/build_arm64" && env $ARM64_DEPLOY_TARGET make -j 12 fish_macapp)
 (cd "$PKGDIR/build_x86_64" && env $X86_64_DEPLOY_TARGET make -j 12 fish_macapp)

-# Make the app's /usr/local/bin/fish binary universal. Note fish.app/Contents/MacOS/fish already is, courtesy of CMake.
+# Make the app's /usr/local/bin binaries universal. Note fish.app/Contents/MacOS/fish already is, courtesy of CMake.
 cd "$PKGDIR/build_arm64"
-FILE=fish.app/Contents/Resources/base/usr/local/bin/fish
-X86_FILE=$PKGDIR/build_x86_64/fish.app/Contents/Resources/base/usr/local/bin/$(basename "$FILE")
-rcodesign macho-universal-create --output "$FILE" "$FILE" "$X86_FILE"
-# macho-universal-create screws up the permissions.
-chmod 755 "$FILE"
+for FILE in fish.app/Contents/Resources/base/usr/local/bin/*; do
+    X86_FILE="$PKGDIR/build_x86_64/fish.app/Contents/Resources/base/usr/local/bin/$(basename "$FILE")"
+    rcodesign macho-universal-create --output "$FILE" "$FILE" "$X86_FILE"
+
+    # macho-universal-create screws up the permissions.
+    chmod 755 "$FILE"
+done

 if test -n "$SIGN"; then
    echo "Signing app"
--- a/build_tools/make_tarball.sh
+++ b/build_tools/make_tarball.sh
@@ -1,43 +1,88 @@
 #!/bin/sh

 # Script to generate a tarball
+# We use git to output a tree. But we also want to build the user documentation
+# and put that in the tarball, so that nobody needs to have sphinx installed
+# to build it.
 # Outputs to $FISH_ARTEFACT_PATH or ~/fish_built by default

+# Exit on error
 set -e

+# We will generate a tarball with a prefix "fish-VERSION"
+# git can do that automatically for us via git-archive
+# but to get the documentation in, we need to make a symlink called "fish-VERSION"
+# and tar from that, so that the documentation gets the right prefix
+
+# Use Ninja if available, as it automatically parallelises
+BUILD_TOOL="make"
+BUILD_GENERATOR="Unix Makefiles"
+if command -v ninja >/dev/null; then
+    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
+done
+
+if [ "$TAR" = "notfound" ]; then
+    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
+wd="$PWD"
+
 # Get the version
-VERSION=$(build_tools/git_version_gen.sh)
+VERSION=$(build_tools/git_version_gen.sh --stdout 2>/dev/null)
+tag_creation_date=$(
+    # If not dirty (i.e. we're building an immutable tag), pin the build date.
+    if [ "$VERSION" = "$(git describe)" ]; then
+        git log --format=%ad '--date=format:%b %d, %Y' -1
+    fi
+)

-prefix=fish-$VERSION
-path=${FISH_ARTEFACT_PATH:-~/fish_built}/$prefix.tar.xz
+# The name of the prefix, which is the directory that you get when you untar
+prefix="fish-$VERSION"

-tmpdir=$(mktemp -d)
-manifest=$tmpdir/Cargo.toml
-lockfile=$tmpdir/Cargo.lock
+# The path where we will output the tar file
+# Defaults to ~/fish_built
+path=${FISH_ARTEFACT_PATH:-~/fish_built}/$prefix.tar

-sed "s/^version = \".*\"\$/version = \"$VERSION\"/g" Cargo.toml \
- >"$manifest"
-awk -v version=$VERSION '
-    /^name = "fish"$/ { ok=1 }
-    ok == 1 && /^version = ".*"$/ {
-        ok = 2;
-        $0 = "version = \"" version "\"";
-    }
-    {print}
-    ' \
-    Cargo.lock >"$lockfile"
+# Clean up stuff we've written before
+rm -f "$path" "$path".xz

-git archive \
-    --prefix="$prefix/" \
-    --add-virtual-file="$prefix/Cargo.toml:$(cat "$manifest")" \
-    --add-virtual-file="$prefix/Cargo.lock:$(cat "$lockfile")" \
-    HEAD |
-    xz >"$path"
+# git starts the archive
+git archive --format=tar --prefix="$prefix"/ HEAD > "$path"

-rm "$manifest"
-rm "$lockfile"
-rmdir "$tmpdir"
+# tarball out the documentation, generate a version file
+PREFIX_TMPDIR=$(mktemp -d)
+cd "$PREFIX_TMPDIR"
+echo "$VERSION" > version
+cmake -G "$BUILD_GENERATOR" -DCMAKE_BUILD_TYPE=Debug "$wd"
+mkdir $PWD/user_doc/src
+FISH_SPHINX_BUILD_DATE=$tag_creation_date \
+FISH_SPHINX_HELP_SECTIONS_OUTPUT=$PWD/user_doc/src/help_sections.rs \
+    $BUILD_TOOL doc
+
+TAR_APPEND="$TAR --append --file=$path --mtime=now --owner=0 --group=0 \
+    --mode=g+w,a+rX --transform s/^/$prefix\//"
+$TAR_APPEND --no-recursion user_doc
+$TAR_APPEND user_doc/html user_doc/man user_doc/src/help_sections.rs
+$TAR_APPEND version
+
+cd -
+rm -r "$PREFIX_TMPDIR"
+
+# xz it
+xz "$path"

 # Output what we did, and the sha256 hash
-echo "Tarball written to $path"
-openssl dgst -sha256 "$path"
+echo "Tarball written to $path".xz
+openssl dgst -sha256 "$path".xz
--- a/build_tools/make_vendor_tarball.sh
+++ b/build_tools/make_vendor_tarball.sh
@@ -26,7 +26,7 @@ fi
 wd="$PWD"

 # Get the version from git-describe
-VERSION=$(build_tools/git_version_gen.sh)
+VERSION=$(build_tools/git_version_gen.sh --stdout 2>/dev/null)

 # The name of the prefix, which is the directory that you get when you untar
 prefix="fish-$VERSION"
@@ -42,14 +42,8 @@ rm -f "$path" "$path".xz
 PREFIX_TMPDIR=$(mktemp -d)
 cd "$PREFIX_TMPDIR"

-# Add .cargo/config.toml. This means that the caller may need to remove that file from the tarball.
-# See e4674cd7b5f (.cargo/config.toml: exclude from tarball, 2025-01-12)
-
 mkdir .cargo
-{
-    cat "$wd"/.cargo/config.toml
-    cargo vendor --manifest-path "$wd/Cargo.toml"
-} > .cargo/config.toml
+cargo vendor --manifest-path "$wd/Cargo.toml" > .cargo/config.toml

 tar cfvJ "$path".xz vendor .cargo

--- a/build_tools/osx_package_resources/welcome.html
+++ b/build_tools/osx_package_resources/welcome.html
@@ -1,28 +1,28 @@
 <html>
-    <head>
-        <style>
-            body {
-                font-family: system-ui, -apple-system, "Helvetica Neue", sans-serif;
-                font-size: 10pt;
-            }
-            code, tt {
-                font-family: ui-monospace, Menlo, monospace;
-            }
-        </style>
-    </head>
-    <body>
-    <p>
-        <strong>fish</strong> is a smart and user-friendly command line shell. For more information, visit <a href="https://fishshell.com">fishshell.com</a>.
-    </p>
-    <p>
-        <strong>fish</strong> will be installed into <tt>/usr/local/</tt>, and its path will be added to <wbr><tt>/etc/shells</tt> if necessary.
-    </p>
-    <p>
-        Your default shell will <em>not</em> be changed. To make <strong>fish</strong> your login shell after the installation, run:
-    </p>
-    <p>
-    <code>chsh -s /usr/local/bin/fish</code>
-    </p>
-    <p>Enjoy! Bugs can be reported on <a href="https://github.org/fish-shell/fish-shell/">GitHub</a>.</p>
-    </body>
+	<head>
+		<style>
+			body {
+				font-family: system-ui, -apple-system, "Helvetica Neue", sans-serif;
+				font-size: 10pt;
+			}
+			code, tt {
+				font-family: ui-monospace, Menlo, monospace;
+			}
+		</style>
+	</head>
+	<body>
+	<p>
+		<strong>fish</strong> is a smart and user-friendly command line shell. For more information, visit <a href="https://fishshell.com">fishshell.com</a>.
+	</p>
+	<p>
+		<strong>fish</strong> will be installed into <tt>/usr/local/</tt>, and its path will be added to <wbr><tt>/etc/shells</tt> if necessary.
+	</p>
+	<p>
+		Your default shell will <em>not</em> be changed. To make <strong>fish</strong> your login shell after the installation, run:
+	</p>
+	<p>
+	<code>chsh -s /usr/local/bin/fish</code>
+	</p>
+	<p>Enjoy! Bugs can be reported on <a href="https://github.org/fish-shell/fish-shell/">GitHub</a>.</p>
+	</body>
 </html>
--- a/build_tools/osx_package_scripts/add-shell
+++ b/build_tools/osx_package_scripts/add-shell
@@ -4,8 +4,8 @@

 if test $# -eq 0
 then
-    echo "usage: $0 shellname [shellname ...]"
-    exit 1
+	echo "usage: $0 shellname [shellname ...]"
+	exit 1
 fi

 scriptname=$(basename "$0")
--- a/build_tools/release-notes.sh
+++ b/build_tools/release-notes.sh
@@ -87,7 +87,7 @@ if test -z "$CI" || [ "$(git -C "$workspace_root" tag | wc -l)" -gt 1 ]; then {
    echo 'Download links:'
    echo 'To download the source code for fish, we suggest the file named ``fish-'"$version"'.tar.xz``.'
    echo 'The file downloaded from ``Source code (tar.gz)`` will not build correctly.'
-    echo 'A GPG signature using `this key <'"${FISH_GPG_PUBLIC_KEY_URL:-???}"'>`__ is available as ``fish-'"$version"'.tar.xz.asc``.'
+    echo 'A GPG signature using the key published at '"${FISH_GPG_PUBLIC_KEY_URL:-???}"' is available as ``fish-'"$version"'.tar.xz.asc``.'
    echo
    echo 'The files called ``fish-'"$version"'-linux-*.tar.xz`` contain'
    echo '`standalone fish binaries <https://github.com/fish-shell/fish-shell/?tab=readme-ov-file#building-fish-with-cargo>`__'
--- a/build_tools/release.sh
+++ b/build_tools/release.sh
@@ -18,18 +18,15 @@ fi
 [ -n "$version" ]

 for tool in \
-    cmake \
    bundle \
    diff \
    gh \
    gpg \
    jq \
-    ninja \
    ruby \
    tar \
    timeout \
    uv \
-    xz \
 ; do
    if ! command -v "$tool" >/dev/null; then
        echo >&2 "$0: missing command: $1"
@@ -83,32 +80,16 @@ sed -i \
    -e "2c$(printf %s "$changelog_title" | sed s/./=/g)" \
    CHANGELOG.rst

-CreateCommit() {
-    git commit -m "$1
+CommitVersion() {
+    sed -i "s/^version = \".*\"/version = \"$1\"/g" Cargo.toml
+    cargo fetch --offline
+    git add CHANGELOG.rst Cargo.toml Cargo.lock
+    git commit -m "$2

 Created by ./build_tools/release.sh $version"
 }

-sed -i "s/^version = \".*\"/version = \"$1\"/g" Cargo.toml
-cargo fetch --offline
-if [ "$1" = "$version" ]; then
-    # debchange is a Debian script to manage the Debian changelog, but
-    # it's too annoying to install everywhere. Just do it by hand.
-    cat - contrib/debian/changelog > contrib/debian/changelog.new <<EOF
-fish (${version}-1) stable; urgency=medium
-
-  * Release of new version $version.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/$version for details.
-
- -- $committer  $(date -R)
-
-EOF
-    mv contrib/debian/changelog.new contrib/debian/changelog
-    git add contrib/debian/changelog
-fi
-git add CHANGELOG.rst Cargo.toml Cargo.lock
-CreateCommit "Release $version"
+CommitVersion "$version" "Release $version"

 git -c "user.signingKey=$committer" \
    tag --sign --message="Release $version" $version
@@ -140,7 +121,7 @@ fish_tar_xz=fish-$version.tar.xz
 (
    local_tarball=$tmpdir/local-tarball
    mkdir "$local_tarball"
-    FISH_ARTEFACT_PATH=$local_tarball ./build_tools/make_tarball.sh
+    FISH_ARTEFACT_PATH=$local_tarball uv run ./build_tools/make_tarball.sh
    cd "$local_tarball"
    tar xf "$fish_tar_xz"
 )
@@ -168,16 +149,9 @@ actual_tag_oid=$(git ls-remote "$remote" |
    gh release upload "$version" "$fish_tar_xz.asc"
 )

-(
-    cd "$tmpdir/local-tarball/fish-$version"
-    uv --no-managed-python venv
-    . .venv/bin/activate
-    cmake -GNinja -DCMAKE_BUILD_TYPE=Debug .
-    ninja doc
-)
 CopyDocs() {
    rm -rf "$fish_site/site/docs/$1"
-    cp -r "$tmpdir/local-tarball/fish-$version/cargo/fish-docs/html" "$fish_site/site/docs/$1"
+    cp -r "$tmpdir/fish-$version/user_doc/html" "$fish_site/site/docs/$1"
    git -C $fish_site add "site/docs/$1"
 }
 minor_version=${version%.*}
@@ -265,8 +239,6 @@ done
    # This takes care to support remote names that are different from
    # fish-shell remote name. Also, support detached HEAD state.
    git push "$fish_site_repo" HEAD:master
-    git fetch "$fish_site_repo" \
-        "$(git rev-parse HEAD):refs/remotes/origin/master"
 )

 if [ -n "$integration_branch" ]; then {
@@ -279,8 +251,7 @@ fish ?.?.? (released ???)
 EOF
    )
    printf %s\\n "$changelog" >CHANGELOG.rst
-    git add CHANGELOG.rst
-    CreateCommit "start new cycle"
+    CommitVersion ${version}-snapshot "start new cycle"
    git push $remote HEAD:master
 } fi

@@ -291,14 +262,14 @@ milestone_version="$(
        echo "$version"
    fi
 )"
-milestone_number() {
+milestone_number=$(
    gh_api_repo milestones?state=open |
        jq --arg name "fish $1" '
            .[] | select(.title == $name) | .number
        '
-}
-gh_api_repo milestones/"$(milestone_number "$milestone_version")" \
-    --method PATCH --raw-field state=closed
+)
+gh_api_repo milestones/"$milestone_number" --method PATCH \
+    --raw-field state=closed

 next_minor_version=$(echo "$minor_version" |
    awk -F. '{ printf "%s.%s", $1, $2+1 }')
--- a/build_tools/style.fish
+++ b/build_tools/style.fish
@@ -24,7 +24,7 @@ if set -l -q _flag_all
    end
 end

-set -l workspace_root (realpath (status dirname)/..)
+set -l workspace_root (status dirname)/..

 if test $all = yes
    if not set -l -q _flag_force; and not set -l -q _flag_check
--- a/build_tools/supported_ubuntu_versions.py
+++ b/build_tools/supported_ubuntu_versions.py
@@ -1,22 +0,0 @@
-# /// script
-# requires-python = ">=3.5"
-# dependencies = [
-#     "launchpadlib",
-# ]
-# ///
-
-from launchpadlib.launchpad import Launchpad
-
-if __name__ == "__main__":
-    launchpad = Launchpad.login_anonymously(
-        "fish shell build script", "production", "~/.cache", version="devel"
-    )
-    ubu = launchpad.projects("ubuntu")
-    print(
-        "\n".join(
-            x["name"]
-            for x in ubu.series.entries
-            if x["supported"] == True
-            and x["name"] not in ("trusty", "xenial", "bionic", "focal")
-        )
-    )
--- a/build_tools/update-dependencies.sh
+++ b/build_tools/update-dependencies.sh
@@ -10,27 +10,22 @@ command -v updatecli
 command -v uv
 sort --version-sort </dev/null

-# TODO This is copied from .github/actions/install-sphinx/action.yml
-uv lock --check --exclude-newer="$(awk -F'"' <uv.lock '/^exclude-newer[[:space:]]*=/ {print $2}')"
+uv lock --check

 updatecli "${@:-apply}"

 uv lock # Python version constraints may have changed.
-uv lock --upgrade --exclude-newer="$(date --date='7 days ago' --iso-8601)"
+uv lock --upgrade

 from_gh() {
    repo=$1
    path=$2
-    destination=$3
+    out_dir=$3
    contents=$(curl -fsS https://raw.githubusercontent.com/"${repo}"/refs/heads/master/"${path}")
-    printf '%s\n' >"$destination" "$contents"
+    printf '%s\n' >"$out_dir/$(basename "$path")" "$contents"
 }
-
-from_gh ridiculousfish/widecharwidth widechar_width.rs crates/widecharwidth/src/widechar_width.rs
-from_gh ridiculousfish/littlecheck littlecheck/littlecheck.py tests/littlecheck.py
-from_gh catppuccin/fish 'themes/Catppuccin Frappe.theme' share/themes/catppuccin-frappe.theme
-from_gh catppuccin/fish 'themes/Catppuccin Macchiato.theme' share/themes/catppuccin-macchiato.theme
-from_gh catppuccin/fish 'themes/Catppuccin Mocha.theme' share/themes/catppuccin-mocha.theme
+from_gh ridiculousfish/widecharwidth widechar_width.rs src/widecharwidth/
+from_gh ridiculousfish/littlecheck littlecheck/littlecheck.py tests/

 # Update Cargo.lock
 cargo update
--- a/build_tools/update_translations.fish
+++ b/build_tools/update_translations.fish
@@ -9,30 +9,29 @@
 # For developers:
 #   - Run with no args to update all PO files after making changes to Rust/fish sources.
 # For translators:
-#   - Specify the language you want to work on as an argument, which must be a file in the
-#     localization/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.
+#   - 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=DIR` to prevent running cargo for extracting an up-to-date
+# 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.
-# `DIR` must be the path to a gettext template file generated from our compilation process.
+# `FILE` must be the path to a gettext template file generated from our compilation process.
 # It can be obtained by running:
-#   set -l DIR (mktemp -d)
-#   FISH_GETTEXT_EXTRACTION_DIR=$DIR cargo check --features=gettext-extract
+#   set -l FILE (mktemp)
+#   FISH_GETTEXT_EXTRACTION_FILE=$FILE cargo check --features=gettext-extract

 # 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 -l po_dir $build_tools/../localization/po
+set -l po_dir $build_tools/../po

 set -l extract

@@ -90,9 +89,8 @@ if set -l --query extract
 end

 if set -l --query _flag_dry_run
-    # On a dry run, we do not modify localization/po/ but write to a temporary directory instead
-    # and check if there is a difference between localization/po/ and the tmpdir after re-generating
-    # the PO files.
+    # 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)

    # Ensure tmpdir has the same initial state as the po dir.
@@ -148,7 +146,7 @@ end
 if set -g --query tmpdir[1]
    diff -ur $po_dir $tmpdir
    or begin
-        echo ERROR: translations in localization/po/ are stale. Try running build_tools/update_translations.fish
+        echo ERROR: translations in ./po/ are stale. Try running build_tools/update_translations.fish
        cleanup_exit
    end
 end
--- a/cmake/Docs.cmake
+++ b/cmake/Docs.cmake
@@ -1,59 +1,88 @@
+find_program(SPHINX_EXECUTABLE NAMES sphinx-build
+    HINTS
+    $ENV{SPHINX_DIR}
+    PATH_SUFFIXES bin
+    DOC "Sphinx documentation generator")
+
 include(FeatureSummary)

-set(SPHINX_OUTPUT_DIR "${FISH_RUST_BUILD_DIR}/fish-docs")
-
-set(FISH_INDENT_FOR_BUILDING_DOCS "" CACHE FILEPATH "Path to fish_indent executable for building HTML docs")
-
-if(FISH_INDENT_FOR_BUILDING_DOCS)
-    set(SPHINX_HTML_FISH_INDENT_DEP)
-else()
-    set(FISH_INDENT_FOR_BUILDING_DOCS "${CMAKE_CURRENT_BINARY_DIR}/fish_indent")
-    set(SPHINX_HTML_FISH_INDENT_DEP fish_indent)
-endif()
-
-set(VARS_FOR_CARGO_SPHINX_WRAPPER
-    "CARGO_TARGET_DIR=${FISH_RUST_BUILD_DIR}"
-    "FISH_SPHINX=${SPHINX_EXECUTABLE}"
-)
+set(SPHINX_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/doc_src")
+set(SPHINX_ROOT_DIR "${CMAKE_CURRENT_BINARY_DIR}/user_doc")
+set(SPHINX_BUILD_DIR "${SPHINX_ROOT_DIR}/build")
+set(SPHINX_HTML_DIR "${SPHINX_ROOT_DIR}/html")
+set(SPHINX_MANPAGE_DIR "${SPHINX_ROOT_DIR}/man")

+# sphinx-docs uses fish_indent for highlighting.
+# Prepend the output dir of fish_indent to PATH.
 add_custom_target(sphinx-docs
-    COMMAND env ${VARS_FOR_CARGO_SPHINX_WRAPPER}
-        cargo xtask html-docs --fish-indent=${FISH_INDENT_FOR_BUILDING_DOCS}
-    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-    DEPENDS ${SPHINX_HTML_FISH_INDENT_DEP}
+    mkdir -p ${SPHINX_HTML_DIR}/_static/
+    COMMAND env PATH="${CMAKE_BINARY_DIR}:$$PATH"
+        ${SPHINX_EXECUTABLE}
+        -j auto
+        -q -b html
+        -c "${SPHINX_SRC_DIR}"
+        -d "${SPHINX_ROOT_DIR}/.doctrees-html"
+        "${SPHINX_SRC_DIR}"
+        "${SPHINX_HTML_DIR}"
+    DEPENDS ${SPHINX_SRC_DIR}/fish_indent_lexer.py fish_indent
    COMMENT "Building HTML documentation with Sphinx")

+# sphinx-manpages needs the fish_indent binary for the version number
 add_custom_target(sphinx-manpages
-    COMMAND env ${VARS_FOR_CARGO_SPHINX_WRAPPER}
-        cargo xtask man-pages
-    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+    env FISH_BUILD_VERSION_FILE=${CMAKE_CURRENT_BINARY_DIR}/${FBVF}
+        ${SPHINX_EXECUTABLE}
+        -j auto
+        -q -b man
+        -c "${SPHINX_SRC_DIR}"
+        -d "${SPHINX_ROOT_DIR}/.doctrees-man"
+        "${SPHINX_SRC_DIR}"
+        # TODO: This only works if we only have section 1 manpages.
+        "${SPHINX_MANPAGE_DIR}/man1"
+    DEPENDS CHECK-FISH-BUILD-VERSION-FILE
    COMMENT "Building man pages with Sphinx")

-if(NOT DEFINED WITH_DOCS) # Don't check for legacy options if the new one is defined, to help bisecting.
-    if(DEFINED BUILD_DOCS)
-        message(FATAL_ERROR "the BUILD_DOCS option is no longer supported, use -DWITH_DOCS=ON|OFF")
-    endif()
-    if(DEFINED INSTALL_DOCS)
-        message(FATAL_ERROR "the INSTALL_DOCS option is no longer supported, use -DWITH_DOCS=ON|OFF")
-    endif()
-endif()
-
 if(SPHINX_EXECUTABLE)
-    option(WITH_DOCS "build documentation (requires Sphinx)" ON)
-else()
-    option(WITH_DOCS "build documentation (requires Sphinx)" OFF)
-endif()
+    option(BUILD_DOCS "build documentation (requires Sphinx)" ON)
+else(SPHINX_EXECUTABLE)
+    option(BUILD_DOCS "build documentation (requires Sphinx)" OFF)
+endif(SPHINX_EXECUTABLE)

-if(WITH_DOCS AND NOT SPHINX_EXECUTABLE)
+if(BUILD_DOCS AND NOT SPHINX_EXECUTABLE)
    message(FATAL_ERROR "build documentation selected, but sphinx-build could not be found")
 endif()

-add_feature_info(Documentation WITH_DOCS "user manual and documentation")
+if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/user_doc/html
+   AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/user_doc/man)
+    set(HAVE_PREBUILT_DOCS TRUE)
+else()
+    set(HAVE_PREBUILT_DOCS FALSE)
+endif()

-if(WITH_DOCS)
+if(BUILD_DOCS OR HAVE_PREBUILT_DOCS)
+    set(INSTALL_DOCS ON)
+else()
+    set(INSTALL_DOCS OFF)
+endif()
+
+add_feature_info(Documentation INSTALL_DOCS "user manual and documentation")
+
+set(USE_PREBUILT_DOCS FALSE)
+if(BUILD_DOCS)
+    configure_file("${SPHINX_SRC_DIR}/conf.py" "${SPHINX_BUILD_DIR}/conf.py" @ONLY)
    add_custom_target(doc ALL
                      DEPENDS sphinx-docs sphinx-manpages)
+
    # Group docs targets into a DocsTargets folder
    set_property(TARGET doc sphinx-docs sphinx-manpages
                 PROPERTY FOLDER cmake/DocTargets)
-endif()
+
+elseif(HAVE_PREBUILT_DOCS)
+    set(USE_PREBUILT_DOCS TRUE)
+    if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
+        # Out of tree build - link the prebuilt documentation to the build tree
+        add_custom_target(link_doc ALL)
+        add_custom_command(TARGET link_doc
+            COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/user_doc ${CMAKE_CURRENT_BINARY_DIR}/user_doc
+            POST_BUILD)
+    endif()
+endif(BUILD_DOCS)
--- a/cmake/Install.cmake
+++ b/cmake/Install.cmake
@@ -1,5 +1,7 @@
 set(CMAKE_INSTALL_MESSAGE NEVER)

+set(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fish ${CMAKE_CURRENT_BINARY_DIR}/fish_indent ${CMAKE_CURRENT_BINARY_DIR}/fish_key_reader)
+
 set(prefix ${CMAKE_INSTALL_PREFIX})
 set(bindir ${CMAKE_INSTALL_BINDIR})
 set(sysconfdir ${CMAKE_INSTALL_SYSCONFDIR})
@@ -28,18 +30,18 @@ set(extra_confdir


 # These are the man pages that go in system manpath; all manpages go in the fish-specific manpath.
-set(MANUALS ${SPHINX_OUTPUT_DIR}/man/man1/fish.1
-            ${SPHINX_OUTPUT_DIR}/man/man1/fish_indent.1
-            ${SPHINX_OUTPUT_DIR}/man/man1/fish_key_reader.1
-            ${SPHINX_OUTPUT_DIR}/man/man1/fish-doc.1
-            ${SPHINX_OUTPUT_DIR}/man/man1/fish-tutorial.1
-            ${SPHINX_OUTPUT_DIR}/man/man1/fish-language.1
-            ${SPHINX_OUTPUT_DIR}/man/man1/fish-interactive.1
-            ${SPHINX_OUTPUT_DIR}/man/man1/fish-terminal-compatibility.1
-            ${SPHINX_OUTPUT_DIR}/man/man1/fish-completions.1
-            ${SPHINX_OUTPUT_DIR}/man/man1/fish-prompt-tutorial.1
-            ${SPHINX_OUTPUT_DIR}/man/man1/fish-for-bash-users.1
-            ${SPHINX_OUTPUT_DIR}/man/man1/fish-faq.1
+set(MANUALS ${CMAKE_CURRENT_BINARY_DIR}/user_doc/man/man1/fish.1
+            ${CMAKE_CURRENT_BINARY_DIR}/user_doc/man/man1/fish_indent.1
+            ${CMAKE_CURRENT_BINARY_DIR}/user_doc/man/man1/fish_key_reader.1
+            ${CMAKE_CURRENT_BINARY_DIR}/user_doc/man/man1/fish-doc.1
+            ${CMAKE_CURRENT_BINARY_DIR}/user_doc/man/man1/fish-tutorial.1
+            ${CMAKE_CURRENT_BINARY_DIR}/user_doc/man/man1/fish-language.1
+            ${CMAKE_CURRENT_BINARY_DIR}/user_doc/man/man1/fish-interactive.1
+            ${CMAKE_CURRENT_BINARY_DIR}/user_doc/man/man1/fish-terminal-compatibility.1
+            ${CMAKE_CURRENT_BINARY_DIR}/user_doc/man/man1/fish-completions.1
+            ${CMAKE_CURRENT_BINARY_DIR}/user_doc/man/man1/fish-prompt-tutorial.1
+            ${CMAKE_CURRENT_BINARY_DIR}/user_doc/man/man1/fish-for-bash-users.1
+            ${CMAKE_CURRENT_BINARY_DIR}/user_doc/man/man1/fish-faq.1
 )

 # Determine which man page we don't want to install.
@@ -73,30 +75,22 @@ function(FISH_TRY_CREATE_DIRS)
  endforeach()
 endfunction(FISH_TRY_CREATE_DIRS)

-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fish
+install(PROGRAMS ${PROGRAMS}
        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
                    GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
        DESTINATION ${bindir})

-if(NOT IS_ABSOLUTE ${bindir})
-  set(abs_bindir "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${bindir}")
-else()
-  set(abs_bindir "\$ENV{DESTDIR}${bindir}")
-endif()
-install(CODE "file(CREATE_LINK ${abs_bindir}/fish ${abs_bindir}/fish_indent)")
-install(CODE "file(CREATE_LINK ${abs_bindir}/fish ${abs_bindir}/fish_key_reader)")
-
 fish_create_dirs(${sysconfdir}/fish/conf.d ${sysconfdir}/fish/completions
    ${sysconfdir}/fish/functions)
 install(FILES etc/config.fish DESTINATION ${sysconfdir}/fish/)

 fish_create_dirs(${rel_datadir}/fish ${rel_datadir}/fish/completions
-                 ${rel_datadir}/fish/functions
+                 ${rel_datadir}/fish/functions ${rel_datadir}/fish/groff
                 ${rel_datadir}/fish/man/man1 ${rel_datadir}/fish/tools
                 ${rel_datadir}/fish/tools/web_config
                 ${rel_datadir}/fish/tools/web_config/js
-                 ${rel_datadir}/fish/prompts
-                 ${rel_datadir}/fish/themes
+                 ${rel_datadir}/fish/tools/web_config/sample_prompts
+                 ${rel_datadir}/fish/tools/web_config/themes
                 )

 configure_file(share/__fish_build_paths.fish.in share/__fish_build_paths.fish)
@@ -114,9 +108,9 @@ configure_file(fish.pc.in fish.pc.noversion @ONLY)
 add_custom_command(OUTPUT fish.pc
    COMMAND sed '/Version/d' fish.pc.noversion > fish.pc
    COMMAND printf "Version: " >> fish.pc
-    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/build_tools/git_version_gen.sh >> fish.pc
+    COMMAND cat ${FBVF} >> fish.pc
    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/fish.pc.noversion)
+    DEPENDS CHECK-FISH-BUILD-VERSION-FILE ${CMAKE_CURRENT_BINARY_DIR}/fish.pc.noversion)

 add_custom_target(build_fish_pc ALL DEPENDS fish.pc)

@@ -131,17 +125,12 @@ install(DIRECTORY share/functions/
        DESTINATION ${rel_datadir}/fish/functions
        FILES_MATCHING PATTERN "*.fish")

-install(DIRECTORY share/prompts/
-        DESTINATION ${rel_datadir}/fish/prompts
-        FILES_MATCHING PATTERN "*.fish")
-
-install(DIRECTORY share/themes/
-        DESTINATION ${rel_datadir}/fish/themes
-        FILES_MATCHING PATTERN "*.theme")
+install(DIRECTORY share/groff
+        DESTINATION ${rel_datadir}/fish)

 # CONDEMNED_PAGE is managed by the conditional above
 # Building the man pages is optional: if sphinx isn't installed, they're not built
-install(DIRECTORY ${SPHINX_OUTPUT_DIR}/man/man1/
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/user_doc/man/man1/
        DESTINATION ${rel_datadir}/fish/man/man1
        FILES_MATCHING
        PATTERN "*.1"
@@ -157,16 +146,18 @@ install(DIRECTORY share/tools/web_config
        PATTERN "*.css"
        PATTERN "*.html"
        PATTERN "*.py"
-        PATTERN "*.js")
+        PATTERN "*.js"
+        PATTERN "*.theme"
+        PATTERN "*.fish")

 # Building the man pages is optional: if Sphinx isn't installed, they're not built
 install(FILES ${MANUALS} DESTINATION ${mandir}/man1/ OPTIONAL)
-install(DIRECTORY ${SPHINX_OUTPUT_DIR}/html/ # Trailing slash is important!
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/user_doc/html/ # Trailing slash is important!
        DESTINATION ${docdir} OPTIONAL)
 install(FILES CHANGELOG.rst DESTINATION ${docdir})

 # Group install targets into a InstallTargets folder
-set_property(TARGET build_fish_pc
+set_property(TARGET build_fish_pc CHECK-FISH-BUILD-VERSION-FILE
             PROPERTY FOLDER cmake/InstallTargets)

 # Make a target build_root that installs into the buildroot directory, for testing.
--- a/cmake/MacApp.cmake
+++ b/cmake/MacApp.cmake
@@ -26,7 +26,7 @@ add_executable(fish_macapp EXCLUDE_FROM_ALL
 # so cmake must be re-run after version changes for the app to be updated. But
 # generally this will be run by make_macos_pkg.sh which always re-runs cmake.
 execute_process(
-    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/build_tools/git_version_gen.sh
+    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/build_tools/git_version_gen.sh --stdout
    COMMAND cut -d- -f1
    OUTPUT_VARIABLE FISH_SHORT_VERSION
    OUTPUT_STRIP_TRAILING_WHITESPACE)
--- a/cmake/Rust.cmake
+++ b/cmake/Rust.cmake
@@ -1,11 +1,13 @@
-include(FeatureSummary)
 include(FindRust)
 find_package(Rust REQUIRED)

-set(FISH_RUST_BUILD_DIR "${CMAKE_BINARY_DIR}/cargo")
+set(FISH_RUST_BUILD_DIR "${CMAKE_BINARY_DIR}/cargo/build")
+
+list(APPEND FISH_CARGO_FEATURES_LIST "embed-data")

 if(DEFINED ASAN)
    list(APPEND CARGO_FLAGS "-Z" "build-std")
+    list(APPEND FISH_CARGO_FEATURES_LIST "asan")
 endif()
 if(DEFINED TSAN)
    list(APPEND CARGO_FLAGS "-Z" "build-std")
@@ -19,18 +21,12 @@ else()
 endif()

 set(rust_profile $<IF:$<CONFIG:Debug>,debug,$<IF:$<CONFIG:RelWithDebInfo>,release-with-debug,release>>)
+set(rust_debugflags "$<$<CONFIG:Debug>:-g>$<$<CONFIG:RelWithDebInfo>:-g>")

-if (NOT DEFINED WITH_MESSAGE_LOCALIZATION) # Don't check for legacy options if the new one is defined, to help bisecting.
-    if(DEFINED WITH_GETTEXT)
-        message(FATAL_ERROR "the WITH_GETTEXT option is no longer supported, use -DWITH_MESSAGE_LOCALIZATION=ON|OFF")
-    endif()
-endif()
-option(WITH_MESSAGE_LOCALIZATION "Build with localization support. Requires `msgfmt` to work." ON)
+option(WITH_GETTEXT "Build with gettext localization support. Requires `msgfmt` to work." ON)
 # Enable gettext feature unless explicitly disabled.
-if(NOT DEFINED WITH_MESSAGE_LOCALIZATION OR "${WITH_MESSAGE_LOCALIZATION}")
+if(NOT DEFINED WITH_GETTEXT OR "${WITH_GETTEXT}")
    list(APPEND FISH_CARGO_FEATURES_LIST "localize-messages")
 endif()

-add_feature_info(Translation WITH_MESSAGE_LOCALIZATION "message localization (requires gettext)")
-
 list(JOIN FISH_CARGO_FEATURES_LIST , FISH_CARGO_FEATURES)
--- a/cmake/Tests.cmake
+++ b/cmake/Tests.cmake
@@ -1,3 +1,5 @@
+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)
@@ -6,7 +8,7 @@ foreach(CHECK ${FISH_CHECKS})
    COMMAND ${CMAKE_SOURCE_DIR}/tests/test_driver.py ${CMAKE_CURRENT_BINARY_DIR}
                checks/${CHECK_NAME}
    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests
-    DEPENDS fish fish_indent fish_key_reader
+    DEPENDS fish fish_indent fish_key_reader fish_test_helper
    USES_TERMINAL
  )
 endforeach(CHECK)
@@ -19,7 +21,7 @@ foreach(PEXPECT ${PEXPECTS})
    COMMAND ${CMAKE_SOURCE_DIR}/tests/test_driver.py ${CMAKE_CURRENT_BINARY_DIR}
                pexpects/${PEXPECT}
    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests
-    DEPENDS fish fish_indent fish_key_reader
+    DEPENDS fish fish_indent fish_key_reader fish_test_helper
    USES_TERMINAL
  )
 endforeach(PEXPECT)
@@ -55,16 +57,8 @@ endif()
 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}
-            ${Rust_CARGO}
-            test
-            --no-default-features
-            --features=${FISH_CARGO_FEATURES}
-            ${CARGO_FLAGS}
-            --workspace
-            --target-dir ${rust_target_dir}
-            ${cargo_test_flags}
+  COMMAND env ${VARS_FOR_CARGO} ${Rust_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
+  DEPENDS fish fish_indent fish_key_reader fish_test_helper
  USES_TERMINAL
 )
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -0,0 +1,55 @@
+# This file adds commands to manage the FISH-BUILD-VERSION-FILE (hereafter
+# FBVF). This file exists in the build directory and is used to populate the
+# documentation and also the version string in fish_version.o (printed with
+# `echo $version` and also fish --version). The essential idea is that we are
+# going to invoke git_version_gen.sh, which will update the
+# FISH-BUILD-VERSION-FILE only if it needs to change; this is what makes
+# incremental rebuilds fast.
+#
+# This code is delicate, with the chief subtlety revolving around Ninja. A
+# natural and naive approach would tell the generated build system that FBVF is
+# a dependency of fish_version.o, and that git_version_gen.sh updates it. Make
+# will then invoke the script, check the timestamp on fish_version.o and FBVF,
+# see that FBVF is earlier, and then not rebuild fish_version.o. Ninja,
+# however, decides what to build up-front and will unconditionally rebuild
+# fish_version.o.
+#
+# To avoid this with Ninja, we want to hook into its 'restat' option which we
+# can do through the BYPRODUCTS feature of CMake. See
+# https://cmake.org/cmake/help/latest/policy/CMP0058.html
+#
+# Unfortunately BYPRODUCTS behaves strangely with the Makefile generator: it
+# marks FBVF as generated and then CMake itself will `touch` it on every build,
+# meaning that using BYPRODUCTS will cause fish_version.o to be rebuilt
+# unconditionally with the Makefile generator. Thus we want to use the
+# natural-and-naive approach for Makefiles.
+
+# **IMPORTANT** If you touch these build rules, please test both Ninja and
+# Makefile generators with both a clean and dirty git tree. Verify that both
+# generated build systems rebuild fish when the git tree goes from dirty to
+# clean (and vice versa), and verify they do NOT rebuild it when the git tree
+# stays the same (incremental builds must be fast).
+
+# Just a handy abbreviation.
+set(FBVF FISH-BUILD-VERSION-FILE)
+
+# TODO: find a cleaner way to do this.
+IF (${CMAKE_GENERATOR} STREQUAL Ninja)
+  set(FBVF-OUTPUT fish-build-version-witness.txt)
+  set(CFBVF-BYPRODUCTS ${FBVF})
+else(${CMAKE_GENERATOR} STREQUAL Ninja)
+  set(FBVF-OUTPUT ${FBVF})
+  set(CFBVF-BYPRODUCTS)
+endif(${CMAKE_GENERATOR} STREQUAL Ninja)
+
+# Set up the version targets
+add_custom_target(CHECK-FISH-BUILD-VERSION-FILE
+                  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/build_tools/git_version_gen.sh ${CMAKE_CURRENT_BINARY_DIR}
+                  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                  BYPRODUCTS ${CFBVF-BYPRODUCTS})
+
+add_custom_command(OUTPUT ${FBVF-OUTPUT}
+                    DEPENDS CHECK-FISH-BUILD-VERSION-FILE)
+
+# Abbreviation for the target.
+set(CFBVF CHECK-FISH-BUILD-VERSION-FILE)
--- a/contrib/debian/changelog
+++ b/contrib/debian/changelog
@@ -1,496 +0,0 @@
-fish (4.4.0-1) stable; urgency=medium
-
-  * Release of new version 4.4.0.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/4.4.0 for details.
-
- -- Johannes Altmanninger <aclopte@gmail.com>  Tue, 03 Feb 2026 12:11:51 +1100
-
-fish (4.3.3-1) stable; urgency=medium
-
-  * Release of new version 4.3.3.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/4.3.3 for details.
-
- -- Johannes Altmanninger <aclopte@gmail.com>  Wed, 07 Jan 2026 08:34:20 +0100
-
-fish (4.3.2-1) stable; urgency=medium
-
-  * Release of new version 4.3.2.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/4.3.2 for details.
-
- -- Johannes Altmanninger <aclopte@gmail.com>  Tue, 30 Dec 2025 17:21:04 +0100
-
-fish (4.3.1-1) stable; urgency=medium
-
-  * Release of new version 4.3.1.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/4.3.1 for details.
-
- -- Johannes Altmanninger <aclopte@gmail.com>  Sun, 28 Dec 2025 16:54:44 +0100
-
-fish (4.3.0-1) stable; urgency=medium
-
-  * Release of new version 4.3.0.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/4.3.0 for details.
-
- -- Johannes Altmanninger <aclopte@gmail.com>  Sun, 28 Dec 2025 10:20:47 +0100
-
-fish (4.2.1-1) testing; urgency=medium
-
-  * Release of new version 4.2.1.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/4.2.1 for details.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Thu, 13 Nov 2025 20:42:43 +0800
-
-fish (4.2.0-1) testing; urgency=medium
-
-  * Release of new version 4.2.0.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/4.2.0 for details.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Mon, 10 Nov 2025 19:29:03 +0800
-
-fish (4.1.2-1) testing; urgency=medium
-
-  * Release of new version 4.1.2.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/4.1.2 for details.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Wed, 08 Oct 2025 13:46:45 +0800
-
-fish (4.1.1-1) testing; urgency=medium
-
-  * Release of new version 4.1.1.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/4.1.1 for details.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Fri, 03 Oct 2025 16:43:43 +0800
-
-fish (4.0.8-1) testing; urgency=medium
-
-  * Release of new version 4.0.8.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/4.0.8 for details.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Thu, 18 Sep 2025 22:17:43 +0800
-
-fish (4.0.6-1) testing; urgency=medium
-
-  * Release of new version 4.0.6.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/4.0.6 for details.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Wed, 17 Sep 2025 12:27:09 +0800
-
-fish (4.0.2-2) testing; urgency=medium
-
-  * Fix tests on Debian.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Sun, 20 Apr 2025 23:08:14 +0800
-
-fish (4.0.2-1) testing; urgency=medium
-
-  * Release of new version 4.0.2.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/4.0.2 for details.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Sun, 20 Apr 2025 21:24:18 +0800
-
-fish (4.0.1-1) testing; urgency=medium
-
-  * Release of new version 4.0.1.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Thu, 13 Mar 2025 11:30:21 +0800
-
-fish (4.0.0-2) testing; urgency=medium
-
-  * Fix tests on Debian.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Thu, 27 Feb 2025 21:50:33 +0800
-
-fish (4.0.0-1) testing; urgency=medium
-
-  * Release of new version 4.0.0.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/4.0.0 for details.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Thu, 27 Feb 2025 19:22:30 +0800
-
-fish (4.0.1-1) testing; urgency=medium
-
-  * Release of new beta version 4.0b1.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/4.0b1 for details.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Tue, 17 Dec 2024 23:42:25 +0800
-
-fish (3.7.1-1) testing; urgency=medium
-
-  * Release of new version 3.7.1.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/3.7.1 for details.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Tue, 19 Mar 2024 13:26:22 +0800
-
-fish (3.7.0-1) testing; urgency=medium
-
-  * Release of new version 3.7.0.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/3.7.0 for details.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Mon, 01 Jan 2024 23:32:55 +0800
-
-fish (3.6.4-1) testing; urgency=medium
-
-  * Release of new version 3.6.4.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/3.6.4 for details.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Tue, 05 Dec 2023 22:34:09 +0800
-
-fish (3.6.3-1) testing; urgency=medium
-
-  * Release of new version 3.6.3.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/3.6.3 for details.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Tue, 05 Dec 2023 00:11:12 +0800
-
-fish (3.6.2-1) testing; urgency=medium
-
-  * Release of new version 3.6.2.
-  * Includes a fix for CVE-2023-49284.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/3.6.2 for details.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Mon, 04 Dec 2023 23:16:42 +0800
-
-fish (3.6.1-1) testing; urgency=medium
-
-  * Release of new version 3.6.1.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/3.6.1 for
-  significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Sat, 25 Mar 2023 17:22:12 +0800
-
-fish (3.6.0-1) testing; urgency=medium
-
-  * Release of new version 3.6.0.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/3.6.0 for
-  significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Sat, 07 Jan 2023 22:41:32 +0800
-
-fish (3.5.1-1) testing; urgency=medium
-
-  * Release of new version 3.5.1.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/3.5.1 for
-  significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Wed, 20 Jul 2022 21:54:09 +0800
-
-fish (3.5.0-1) testing; urgency=medium
-
-  * Release of new version 3.5.0.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/3.5.0 for
-  significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Thu, 16 Jun 2022 19:45:33 +0800
-
-fish (3.4.0-1) testing; urgency=medium
-
-  * Release of new version 3.4.0.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/3.4.0 for
-  significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Sat, 12 Mar 2022 23:24:22 +0800
-
-fish (3.3.1-1) testing; urgency=medium
-
-  * Release of new version 3.3.1.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/3.3.1 for
-  significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Tue, 06 Jul 2021 23:22:36 +0800
-
-fish (3.3.0-1) testing; urgency=medium
-
-  * Release of new version 3.3.0.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/3.3.0 for
-  significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Mon, 28 Jun 2021 23:06:36 +0800
-
-fish (3.2.2-1) testing; urgency=medium
-
-  * Release of new version 3.2.2.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/3.2.2 for
-  significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Wed, 07 Apr 2021 21:10:54 +0800
-
-fish (3.2.1-1) testing; urgency=medium
-
-  * Release of new version 3.2.1.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/3.2.1 for
-  significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Thu, 18 Mar 2021 12:08:13 +0800
-
-fish (3.2.0-1) testing; urgency=medium
-
-  * Release of new version 3.2.0.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/3.2.0 for
-  significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Mon, 01 Mar 2021 21:22:39 +0800
-
-fish (3.1.2-1) testing; urgency=medium
-
-  * Release of new version 3.1.2.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/3.1.2 for
-  significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Wed, 29 Apr 2020 11:22:35 +0800
-
-fish (3.1.1-1) testing; urgency=medium
-
-  * Release of new version 3.1.1.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/3.1.1 for
-  significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Mon, 27 Apr 2020 22:45:35 +0800
-
-fish (3.1.0-1) testing; urgency=medium
-
-  * Release of new version 3.1.0.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/3.1.0 for
-  significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Wed, 12 Feb 2020 22:34:53 +0800
-
-fish (3.1.1-1) testing; urgency=medium
-
-  * Release of new beta version 3.1b1.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/3.1b1 for
-  significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Sun, 26 Jan 2020 21:42:46 +0800
-
-fish (3.0.2-1) testing; urgency=medium
-
-  * Release of new version 3.0.2.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/3.0.2 for
-  significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Tue, 19 Feb 2019 21:45:05 +0800
-
-fish (3.0.1-1) testing; urgency=medium
-
-  * Release of new version 3.0.1.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/3.0.1 for
-  significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Mon, 11 Feb 2019 20:23:55 +0800
-
-fish (3.0.0-1) testing; urgency=medium
-
-  * Release of new version 3.0.0.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/3.0.0 for
-  significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Fri, 28 Dec 2018 21:10:28 +0800
-
-fish (3.0.1-1) testing; urgency=medium
-
-  * Release of new beta version 3.0b1.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/3.0b1 for
-  significant changes, which includes backward incompatibility.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Tue, 11 Dec 2018 22:59:15 +0800
-
-fish (2.7.1-1) testing; urgency=medium
-
-  * Release of new bug fix version 2.7.1. On all Linux platforms, this is
-    release will behave identically to 2.7.0.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Sat, 23 Dec 2017 00:43:12 +0800
-
-fish (2.7.0-1) testing; urgency=medium
-
-  * Release of new version 2.7.0.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/2.7.0 for
-  significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Thu, 23 Nov 2017 18:38:21 +0800
-
-fish (2.7.1-1) testing; urgency=medium
-
-  * Release of new beta version 2.7b1.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/2.7b1 for
-  significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Tue, 31 Oct 2017 20:32:29 +0800
-
-fish (2.6.0-1) testing; urgency=medium
-
-  * Relase of new version 2.6.0.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/2.6.0 for
-  significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Sat, 03 Jun 2017 20:51:50 +0800
-
-fish (2.6b1-1) testing; urgency=medium
-
-  * Release of new beta version 2.6b1.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/2.6b1 for
-  significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Sun, 14 May 2017 10:47:39 +0800
-
-fish (2.5.0-1) testing; urgency=medium
-
-  * Release of new version 2.5.0.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/2.5.0 for
-  significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Fri, 03 Feb 2017 09:52:57 +0800
-
-fish (2.5b1-1) testing; urgency=medium
-
-  * Release of new beta version 2.5b1.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/2.5b1 for
-  significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Sat, 14 Jan 2017 08:49:34 +0800
-
-fish (2.4.0-2) testing; urgency=medium
-
-  * Change recommendation of xdg-utils to suggestion (closes
-    https://github.com/fish-shell/fish-shell/issues/3534).
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Wed, 09 Nov 2016 22:56:16 +0800
-
-fish (2.4.0-1) testing; urgency=medium
-
-  * Release of new version 2.4.0.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/2.4.0 for
-  significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Tue, 08 Nov 2016 11:29:57 +0800
-
-fish (2.4b1-1) testing; urgency=medium
-
-  * Release of new beta version 2.4b1.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/2.4b1 for
-  significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Tue, 18 Oct 2016 22:25:26 +0800
-
-fish (2.3.1-1) testing; urgency=medium
-
-  * Release of new version 2.3.1.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Sun, 03 Jul 2016 21:21:51 +0800
-
-fish (2.3.0-1) testing; urgency=medium
-
-  * Release of new version 2.3.0.
-
-  See http://fishshell.com/release_notes.html for significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Sat, 21 May 2016 06:59:54 +0800
-
-fish (2.3b2-1) testing; urgency=medium
-
-  * Release of new beta version 2.3b2.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/2.3b2 for
-  significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Thu, 05 May 2016 06:22:37 +0800
-
-fish (2.3.1-1) testing; urgency=medium
-
-  * Release of new beta version 2.3b1.
-
-  See http://github.com/fish-shell/fish-shell/releases/tag/2.3b1 for
-  significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Tue, 19 Apr 2016 21:07:17 +0800
-
-fish (2.2.0-2) testing; urgency=medium
-
-  * Binary rebuild only to resynchronise repository state.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Mon, 15 Feb 2016 22:45:05 +0800
-
-fish (2.2.0-1) testing; urgency=medium
-
-  * Release of new version 2.2.0.
-
-    See http://fishshell.com/release_notes.html for significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Sun, 12 Jul 2015 18:52:29 +0800
-
-fish (2.2b1-1) testing; urgency=low
-
-  * Release of new beta version 2.2b1.
-
-  See http://fishshell.com/staging/release_notes.html for significant
-  changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Thu, 07 May 2015 14:48:21 +0800
-
-fish (2.1.1-1) unstable; urgency=high
-
-  * Release of new version 2.1.1.
-
-    See http://fishshell.com/release_notes.html for significant changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Sun, 07 Sep 2014 17:06:31 +0800
-
-fish (2.1.0-1) unstable; urgency=low
-
-  * Release of new version 2.1.0.
-
-    See http://fishshell.com/staging/release_notes.html for significant
-    changes.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Sat, 19 Oct 2013 14:35:23 +0800
-
-fish (2.0.0-0) unstable; urgency=low
-
-  * Initial release of fish 2.0.0.
-
- -- David Adam <zanchey@ucc.gu.uwa.edu.au>  Thu, 19 Jul 2012 23:17:58 +0800
--- a/contrib/debian/source/local-options
+++ b/contrib/debian/source/local-options
@@ -1,3 +0,0 @@
-# The vendor tarball drops a new version of .cargo/config into place. Representing this as a patch
-# in automated workflows is tricky, so for our purposes auto-commit is fine.
-auto-commit
--- a/crates/build-helper/Cargo.toml
+++ b/crates/build-helper/Cargo.toml
@@ -4,7 +4,6 @@ edition.workspace = true
 rust-version.workspace = true
 version = "0.0.0"
 repository.workspace = true
-license.workspace = true

 [dependencies]
 rsconf.workspace = true
--- a/crates/build-helper/src/lib.rs
+++ b/crates/build-helper/src/lib.rs
@@ -34,10 +34,6 @@ pub fn fish_build_dir() -> Cow<'static, Path> {
        .unwrap_or(cargo_target_dir())
 }

-pub fn fish_doc_dir() -> Cow<'static, Path> {
-    cargo_target_dir().join("fish-docs").into()
-}
-
 // TODO Move this to rsconf
 pub fn rebuild_if_path_changed<P: AsRef<Path>>(path: P) {
    rsconf::rebuild_if_path_changed(path.as_ref().to_str().unwrap());
@@ -49,56 +45,3 @@ pub fn rebuild_if_paths_changed<P: AsRef<Path>, I: IntoIterator<Item = P>>(paths
        rsconf::rebuild_if_path_changed(path.as_ref().to_str().unwrap());
    }
 }
-
-pub fn rebuild_if_embedded_path_changed<P: AsRef<Path>>(path: P) {
-    // Not necessary in debug builds, where rust-embed reads from the filesystem.
-    if cfg!(any(not(debug_assertions), windows)) {
-        rebuild_if_path_changed(path);
-    }
-}
-
-// Target OS for compiling our crates, as opposed to the build script.
-pub fn target_os() -> String {
-    env_var("CARGO_CFG_TARGET_OS").unwrap()
-}
-
-pub fn target_os_is_apple() -> bool {
-    matches!(target_os().as_str(), "ios" | "macos")
-}
-
-/// Detect if we're being compiled for a BSD-derived OS, allowing targeting code conditionally with
-/// `#[cfg(bsd)]`.
-///
-/// Rust offers fine-grained conditional compilation per-os for the popular operating systems, but
-/// doesn't necessarily include less-popular forks nor does it group them into families more
-/// specific than "windows" vs "unix" so we can conditionally compile code for BSD systems.
-pub fn target_os_is_bsd() -> bool {
-    let target_os = target_os();
-    let is_bsd = target_os.ends_with("bsd") || target_os == "dragonfly";
-    if matches!(
-        target_os.as_str(),
-        "dragonfly" | "freebsd" | "netbsd" | "openbsd"
-    ) {
-        assert!(is_bsd, "Target incorrectly detected as not BSD!");
-    }
-    is_bsd
-}
-
-pub fn target_os_is_cygwin() -> bool {
-    target_os() == "cygwin"
-}
-
-#[macro_export]
-macro_rules! as_os_strs {
-    [ $( $x:expr, )* ] => {
-        {
-            use std::ffi::OsStr;
-            fn as_os_str<S: AsRef<OsStr> + ?Sized>(s: &S) -> &OsStr {
-                s.as_ref()
-            }
-            &[
-                $( as_os_str($x), )*
-            ]
-        }
-    }
-}
--- a/crates/build-man-pages/Cargo.toml
+++ b/crates/build-man-pages/Cargo.toml
@@ -4,7 +4,6 @@ edition.workspace = true
 rust-version.workspace = true
 version = "0.0.0"
 repository.workspace = true
-license.workspace = true

 [build-dependencies]
 fish-build-helper.workspace = true
--- a/crates/build-man-pages/build.rs
+++ b/crates/build-man-pages/build.rs
@@ -1,24 +1,43 @@
+use fish_build_helper::{env_var, workspace_root};
 use std::path::Path;

-use fish_build_helper::{as_os_strs, fish_doc_dir};
-
 fn main() {
-    let sec1_dir = fish_doc_dir().join("man").join("man1");
-    // Running `cargo clippy` on a clean build directory panics, because when rust-embed
-    // tries to embed a directory which does not exist it will panic.
+    let man_dir = fish_build_helper::fish_build_dir().join("fish-man");
+    let sec1_dir = man_dir.join("man1");
+    // Running `cargo clippy` on a clean build directory panics, because when rust-embed tries to
+    // embed a directory which does not exist it will panic.
    let _ = std::fs::create_dir_all(&sec1_dir);
-    if !cfg!(clippy) {
-        build_man(&sec1_dir);
+
+    let help_sections_path = Path::new(&env_var("OUT_DIR").unwrap()).join("help_sections.rs");
+
+    if env_var("FISH_USE_PREBUILT_DOCS").is_some_and(|v| v == "TRUE") {
+        std::fs::copy(
+            workspace_root().join("user_doc/src/help_sections.rs"),
+            help_sections_path,
+        )
+        .unwrap();
+        return;
    }
+
+    std::fs::write(
+        help_sections_path.clone(),
+        r#"pub static HELP_SECTIONS: &str = "";"#,
+    )
+    .unwrap();
+
+    #[cfg(not(clippy))]
+    build_man(&man_dir, &sec1_dir, &help_sections_path);
 }

-fn build_man(sec1_dir: &Path) {
-    use fish_build_helper::{env_var, workspace_root};
-    use std::process::{Command, Stdio};
+#[cfg(not(clippy))]
+fn build_man(man_dir: &Path, sec1_dir: &Path, help_sections_path: &Path) {
+    use std::{
+        ffi::OsStr,
+        process::{Command, Stdio},
+    };

    let workspace_root = workspace_root();
    let doc_src_dir = workspace_root.join("doc_src");
-    let doctrees_dir = fish_doc_dir().join(".doctrees-man");

    fish_build_helper::rebuild_if_paths_changed([
        &workspace_root.join("CHANGELOG.rst"),
@@ -26,21 +45,36 @@ fn build_man(sec1_dir: &Path) {
        &doc_src_dir,
    ]);

-    let args = as_os_strs![
-        "-j",
-        "auto",
-        "-q",
-        "-b",
-        "man",
-        "-c",
-        &doc_src_dir,
-        // doctree path - put this *above* the man1 dir to exclude it.
-        // this is ~6M
-        "-d",
-        &doctrees_dir,
-        &doc_src_dir,
-        &sec1_dir,
-    ];
+    let help_sections_arg = format!("fish_help_sections_output={}", help_sections_path.display());
+    let args: &[&OsStr] = {
+        fn as_os_str<S: AsRef<OsStr> + ?Sized>(s: &S) -> &OsStr {
+            s.as_ref()
+        }
+        macro_rules! as_os_strs {
+            ( [ $( $x:expr, )* ] ) => {
+                &[
+                    $( as_os_str($x), )*
+                ]
+            }
+        }
+        as_os_strs!([
+            "-j",
+            "auto",
+            "-q",
+            "-b",
+            "man",
+            "-c",
+            &doc_src_dir,
+            // doctree path - put this *above* the man1 dir to exclude it.
+            // this is ~6M
+            "-d",
+            &man_dir,
+            &doc_src_dir,
+            &sec1_dir,
+            "-D",
+            &help_sections_arg,
+        ])
+    };

    rsconf::rebuild_if_env_changed("FISH_BUILD_DOCS");
    if env_var("FISH_BUILD_DOCS") == Some("0".to_string()) {
@@ -60,12 +94,12 @@ fn build_man(sec1_dir: &Path) {
        .spawn()
    {
        Err(e) if e.kind() == std::io::ErrorKind::NotFound => {
-            assert_ne!(
-                env_var("FISH_BUILD_DOCS"),
-                Some("1".to_string()),
-                "Could not find sphinx-build required to build man pages.\n\
-                 Install Sphinx or disable building the docs by setting $FISH_BUILD_DOCS=0."
-            );
+            if env_var("FISH_BUILD_DOCS") == Some("1".to_string()) {
+                panic!(
+                    "Could not find sphinx-build required to build man pages.\n\
+                     Install Sphinx or disable building the docs by setting $FISH_BUILD_DOCS=0."
+                );
+            }
            rsconf::warn!(
                "Could not find sphinx-build required to build man pages. \
                 If you install Sphinx now, you need to trigger a rebuild to include man pages. \
@@ -92,10 +126,9 @@ fn build_man(sec1_dir: &Path) {
                rsconf::warn!("sphinx-build: {}", String::from_utf8_lossy(&out.stderr));
            }
            assert_eq!(&String::from_utf8_lossy(&out.stdout), "");
-            assert!(
-                out.status.success(),
-                "sphinx-build failed to build the man pages."
-            );
+            if !out.status.success() {
+                panic!("sphinx-build failed to build the man pages.");
+            }
        }
    }
 }
--- a/crates/build-man-pages/src/lib.rs
+++ b/crates/build-man-pages/src/lib.rs
@@ -1 +1 @@
-
+include!(concat!(env!("OUT_DIR"), "/help_sections.rs"));
--- a/crates/color/Cargo.toml
+++ b/crates/color/Cargo.toml
@@ -1,14 +0,0 @@
-[package]
-name = "fish-color"
-edition.workspace = true
-rust-version.workspace = true
-version = "0.0.0"
-repository.workspace = true
-license.workspace = true
-
-[dependencies]
-fish-common.workspace = true
-fish-widestring.workspace = true
-
-[lints]
-workspace = true
--- a/crates/common/Cargo.toml
+++ b/crates/common/Cargo.toml
@@ -1,16 +0,0 @@
-[package]
-name = "fish-common"
-edition.workspace = true
-rust-version.workspace = true
-version = "0.0.0"
-repository.workspace = true
-license.workspace = true
-
-[dependencies]
-bitflags.workspace = true
-fish-widestring.workspace = true
-libc.workspace = true
-nix.workspace = true
-
-[lints]
-workspace = true
--- a/crates/common/src/lib.rs
+++ b/crates/common/src/lib.rs
@@ -1,709 +0,0 @@
-use bitflags::bitflags;
-use fish_widestring::{L, char_offset, wstr};
-use libc::{SIG_IGN, SIGTTOU, STDIN_FILENO};
-use std::cell::{Cell, RefCell};
-use std::io::Read;
-use std::ops::{Deref, DerefMut};
-use std::os::fd::{AsRawFd, BorrowedFd, RawFd};
-use std::os::unix::ffi::OsStrExt;
-use std::sync::OnceLock;
-use std::sync::atomic::{AtomicI32, AtomicU32, Ordering};
-use std::{env, mem, time};
-
-pub const PACKAGE_NAME: &str = env!("CARGO_PKG_NAME");
-
-// Highest legal ASCII value.
-pub const ASCII_MAX: char = 127 as char;
-
-// Highest legal 16-bit Unicode value.
-pub const UCS2_MAX: char = '\u{FFFF}';
-
-// Highest legal byte value.
-pub const BYTE_MAX: char = 0xFF as char;
-
-// Unicode BOM value.
-pub const UTF8_BOM_WCHAR: char = '\u{FEFF}';
-
-// Use Unicode "non-characters" for internal characters as much as we can. This
-// gives us 32 "characters" for internal use that we can guarantee should not
-// appear in our input stream. See http://www.unicode.org/faq/private_use.html.
-pub const RESERVED_CHAR_BASE: char = '\u{FDD0}';
-pub const RESERVED_CHAR_END: char = '\u{FDF0}';
-// Split the available non-character values into two ranges to ensure there are
-// no conflicts among the places we use these special characters.
-pub const EXPAND_RESERVED_BASE: char = RESERVED_CHAR_BASE;
-pub const EXPAND_RESERVED_END: char = char_offset(EXPAND_RESERVED_BASE, 16);
-pub const WILDCARD_RESERVED_BASE: char = EXPAND_RESERVED_END;
-pub const WILDCARD_RESERVED_END: char = char_offset(WILDCARD_RESERVED_BASE, 16);
-// Make sure the ranges defined above don't exceed the range for non-characters.
-// This is to make sure we didn't do something stupid in subdividing the
-// Unicode range for our needs.
-const _: () = assert!(WILDCARD_RESERVED_END <= RESERVED_CHAR_END);
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum EscapeStringStyle {
-    Script(EscapeFlags),
-    Url,
-    Var,
-    Regex,
-}
-
-impl Default for EscapeStringStyle {
-    fn default() -> Self {
-        Self::Script(EscapeFlags::default())
-    }
-}
-
-impl TryFrom<&wstr> for EscapeStringStyle {
-    type Error = &'static wstr;
-    fn try_from(s: &wstr) -> Result<Self, Self::Error> {
-        use EscapeStringStyle::*;
-        match s {
-            s if s == "script" => Ok(Self::default()),
-            s if s == "var" => Ok(Var),
-            s if s == "url" => Ok(Url),
-            s if s == "regex" => Ok(Regex),
-            _ => Err(L!("Invalid escape style")),
-        }
-    }
-}
-
-bitflags! {
-    /// Flags for the [`escape_string()`] function. These are only applicable when the escape style is
-    /// [`EscapeStringStyle::Script`].
-    #[derive(Copy, Clone, Debug, Default, Eq, PartialEq)]
-    pub struct EscapeFlags: u32 {
-        /// Do not escape special fish syntax characters like the semicolon. Only escape non-printable
-        /// characters and backslashes.
-        const NO_PRINTABLES = 1 << 0;
-        /// Do not try to use 'simplified' quoted escapes, and do not use empty quotes as the empty
-        /// string.
-        const NO_QUOTED = 1 << 1;
-        /// Do not escape tildes.
-        const NO_TILDE = 1 << 2;
-        /// Replace non-printable control characters with Unicode symbols.
-        const SYMBOLIC = 1 << 3;
-        /// Escape ,
-        const COMMA = 1 << 4;
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum UnescapeStringStyle {
-    Script(UnescapeFlags),
-    Url,
-    Var,
-}
-
-impl Default for UnescapeStringStyle {
-    fn default() -> Self {
-        Self::Script(UnescapeFlags::default())
-    }
-}
-
-impl TryFrom<&wstr> for UnescapeStringStyle {
-    type Error = &'static wstr;
-    fn try_from(s: &wstr) -> Result<Self, Self::Error> {
-        use UnescapeStringStyle::*;
-        match s {
-            s if s == "script" => Ok(Self::default()),
-            s if s == "var" => Ok(Var),
-            s if s == "url" => Ok(Url),
-            _ => Err(L!("Invalid escape style")),
-        }
-    }
-}
-
-bitflags! {
-    /// Flags for unescape_string functions.
-    #[derive(Copy, Clone, Debug, Default, Eq, PartialEq)]
-    pub struct UnescapeFlags: u32 {
-        /// escape special fish syntax characters like the semicolon
-        const SPECIAL = 1 << 0;
-        /// allow incomplete escape sequences
-        const INCOMPLETE = 1 << 1;
-        /// don't handle backslash escapes
-        const NO_BACKSLASHES = 1 << 2;
-    }
-}
-
-/// This function attempts to distinguish between a console session (at the actual login vty) and a
-/// session within a terminal emulator inside a desktop environment or over SSH. Unfortunately
-/// there are few values of $TERM that we can interpret as being exclusively console sessions, and
-/// most common operating systems do not use them. The value is cached for the duration of the fish
-/// session. We err on the side of assuming it's not a console session. This approach isn't
-/// bullet-proof and that's OK.
-pub fn is_console_session() -> bool {
-    static IS_CONSOLE_SESSION: OnceLock<bool> = OnceLock::new();
-    // TODO(terminal-workaround)
-    *IS_CONSOLE_SESSION.get_or_init(|| {
-        nix::unistd::ttyname(unsafe { std::os::fd::BorrowedFd::borrow_raw(STDIN_FILENO) })
-            .is_ok_and(|buf| {
-                // Check if the tty matches /dev/(console|dcons|tty[uv\d])
-                let is_console_tty = match buf.as_os_str().as_bytes() {
-                    b"/dev/console" => true,
-                    b"/dev/dcons" => true,
-                    bytes => bytes.strip_prefix(b"/dev/tty").is_some_and(|rest| {
-                        matches!(rest.first(), Some(b'u' | b'v' | b'0'..=b'9'))
-                    }),
-                };
-
-                // and that $TERM is simple, e.g. `xterm` or `vt100`, not `xterm-something` or `sun-color`.
-                is_console_tty && env::var_os("TERM").is_none_or(|t| !t.as_bytes().contains(&b'-'))
-            })
-    })
-}
-
-/// Exits without invoking destructors (via _exit), useful for code after fork.
-pub fn exit_without_destructors(code: libc::c_int) -> ! {
-    unsafe { libc::_exit(code) };
-}
-
-/// The character to use where the text has been truncated.
-pub fn get_ellipsis_char() -> char {
-    '\u{2026}' // ('…')
-}
-
-/// The character or string to use where text has been truncated (ellipsis if possible, otherwise
-/// ...)
-pub fn get_ellipsis_str() -> &'static wstr {
-    L!("\u{2026}")
-}
-
-// Only pub for `src/common.rs`
-pub static OBFUSCATION_READ_CHAR: AtomicU32 = AtomicU32::new(0);
-
-pub fn get_obfuscation_read_char() -> char {
-    char::from_u32(OBFUSCATION_READ_CHAR.load(Ordering::Relaxed)).unwrap()
-}
-
-/// Call read, blocking and repeating on EINTR. Exits on EAGAIN.
-/// Return the number of bytes read, or 0 on EOF, or an error.
-pub fn read_blocked(fd: RawFd, buf: &mut [u8]) -> nix::Result<usize> {
-    loop {
-        let res = nix::unistd::read(unsafe { BorrowedFd::borrow_raw(fd) }, buf);
-        if let Err(nix::Error::EINTR) = res {
-            continue;
-        }
-        return res;
-    }
-}
-
-pub trait ReadExt {
-    /// Like [`std::io::Read::read_to_end`], but does not retry on EINTR.
-    fn read_to_end_interruptible(&mut self, buf: &mut Vec<u8>) -> std::io::Result<()>;
-}
-
-impl<T: Read + ?Sized> ReadExt for T {
-    fn read_to_end_interruptible(&mut self, buf: &mut Vec<u8>) -> std::io::Result<()> {
-        let mut chunk = [0_u8; 4096];
-        loop {
-            match self.read(&mut chunk)? {
-                0 => return Ok(()),
-                n => buf.extend_from_slice(&chunk[..n]),
-            }
-        }
-    }
-}
-
-/// A rusty port of the C++ `write_loop()` function from `common.cpp`. This should be deprecated in
-/// favor of native rust read/write methods at some point.
-pub fn safe_write_loop<Fd: AsRawFd>(fd: &Fd, buf: &[u8]) -> std::io::Result<()> {
-    let fd = fd.as_raw_fd();
-    let mut total = 0;
-    while total < buf.len() {
-        match nix::unistd::write(unsafe { BorrowedFd::borrow_raw(fd) }, &buf[total..]) {
-            Ok(written) => {
-                total += written;
-            }
-            Err(err) => {
-                if matches!(err, nix::Error::EAGAIN | nix::Error::EINTR) {
-                    continue;
-                }
-                return Err(std::io::Error::from(err));
-            }
-        }
-    }
-    Ok(())
-}
-
-pub use safe_write_loop as write_loop;
-
-pub const fn help_section_exists(section: &str) -> bool {
-    let haystack = include_str!("../../../share/help_sections");
-    let needle = section;
-
-    let needle = needle.as_bytes();
-    let haystack = haystack.as_bytes();
-    let nlen = needle.len();
-    let mut line_start = 0;
-    let mut i = 0;
-    while i <= haystack.len() {
-        if i == haystack.len() || haystack[i] == b'\n' {
-            let line_len = i - line_start;
-
-            if line_len == nlen {
-                let mut j = 0;
-                while j < nlen && haystack[line_start + j] == needle[j] {
-                    j += 1;
-                }
-                if j == nlen {
-                    return true;
-                }
-            }
-            line_start = i + 1;
-        }
-        i += 1;
-    }
-    false
-}
-
-#[macro_export]
-macro_rules! help_section {
-    ($section:expr) => {{
-        const {
-            assert!($crate::help_section_exists($section));
-        }
-
-        $section
-    }};
-}
-
-pub type Timepoint = f64;
-
-/// Return the number of seconds from the UNIX epoch, with subsecond precision. This function uses
-/// the gettimeofday function and will have the same precision as that function.
-pub fn timef() -> Timepoint {
-    match time::SystemTime::now().duration_since(time::UNIX_EPOCH) {
-        Ok(difference) => difference.as_secs() as f64,
-        Err(until_epoch) => -(until_epoch.duration().as_secs() as f64),
-    }
-}
-
-/// Be able to restore the term's foreground process group.
-/// This is set during startup and not modified after.
-static INITIAL_FG_PROCESS_GROUP: AtomicI32 = AtomicI32::new(-1); // HACK, should be pid_t
-const _: () = assert!(mem::size_of::<i32>() >= mem::size_of::<libc::pid_t>());
-
-/// Save the value of tcgetpgrp so we can restore it on exit.
-pub fn save_term_foreground_process_group() {
-    INITIAL_FG_PROCESS_GROUP.store(unsafe { libc::tcgetpgrp(STDIN_FILENO) }, Ordering::Relaxed);
-}
-
-pub fn restore_term_foreground_process_group_for_exit() {
-    // We wish to restore the tty to the initial owner. There's two ways this can go wrong:
-    //  1. We may steal the tty from someone else (#7060).
-    //  2. The call to tcsetpgrp may deliver SIGSTOP to us, and we will not exit.
-    // Hanging on exit seems worse, so ensure that SIGTTOU is ignored so we do not get SIGSTOP.
-    // Note initial_fg_process_group == 0 is possible with Linux pid namespaces.
-    // This is called during shutdown and from a signal handler. We don't bother to complain on
-    // failure because doing so is unlikely to be noticed.
-    // Safety: All of getpgrp, signal, and tcsetpgrp are async-signal-safe.
-    let initial_fg_process_group = INITIAL_FG_PROCESS_GROUP.load(Ordering::Relaxed);
-    if initial_fg_process_group > 0 && initial_fg_process_group != unsafe { libc::getpgrp() } {
-        unsafe {
-            libc::signal(SIGTTOU, SIG_IGN);
-            libc::tcsetpgrp(STDIN_FILENO, initial_fg_process_group);
-        }
-    }
-}
-
-/// A wrapper around Cell which supports modifying the contents, scoped to a region of code.
-/// This provides a somewhat nicer API than ScopedRefCell because you can directly modify the value,
-/// instead of requiring an accessor function which returns a mutable reference to a field.
-pub struct ScopedCell<T>(Cell<T>);
-
-impl<T> Deref for ScopedCell<T> {
-    type Target = Cell<T>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl<T> DerefMut for ScopedCell<T> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-
-impl<T: Copy> ScopedCell<T> {
-    pub fn new(value: T) -> Self {
-        Self(Cell::new(value))
-    }
-
-    /// Temporarily modify a value in the ScopedCell, restoring it when the returned object is dropped.
-    ///
-    /// This is useful when you want to apply a change for the duration of a scope
-    /// without having to manually restore the previous value.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// use fish_common::ScopedCell;
-    ///
-    /// let cell = ScopedCell::new(5);
-    /// assert_eq!(cell.get(), 5);
-    ///
-    /// {
-    ///     let _guard = cell.scoped_mod(|v| *v += 10);
-    ///     assert_eq!(cell.get(), 15);
-    /// }
-    ///
-    /// // Restored after scope
-    /// assert_eq!(cell.get(), 5);
-    /// ```
-    pub fn scoped_mod<'a, Modifier: FnOnce(&mut T)>(
-        &'a self,
-        modifier: Modifier,
-    ) -> impl ScopeGuarding + 'a {
-        let mut val = self.get();
-        modifier(&mut val);
-        let saved = self.replace(val);
-        ScopeGuard::new(self, move |cell| cell.set(saved))
-    }
-}
-
-/// A wrapper around RefCell which supports modifying the contents, scoped to a region of code.
-pub struct ScopedRefCell<T>(RefCell<T>);
-
-impl<T> Deref for ScopedRefCell<T> {
-    type Target = RefCell<T>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl<T> DerefMut for ScopedRefCell<T> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-
-impl<T> ScopedRefCell<T> {
-    pub fn new(value: T) -> Self {
-        Self(RefCell::new(value))
-    }
-
-    /// Temporarily modify a field in the ScopedRefCell, restoring it when the returned guard is dropped.
-    ///
-    /// This is useful when you want to change part of a data structure for the duration of a scope,
-    /// and automatically restore the original value afterward.
-    ///
-    /// The `accessor` function selects the field to modify by returning a mutable reference to it.
-    ///
-    /// # Example
-    /// ```
-    /// use fish_common::ScopedRefCell;
-    ///
-    /// struct State { flag: bool }
-    ///
-    /// let cell = ScopedRefCell::new(State { flag: false });
-    /// assert_eq!(cell.borrow().flag, false);
-    ///
-    /// {
-    ///     let _guard = cell.scoped_set(true, |s| &mut s.flag);
-    ///     assert_eq!(cell.borrow().flag, true);
-    /// }
-    ///
-    /// // Restored after scope
-    /// assert_eq!(cell.borrow().flag, false);
-    /// ```
-    pub fn scoped_set<'a, Accessor, Value: 'a>(
-        &'a self,
-        value: Value,
-        accessor: Accessor,
-    ) -> impl ScopeGuarding + 'a
-    where
-        Accessor: Fn(&mut T) -> &mut Value + 'a,
-    {
-        let mut data = self.borrow_mut();
-        let mut saved = std::mem::replace(accessor(&mut data), value);
-        ScopeGuard::new(self, move |cell| {
-            let mut data = cell.borrow_mut();
-            std::mem::swap((accessor)(&mut data), &mut saved);
-        })
-    }
-
-    /// Convenience method for replacing the entire contents of the ScopedRefCell, restoring it when dropped.
-    ///
-    /// Equivalent to `scoped_set(value, |s| s)`.
-    ///
-    /// # Example
-    /// ```
-    /// use fish_common::ScopedRefCell;
-    ///
-    /// let cell = ScopedRefCell::new(10);
-    /// assert_eq!(*cell.borrow(), 10);
-    ///
-    /// {
-    ///     let _guard = cell.scoped_replace(99);
-    ///     assert_eq!(*cell.borrow(), 99);
-    /// }
-    ///
-    /// assert_eq!(*cell.borrow(), 10);
-    /// ```
-    pub fn scoped_replace<'a>(&'a self, value: T) -> impl ScopeGuarding + 'a {
-        self.scoped_set(value, |s| s)
-    }
-}
-
-/// A RAII cleanup object. Unlike in C++ where there is no borrow checker, we can't just provide a
-/// callback that modifies live objects willy-nilly because then there would be two &mut references
-/// to the same object - the original variables we keep around to use and their captured references
-/// held by the closure until its scope expires.
-///
-/// Instead we have a `ScopeGuard` type that takes exclusive ownership of (a mutable reference to)
-/// the object to be managed. In lieu of keeping the original value around, we obtain a regular or
-/// mutable reference to it via ScopeGuard's [`Deref`] and [`DerefMut`] impls.
-///
-/// The `ScopeGuard` is considered to be the exclusively owner of the passed value for the
-/// duration of its lifetime. If you need to use the value again, use `ScopeGuard` to shadow the
-/// value and obtain a reference to it via the `ScopeGuard` itself:
-///
-/// ```rust
-/// use std::io::prelude::*;
-/// use fish_common::ScopeGuard;
-///
-/// let file = std::fs::File::create("/dev/null").unwrap();
-/// // Create a scope guard to write to the file when the scope expires.
-/// // To be able to still use the file, shadow `file` with the ScopeGuard itself.
-/// let mut file = ScopeGuard::new(file, |mut file| file.write_all(b"goodbye\n").unwrap());
-/// // Now write to the file normally "through" the capturing ScopeGuard instance.
-/// file.write_all(b"hello\n").unwrap();
-///
-/// // hello will be written first, then goodbye.
-/// ```
-pub struct ScopeGuard<T, F: FnOnce(T)>(Option<(T, F)>);
-
-impl<T, F: FnOnce(T)> ScopeGuard<T, F> {
-    /// Creates a new `ScopeGuard` wrapping `value`. The `on_drop` callback is executed when the
-    /// ScopeGuard's lifetime expires or when it is manually dropped.
-    pub fn new(value: T, on_drop: F) -> Self {
-        Self(Some((value, on_drop)))
-    }
-
-    /// Invokes the callback, consuming the ScopeGuard.
-    pub fn commit(guard: Self) {
-        std::mem::drop(guard);
-    }
-
-    /// Cancels the invocation of the callback, returning the original wrapped value.
-    pub fn cancel(mut guard: Self) -> T {
-        let (value, _) = guard.0.take().expect("Should always have Some value");
-        value
-    }
-}
-
-impl<T, F: FnOnce(T)> Deref for ScopeGuard<T, F> {
-    type Target = T;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0.as_ref().unwrap().0
-    }
-}
-
-impl<T, F: FnOnce(T)> DerefMut for ScopeGuard<T, F> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0.as_mut().unwrap().0
-    }
-}
-
-impl<T, F: FnOnce(T)> Drop for ScopeGuard<T, F> {
-    fn drop(&mut self) {
-        if let Some((value, on_drop)) = self.0.take() {
-            on_drop(value);
-        }
-    }
-}
-
-/// A trait expressing what ScopeGuard can do. This is necessary because our scoped cells return an
-/// `impl Trait` object and therefore methods on ScopeGuard which take a self parameter cannot be
-/// used.
-pub trait ScopeGuarding: DerefMut + Sized {
-    /// Invokes the callback, consuming the guard.
-    fn commit(guard: Self) {
-        std::mem::drop(guard);
-    }
-}
-
-impl<T, F: FnOnce(T)> ScopeGuarding for ScopeGuard<T, F> {}
-
-pub const fn assert_send<T: Send>() {}
-pub const fn assert_sync<T: Sync>() {}
-
-/// Asserts that a slice is alphabetically sorted by a <code>&[wstr]</code> `name` field.
-///
-/// Mainly useful for static asserts/const eval.
-///
-/// # Panics
-///
-/// This function panics if the given slice is unsorted.
-///
-/// # Examples
-///
-/// ```
-/// use fish_widestring::{L, wstr};
-/// use fish_common::assert_sorted_by_name;
-///
-/// const COLORS: &[(&wstr, u32)] = &[
-///     // must be in alphabetical order
-///     (L!("blue"), 0x0000ff),
-///     (L!("green"), 0x00ff00),
-///     (L!("red"), 0xff0000),
-/// ];
-///
-/// assert_sorted_by_name!(COLORS, 0);
-/// ```
-///
-/// While this example would fail to compile:
-///
-/// ```compile_fail
-/// use fish_widestring::{L, wstr};
-/// use fish_common::assert_sorted_by_name;
-///
-/// const COLORS: &[(&wstr, u32)] = &[
-///     // not in alphabetical order
-///     (L!("green"), 0x00ff00),
-///     (L!("blue"), 0x0000ff),
-///     (L!("red"), 0xff0000),
-/// ];
-///
-/// assert_sorted_by_name!(COLORS, 0);
-/// ```
-#[macro_export]
-macro_rules! assert_sorted_by_name {
-    ($slice:expr, $field:tt) => {
-        const _: () = {
-            use std::cmp::Ordering;
-
-            // ugly const eval workarounds below.
-            const fn cmp_i32(lhs: i32, rhs: i32) -> Ordering {
-                match lhs - rhs {
-                    ..=-1 => Ordering::Less,
-                    0 => Ordering::Equal,
-                    1.. => Ordering::Greater,
-                }
-            }
-
-            const fn cmp_slice(s1: &[char], s2: &[char]) -> Ordering {
-                let mut i = 0;
-                while i < s1.len() && i < s2.len() {
-                    match cmp_i32(s1[i] as i32, s2[i] as i32) {
-                        Ordering::Equal => i += 1,
-                        other => return other,
-                    }
-                }
-                cmp_i32(s1.len() as i32, s2.len() as i32)
-            }
-
-            let mut i = 1;
-            while i < $slice.len() {
-                let prev = $slice[i - 1].$field.as_char_slice();
-                let cur = $slice[i].$field.as_char_slice();
-                if matches!(cmp_slice(prev, cur), Ordering::Greater) {
-                    panic!("array must be sorted");
-                }
-                i += 1;
-            }
-        };
-    };
-    ($slice:expr) => {
-        assert_sorted_by_name!($slice, name);
-    };
-}
-
-pub trait Named {
-    fn name(&self) -> &'static wstr;
-}
-
-/// Return a reference to the first entry with the given name, assuming the entries are sorted by
-/// name. Return None if not found.
-pub fn get_by_sorted_name<T: Named>(name: &wstr, vals: &'static [T]) -> Option<&'static T> {
-    match vals.binary_search_by_key(&name, |val| val.name()) {
-        Ok(index) => Some(&vals[index]),
-        Err(_) => None,
-    }
-}
-
-/// Given an input string, return a prefix of the string up to the first NUL character,
-/// or the entire string if there is no NUL character.
-pub fn truncate_at_nul(input: &wstr) -> &wstr {
-    match input.chars().position(|c| c == '\0') {
-        Some(nul_pos) => &input[..nul_pos],
-        None => input,
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_scoped_cell() {
-        let cell = ScopedCell::new(42);
-
-        {
-            let _guard = cell.scoped_mod(|x| *x += 1);
-            assert_eq!(cell.get(), 43);
-        }
-
-        assert_eq!(cell.get(), 42);
-    }
-
-    #[test]
-    fn test_scoped_refcell() {
-        #[derive(Debug, PartialEq, Clone)]
-        struct Data {
-            x: i32,
-            y: i32,
-        }
-
-        let cell = ScopedRefCell::new(Data { x: 1, y: 2 });
-
-        {
-            let _guard = cell.scoped_set(10, |d| &mut d.x);
-            assert_eq!(cell.borrow().x, 10);
-        }
-        assert_eq!(cell.borrow().x, 1);
-
-        {
-            let _guard = cell.scoped_replace(Data { x: 42, y: 99 });
-            assert_eq!(*cell.borrow(), Data { x: 42, y: 99 });
-        }
-        assert_eq!(*cell.borrow(), Data { x: 1, y: 2 });
-    }
-
-    #[test]
-    fn test_scope_guard() {
-        let relaxed = std::sync::atomic::Ordering::Relaxed;
-        let counter = std::sync::atomic::AtomicUsize::new(0);
-        {
-            let guard = ScopeGuard::new(123, |arg| {
-                assert_eq!(arg, 123);
-                counter.fetch_add(1, relaxed);
-            });
-            assert_eq!(counter.load(relaxed), 0);
-            std::mem::drop(guard);
-            assert_eq!(counter.load(relaxed), 1);
-        }
-        // commit also invokes the callback.
-        {
-            let guard = ScopeGuard::new(123, |arg| {
-                assert_eq!(arg, 123);
-                counter.fetch_add(1, relaxed);
-            });
-            assert_eq!(counter.load(relaxed), 1);
-            ScopeGuard::commit(guard);
-            assert_eq!(counter.load(relaxed), 2);
-        }
-    }
-
-    #[test]
-    fn test_truncate_at_nul() {
-        assert_eq!(truncate_at_nul(L!("abc\0def")), L!("abc"));
-        assert_eq!(truncate_at_nul(L!("abc")), L!("abc"));
-        assert_eq!(truncate_at_nul(L!("\0abc")), L!(""));
-    }
-}
--- a/crates/fallback/Cargo.toml
+++ b/crates/fallback/Cargo.toml
@@ -1,21 +0,0 @@
-[package]
-name = "fish-fallback"
-edition.workspace = true
-rust-version.workspace = true
-version = "0.0.0"
-repository.workspace = true
-license.workspace = true
-
-[dependencies]
-fish-common.workspace = true
-fish-widecharwidth.workspace = true
-fish-widestring.workspace = true
-libc.workspace = true
-widestring.workspace = true
-
-[build-dependencies]
-fish-build-helper.workspace = true
-rsconf.workspace = true
-
-[lints]
-workspace = true
--- a/crates/fallback/build.rs
+++ b/crates/fallback/build.rs
@@ -1,5 +0,0 @@
-use fish_build_helper::target_os_is_cygwin;
-
-fn main() {
-    rsconf::declare_cfg("cygwin", target_os_is_cygwin());
-}
--- a/crates/gettext-extraction/Cargo.toml
+++ b/crates/gettext-extraction/Cargo.toml
@@ -4,18 +4,13 @@ edition.workspace = true
 rust-version.workspace = true
 version = "0.0.0"
 repository.workspace = true
-license.workspace = true
 description = "proc-macro for extracting strings for gettext translation"

 [lib]
 proc-macro = true

 [dependencies]
-fish-tempfile.workspace = true
 proc-macro2.workspace = true

-[build-dependencies]
-rsconf.workspace = true
-
 [lints]
 workspace = true
--- a/crates/gettext-extraction/build.rs
+++ b/crates/gettext-extraction/build.rs
@@ -1,3 +0,0 @@
-fn main() {
-    rsconf::rebuild_if_env_changed("FISH_GETTEXT_EXTRACTION_DIR");
-}
--- a/crates/gettext-extraction/src/lib.rs
+++ b/crates/gettext-extraction/src/lib.rs
@@ -1,7 +1,6 @@
 extern crate proc_macro;
-use fish_tempfile::random_filename;
 use proc_macro::TokenStream;
-use std::{ffi::OsString, io::Write, path::PathBuf};
+use std::{ffi::OsString, fs::OpenOptions, io::Write};

 fn unescape_multiline_rust_string(s: String) -> String {
    if !s.contains('\n') {
@@ -26,7 +25,7 @@ enum State {
            Escaped => match c {
                '\\' => {
                    unescaped.push('\\');
-                    state = Ground;
+                    state = Ground
                }
                '\n' => state = ContinuationLineLeadingWhitespace,
                _ => panic!("Unsupported escape sequence '\\{c}' in message string '{s}'"),
@@ -35,7 +34,7 @@ enum State {
                ' ' | '\t' => (),
                _ => {
                    unescaped.push(c);
-                    state = Ground;
+                    state = Ground
                }
            },
        }
@@ -43,22 +42,18 @@ enum State {
    unescaped
 }

-// Each entry is written to a fresh file to avoid race conditions arising when there are multiple
-// unsynchronized writers to the same file.
-fn write_po_entry_to_file(message: &TokenStream, dir: &OsString) {
+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 = unescape_multiline_rust_string(message.to_string());
-    assert!(
-        !message_string.contains('\n'),
-        "Gettext strings may not contain unescaped newlines. Unescaped newline found in '{message_string}'"
-    );
-    let msgid_without_quotes = &message_string[1..(message_string.len() - 1)];
-    // We don't want leading or trailing whitespace in our messages.
-    let trimmed_msgid = msgid_without_quotes.trim();
-    assert_eq!(msgid_without_quotes, trimmed_msgid);
-    assert!(!trimmed_msgid.starts_with("\\n"));
-    assert!(!trimmed_msgid.ends_with("\\n"));
-    assert!(!trimmed_msgid.starts_with("\\t"));
-    assert!(!trimmed_msgid.ends_with("\\t"));
+    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"
@@ -66,41 +61,35 @@ fn write_po_entry_to_file(message: &TokenStream, dir: &OsString) {
        ""
    };
    let po_entry = format!("{format_string_annotation}msgid {message_string}\nmsgstr \"\"\n\n");
-
-    let dir = PathBuf::from(dir);
-    let (path, result) =
-        fish_tempfile::create_file_with_retry(|| dir.join(random_filename(OsString::new())));
-    let mut file = result.unwrap_or_else(|e| {
-        panic!("Failed to create temporary file {path:?}:\n{e}");
-    });
    file.write_all(po_entry.as_bytes()).unwrap();
 }

 /// The `message` is passed through unmodified.
-/// If `FISH_GETTEXT_EXTRACTION_DIR` is defined in the environment,
-/// the message ID is written into a new file in this directory,
+/// 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_DIR` variable is set and `message` has an
+/// 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(dir_path) = std::env::var_os("FISH_GETTEXT_EXTRACTION_DIR") {
+    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.");
-        assert!(
-            token_trees.next().is_none(),
-            "Invalid number of tokens passed to gettext_extract. Expected one token, but got more."
-        );
+        if token_trees.next().is_some() {
+            panic!(
+                "Invalid number of tokens passed to gettext_extract. Expected one token, but got more."
+            )
+        }
        let proc_macro2::TokenTree::Group(group) = first_token else {
            panic!("Expected group in gettext_extract, but got: {first_token:?}");
        };
@@ -108,12 +97,13 @@ pub fn gettext_extract(message: TokenStream) -> TokenStream {
        let first_group_token = group_tokens
            .next()
            .expect("gettext_extract expected one group token but got none.");
-        assert!(
-            group_tokens.next().is_none(),
-            "Invalid number of tokens in group passed to gettext_extract. Expected one token, but got more."
-        );
+        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 {
-            write_po_entry_to_file(&message, &dir_path);
+            append_po_entry_to_file(&message, &file_path);
        } else {
            panic!("Expected literal in gettext_extract, but got: {first_group_token:?}");
        }
--- a/crates/gettext-maps/Cargo.toml
+++ b/crates/gettext-maps/Cargo.toml
@@ -4,7 +4,6 @@ edition.workspace = true
 rust-version.workspace = true
 version = "0.0.0"
 repository.workspace = true
-license.workspace = true

 [dependencies]
 phf.workspace = true
--- a/crates/gettext-maps/build.rs
+++ b/crates/gettext-maps/build.rs
@@ -11,11 +11,7 @@ fn main() {
        PathBuf::from(fish_build_helper::fish_build_dir()).join("fish-localization-map-cache");
    embed_localizations(&cache_dir);

-    fish_build_helper::rebuild_if_path_changed(
-        fish_build_helper::workspace_root()
-            .join("localization")
-            .join("po"),
-    );
+    fish_build_helper::rebuild_if_path_changed(fish_build_helper::workspace_root().join("po"));
 }

 fn embed_localizations(cache_dir: &Path) {
@@ -25,9 +21,7 @@ fn embed_localizations(cache_dir: &Path) {
        io::{BufWriter, Write},
    };

-    let po_dir = fish_build_helper::workspace_root()
-        .join("localization")
-        .join("po");
+    let po_dir = fish_build_helper::workspace_root().join("po");

    // Ensure that the directory is created, because clippy cannot compile the code if the
    // directory does not exist.
@@ -47,7 +41,7 @@ fn embed_localizations(cache_dir: &Path) {
                "Could not find msgfmt required to build message catalogs. \
                 Localization will not work. \
                 If you install gettext now, you need to trigger a rebuild to include localization support. \
-                 For example by running `touch localization/po` followed by the build command."
+                 For example by running `touch po` followed by the build command."
            );
        }
        Err(e) => {
@@ -91,7 +85,7 @@ fn embed_localizations(cache_dir: &Path) {
                    if cached_map_mtime > po_mtime {
                        // Cached map file is considered up-to-date.
                        continue;
-                    }
+                    };
                }

                // Generate the map file.
@@ -104,7 +98,7 @@ fn embed_localizations(cache_dir: &Path) {
                        cmd = cmd.arg("--check-format");
                    } else {
                        tmp_mo_file = Some(cache_dir.join("messages.mo"));
-                    }
+                    };
                    cmd.arg(format!(
                        "--output-file={}",
                        tmp_mo_file
@@ -115,11 +109,12 @@ fn embed_localizations(cache_dir: &Path) {
                    .output()
                    .unwrap()
                };
-                assert!(
-                    output.status.success(),
-                    "msgfmt failed:\n{}",
-                    String::from_utf8(output.stderr).unwrap()
-                );
+                if !output.status.success() {
+                    panic!(
+                        "msgfmt failed:\n{}",
+                        String::from_utf8(output.stderr).unwrap()
+                    );
+                }
                let mo_data =
                    tmp_mo_file.map_or(output.stdout, |path| std::fs::read(path).unwrap());

--- a/crates/gettext-mo-file-parser/Cargo.toml
+++ b/crates/gettext-mo-file-parser/Cargo.toml
@@ -4,7 +4,6 @@ edition.workspace = true
 rust-version.workspace = true
 version = "0.0.0"
 repository.workspace = true
-license.workspace = true

 [lints]
 workspace = true
--- a/crates/gettext-mo-file-parser/src/lib.rs
+++ b/crates/gettext-mo-file-parser/src/lib.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;

-const U32_SIZE: usize = size_of::<u32>();
+const U32_SIZE: usize = std::mem::size_of::<u32>();

 fn read_le_u32(bytes: &[u8]) -> u32 {
    u32::from_le_bytes(bytes[..U32_SIZE].try_into().unwrap())
@@ -47,12 +47,9 @@ fn check_if_revision_is_supported(revision: u32) -> std::io::Result<()> {
 }

 fn as_usize(value: u32) -> usize {
-    const {
-        assert!(size_of::<u32>() <= size_of::<usize>());
-    }
-
-    // SAFETY: `usize` is guaranteed to be at least as wide as `u32` by the const assert above.
-    unsafe { usize::try_from(value).unwrap_unchecked() }
+    use std::mem::size_of;
+    const _: () = assert!(size_of::<u32>() <= size_of::<usize>());
+    usize::try_from(value).unwrap()
 }

 fn parse_strings(
--- a/crates/gettext/Cargo.toml
+++ b/crates/gettext/Cargo.toml
@@ -1,14 +0,0 @@
-[package]
-name = "fish-gettext"
-edition.workspace = true
-rust-version.workspace = true
-version = "0.0.0"
-repository.workspace = true
-license.workspace = true
-
-[dependencies]
-fish-gettext-maps.workspace = true
-phf.workspace = true
-
-[lints]
-workspace = true
--- a/crates/gettext/src/lib.rs
+++ b/crates/gettext/src/lib.rs
@@ -1,60 +0,0 @@
-use fish_gettext_maps::CATALOGS;
-use std::{
-    collections::HashMap,
-    sync::{LazyLock, Mutex},
-};
-
-type Catalog = &'static phf::Map<&'static str, &'static str>;
-
-static LANGUAGE_PRECEDENCE: LazyLock<Mutex<Vec<(&'static str, Catalog)>>> =
-    LazyLock::new(|| Mutex::new(vec![]));
-
-pub fn gettext(message_str: &'static str) -> Option<&'static str> {
-    let language_precedence = LANGUAGE_PRECEDENCE.lock().unwrap();
-
-    // Use the localization from the highest-precedence language that has one available.
-    for (_, catalog) in language_precedence.iter() {
-        if let Some(localized_str) = catalog.get(message_str) {
-            return Some(localized_str);
-        }
-    }
-    None
-}
-
-#[derive(Clone, Copy)]
-pub struct GettextLocalizationLanguage {
-    language: &'static str,
-}
-
-static AVAILABLE_LANGUAGES: LazyLock<HashMap<&'static str, GettextLocalizationLanguage>> =
-    LazyLock::new(|| {
-        HashMap::from_iter(
-            CATALOGS
-                .entries()
-                .map(|(&language, _)| (language, GettextLocalizationLanguage { language })),
-        )
-    });
-
-pub fn get_available_languages() -> &'static HashMap<&'static str, GettextLocalizationLanguage> {
-    &AVAILABLE_LANGUAGES
-}
-
-pub fn set_language_precedence(new_precedence: &[GettextLocalizationLanguage]) {
-    let catalogs = new_precedence
-        .iter()
-        .map(|lang| {
-            (
-                lang.language,
-                *CATALOGS
-                    .get(lang.language)
-                    .expect("Only languages for which catalogs exist may be passed to gettext."),
-            )
-        })
-        .collect();
-    *LANGUAGE_PRECEDENCE.lock().unwrap() = catalogs;
-}
-
-pub fn get_language_precedence() -> Vec<&'static str> {
-    let language_precedence = LANGUAGE_PRECEDENCE.lock().unwrap();
-    language_precedence.iter().map(|&(lang, _)| lang).collect()
-}
--- a/crates/printf/Cargo.toml
+++ b/crates/printf/Cargo.toml
@@ -8,11 +8,10 @@ description = "printf implementation, based on musl"
 license = "MIT"

 [dependencies]
-assert_matches.workspace = true
 libc.workspace = true
+widestring = { workspace = true, optional = true }
 unicode-segmentation.workspace = true
 unicode-width.workspace = true
-widestring = { workspace = true, optional = true }

 [lints]
 workspace = true
--- a/crates/printf/src/arg.rs
+++ b/crates/printf/src/arg.rs
@@ -199,28 +199,27 @@ fn to_arg(self) -> Arg<'a> {
 #[cfg(test)]
 mod tests {
    use super::*;
-    use assert_matches::assert_matches;
    #[cfg(feature = "widestring")]
    use widestring::utf32str;

    #[test]
    fn test_to_arg() {
-        assert_matches!("test".to_arg(), Arg::Str("test"));
-        assert_matches!(String::from("test").to_arg(), Arg::Str(_));
+        assert!(matches!("test".to_arg(), Arg::Str("test")));
+        assert!(matches!(String::from("test").to_arg(), Arg::Str(_)));
        #[cfg(feature = "widestring")]
-        assert_matches!(utf32str!("test").to_arg(), Arg::WStr(_));
+        assert!(matches!(utf32str!("test").to_arg(), Arg::WStr(_)));
        #[cfg(feature = "widestring")]
-        assert_matches!(WString::from("test").to_arg(), Arg::WStr(_));
-        assert_matches!(42f32.to_arg(), Arg::Float(_));
-        assert_matches!(42f64.to_arg(), Arg::Float(_));
-        assert_matches!('x'.to_arg(), Arg::UInt(120));
+        assert!(matches!(WString::from("test").to_arg(), Arg::WStr(_)));
+        assert!(matches!(42f32.to_arg(), Arg::Float(_)));
+        assert!(matches!(42f64.to_arg(), Arg::Float(_)));
+        assert!(matches!('x'.to_arg(), Arg::UInt(120)));
        let mut usize_val: usize = 0;
-        assert_matches!((&mut usize_val).to_arg(), Arg::USizeRef(_));
-        assert_matches!(42i8.to_arg(), Arg::SInt(42));
-        assert_matches!(42i16.to_arg(), Arg::SInt(42));
-        assert_matches!(42i32.to_arg(), Arg::SInt(42));
-        assert_matches!(42i64.to_arg(), Arg::SInt(42));
-        assert_matches!(42isize.to_arg(), Arg::SInt(42));
+        assert!(matches!((&mut usize_val).to_arg(), Arg::USizeRef(_)));
+        assert!(matches!(42i8.to_arg(), Arg::SInt(42)));
+        assert!(matches!(42i16.to_arg(), Arg::SInt(42)));
+        assert!(matches!(42i32.to_arg(), Arg::SInt(42)));
+        assert!(matches!(42i64.to_arg(), Arg::SInt(42)));
+        assert!(matches!(42isize.to_arg(), Arg::SInt(42)));

        assert_eq!((-42i8).to_arg(), Arg::SInt(-42));
        assert_eq!((-42i16).to_arg(), Arg::SInt(-42));
@@ -228,14 +227,14 @@ fn test_to_arg() {
        assert_eq!((-42i64).to_arg(), Arg::SInt(-42));
        assert_eq!((-42isize).to_arg(), Arg::SInt(-42));

-        assert_matches!(42u8.to_arg(), Arg::UInt(42));
-        assert_matches!(42u16.to_arg(), Arg::UInt(42));
-        assert_matches!(42u32.to_arg(), Arg::UInt(42));
-        assert_matches!(42u64.to_arg(), Arg::UInt(42));
-        assert_matches!(42usize.to_arg(), Arg::UInt(42));
+        assert!(matches!(42u8.to_arg(), Arg::UInt(42)));
+        assert!(matches!(42u16.to_arg(), Arg::UInt(42)));
+        assert!(matches!(42u32.to_arg(), Arg::UInt(42)));
+        assert!(matches!(42u64.to_arg(), Arg::UInt(42)));
+        assert!(matches!(42usize.to_arg(), Arg::UInt(42)));

-        let ptr = std::ptr::from_ref(&42f32);
-        assert_matches!(ptr.to_arg(), Arg::UInt(_));
+        let ptr = &42f32 as *const f32;
+        assert!(matches!(ptr.to_arg(), Arg::UInt(_)));
    }

    #[test]
--- a/crates/printf/src/fmt_fp/decimal.rs
+++ b/crates/printf/src/fmt_fp/decimal.rs
@@ -266,7 +266,7 @@ fn should_round_up(&self, digit_idx: i32, remainder: u32, mod_base: u32) -> bool
        if rounding_digit & 1 != 0 {
            round += 2.0;
            // round now has an odd lsb (though round itself is even).
-            debug_assert_ne!(round.to_bits() & 1, 0);
+            debug_assert!(round.to_bits() & 1 != 0);
        }

        // Set 'small' to a value which is less than halfway, exactly halfway, or more than halfway
--- a/crates/printf/src/fmt_fp/mod.rs
+++ b/crates/printf/src/fmt_fp/mod.rs
@@ -4,7 +4,6 @@

 use super::locale::Locale;
 use super::printf_impl::{ConversionSpec, Error, ModifierFlags, pad};
-use assert_matches::debug_assert_matches;
 use decimal::{DIGIT_WIDTH, Decimal, DigitLimit};
 use std::cmp::min;
 use std::fmt::Write;
@@ -130,10 +129,10 @@ pub(crate) fn format_float(
 ) -> Result<usize, Error> {
    // Only float conversions are expected.
    type CS = ConversionSpec;
-    debug_assert_matches!(
+    debug_assert!(matches!(
        conv_spec,
        CS::e | CS::E | CS::f | CS::F | CS::g | CS::G | CS::a | CS::A
-    );
+    ));
    let prefix = match (y.is_sign_negative(), flags.mark_pos, flags.pad_pos) {
        (true, _, _) => "-",
        (false, true, _) => "+",
--- a/crates/printf/src/lib.rs
+++ b/crates/printf/src/lib.rs
@@ -84,7 +84,7 @@ macro_rules! sprintf {
 ///
 /// let result = printf_c_locale(&mut output, fmt, &mut args);
 ///
-/// assert_eq!(result, Ok(10));
+/// assert!(result == Ok(10));
 /// assert_eq!(output, "1.2346e+05");
 /// ```
 pub fn printf_c_locale(
--- a/crates/printf/src/printf_impl.rs
+++ b/crates/printf/src/printf_impl.rs
@@ -2,7 +2,6 @@
 use super::arg::Arg;
 use super::fmt_fp::format_float;
 use super::locale::Locale;
-use assert_matches::assert_matches;
 use std::fmt::{self, Write};
 use std::mem;
 use std::result::Result;
@@ -58,7 +57,7 @@ fn try_set(&mut self, c: char) -> bool {
            '+' => self.mark_pos = true,
            '\'' => self.grouped = true,
            _ => return false,
-        }
+        };
        true
    }
 }
@@ -302,7 +301,7 @@ pub(super) fn pad(
    min_width: usize,
    current_width: usize,
 ) -> fmt::Result {
-    assert_matches!(c, '0' | ' ');
+    assert!(c == '0' || c == ' ');
    if current_width >= min_width {
        return Ok(());
    }
@@ -342,7 +341,7 @@ pub(super) fn pad(
 ///
 /// let result = sprintf_locale(&mut output, fmt, &locale::EN_US_LOCALE, &mut args);
 ///
-/// assert_eq!(result, Ok(12));
+/// assert!(result == Ok(12));
 /// assert_eq!(output, "1,234,567.89");
 /// ```
 pub fn sprintf_locale(
@@ -372,7 +371,7 @@ pub fn sprintf_locale(
        }

        // Consume the % at the start of the format specifier.
-        debug_assert_eq!(s.at(0), Some('%'));
+        debug_assert!(s.at(0) == Some('%'));
        s.advance_by(1);

        // Read modifier flags. '-' and '0' flags are mutually exclusive.
@@ -562,7 +561,7 @@ pub fn sprintf_locale(
        };
        // Numeric output should be empty iff the value is 0.
        if spec_is_numeric && body.is_empty() {
-            debug_assert_eq!(arg.as_uint().unwrap(), 0);
+            debug_assert!(arg.as_uint().unwrap() == 0);
        }

        // Decide if we want to apply thousands grouping to the body, and compute its size.
--- a/crates/printf/src/tests.rs
+++ b/crates/printf/src/tests.rs
@@ -1,6 +1,7 @@
 use crate::arg::ToArg;
 use crate::locale::{C_LOCALE, EN_US_LOCALE, Locale};
 use crate::{Error, FormatString, sprintf_locale};
+use libc::c_char;
 use std::f64::consts::{E, PI, TAU};
 use std::ffi::CStr;
 use std::fmt;
@@ -861,8 +862,8 @@ fn test_float_hex_prec() {
    let mut libc_sprintf = libc_sprintf_one_float_with_precision(&mut c_storage, c"%.*a");

    let mut failed = false;
-    for sign in [1.0, -1.0] {
-        for mut v in [0.0, 0.5, 1.0, 1.5, PI, TAU, E] {
+    for sign in [1.0, -1.0].into_iter() {
+        for mut v in [0.0, 0.5, 1.0, 1.5, PI, TAU, E].into_iter() {
            v *= sign;
            for preci in 1..=200_usize {
                rust_str.clear();
@@ -889,16 +890,10 @@ fn libc_sprintf_one_float_with_precision<'a>(
    fmt: &'a CStr,
 ) -> impl FnMut(usize, f64) -> &'a str {
    |preci, float_val| unsafe {
-        let storage_ptr = storage.as_mut_ptr();
-        let len = libc::snprintf(
-            storage_ptr.cast(),
-            storage.len(),
-            fmt.as_ptr(),
-            preci,
-            float_val,
-        );
+        let storage_ptr = storage.as_mut_ptr() as *mut c_char;
+        let len = libc::snprintf(storage_ptr, storage.len(), fmt.as_ptr(), preci, float_val);
        assert!(len >= 0);
-        let sl = std::slice::from_raw_parts(storage_ptr, len as usize);
+        let sl = std::slice::from_raw_parts(storage_ptr as *const u8, len as usize);
        std::str::from_utf8(sl).unwrap()
    }
 }
--- a/crates/tempfile/Cargo.toml
+++ b/crates/tempfile/Cargo.toml
@@ -4,11 +4,9 @@ edition.workspace = true
 rust-version.workspace = true
 version = "0.0.0"
 repository.workspace = true
-license.workspace = true

 [dependencies]
 nix = { workspace = true, features = ["fs", "feature"] }
-rand.workspace = true

 [lints]
 workspace = true
--- a/crates/tempfile/src/lib.rs
+++ b/crates/tempfile/src/lib.rs
@@ -1,11 +1,4 @@
-use std::{
-    ffi::OsString,
-    fs::{File, OpenOptions},
-    io::ErrorKind,
-    path::PathBuf,
-};
-
-use rand::distr::{Alphanumeric, Distribution};
+use std::{fs::File, path::PathBuf};

 pub struct TempFile {
    file: File,
@@ -48,56 +41,20 @@ fn drop(&mut self) {
    }
 }

-/// Creates a random filename with the given prefix.
-/// Appends a random sequence of alphanumeric ASCII characters.
-pub fn random_filename(mut prefix: OsString) -> OsString {
-    let mut rng = rand::rng();
-    let suffix_length = 10;
-    let random_part: String = Alphanumeric
-        .sample_iter(&mut rng)
-        .take(suffix_length)
-        .map(char::from)
-        .collect();
-    assert_eq!(random_part.len(), suffix_length);
-    prefix.push(random_part);
-    prefix
+fn get_tmpdir() -> PathBuf {
+    PathBuf::from(std::env::var_os("TMPDIR").unwrap_or("/tmp".into()))
 }

-/// Tries to create a new file at the path returned by `generate_path`.
-/// If a file already exists at this path, `generate_path` will be called again and file creation
-/// will be retried. This is repeated until a new file is created, or an error occurs.
-pub fn create_file_with_retry(
-    generate_path: impl Fn() -> PathBuf,
-) -> (PathBuf, std::io::Result<File>) {
-    loop {
-        let path = generate_path();
-        match OpenOptions::new()
-            .read(true)
-            .write(true)
-            .create_new(true)
-            .open(&path)
-        {
-            Ok(file) => {
-                return (path, Ok(file));
-            }
-            Err(e) => {
-                if e.kind() != ErrorKind::AlreadyExists {
-                    return (path, Err(e));
-                }
-            }
-        }
-    }
+fn get_template() -> PathBuf {
+    get_tmpdir().join("fish_tmp_XXXXXX")
 }

-/// Tries to create a new temporary file in the operating system's default location for temporary
-/// files.
+/// Tries to create a new temporary file using `mkstemp`.
 /// On success, a [`TempFile`] is returned.
 /// When this struct is dropped, the backing file will be deleted.
 pub fn new_file() -> std::io::Result<TempFile> {
-    let (path, result) = create_file_with_retry(|| {
-        std::env::temp_dir().join(random_filename(OsString::from("fish_tmp_")))
-    });
-    let file = result?;
+    let (fd, path) = nix::unistd::mkstemp(&get_template())?;
+    let file = File::from(fd);
    Ok(TempFile { file, path })
 }

@@ -105,8 +62,7 @@ pub fn new_file() -> std::io::Result<TempFile> {
 /// On success, a [`TempDir`] is returned.
 /// When this struct is dropped, the backing directory, including all its contents, will be deleted.
 pub fn new_dir() -> std::io::Result<TempDir> {
-    let template = std::env::temp_dir().join("fish_tmp_XXXXXX");
-    let path = nix::unistd::mkdtemp(&template)?;
+    let path = nix::unistd::mkdtemp(&get_template())?;
    Ok(TempDir { path })
 }

--- a/crates/util/Cargo.toml
+++ b/crates/util/Cargo.toml
@@ -1,14 +0,0 @@
-[package]
-name = "fish-util"
-edition.workspace = true
-rust-version.workspace = true
-version = "0.0.0"
-repository.workspace = true
-license.workspace = true
-
-[dependencies]
-fish-widestring.workspace = true
-rand.workspace = true
-
-[lints]
-workspace = true
--- a/crates/wcstringutil/Cargo.toml
+++ b/crates/wcstringutil/Cargo.toml
@@ -1,21 +0,0 @@
-[package]
-name = "fish-wcstringutil"
-edition.workspace = true
-rust-version.workspace = true
-version = "0.0.0"
-repository.workspace = true
-license.workspace = true
-
-[dependencies]
-fish-common.workspace = true
-fish-fallback.workspace = true
-fish-widestring.workspace = true
-
-# Only needed for cygwin detection.
-# TODO(MSRV>=1.86): remove
-[build-dependencies]
-fish-build-helper.workspace = true
-rsconf.workspace = true
-
-[lints]
-workspace = true
--- a/crates/wcstringutil/build.rs
+++ b/crates/wcstringutil/build.rs
@@ -1,3 +0,0 @@
-fn main() {
-    rsconf::declare_cfg("cygwin", fish_build_helper::target_os_is_cygwin());
-}
--- a/crates/wgetopt/Cargo.toml
+++ b/crates/wgetopt/Cargo.toml
@@ -1,15 +0,0 @@
-[package]
-name = "fish-wgetopt"
-edition.workspace = true
-rust-version.workspace = true
-version = "0.0.0"
-repository.workspace = true
-license.workspace = true
-
-[dependencies]
-assert_matches.workspace = true
-fish-wcstringutil.workspace = true
-fish-widestring.workspace = true
-
-[lints]
-workspace = true
--- a/crates/widecharwidth/Cargo.toml
+++ b/crates/widecharwidth/Cargo.toml
@@ -1,10 +0,0 @@
-[package]
-name = "fish-widecharwidth"
-edition.workspace = true
-rust-version.workspace = true
-version = "0.0.0"
-repository.workspace = true
-license = "CC0-1.0"
-
-[lints]
-workspace = true
--- a/crates/widestring/Cargo.toml
+++ b/crates/widestring/Cargo.toml
@@ -1,13 +0,0 @@
-[package]
-name = "fish-widestring"
-edition.workspace = true
-rust-version.workspace = true
-version = "0.0.0"
-repository.workspace = true
-license.workspace = true
-
-[dependencies]
-widestring.workspace = true
-
-[lints]
-workspace = true
--- a/crates/widestring/src/word_char.rs
+++ b/crates/widestring/src/word_char.rs
@@ -1,391 +0,0 @@
-//! Support for character classification for vi-mode word movements
-
-use std::{cmp::Ordering, ops::RangeInclusive};
-
-/// Character class for word movements
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum WordCharClass {
-    Blank,       // whitespace
-    Newline,     // newline
-    Punctuation, // punctuation and symbols
-    Word,        // word character
-    Emoji,       // emoji
-    Superscript, // superscript (U+2070-U+207F)
-    Subscript,   // subscript (U+2080-U+2094)
-    Braille,     // braille (U+2800-U+28FF)
-    Hiragana,    // Hiragana (U+3040-U+309F)
-    Katakana,    // Katakana (U+30A0-U+30FF)
-    Cjk,         // CJK Ideographs
-    Hangul,      // Hangul Syllables
-}
-
-pub fn is_blank(c: char) -> bool {
-    WordCharClass::from_char(c) == WordCharClass::Blank
-}
-
-impl WordCharClass {
-    /// Reference: <https://github.com/vim/vim/blob/48940d94/src/mbyte.c#L2866-L2982>
-    pub fn from_char(c: char) -> Self {
-        // Quick check for Latin1 characters
-        if u32::from(c) < 0x100 {
-            // newline
-            if c == '\n' {
-                return WordCharClass::Newline;
-            }
-            // space, tab, NUL, or non-breaking space
-            if matches!(c, ' ' | '\t' | '\0' | '\u{a0}' /* NBSP */) {
-                return WordCharClass::Blank;
-            }
-            if is_latin1_word_char(c) {
-                return WordCharClass::Word;
-            }
-            return WordCharClass::Punctuation;
-        }
-
-        // emoji check
-        if is_emoji(c) {
-            return WordCharClass::Emoji;
-        }
-
-        // binary search in table
-        CLASSES
-            .binary_search_by(|interval| compare_range_to_char(&interval.range, c))
-            .map_or(
-                // most other characters are "word" characters
-                WordCharClass::Word,
-                |i| CLASSES[i].class,
-            )
-    }
-}
-
-/// Check if codepoint is a word character (alphanumeric)
-/// Note: Different from vim default behavior, we do not regard underscore as a word character!
-fn is_latin1_word_char(c: char) -> bool {
-    c.is_ascii_alphanumeric() || (matches!( c, | 'À'..='ÿ') && c != '×' && c != '÷')
-}
-
-fn compare_range_to_char(range: &RangeInclusive<char>, c: char) -> Ordering {
-    if *range.end() < c {
-        Ordering::Less
-    } else if *range.start() > c {
-        Ordering::Greater
-    } else {
-        Ordering::Equal
-    }
-}
-
-/// Check if codepoint is in emoji table using binary search (like vim's intable)
-fn is_emoji(c: char) -> bool {
-    EMOJI_ALL
-        .binary_search_by(|range| compare_range_to_char(range, c))
-        .is_ok()
-}
-
-/// Character class interval
-struct ClassInterval {
-    range: RangeInclusive<char>,
-    class: WordCharClass,
-}
-
-impl ClassInterval {
-    const fn new(range: RangeInclusive<char>, class: WordCharClass) -> Self {
-        Self { range, class }
-    }
-
-    const fn single(c: char, class: WordCharClass) -> Self {
-        Self::new(c..=c, class)
-    }
-}
-
-/// Character classification table (sorted non-overlapping intervals)
-/// Reference: <https://github.com/vim/vim/blob/48940d94/src/mbyte.c#L2867-L2948>
-static CLASSES: &[ClassInterval] = {
-    use ClassInterval as I;
-    use WordCharClass::*;
-    &[
-        I::single('\u{037e}', Punctuation), // Greek question mark
-        I::single('\u{0387}', Punctuation), // Greek ano teleia
-        I::new('\u{055a}'..='\u{055f}', Punctuation), // Armenian punctuation
-        I::single('\u{0589}', Punctuation), // Armenian full stop
-        I::single('\u{05be}', Punctuation),
-        I::single('\u{05c0}', Punctuation),
-        I::single('\u{05c3}', Punctuation),
-        I::new('\u{05f3}'..='\u{05f4}', Punctuation),
-        I::single('\u{060c}', Punctuation),
-        I::single('\u{061b}', Punctuation),
-        I::single('\u{061f}', Punctuation),
-        I::new('\u{066a}'..='\u{066d}', Punctuation),
-        I::single('\u{06d4}', Punctuation),
-        I::new('\u{0700}'..='\u{070d}', Punctuation), // Syriac punctuation
-        I::new('\u{0964}'..='\u{0965}', Punctuation),
-        I::single('\u{0970}', Punctuation),
-        I::single('\u{0df4}', Punctuation),
-        I::single('\u{0e4f}', Punctuation),
-        I::new('\u{0e5a}'..='\u{0e5b}', Punctuation),
-        I::new('\u{0f04}'..='\u{0f12}', Punctuation),
-        I::new('\u{0f3a}'..='\u{0f3d}', Punctuation),
-        I::single('\u{0f85}', Punctuation),
-        I::new('\u{104a}'..='\u{104f}', Punctuation), // Myanmar punctuation
-        I::single('\u{10fb}', Punctuation),           // Georgian punctuation
-        I::new('\u{1361}'..='\u{1368}', Punctuation), // Ethiopic punctuation
-        I::new('\u{166d}'..='\u{166e}', Punctuation), // Canadian Syl. punctuation
-        I::single('\u{1680}', Blank),
-        I::new('\u{169b}'..='\u{169c}', Punctuation),
-        I::new('\u{16eb}'..='\u{16ed}', Punctuation),
-        I::new('\u{1735}'..='\u{1736}', Punctuation),
-        I::new('\u{17d4}'..='\u{17dc}', Punctuation), // Khmer punctuation
-        I::new('\u{1800}'..='\u{180a}', Punctuation), // Mongolian punctuation
-        I::new('\u{2000}'..='\u{200b}', Blank),       // spaces
-        I::new('\u{200c}'..='\u{2027}', Punctuation), // punctuation and symbols
-        I::new('\u{2028}'..='\u{2029}', Blank),
-        I::new('\u{202a}'..='\u{202e}', Punctuation), // punctuation and symbols
-        I::single('\u{202f}', Blank),
-        I::new('\u{2030}'..='\u{205e}', Punctuation), // punctuation and symbols
-        I::single('\u{205f}', Blank),
-        I::new('\u{2060}'..='\u{206f}', Punctuation), // punctuation and symbols
-        I::new('\u{2070}'..='\u{207f}', Superscript),
-        I::new('\u{2080}'..='\u{2094}', Subscript),
-        I::new('\u{20a0}'..='\u{27ff}', Punctuation), // all kinds of symbols
-        I::new('\u{2800}'..='\u{28ff}', Braille),
-        I::new('\u{2900}'..='\u{2998}', Punctuation), // arrows, brackets, etc.
-        I::new('\u{29d8}'..='\u{29db}', Punctuation),
-        I::new('\u{29fc}'..='\u{29fd}', Punctuation),
-        I::new('\u{2e00}'..='\u{2e7f}', Punctuation), // supplemental punctuation
-        I::single('\u{3000}', Blank),                 // ideographic space
-        I::new('\u{3001}'..='\u{3020}', Punctuation), // ideographic punctuation
-        I::single('\u{3030}', Punctuation),
-        I::single('\u{303d}', Punctuation),
-        I::new('\u{3040}'..='\u{309f}', Hiragana),
-        I::new('\u{30a0}'..='\u{30ff}', Katakana),
-        I::new('\u{3300}'..='\u{9fff}', Cjk),
-        I::new('\u{ac00}'..='\u{d7a3}', Hangul),
-        I::new('\u{f900}'..='\u{faff}', Cjk),
-        I::new('\u{fd3e}'..='\u{fd3f}', Punctuation),
-        I::new('\u{fe30}'..='\u{fe6b}', Punctuation), // punctuation forms
-        I::new('\u{ff00}'..='\u{ff0f}', Punctuation), // half/fullwidth ASCII
-        I::new('\u{ff1a}'..='\u{ff20}', Punctuation), // half/fullwidth ASCII
-        I::new('\u{ff3b}'..='\u{ff40}', Punctuation), // half/fullwidth ASCII
-        I::new('\u{ff5b}'..='\u{ff65}', Punctuation), // half/fullwidth ASCII
-        I::new('\u{1d000}'..='\u{1d24f}', Punctuation), // Musical notation
-        I::new('\u{1d400}'..='\u{1d7ff}', Punctuation), // Mathematical Alphanumeric Symbols
-        I::new('\u{1f000}'..='\u{1f2ff}', Punctuation), // Game pieces; enclosed characters
-        I::new('\u{1f300}'..='\u{1f9ff}', Punctuation), // Many symbol blocks
-        I::new('\u{20000}'..='\u{2a6df}', Cjk),
-        I::new('\u{2a700}'..='\u{2b73f}', Cjk),
-        I::new('\u{2b740}'..='\u{2b81f}', Cjk),
-        I::new('\u{2f800}'..='\u{2fa1f}', Cjk),
-    ]
-};
-
-/// Reference: <https://github.com/vim/vim/blob/48940d94/src/mbyte.c#L2704-L2852>
-static EMOJI_ALL: &[RangeInclusive<char>] = &[
-    '\u{203c}'..='\u{203c}',
-    '\u{2049}'..='\u{2049}',
-    '\u{2122}'..='\u{2122}',
-    '\u{2139}'..='\u{2139}',
-    '\u{2194}'..='\u{2199}',
-    '\u{21a9}'..='\u{21aa}',
-    '\u{231a}'..='\u{231b}',
-    '\u{2328}'..='\u{2328}',
-    '\u{23cf}'..='\u{23cf}',
-    '\u{23e9}'..='\u{23f3}',
-    '\u{23f8}'..='\u{23fa}',
-    '\u{24c2}'..='\u{24c2}',
-    '\u{25aa}'..='\u{25ab}',
-    '\u{25b6}'..='\u{25b6}',
-    '\u{25c0}'..='\u{25c0}',
-    '\u{25fb}'..='\u{25fe}',
-    '\u{2600}'..='\u{2604}',
-    '\u{260e}'..='\u{260e}',
-    '\u{2611}'..='\u{2611}',
-    '\u{2614}'..='\u{2615}',
-    '\u{2618}'..='\u{2618}',
-    '\u{261d}'..='\u{261d}',
-    '\u{2620}'..='\u{2620}',
-    '\u{2622}'..='\u{2623}',
-    '\u{2626}'..='\u{2626}',
-    '\u{262a}'..='\u{262a}',
-    '\u{262e}'..='\u{262f}',
-    '\u{2638}'..='\u{263a}',
-    '\u{2640}'..='\u{2640}',
-    '\u{2642}'..='\u{2642}',
-    '\u{2648}'..='\u{2653}',
-    '\u{265f}'..='\u{2660}',
-    '\u{2663}'..='\u{2663}',
-    '\u{2665}'..='\u{2666}',
-    '\u{2668}'..='\u{2668}',
-    '\u{267b}'..='\u{267b}',
-    '\u{267e}'..='\u{267f}',
-    '\u{2692}'..='\u{2697}',
-    '\u{2699}'..='\u{2699}',
-    '\u{269b}'..='\u{269c}',
-    '\u{26a0}'..='\u{26a1}',
-    '\u{26a7}'..='\u{26a7}',
-    '\u{26aa}'..='\u{26ab}',
-    '\u{26b0}'..='\u{26b1}',
-    '\u{26bd}'..='\u{26be}',
-    '\u{26c4}'..='\u{26c5}',
-    '\u{26c8}'..='\u{26c8}',
-    '\u{26ce}'..='\u{26cf}',
-    '\u{26d1}'..='\u{26d1}',
-    '\u{26d3}'..='\u{26d4}',
-    '\u{26e9}'..='\u{26ea}',
-    '\u{26f0}'..='\u{26f5}',
-    '\u{26f7}'..='\u{26fa}',
-    '\u{26fd}'..='\u{26fd}',
-    '\u{2702}'..='\u{2702}',
-    '\u{2705}'..='\u{2705}',
-    '\u{2708}'..='\u{270d}',
-    '\u{270f}'..='\u{270f}',
-    '\u{2712}'..='\u{2712}',
-    '\u{2714}'..='\u{2714}',
-    '\u{2716}'..='\u{2716}',
-    '\u{271d}'..='\u{271d}',
-    '\u{2721}'..='\u{2721}',
-    '\u{2728}'..='\u{2728}',
-    '\u{2733}'..='\u{2734}',
-    '\u{2744}'..='\u{2744}',
-    '\u{2747}'..='\u{2747}',
-    '\u{274c}'..='\u{274c}',
-    '\u{274e}'..='\u{274e}',
-    '\u{2753}'..='\u{2755}',
-    '\u{2757}'..='\u{2757}',
-    '\u{2763}'..='\u{2764}',
-    '\u{2795}'..='\u{2797}',
-    '\u{27a1}'..='\u{27a1}',
-    '\u{27b0}'..='\u{27b0}',
-    '\u{27bf}'..='\u{27bf}',
-    '\u{2934}'..='\u{2935}',
-    '\u{2b05}'..='\u{2b07}',
-    '\u{2b1b}'..='\u{2b1c}',
-    '\u{2b50}'..='\u{2b50}',
-    '\u{2b55}'..='\u{2b55}',
-    '\u{3030}'..='\u{3030}',
-    '\u{303d}'..='\u{303d}',
-    '\u{3297}'..='\u{3297}',
-    '\u{3299}'..='\u{3299}',
-    '\u{1f004}'..='\u{1f004}',
-    '\u{1f0cf}'..='\u{1f0cf}',
-    '\u{1f170}'..='\u{1f171}',
-    '\u{1f17e}'..='\u{1f17f}',
-    '\u{1f18e}'..='\u{1f18e}',
-    '\u{1f191}'..='\u{1f19a}',
-    '\u{1f1e6}'..='\u{1f1ff}',
-    '\u{1f201}'..='\u{1f202}',
-    '\u{1f21a}'..='\u{1f21a}',
-    '\u{1f22f}'..='\u{1f22f}',
-    '\u{1f232}'..='\u{1f23a}',
-    '\u{1f250}'..='\u{1f251}',
-    '\u{1f300}'..='\u{1f321}',
-    '\u{1f324}'..='\u{1f393}',
-    '\u{1f396}'..='\u{1f397}',
-    '\u{1f399}'..='\u{1f39b}',
-    '\u{1f39e}'..='\u{1f3f0}',
-    '\u{1f3f3}'..='\u{1f3f5}',
-    '\u{1f3f7}'..='\u{1f4fd}',
-    '\u{1f4ff}'..='\u{1f53d}',
-    '\u{1f549}'..='\u{1f54e}',
-    '\u{1f550}'..='\u{1f567}',
-    '\u{1f56f}'..='\u{1f570}',
-    '\u{1f573}'..='\u{1f57a}',
-    '\u{1f587}'..='\u{1f587}',
-    '\u{1f58a}'..='\u{1f58d}',
-    '\u{1f590}'..='\u{1f590}',
-    '\u{1f595}'..='\u{1f596}',
-    '\u{1f5a4}'..='\u{1f5a5}',
-    '\u{1f5a8}'..='\u{1f5a8}',
-    '\u{1f5b1}'..='\u{1f5b2}',
-    '\u{1f5bc}'..='\u{1f5bc}',
-    '\u{1f5c2}'..='\u{1f5c4}',
-    '\u{1f5d1}'..='\u{1f5d3}',
-    '\u{1f5dc}'..='\u{1f5de}',
-    '\u{1f5e1}'..='\u{1f5e1}',
-    '\u{1f5e3}'..='\u{1f5e3}',
-    '\u{1f5e8}'..='\u{1f5e8}',
-    '\u{1f5ef}'..='\u{1f5ef}',
-    '\u{1f5f3}'..='\u{1f5f3}',
-    '\u{1f5fa}'..='\u{1f64f}',
-    '\u{1f680}'..='\u{1f6c5}',
-    '\u{1f6cb}'..='\u{1f6d2}',
-    '\u{1f6d5}'..='\u{1f6d7}',
-    '\u{1f6dc}'..='\u{1f6e5}',
-    '\u{1f6e9}'..='\u{1f6e9}',
-    '\u{1f6eb}'..='\u{1f6ec}',
-    '\u{1f6f0}'..='\u{1f6f0}',
-    '\u{1f6f3}'..='\u{1f6fc}',
-    '\u{1f7e0}'..='\u{1f7eb}',
-    '\u{1f7f0}'..='\u{1f7f0}',
-    '\u{1f90c}'..='\u{1f93a}',
-    '\u{1f93c}'..='\u{1f945}',
-    '\u{1f947}'..='\u{1f9ff}',
-    '\u{1fa70}'..='\u{1fa7c}',
-    '\u{1fa80}'..='\u{1fa88}',
-    '\u{1fa90}'..='\u{1fabd}',
-    '\u{1fabf}'..='\u{1fac5}',
-    '\u{1face}'..='\u{1fadb}',
-    '\u{1fae0}'..='\u{1fae8}',
-    '\u{1faf0}'..='\u{1faf8}',
-];
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_blank() {
-        assert_eq!(WordCharClass::from_char(' '), WordCharClass::Blank); // space
-        assert_eq!(WordCharClass::from_char('\t'), WordCharClass::Blank); // tab
-        assert_eq!(WordCharClass::from_char('\0'), WordCharClass::Blank); // NUL
-        assert_eq!(WordCharClass::from_char('\u{a0}'), WordCharClass::Blank); // non-breaking space
-        assert_eq!(WordCharClass::from_char('\u{3000}'), WordCharClass::Blank); // ideographic space
-    }
-
-    #[test]
-    fn test_word() {
-        assert_eq!(WordCharClass::from_char('a'), WordCharClass::Word); // 'a'
-        assert_eq!(WordCharClass::from_char('Z'), WordCharClass::Word); // 'Z'
-        assert_eq!(WordCharClass::from_char('0'), WordCharClass::Word); // '0'
-        assert_eq!(WordCharClass::from_char('e'), WordCharClass::Word); // 'e' with acute
-    }
-
-    #[test]
-    fn test_punctuation() {
-        assert_eq!(WordCharClass::from_char('.'), WordCharClass::Punctuation);
-        assert_eq!(WordCharClass::from_char(','), WordCharClass::Punctuation);
-        assert_eq!(WordCharClass::from_char(';'), WordCharClass::Punctuation);
-        assert_eq!(WordCharClass::from_char('，'), WordCharClass::Punctuation); // ideographic comma
-        assert_eq!(WordCharClass::from_char('_'), WordCharClass::Punctuation);
-    }
-
-    #[test]
-    fn test_cjk() {
-        assert_eq!(WordCharClass::from_char('中'), WordCharClass::Cjk); // CJK character
-        assert_eq!(WordCharClass::from_char('𠀀'), WordCharClass::Cjk); // CJK Extension B
-    }
-
-    #[test]
-    fn test_japanese() {
-        assert_eq!(WordCharClass::from_char('あ'), WordCharClass::Hiragana);
-        assert_eq!(WordCharClass::from_char('ア'), WordCharClass::Katakana);
-    }
-
-    #[test]
-    fn test_hangul() {
-        assert_eq!(WordCharClass::from_char('한'), WordCharClass::Hangul);
-    }
-
-    #[test]
-    fn test_emoji() {
-        assert_eq!(WordCharClass::from_char('😀'), WordCharClass::Emoji); // grinning face
-        assert_eq!(WordCharClass::from_char('🚀'), WordCharClass::Emoji); // rocket
-        assert_eq!(WordCharClass::from_char('❤'), WordCharClass::Emoji); // red heart
-        assert_eq!(WordCharClass::from_char('✅'), WordCharClass::Emoji); // check mark
-    }
-
-    #[test]
-    fn test_special() {
-        assert_eq!(WordCharClass::from_char('⁰'), WordCharClass::Superscript); // superscript zero
-        assert_eq!(WordCharClass::from_char('₀'), WordCharClass::Subscript); // subscript zero
-        assert_eq!(WordCharClass::from_char('\u{2800}'), WordCharClass::Braille); // braille blank
-    }
-}
--- a/crates/xtask/Cargo.toml
+++ b/crates/xtask/Cargo.toml
@@ -1,11 +0,0 @@
-[package]
-name = "xtask"
-version = "0.0.0"
-rust-version.workspace = true
-edition.workspace = true
-repository.workspace = true
-
-[dependencies]
-clap.workspace = true
-fish-build-helper.workspace = true
-fish-tempfile.workspace = true
--- a/crates/xtask/src/lib.rs
+++ b/crates/xtask/src/lib.rs
@@ -1,28 +0,0 @@
-use std::{ffi::OsStr, process::Command};
-
-pub trait CommandExt {
-    fn run_or_panic(&mut self);
-}
-
-impl CommandExt for Command {
-    fn run_or_panic(&mut self) {
-        match self.status() {
-            Ok(exit_status) => {
-                if !exit_status.success() {
-                    panic!("Command did not run successfully: {:?}", self.get_program())
-                }
-            }
-            Err(err) => {
-                panic!("Failed to run command: {err}");
-            }
-        }
-    }
-}
-
-pub fn cargo<I, S>(cargo_args: I)
-where
-    I: IntoIterator<Item = S>,
-    S: AsRef<OsStr>,
-{
-    Command::new(env!("CARGO")).args(cargo_args).run_or_panic();
-}
--- a/crates/xtask/src/main.rs
+++ b/crates/xtask/src/main.rs
@@ -1,95 +0,0 @@
-use clap::{Parser, Subcommand};
-use fish_build_helper::as_os_strs;
-use std::{path::PathBuf, process::Command};
-use xtask::{CommandExt, cargo};
-
-#[derive(Parser)]
-#[command(
-    name = "cargo xtask",
-    about = "Wrapper for running various utilities",
-    arg_required_else_help(true)
-)]
-struct Cli {
-    #[command(subcommand)]
-    task: Task,
-}
-
-#[derive(Subcommand)]
-enum Task {
-    /// Run various checks on the repo.
-    Check,
-    /// Build HTML docs
-    HtmlDocs {
-        /// Path to a fish_indent executable. If none is specified, fish_indent will be built.
-        #[arg(long)]
-        fish_indent: Option<PathBuf>,
-    },
-    /// Build man pages
-    ManPages,
-}
-
-fn main() {
-    let cli = Cli::parse();
-    match cli.task {
-        Task::Check => run_checks(),
-        Task::HtmlDocs { fish_indent } => build_html_docs(fish_indent),
-        Task::ManPages => cargo(["build", "--package", "fish-build-man-pages"]),
-    }
-}
-
-fn run_checks() {
-    let repo_root_dir = fish_build_helper::workspace_root();
-    let check_script = repo_root_dir.join("build_tools").join("check.sh");
-    Command::new(check_script).run_or_panic();
-}
-
-fn build_html_docs(fish_indent: Option<PathBuf>) {
-    let fish_indent_path = fish_indent.unwrap_or_else(|| {
-        // Build fish_indent if no existing one is specified.
-        cargo([
-            "build",
-            "--bin",
-            "fish_indent",
-            "--profile",
-            "dev",
-            "--no-default-features",
-        ]);
-        fish_build_helper::fish_build_dir()
-            .join("debug")
-            .join("fish_indent")
-    });
-    // Set path so `sphinx-build` can find `fish_indent`.
-    // Create tempdir to store symlink to fish_indent.
-    // This is done to avoid adding other binaries to the PATH.
-    let tempdir = fish_tempfile::new_dir().unwrap();
-    std::os::unix::fs::symlink(
-        std::fs::canonicalize(fish_indent_path).unwrap(),
-        tempdir.path().join("fish_indent"),
-    )
-    .unwrap();
-    let new_path = format!(
-        "{}:{}",
-        tempdir.path().to_str().unwrap(),
-        fish_build_helper::env_var("PATH").unwrap()
-    );
-    let doc_src_dir = fish_build_helper::workspace_root().join("doc_src");
-    let doctrees_dir = fish_build_helper::fish_doc_dir().join(".doctrees-html");
-    let html_dir = fish_build_helper::fish_doc_dir().join("html");
-    let args = as_os_strs![
-        "-j",
-        "auto",
-        "-q",
-        "-b",
-        "html",
-        "-c",
-        &doc_src_dir,
-        "-d",
-        &doctrees_dir,
-        &doc_src_dir,
-        &html_dir,
-    ];
-    Command::new(option_env!("FISH_SPHINX").unwrap_or("sphinx-build"))
-        .env("PATH", new_path)
-        .args(args)
-        .run_or_panic();
-}
--- a/debian/compat
+++ b/debian/compat
@@ -0,0 +1 @@
+12
--- a/contrib/debian/control
+++ b/contrib/debian/control
@@ -3,31 +3,33 @@ Section: shells
 Priority: optional
 Maintainer: ridiculous_fish <corydoras@ridiculousfish.com>
 Uploaders: David Adam <zanchey@ucc.gu.uwa.edu.au>
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: debhelper (>= 12),
 # -web is for Debian's updated version, -X.Y is for Ubuntu's backported versions
 cargo (>= 1.85) | cargo-web (>= 1.85) | cargo-1.85,
 cmake (>= 3.15.0),
 gettext,
 libpcre2-dev,
 rustc (>= 1.85) | rustc-web (>= 1.85) | rustc-1.85,
- python3-sphinx,
 # Test dependencies
 locales-all,
- man-db,
+ ncurses-base,
 python3
-# 4.6.2 is Debian 12/Ubuntu Noble 24.04; Ubuntu Jammy is 4.6.0.1
-Standards-Version: 4.6.2
+Standards-Version: 4.1.5
 Homepage: https://fishshell.com/
 Vcs-Git: https://github.com/fish-shell/fish-shell.git
 Vcs-Browser: https://github.com/fish-shell/fish-shell

 Package: fish
 Architecture: any
-# for col and lock
-Depends: bsdextrautils,
+# for col and lock - bsdmainutils is required in Ubuntu focal
+Depends: bsdextrautils | bsdmainutils,
 file,
+# for the msgfmt command
+ gettext-base,
 # for man
 man-db,
+# for terminal definitions
+ ncurses-base,
 # for kill
 procps,
 python3 (>=3.5),
--- a/contrib/debian/copyright
+++ b/contrib/debian/copyright
@@ -17,11 +17,11 @@ Files: share/tools/web_config/js/alpine.js
 Copyright: 2019-2021 Caleb Porzio and contributors
 License: MIT

-Files: share/themes/Dracula.theme
+Files: share/tools/web_config/themes/Dracula.theme
 Copyright: 2018 Dracula Team
 License: MIT

-Files: share/themes/Nord.theme
+Files: share/tools/web_config/themes/Nord.theme
 Copyright: 2016-2024 Sven Greb
 License: MIT

@@ -34,7 +34,7 @@ Copyright: 1990-2007 Free Software Foundation, Inc.
           2022 fish-shell contributors
 License: GPL-2+

-Files: crates/wgetopt/src/wgetopt.rs
+Files: src/wgetopt.rs
 Copyright: 1989-1994 Free Software Foundation, Inc.
 License: LGPL-2+

--- a/contrib/debian/doc-base
+++ b/contrib/debian/doc-base
--- a/contrib/debian/docs
+++ b/contrib/debian/docs
--- a/contrib/debian/lintian-overrides
+++ b/contrib/debian/lintian-overrides
--- a/contrib/debian/postinst
+++ b/contrib/debian/postinst
--- a/contrib/debian/prerm
+++ b/contrib/debian/prerm
--- a/contrib/debian/rules
+++ b/contrib/debian/rules
@@ -1,11 +1,8 @@
 #!/usr/bin/make -f
 # -*- makefile -*-

-ifeq (,$(filter terse,$(DEB_BUILD_OPTIONS)))
-  export DH_VERBOSE=1
-  # VERBOSE to satisfy Debian policy 4.9, introduced in version 4.2.0
-  export CARGO_TERM_VERBOSE=true
-endif
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
 # The LTO profile sets CFLAGS/CXXFLAGS which confuse the compilation process; disable it
 # LTO is still performed by rustc based on Cargo.toml
 export DEB_BUILD_MAINT_OPTIONS=optimize=-lto
--- a/contrib/debian/source/format
+++ b/contrib/debian/source/format
--- a/deny.toml
+++ b/deny.toml
@@ -6,12 +6,9 @@ allow = [
    "BSD-2-Clause",
    "BSD-3-Clause",
    "BSL-1.0",
-    "CC0-1.0",
    "GPL-2.0",
-    "GPL-2.0-only",
    "ISC",
    "LGPL-2.0",
-    "LGPL-2.0-or-later",
    "MIT",
    "MPL-2.0",
    "PSF-2.0",
--- a/doc_internal/fish-riir-plan.md
+++ b/doc_internal/fish-riir-plan.md
@@ -31,7 +31,7 @@ The work will **proceed on master**: no long-lived branches. Tests and CI contin

 The Rust code will initially resemble the replaced C++. Fidelity to existing code is more important than Rust idiomaticity, to aid review and bisecting. But don't take this to extremes - use judgement.

-The port will proceed "outside in." We'll start with leaf components (e.g. builtins) and proceed towards the core. Some components will have both a Rust and C++ implementation (e.g. flog), in other cases we'll change the existing C++ to invoke the new Rust implementations (builtins).
+The port will proceed "outside in." We'll start with leaf components (e.g. builtins) and proceed towards the core. Some components will have both a Rust and C++ implementation (e.g. FLOG), in other cases we'll change the existing C++ to invoke the new Rust implementations (builtins).

 After porting the C++, we'll replace CMake.

--- a/doc_internal/rust-devel.md
+++ b/doc_internal/rust-devel.md
@@ -58,7 +58,7 @@ The basic development loop for this port:
   - Do this even if it results in less idiomatic Rust, but avoid being super-dogmatic either way.
   - One technique is to paste the C++ into the Rust code, commented out, and go line by line.
 4. Decide whether any existing C++ callers should invoke the Rust implementation, or whether we should keep the C++ one.
-   - Utility functions may have both a Rust and C++ implementation. An example is `flog` where interop is too hard.
+   - Utility functions may have both a Rust and C++ implementation. An example is `FLOG` where interop is too hard.
   - Major components (e.g. builtin implementations) should _not_ be duplicated; instead the Rust should call C++ or vice-versa.
 5. Remember to run `cargo fmt` and `cargo clippy` to keep the codebase somewhat clean (otherwise CI will fail). If you use rust-analyzer, you can run clippy automatically by setting `rust-analyzer.checkOnSave.command = "clippy"`.

@@ -93,7 +93,7 @@ None of the Rust string types are nul-terminated. We're taking this opportunity
 One may create a `&wstr` from a string literal using the `wchar::L!` macro:

 ```rust
-use crate::prelude::*;
+use crate::wchar::prelude::*;
 // This imports wstr, the L! macro, WString, a ToWString trait that supplies .to_wstring() along with other things

 fn get_shell_name() -> &'static wstr {
@@ -116,7 +116,7 @@ fn get_shell_name() -> &'static wstr {
 #### The wchar prelude

 We have a prelude to make working with these string types a whole lot more ergonomic. In particular `WExt` supplies the null-terminated-compatible `.char_at(usize)`,
-and a whole lot more methods that makes porting C++ code easier. It is also preferred to use char-based-methods like `.char_count()` and `.slice_{from,to}()`
+and a whole lot more methods that makes porting C++ code easier. It is also preferred to use char-based-methods like `.char_count()` and `.slice_{from,to}()` 
 of the `WExt` trait over directly calling `.len()` and `[usize..]/[..usize]`, as that makes the code compatible with a potential future change to UTF8-strings.

 ```rust
@@ -144,7 +144,7 @@ These types should be confined to the FFI modules, in particular `wchar_ffi`. Th

 ### Format strings

-Rust's builtin `std::fmt` modules do not accept runtime-provided format strings, so we mostly won't use them, except perhaps for flog / other non-translated text.
+Rust's builtin `std::fmt` modules do not accept runtime-provided format strings, so we mostly won't use them, except perhaps for FLOG / other non-translated text.

 Instead we'll continue to use printf-style strings, with a Rust printf implementation.

--- a/doc_src/cmds/_.rst
+++ b/doc_src/cmds/_.rst
@@ -23,8 +23,6 @@ If other programs launched via fish should respect these locale variables they h

 For :envvar:`LANGUAGE` you can use a list, or use colons to separate multiple languages.

-If the :ref:`status language set <status-language>` command was used, its arguments specify the language precedence, and the environment variables are ignored.
-
 Options
 -------

--- a/doc_src/cmds/abbr.rst
+++ b/doc_src/cmds/abbr.rst
@@ -10,7 +10,7 @@ Synopsis
                    [--set-cursor[=MARKER]] ([-f | --function FUNCTION] | EXPANSION)
    abbr --erase [ [-c | --command COMMAND]... ] NAME ...
    abbr --rename [ [-c | --command COMMAND]... ] OLD_WORD NEW_WORD
-    abbr [--show] [--color WHEN]
+    abbr --show
    abbr --list
    abbr --query NAME ...

@@ -46,7 +46,7 @@ Combining these features, it is possible to create custom syntaxes, where a regu

     > abbr >> ~/.config/fish/config.fish
     > abbr --erase (abbr --list)
-
+   
   Alternatively you can keep them in a separate :ref:`configuration file <configuration>` by doing something like the following::

     > abbr > ~/.config/fish/conf.d/myabbrs.fish
@@ -75,6 +75,7 @@ With **--set-cursor=MARKER**, the cursor is moved to the first occurrence of **M

 With **-f FUNCTION** or **--function FUNCTION**, **FUNCTION** is treated as the name of a fish function instead of a literal replacement. When the abbreviation matches, the function will be called with the matching token as an argument. If the function's exit status is 0 (success), the token will be replaced by the function's output; otherwise the token will be left unchanged. No **EXPANSION** may be given separately.

+
 Examples
 ########

--- a/doc_src/cmds/alias.rst
+++ b/doc_src/cmds/alias.rst
@@ -46,12 +46,12 @@ The following code will create ``rmi``, which runs ``rm`` with additional argume
 ::

    alias rmi="rm -i"
-
+    
    # This is equivalent to entering the following function:
    function rmi --wraps rm --description 'alias rmi=rm -i'
        rm -i $argv
    end
-
+    
 ``alias`` sometimes requires escaping, as you can see here::

    # This needs to have the spaces escaped or "Chrome.app..."
--- a/doc_src/cmds/begin.rst
+++ b/doc_src/cmds/begin.rst
@@ -33,10 +33,10 @@ The following code sets a number of variables inside of a block scope. Since the

    begin
        set -l PIRATE Yarrr
-
+    
        ...
    end
-
+    
    echo $PIRATE
    # This will not output anything, since the PIRATE variable
    # went out of scope at the end of the block
--- a/doc_src/cmds/bind.rst
+++ b/doc_src/cmds/bind.rst
@@ -6,8 +6,8 @@ Synopsis
 .. synopsis::

    bind [(-M | --mode) MODE] [(-m | --sets-mode) NEW_MODE] [--preset | --user] [-s | --silent] KEYS COMMAND ...
-    bind [(-M | --mode) MODE] [--preset] [--user] [--color WHEN] [KEYS]
-    bind [-a | --all] [--preset] [--user] [--color WHEN]
+    bind [(-M | --mode) MODE] [--preset] [--user] [KEYS]
+    bind [-a | --all] [--preset] [--user]
    bind (-f | --function-names)
    bind (-K | --key-names)
    bind (-L | --list-modes)
@@ -19,8 +19,8 @@ Description
 ``bind`` manages key bindings.

 If both ``KEYS`` and ``COMMAND`` are given, ``bind`` adds (or replaces) a binding in ``MODE``.
-If only ``KEYS`` is given, ``bind`` lists any existing bindings for those keys in ``MODE`` or in all modes.
-If no ``KEYS`` argument is provided, ``bind`` lists all bindings in ``MODE`` or in all modes.
+If only ``KEYS`` is given, any existing binding for those keys in the given ``MODE`` will be printed.
+If no ``KEYS`` argument is provided, all bindings (in the given ``MODE``) are printed.

 ``KEYS`` is a comma-separated list of key names.
 Modifier keys can be specified by prefixing a key name with a combination of ``ctrl-``, ``alt-``, ``shift-`` and ``super-`` (i.e. the "windows" or "command" key).
@@ -104,10 +104,6 @@ The following options are available:
 **-s** or **--silent**
    Silences some of the error messages, including for unknown key names and unbound sequences.

-**--color** *WHEN*
-    Controls when to use syntax highlighting colors when listing bindings.
-    *WHEN* can be ``auto`` (the default, colorize if the output :doc:`is a terminal <isatty>`), ``always``, or ``never``.
-
 **-h** or **--help**
    Displays help about using this command.

@@ -131,43 +127,32 @@ The following special input functions are available:
    move one character to the left, but do not trigger any non-movement-related operations. If the cursor is at the start of
    the commandline, does nothing. Does not change the selected item in the completion pager UI when shown.

+``backward-bigword``
+    move one whitespace-delimited word to the left
+
 ``backward-token``
    move one argument to the left

 ``backward-delete-char``
    deletes one character of input to the left of the cursor

+``backward-kill-bigword``
+    move the whitespace-delimited word to the left of the cursor to the killring
+
 ``backward-kill-token``
    move the argument to the left of the cursor to the killring

 ``backward-kill-line``
    move everything from the beginning of the line to the cursor to the killring

-.. _cmd-bind-backward-kill-path-component:
-
 ``backward-kill-path-component``
    move one path component to the left of the cursor to the killring. A path component is everything likely to belong to a path component, i.e. not any of the following: `/={,}'\":@ |;<>&`, plus newlines and tabs.

 ``backward-kill-word``
-    move the word to the left of the cursor to the killring, until the start of the current word (like vim's ``db``)
-
-``backward-kill-bigword``
-    move the whitespace-delimited word to the left of the cursor to the killring, until the start of the current word (like vim's ``dB``)
-
-``backward-path-component``
-    move one :ref:`path component <cmd-bind-backward-kill-path-component>` to the left
+    move the word to the left of the cursor to the killring. The "word" here is everything up to punctuation or whitespace.

 ``backward-word``
-    move one word to the left, stopping at the start of the previous word (like vim's ``b``, or Emacs' ``M-b`` but differs slightly in word division rules)
-
-``backward-bigword``
-    move one whitespace-delimited word to the left, stopping at the start of the previous word (like vim's ``B``)
-
-``backward-word-end``
-    move to the end of the previous word (like vim's ``ge``)
-
-``backward-bigword-end``
-    move to the end of the previous whitespace-delimited word (like vim's ``gE``)
+    move one word to the left

 ``beginning-of-buffer``
    moves to the beginning of the buffer, i.e. the start of the first line
@@ -221,8 +206,7 @@ The following special input functions are available:
    make the current word lowercase

 ``end-of-buffer``
-    moves to the end of the buffer, i.e. the end of the last line;
-    or if already at the end of the commandline, accept the current autosuggestion.
+    moves to the end of the buffer, i.e. the end of the first line

 ``end-of-history``
    move to the end of the history
@@ -242,6 +226,9 @@ The following special input functions are available:
 ``exit``
    exit the shell

+``forward-bigword``
+    move one whitespace-delimited word to the right
+
 ``forward-token``
    move one argument to the right

@@ -254,35 +241,13 @@ The following special input functions are available:
    commandline, does not accept the current autosuggestion (if any). Does not change the selected item in the completion pager,
    if shown.

-``forward-path-component``
-    move one :ref:`path component <cmd-bind-backward-kill-path-component>` to the right; or if at the end of the commandline, accept a path component from the current autosuggestion.
-
 ``forward-single-char``
    move one character to the right; or if at the end of the commandline, accept a single char from the current autosuggestion.

-.. _cmd-bind-forward-word:
-
 ``forward-word``
-    move one word to the right, stopping after the end of the current word; or if at the end of the commandline, accept one word
+    move one word to the right; or if at the end of the commandline, accept one word
    from the current autosuggestion.

-``forward-word-vi``
-    like :ref:`forward-word <cmd-bind-forward-word>`, but stops at the start of the next word (like vim's ``w``)
-
-``forward-word-end``
-    like :ref:`forward-word <cmd-bind-forward-word>`, but stops at the end of the next word (like vim's ``e``)
-
-.. _cmd-bind-forward-bigword:
-
-``forward-bigword``
-    move one whitespace-delimited word to the right, stopping after the end of the current word; or if at the end of the commandline, accept one word from the current autosuggestion.
-
-``forward-bigword-vi``
-    like :ref:`forward-bigword <cmd-bind-forward-bigword>`, but stops at the start of the next word (like vim's ``W``)
-
-``forward-bigword-end``
-    like :ref:`forward-bigword <cmd-bind-forward-bigword>`, but stops at the end of the next word (like vim's ``E``)
-
 ``history-pager``
    invoke the searchable pager on history (incremental search); or if the history pager is already active, search further backwards in time.

@@ -334,15 +299,15 @@ The following special input functions are available:
    The input function is useful to emulate ``ib`` vi text object.
    The following brackets are considered: ``([{}])``

+``kill-bigword``
+    move the next whitespace-delimited word to the killring
+
 ``kill-token``
    move the next argument to the killring

 ``kill-line``
    move everything from the cursor to the end of the line to the killring

-``kill-path-component``
-    move one :ref:`path component <cmd-bind-backward-kill-path-component>` to the killring.
-
 ``kill-selection``
    move the selected text to the killring

@@ -353,28 +318,7 @@ The following special input functions are available:
    move the line (without the following newline) to the killring

 ``kill-word``
-    move the next word to the killring, stopping after the end of the killed word
-
-``kill-word-vi``
-    move the next word to the killring, stopping at the start of the next word (like vim's ``dw``)
-
-``kill-bigword``
-    move the next whitespace-delimited word to the killring, stopping after the end of the current word
-
-``kill-bigword-vi``
-    move the next whitespace-delimited word to the killring, stopping at the start of the next word (like vim's ``dW``)
-
-``kill-inner-word``
-    delete the word under the cursor (like vim's ``diw``)
-
-``kill-inner-bigword``
-    delete the whitespace-delimited word under the cursor (like vim's ``diW``)
-
-``kill-a-word``
-    delete the word under the cursor plus surrounding whitespace (like vim's ``daw``)
-
-``kill-a-bigword``
-    delete the whitespace-delimited word under the cursor plus surrounding whitespace (like vim's ``daW``)
+    move the next word to the killring

 ``nextd-or-forward-word``
    if the commandline is empty, then move forward in the directory history, otherwise move one word to the right;
--- a/doc_src/cmds/cd.rst
+++ b/doc_src/cmds/cd.rst
@@ -41,7 +41,7 @@ Examples

    cd
    # changes the working directory to your home directory.
-
+    
    cd /usr/src/fish-shell
    # changes the working directory to /usr/src/fish-shell

--- a/Show More
+++ b/Show More
				`@@ -1 +1 @@`

				`include!(concat!(env!("OUT_DIR"), "/help_sections.rs"));`