Release 4.3.3

Created by ./build_tools/release.sh 4.3.3

.cirrus.yml

@@ -27,8 +27,9 @@ freebsd_task:
     matrix:
         - name: FreeBSD Stable
           freebsd_instance:
-              image: freebsd-14-3-release-amd64-ufs # updatecli.d/cirrus-freebsd.yml
+              image: freebsd-15-0-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

.editorconfig

@@ -14,7 +14,6 @@ indent_style = tab
 
 [*.{md,rst}]
 max_line_length = unset
-trim_trailing_whitespace = false
 
 [*.sh]
 indent_size = 4

.gitattributes

@@ -14,8 +14,6 @@
 .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

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github:
+  - krobelus

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,11 +1,8 @@
-## Description
 
-Talk about your changes here.
-
-Fixes issue #
 
 ## TODOs:
-<!-- Just check off what what we know been done so far. We can help you with this stuff. -->
+<!-- Check off what what has been done so far. -->
+- [ ] If addressing an issue, a commit message mentions `Fixes issue #<issue-number>`
 - [ ] Changes to fish usage are reflected in user documentation/manpages.
 - [ ] Tests have been added for regressions fixed
-- [ ] User-visible changes noted in CHANGELOG.rst <!-- Don't document changes for completions inside CHANGELOG.rst, there are lot of such edits -->
+- [ ] User-visible changes noted in CHANGELOG.rst <!-- Usually skipped for changes to completions -->

.github/actions/install-sphinx/action.yml

@@ -9,13 +9,14 @@ runs:
     - shell: bash
       run: |
         set -x
-        pip=$(command -v pip pip3 | head -1)
+        sudo pip install uv --break-system-packages
-        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
+        $uv lock --check --exclude-newer="$(awk -F'"' <uv.lock '/^exclude-newer[[:space:]]*=/ {print $2}')"
         # Install globally.
         sudo $uv pip install --group=dev --system --break-system-packages
         # Smoke test.

.github/actions/rust-toolchain/action.yml

@@ -25,7 +25,7 @@ runs:
         set -x
         toolchain=$(
           case "$toolchain_channel" in
-            (stable) echo 1.91 ;; # updatecli.d/rust.yml
+            (stable) echo 1.92 ;; # updatecli.d/rust.yml
             (msrv)   echo 1.85 ;; # updatecli.d/rust.yml
             (*)
               printf >&2 "error: unsupported toolchain channel %s" "$toolchain_channel"

.github/workflows/lint-dependencies.yml

@@ -0,0 +1,24 @@
+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@v4
+    - uses: EmbarkStudios/cargo-deny-action@v2
+      with:
+        command: check licenses
+        arguments: --all-features --locked --exclude-dev
+        rust-version: 1.92 # updatecli.d/rust.yml

.github/workflows/release.yml

@@ -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
+            -n -j /tmp/notarize.json -- -c "-DWITH_DOCS=ON"
           version=$(git describe)
           [ -f "${FISH_ARTEFACT_PATH}/fish-$version.app.zip" ]
           [ -f "${FISH_ARTEFACT_PATH}/fish-$version.pkg" ]

.github/workflows/test.yml

@@ -148,9 +148,6 @@ jobs:
     - name: make fish_run_tests
       run: |
         make -C build VERBOSE=1 fish_run_tests
-    - name: Setup tmate session
-      if: ${{ failure() }}
-      uses: mxschmitt/action-tmate@v3
 
   windows:
     runs-on: windows-latest

CHANGELOG.rst

@@ -1,3 +1,115 @@
+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 4.2.1 (released November 13, 2025)
+=======================================
+
+This release fixes the following problems identified in 4.2.0:
+
+- When building from a tarball without Sphinx (that is, with ``-DBUILD_DOCS=OFF`` or when ``sphinx-build`` is not found),
+  builtin man pages and help files were missing, which has been fixed (:issue:`12052`).
+- ``fish_config``'s theme selector (the "colors" tab) was broken, which has been fixed (:issue:`12053`).
+
 fish 4.2.0 (released November 10, 2025)
 =======================================
 

CMakeLists.txt

@@ -42,7 +42,6 @@ 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}"
 )
 
@@ -57,37 +56,40 @@ 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()
 
-# Define a function to build and link dependencies.
+add_custom_target(
-function(CREATE_TARGET 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)
   add_custom_target(
     ${target} ALL
-    COMMAND
+    DEPENDS fish
-      "${CMAKE_COMMAND}" -E
+    COMMAND ln -f fish ${target}
-        env ${VARS_FOR_CARGO}
+    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
-          ${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_TARGET)
+endfunction(CREATE_LINK)
-
-# Define fish.
-create_target(fish)
 
 # Define fish_indent.
-create_target(fish_indent)
+create_link(fish_indent)
 
 # Define fish_key_reader.
-create_target(fish_key_reader)
+create_link(fish_key_reader)
 
 # Set up tests.
 include(cmake/Tests.cmake)

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
 
@@ -52,6 +52,23 @@ 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 (``build_tools/check.sh``)
 
+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.
+
 Contributing completions
 ========================
 
@@ -89,11 +106,18 @@ Contributing documentation
 
 The documentation is stored in ``doc_src/``, and written in ReStructured Text and built with Sphinx.
 
-To build it locally, run from the main fish-shell directory::
+To build it locally, run either::
 
-    sphinx-build -j 8 -b html -n doc_src/ /tmp/fish-doc/
+    sphinx-build -j auto -b html doc_src/ /tmp/fish-doc/
 
-which will build the docs as html in /tmp/fish-doc. You can open it in a browser and see that it looks okay.
+which will output HTML docs to /tmp/fish-doc.
+You can open it in a browser and see that it looks okay.
+
+Alternatively, you can use::
+
+    cmake --build build -t sphinx-docs
+
+which outputs to build/user_doc/html/.
 
 The builtins and various functions shipped with fish are documented in doc_src/cmds/.
 
@@ -175,7 +199,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
@@ -233,9 +257,8 @@ 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
+Translation sources are stored in the ``localization/po`` directory and named ``ll_CC.po``,
-stored in the ``po`` directory, named ``ll_CC.po``, where ``ll`` is the
+where ``ll`` is the two (or possibly three) letter ISO 639-1 language code of the target language
-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.
@@ -249,7 +272,7 @@ More specifically, you will need ``msguniq`` and ``msgmerge`` for creating trans
 language.
 To create a new translation, run::
 
-    build_tools/update_translations.fish po/ll_CC.po
+    build_tools/update_translations.fish localization/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.
@@ -295,7 +318,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 ``po/sv.po``, and you'll see something like::
+Open up the PO file, for example ``localization/po/sv.po``, and you'll see something like::
 
     msgid "%s: No suitable job\n"
     msgstr ""
@@ -323,7 +346,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 (``po/*.po``).
+run ``build_tools/update_translations.fish`` to propagate this to all translation files (``localization/po/*.po``).
 This is only relevant for developers modifying the source files of fish or fish scripts.
 
 Setting Code Up For Translations

Cargo.lock

@@ -4,9 +4,9 @@ version = 4
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
 dependencies = [
  "memchr",
 ]
@@ -40,9 +40,9 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "1.12.0"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
+checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab"
 dependencies = [
  "memchr",
  "serde",
@@ -50,9 +50,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.41"
+version = "1.2.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7"
+checksum = "7a0aeaff4ff1a90589618835a598e545176939b97874f7abc7851caa0618f203"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -83,9 +83,9 @@ dependencies = [
 
 [[package]]
 name = "crypto-common"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
 dependencies = [
  "generic-array",
  "typenum",
@@ -146,13 +146,13 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.4"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
+checksum = "645cbb3a84e60b7531617d5ae4e57f7e27308f6445f5abf653209ea76dec8dff"
 
 [[package]]
 name = "fish"
-version = "4.2.0"
+version = "4.3.3"
 dependencies = [
  "bitflags",
  "cc",
@@ -160,11 +160,15 @@ dependencies = [
  "errno",
  "fish-build-helper",
  "fish-build-man-pages",
+ "fish-common",
+ "fish-fallback",
+ "fish-gettext",
  "fish-gettext-extraction",
- "fish-gettext-maps",
  "fish-gettext-mo-file-parser",
  "fish-printf",
  "fish-tempfile",
+ "fish-wchar",
+ "fish-widecharwidth",
  "libc",
  "lru",
  "macro_rules_attribute",
@@ -172,16 +176,16 @@ dependencies = [
  "num-traits",
  "once_cell",
  "pcre2",
- "phf 0.12.1",
+ "phf_codegen 0.13.1",
- "phf_codegen 0.12.1",
  "portable-atomic",
- "rand",
+ "rand 0.9.2",
  "rsconf",
  "rust-embed",
  "serial_test",
  "terminfo",
  "unix_path",
  "widestring",
+ "xterm-color",
 ]
 
 [[package]]
@@ -199,11 +203,42 @@ dependencies = [
  "rsconf",
 ]
 
+[[package]]
+name = "fish-common"
+version = "0.0.0"
+dependencies = [
+ "libc",
+ "nix",
+]
+
+[[package]]
+name = "fish-fallback"
+version = "0.0.0"
+dependencies = [
+ "fish-build-helper",
+ "fish-common",
+ "fish-wchar",
+ "fish-widecharwidth",
+ "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]]
@@ -212,8 +247,8 @@ version = "0.0.0"
 dependencies = [
  "fish-build-helper",
  "fish-gettext-mo-file-parser",
- "phf 0.12.1",
+ "phf 0.13.1",
- "phf_codegen 0.12.1",
+ "phf_codegen 0.13.1",
  "rsconf",
 ]
 
@@ -236,8 +271,21 @@ name = "fish-tempfile"
 version = "0.0.0"
 dependencies = [
  "nix",
+ "rand 0.9.2",
 ]
 
+[[package]]
+name = "fish-wchar"
+version = "0.0.0"
+dependencies = [
+ "fish-common",
+ "widestring",
+]
+
+[[package]]
+name = "fish-widecharwidth"
+version = "0.0.0"
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -246,15 +294,15 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "foldhash"
-version = "0.1.5"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
 
 [[package]]
 name = "generic-array"
-version = "0.14.9"
+version = "0.14.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
  "typenum",
  "version_check",
@@ -285,9 +333,9 @@ dependencies = [
 
 [[package]]
 name = "globset"
-version = "0.4.16"
+version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5"
+checksum = "52dfc19153a48bde0cbd630453615c8151bce3a5adfac7a0aebfbf0a1e1f57e3"
 dependencies = [
  "aho-corasick",
  "bstr",
@@ -298,9 +346,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.5"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
 dependencies = [
  "allocator-api2",
  "equivalent",
@@ -319,15 +367,15 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.177"
+version = "0.2.178"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
+checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091"
 
 [[package]]
 name = "libredox"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
+checksum = "df15f6eac291ed1cf25865b1ee60399f57e7c227e7f51bdbd4c5270396a9ed50"
 dependencies = [
  "bitflags",
  "libc",
@@ -344,15 +392,15 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.28"
+version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 
 [[package]]
 name = "lru"
-version = "0.13.0"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "227748d55f2f0ab4735d87fd623798cb6b664512fe979705f829c9f81c934465"
+checksum = "96051b46fc183dc9cd4a223960ef37b9af631b55191852a8274bfef064cda20f"
 dependencies = [
  "hashbrown",
 ]
@@ -488,11 +536,11 @@ dependencies = [
 
 [[package]]
 name = "phf"
-version = "0.12.1"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "913273894cec178f401a31ec4b656318d95473527be05c0752cc41cdc32be8b7"
+checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
 dependencies = [
- "phf_shared 0.12.1",
+ "phf_shared 0.13.1",
 ]
 
 [[package]]
@@ -507,12 +555,12 @@ dependencies = [
 
 [[package]]
 name = "phf_codegen"
-version = "0.12.1"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efbdcb6f01d193b17f0b9c3360fa7e0e620991b193ff08702f78b3ce365d7e61"
+checksum = "49aa7f9d80421bca176ca8dbfebe668cc7a2684708594ec9f3c0db0805d5d6e1"
 dependencies = [
- "phf_generator 0.12.1",
+ "phf_generator 0.13.1",
- "phf_shared 0.12.1",
+ "phf_shared 0.13.1",
 ]
 
 [[package]]
@@ -522,17 +570,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
 dependencies = [
  "phf_shared 0.11.3",
- "rand",
+ "rand 0.8.5",
 ]
 
 [[package]]
 name = "phf_generator"
-version = "0.12.1"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cbb1126afed61dd6368748dae63b1ee7dc480191c6262a3b4ff1e29d86a6c5b"
+checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737"
 dependencies = [
  "fastrand",
- "phf_shared 0.12.1",
+ "phf_shared 0.13.1",
 ]
 
 [[package]]
@@ -546,9 +594,9 @@ dependencies = [
 
 [[package]]
 name = "phf_shared"
-version = "0.12.1"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06005508882fb681fd97892ecff4b7fd0fee13ef1aa569f8695dae7ab9099981"
+checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
 dependencies = [
  "siphasher",
 ]
@@ -561,24 +609,33 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
 [[package]]
 name = "portable-atomic"
-version = "1.11.1"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+checksum = "f59e70c4aef1e55797c2e8fd94a4f2a973fc972cfde0e0b05f683667b0cd39dd"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.101"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
+checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
 dependencies = [
  "proc-macro2",
 ]
@@ -595,7 +652,27 @@ version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
- "rand_core",
+ "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.3",
+]
+
+[[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.3",
 ]
 
 [[package]]
@@ -604,6 +681,15 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 
+[[package]]
+name = "rand_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+dependencies = [
+ "getrandom 0.3.4",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.5.18"
@@ -643,18 +729,18 @@ checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
 
 [[package]]
 name = "rsconf"
-version = "0.2.2"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd2af859f1af0401e7fc7577739c87b0d239d8a5da400d717183bca92336bcdc"
+checksum = "06cbd984e96cc891aa018958ac3d09986c0ea7635eedfff670b99a90970f159f"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "rust-embed"
-version = "8.8.0"
+version = "8.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb44e1917075637ee8c7bcb865cf8830e3a92b5b1189e44e3a0ab5a0d5be314b"
+checksum = "947d7f3fad52b283d261c4c99a084937e2fe492248cb9a68a8435a861b8798ca"
 dependencies = [
  "rust-embed-impl",
  "rust-embed-utils",
@@ -663,9 +749,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-impl"
-version = "8.8.0"
+version = "8.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "382499b49db77a7c19abd2a574f85ada7e9dbe125d5d1160fa5cad7c4cf71fc9"
+checksum = "5fa2c8c9e8711e10f9c4fd2d64317ef13feaab820a4c51541f1a8c8e2e851ab2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -677,9 +763,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-utils"
-version = "8.8.0"
+version = "8.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21fcbee55c2458836bcdbfffb6ec9ba74bbc23ca7aa6816015a3dd2c4d8fc185"
+checksum = "60b161f275cb337fe0a44d924a5f4df0ed69c2c39519858f931ce61c779d3475"
 dependencies = [
  "globset",
  "sha2",
@@ -808,9 +894,9 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "syn"
-version = "2.0.107"
+version = "2.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a26dbd934e5451d21ef060c018dae56fc073894c5a7896f882928a76e6d081b"
+checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -857,9 +943,9 @@ checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.20"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06"
+checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
 
 [[package]]
 name = "unicode-segmentation"
@@ -954,3 +1040,29 @@ name = "wit-bindgen"
 version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+
+[[package]]
+name = "xterm-color"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4de5f056fb9dc8b7908754867544e26145767187aaac5a98495e88ad7cb8a80f"
+
+[[package]]
+name = "zerocopy"
+version = "0.8.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]

Cargo.toml

@@ -6,6 +6,9 @@ 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]
 bitflags = "2.5.0"
@@ -14,44 +17,49 @@ cfg-if = "1.0.3"
 errno = "0.3.0"
 fish-build-helper = { path = "crates/build-helper" }
 fish-build-man-pages = { path = "crates/build-man-pages" }
+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-wchar = { path = "crates/wchar" }
+fish-widecharwidth = { path = "crates/widecharwidth" }
 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.13.0"
+lru = "0.16.2"
 nix = { version = "0.30.1", default-features = false, features = [
     "event",
     "inotify",
     "resource",
     "fs",
+    "term",
 ] }
 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.12", default-features = false }
+phf = { version = "0.13", default-features = false }
-phf_codegen = { version = "0.12" }
+phf_codegen = "0.13"
 portable-atomic = { version = "1", default-features = false, features = [
     "fallback",
 ] }
 proc-macro2 = "1.0"
-# Don't use the "getrandom" feature as it requires "getentropy" which was not
+rand = { version = "0.9.2", default-features = false, features = [
-# available on macOS < 10.12. We can enable "getrandom" when we raise the
+    "small_rng",
-# minimum supported version to 10.12.
+    "thread_rng",
-rand = { version = "0.8.5", default-features = false, features = ["small_rng"] }
+] }
-rsconf = "0.2.2"
+rsconf = "0.3.0"
-rust-embed = { version = "8.7.2", features = [
+rust-embed = { version = "8.9.0", 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"
@@ -59,6 +67,7 @@ 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
@@ -70,13 +79,11 @@ debug = true
 
 [package]
 name = "fish"
-version = "4.2.0"
+version = "4.3.3"
 edition.workspace = true
 rust-version.workspace = true
 default-run = "fish"
-# see doc_src/license.rst for details
+license.workspace = true
-# 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"
 
@@ -86,10 +93,14 @@ cfg-if.workspace = true
 errno.workspace = true
 fish-build-helper.workspace = true
 fish-build-man-pages = { workspace = true, optional = 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-wchar.workspace = true
+fish-widecharwidth.workspace = true
 libc.workspace = true
 lru.workspace = true
 macro_rules_attribute = "0.2.2"
@@ -97,23 +108,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, optional = true, features = [
+rust-embed = { workspace = true, features = [
     "deterministic-timestamps",
     "debug-embed",
     "include-exclude",
     "interpolate-folder-path",
 ] }
 [target.'cfg(not(windows))'.dependencies]
-rust-embed = { workspace = true, optional = true, features = [
+rust-embed = { workspace = true, features = [
     "deterministic-timestamps",
     "include-exclude",
     "interpolate-folder-path",
@@ -149,12 +160,12 @@ name = "fish_key_reader"
 path = "src/bin/fish_key_reader.rs"
 
 [features]
-default = ["embed-data", "localize-messages"]
+default = ["embed-manpages", "localize-messages"]
 benchmark = []
-embed-data = ["dep:rust-embed", "dep:fish-build-man-pages"]
+embed-manpages = ["dep:fish-build-man-pages"]
 # Enable gettext localization at runtime. Requires the `msgfmt` tool to generate catalog data at
 # build time.
-localize-messages = ["dep:phf", "dep:fish-gettext-maps"]
+localize-messages = ["dep:fish-gettext"]
 # 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 `build_tools/check.sh` and when calling
@@ -171,19 +182,24 @@ rust.non_upper_case_globals = "allow"
 rust.unknown_lints = "allow"
 rust.unstable_name_collisions = "allow"
 rustdoc.private_intra_doc_links = "allow"
-clippy.len_without_is_empty = "allow"     # we're not a library crate
+
-clippy.let_and_return = "allow"
+[workspace.lints.clippy]
-clippy.manual_range_contains = "allow"
+assigning_clones = "warn"
-clippy.needless_lifetimes = "allow"
+implicit_clone = "warn"
-clippy.needless_return = "allow"
+cloned_instead_of_copied = "warn"
-clippy.new_without_default = "allow"
+len_without_is_empty = "allow"     # we're not a library crate
-clippy.option_map_unit_fn = "allow"
+let_and_return = "allow"
+manual_range_contains = "allow"
+map_unwrap_or = "warn"
+needless_lifetimes = "allow"
+new_without_default = "allow"
+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.
-clippy.print_stdout = "deny"
+print_stdout = "deny"
-clippy.print_stderr = "deny"
+print_stderr = "deny"
 
 [lints]
 workspace = true

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.10 "Yosemite".
+Note: The minimum supported macOS version is 10.12.
 
 Packages for Linux
 ~~~~~~~~~~~~~~~~~~
@@ -117,7 +117,7 @@ Dependencies
 
 Compiling fish requires:
 
--  Rust (version 1.85 or later)
+-  Rust (version 1.85 or later), including cargo
 -  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,10 +157,13 @@ 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.
-- BUILD_DOCS=ON|OFF - whether to build the documentation. This is automatically set to OFF when Sphinx isn't installed.
+- WITH_DOCS=ON|OFF - whether to build the documentation. By default, this is ON when Sphinx is 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_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``.
 - FISH_USE_SYSTEM_PCRE2=ON|OFF - whether to use an installed pcre2. This is normally autodetected.
-- 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
 
@@ -185,13 +188,14 @@ 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-data`` to cargo.
+To disable translations, disable the ``localize-messages`` feature by passing ``--no-default-features --features=embed-manpages`` 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,

build.rs

@@ -1,4 +1,7 @@
-use fish_build_helper::{env_var, fish_build_dir, workspace_root};
+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 rsconf::Target;
 use std::env;
 use std::path::{Path, PathBuf};
@@ -37,17 +40,7 @@ fn main() {
     // the source directory is the current working directory of the build script
     rsconf::set_env_value("FISH_BUILD_VERSION", version);
 
-    // safety: single-threaded code.
+    fish_build_helper::rebuild_if_embedded_path_changed("share");
-    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();
@@ -73,36 +66,41 @@ 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. Model new entries after the
+        // Ignore the first entry, it just sets up the type inference.
-        // second line.
         ("", &(|_: &Target| false) as &dyn Fn(&Target) -> bool),
-        ("apple", &detect_apple),
+        ("apple", &(|_| target_os_is_apple())),
-        ("bsd", &detect_bsd),
+        ("bsd", &(|_| target_os_is_bsd())),
-        ("using_cmake", &|_| option_env!("FISH_CMAKE_BINARY_DIR").is_some()),
+        ("cygwin", &(|_| target_os_is_cygwin())),
-        ("cygwin", &detect_cygwin),
+        ("have_eventfd", &|target| {
-        ("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")
-        }),
-        ("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") {
+            if target_os() == "netbsd" {
-                 false
+                false
-             } else {
+            } else {
-                 target.has_header("sys/eventfd.h")
+                target.has_header("sys/eventfd.h")
             }
         }),
-        ("HAVE_WAITSTATUS_SIGNAL_RET", &|target| {
+        ("have_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")
+            }
+        }),
+        ("small_main_stack", &has_small_stack),
+        ("using_cmake", &|_| {
+            option_env!("FISH_CMAKE_BINARY_DIR").is_some()
+        }),
+        ("waitstatus_signal_ret", &|target| {
             target.r#if("WEXITSTATUS(0x007f) == 0x7f", &["sys/wait.h"])
         }),
     ] {
@@ -110,39 +108,6 @@ fn detect_cfgs(target: &mut 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.
@@ -209,32 +174,18 @@ 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(
+            env_sysconfdir.unwrap_or("/etc/".to_string()),
-                // 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| {
-        let default = default_ok.then_some("share/".to_string());
+        env_datadir.map(|p| join_if_relative(&prefix, p))
-        env_datadir
-            .or(default)
-            .map(|p| join_if_relative(&prefix, p))
     });
     overridable_path("BINDIR", |env_bindir| {
-        let default = default_ok.then_some("bin/".to_string());
+        env_bindir.map(|p| join_if_relative(&prefix, p))
-        env_bindir.or(default).map(|p| join_if_relative(&prefix, p))
     });
     overridable_path("DOCDIR", |env_docdir| {
-        let default = default_ok.then_some("doc/fish".to_string());
+        env_docdir.map(|p| {
-        env_docdir.or(default).map(|p| {
             join_if_relative(
                 &datadir
                     .expect("Setting DOCDIR without setting DATADIR is not currently supported"),

build_tools/check.sh

@@ -33,13 +33,18 @@ fi
 cargo() {
     subcmd=$1
     shift
-    # shellcheck disable=2086
+    if [ -n "$FISH_CHECK_RUST_TOOLCHAIN" ]; then
-    command cargo "$subcmd" $cargo_args "$@"
+        # shellcheck disable=2086
+        command cargo "+$FISH_CHECK_RUST_TOOLCHAIN" "$subcmd" $cargo_args "$@"
+    else
+        # shellcheck disable=2086
+        command cargo "$subcmd" $cargo_args "$@"
+    fi
 }
 
 cleanup () {
-    if [ -n "$template_file" ] && [ -e "$template_file" ]; then
+    if [ -n "$gettext_template_dir" ] && [ -e "$gettext_template_dir" ]; then
-        rm "$template_file"
+        rm -r "$gettext_template_dir"
     fi
 }
 
@@ -64,12 +69,15 @@ if [ -n "$FISH_TEST_MAX_CONCURRENCY" ]; then
     export CARGO_BUILD_JOBS="$FISH_TEST_MAX_CONCURRENCY"
 fi
 
-template_file=$(mktemp)
+gettext_template_dir=$(mktemp -d)
 (
-    export FISH_GETTEXT_EXTRACTION_FILE="$template_file"
+    export FISH_GETTEXT_EXTRACTION_DIR="$gettext_template_dir"
     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
@@ -78,9 +86,9 @@ fi
 cargo test --no-default-features --workspace --all-targets
 cargo test --doc --workspace
 if $lint; then
-    cargo doc --workspace
+    cargo doc --workspace --no-deps
 fi
-FISH_GETTEXT_EXTRACTION_FILE=$template_file "$workspace_root/tests/test_driver.py" "$build_dir"
+FISH_GETTEXT_EXTRACTION_DIR=$gettext_template_dir "$workspace_root/tests/test_driver.py" "$build_dir"
 
 exit
 }

build_tools/fish_xgettext.fish

@@ -21,13 +21,13 @@ begin
 
     set -g workspace_root (path resolve (status dirname)/..)
 
-    set -l rust_extraction_file
+    set -l rust_extraction_dir
     if set -l --query _flag_use_existing_template
-        set rust_extraction_file $_flag_use_existing_template
+        set rust_extraction_dir $_flag_use_existing_template
     else
-        set rust_extraction_file (mktemp)
+        set rust_extraction_dir (mktemp -d)
         # We need to build to ensure that the proc macro for extracting strings runs.
-        FISH_GETTEXT_EXTRACTION_FILE=$rust_extraction_file cargo check --no-default-features --features=gettext-extract
+        FISH_GETTEXT_EXTRACTION_DIR=$rust_extraction_dir cargo check --features=gettext-extract
         or exit 1
     end
 
@@ -41,11 +41,11 @@ begin
     mark_section tier1-from-rust
 
     # Get rid of duplicates and sort.
-    msguniq --no-wrap --sort-output $rust_extraction_file
+    find $rust_extraction_dir -type f -exec cat {} + | msguniq --no-wrap --sort-output
     or exit 1
 
     if not set -l --query _flag_use_existing_template
-        rm $rust_extraction_file
+        rm -r $rust_extraction_dir
     end
 
     function extract_fish_script_messages_impl

build_tools/git_version_gen.sh

@@ -13,9 +13,9 @@ git_permission_failed=0
 
 # First see if there is a version file (included in release tarballs),
 # then try git-describe, then default.
-if test -f version
+if test -f "$FISH_BASE_DIR"/version
 then
-	VN=$(cat version) || VN="$DEF_VER"
+	VN=$(cat "$FISH_BASE_DIR"/version) || VN="$DEF_VER"
 else
     if VN=$(git -C "$FISH_BASE_DIR" describe --always --dirty 2>/dev/null); then
        :

build_tools/make_macos_pkg.sh

@@ -25,9 +25,11 @@ NOTARIZE=
 
 ARM64_DEPLOY_TARGET='MACOSX_DEPLOYMENT_TARGET=11.0'
 X86_64_DEPLOY_TARGET='MACOSX_DEPLOYMENT_TARGET=10.12'
+cmake_args=()
 
-while getopts "sf:i:p:e:nj:" opt; do
+while getopts "c: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");;
@@ -65,6 +67,7 @@ do_cmake() {
         -DCMAKE_EXE_LINKER_FLAGS="-Wl,-ld_classic" \
         -DCMAKE_OSX_ARCHITECTURES='arm64;x86_64' \
         -DFISH_USE_SYSTEM_PCRE2=OFF \
+        "${cmake_args[@]}" \
         "$@" \
         "$SRC_DIR"
 }
@@ -79,17 +82,16 @@ do_cmake() {
     && env DESTDIR="$PKGDIR/root/" $ARM64_DEPLOY_TARGET make install;
 }
 
-# Build for x86-64 but do not install; instead we will make some fat binaries inside the root.
+# Build for x86-64 but do not install; instead we will make a fat binary 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 them up.
+# Fatten it up.
-for FILE in "$PKGDIR"/root/usr/local/bin/*; do
+FILE=$PKGDIR/root/usr/local/bin/fish
-    X86_FILE="$PKGDIR/build_x86_64/$(basename "$FILE")"
+X86_FILE=$PKGDIR/build_x86_64/$(basename "$FILE")
-    rcodesign macho-universal-create --output "$FILE" "$FILE" "$X86_FILE"
+rcodesign macho-universal-create --output "$FILE" "$FILE" "$X86_FILE"
-    chmod 755 "$FILE"
+chmod 755 "$FILE"
-done
 
 if test -n "$SIGN"; then
     echo "Signing executables"
@@ -102,9 +104,7 @@ if test -n "$SIGN"; then
     if [ -n "$ENTITLEMENTS_FILE" ]; then
         ARGS+=(--entitlements-xml-file "$ENTITLEMENTS_FILE")
     fi
-    for FILE in "$PKGDIR"/root/usr/local/bin/*; do
+    (set +x; rcodesign sign "${ARGS[@]}" "$PKGDIR"/root/usr/local/bin/fish)
-        (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,15 +125,13 @@ 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 binaries universal. Note fish.app/Contents/MacOS/fish already is, courtesy of CMake.
+# Make the app's /usr/local/bin/fish binary universal. Note fish.app/Contents/MacOS/fish already is, courtesy of CMake.
 cd "$PKGDIR/build_arm64"
-for FILE in fish.app/Contents/Resources/base/usr/local/bin/*; do
+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")"
+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"
+rcodesign macho-universal-create --output "$FILE" "$FILE" "$X86_FILE"
-
+# macho-universal-create screws up the permissions.
-    # macho-universal-create screws up the permissions.
+chmod 755 "$FILE"
-    chmod 755 "$FILE"
-done
 
 if test -n "$SIGN"; then
     echo "Signing app"

build_tools/make_tarball.sh

@@ -1,86 +1,23 @@
 #!/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 --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
-)
 
-# The name of the prefix, which is the directory that you get when you untar
+prefix=fish-$VERSION
-prefix="fish-$VERSION"
+path=${FISH_ARTEFACT_PATH:-~/fish_built}/$prefix.tar.xz
 
-# The path where we will output the tar file
+git archive \
-# Defaults to ~/fish_built
+    --prefix="$prefix/" \
-path=${FISH_ARTEFACT_PATH:-~/fish_built}/$prefix.tar
+    --add-virtual-file="$prefix/version:$VERSION" \
-
+    HEAD |
-# Clean up stuff we've written before
+    xz >"$path"
-rm -f "$path" "$path".xz
-
-# git starts the archive
-git archive --format=tar --prefix="$prefix"/ HEAD > "$path"
-
-# 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"
-FISH_SPHINX_BUILD_DATE=$tag_creation_date \
-    $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
-$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".xz
+echo "Tarball written to $path"
-openssl dgst -sha256 "$path".xz
+openssl dgst -sha256 "$path"

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 the key published at '"${FISH_GPG_PUBLIC_KEY_URL:-???}"' is available as ``fish-'"$version"'.tar.xz.asc``.'
+    echo 'A GPG signature using `this key <'"${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>`__'

build_tools/release.sh

@@ -18,15 +18,18 @@ 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,6 +86,22 @@ sed -i \
 CommitVersion() {
     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
     git commit -m "$2
 
@@ -121,7 +140,7 @@ fish_tar_xz=fish-$version.tar.xz
 (
     local_tarball=$tmpdir/local-tarball
     mkdir "$local_tarball"
-    FISH_ARTEFACT_PATH=$local_tarball uv run ./build_tools/make_tarball.sh
+    FISH_ARTEFACT_PATH=$local_tarball ./build_tools/make_tarball.sh
     cd "$local_tarball"
     tar xf "$fish_tar_xz"
 )
@@ -149,9 +168,16 @@ 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/fish-$version/user_doc/html" "$fish_site/site/docs/$1"
+    cp -r "$tmpdir/local-tarball/fish-$version/user_doc/html" "$fish_site/site/docs/$1"
     git -C $fish_site add "site/docs/$1"
 }
 minor_version=${version%.*}
@@ -239,6 +265,8 @@ 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 {
@@ -255,23 +283,27 @@ EOF
     git push $remote HEAD:master
 } fi
 
-milestone_number=$(
+milestone_version="$(
+    if echo "$version" | grep -q '\.0$'; then
+        echo "$minor_version"
+    else
+        echo "$version"
+    fi
+)"
+milestone_number() {
     gh_api_repo milestones?state=open |
-        jq '.[] | select(.title == "fish '"$version"'") | .number'
+        jq --arg name "fish $1" '
-)
+            .[] | select(.title == $name) | .number
-gh_api_repo milestones/$milestone_number --method PATCH \
+        '
-    --raw-field state=closed
+}
+gh_api_repo milestones/"$(milestone_number "$milestone_version")" \
+    --method PATCH --raw-field state=closed
 
-next_patch_version=$(
+next_minor_version=$(echo "$minor_version" |
-    echo "$version" | awk -F. '
+    awk -F. '{ printf "%s.%s", $1, $2+1 }')
-        NF == 3 && $3 ~ /[0-9]+/ {
+if [ -z "$(milestone_number "$next_minor_version")" ]; then
-            printf "%s.%s.%s", $1, $2, $3+1
-        }
-    '
-)
-if [ -n "$next_patch_version" ]; then
     gh_api_repo milestones --method POST \
-        --raw-field title="fish $next_patch_version"
+        --raw-field title="fish $next_minor_version"
 fi
 
 exit

build_tools/supported_ubuntu_versions.py

@@ -0,0 +1,22 @@
+# /// 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")
+        )
+    )

build_tools/update-dependencies.sh

@@ -10,12 +10,13 @@ command -v updatecli
 command -v uv
 sort --version-sort </dev/null
 
-uv lock --check
+# 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}')"
 
 updatecli "${@:-apply}"
 
 uv lock # Python version constraints may have changed.
-uv lock --upgrade
+uv lock --upgrade --exclude-newer="$(date --date='7 days ago' --iso-8601)"
 
 from_gh() {
     repo=$1
@@ -24,7 +25,7 @@ from_gh() {
     contents=$(curl -fsS https://raw.githubusercontent.com/"${repo}"/refs/heads/master/"${path}")
     printf '%s\n' >"$out_dir/$(basename "$path")" "$contents"
 }
-from_gh ridiculousfish/widecharwidth widechar_width.rs src/widecharwidth/
+from_gh ridiculousfish/widecharwidth widechar_width.rs crates/widecharwidth/src/
 from_gh ridiculousfish/littlecheck littlecheck/littlecheck.py tests/
 
 # Update Cargo.lock

build_tools/update_translations.fish

@@ -9,29 +9,30 @@
 # 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 po/
+#   - Specify the language you want to work on as an argument, which must be a file in the
-#     directory. You can specify a language which does not have translations yet by specifying the
+#     localization/po/ directory. You can specify a language which does not have translations
-#     name of a file which does not yet exist. Make sure to follow the naming convention.
+#     yet by specifying the name of a file which does not yet exist.
+#     Make sure to follow the naming convention.
 # For testing:
 #   - Specify `--dry-run` to see if any updates to the PO files would by applied by this script.
 #     If this flag is specified, the script will exit with an error if there are outstanding
 #     changes, and will display the diff. Do not specify other flags if `--dry-run` is specified.
 #
-# Specify `--use-existing-template=FILE` to prevent running cargo for extracting an up-to-date
+# Specify `--use-existing-template=DIR` to prevent running cargo for extracting an up-to-date
 # version of the localized strings. This flag is intended for testing setups which make it
 # inconvenient to run cargo here, but run it in an earlier step to ensure up-to-date values.
 # This argument is passed on to the `fish_xgettext.fish` script and has no other uses.
-# `FILE` must be the path to a gettext template file generated from our compilation process.
+# `DIR` must be the path to a gettext template file generated from our compilation process.
 # It can be obtained by running:
-#   set -l FILE (mktemp)
+#   set -l DIR (mktemp -d)
-#   FISH_GETTEXT_EXTRACTION_FILE=$FILE cargo check --features=gettext-extract
+#   FISH_GETTEXT_EXTRACTION_DIR=$DIR 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/../po
+set -l po_dir $build_tools/../localization/po
 
 set -l extract
 
@@ -89,8 +90,9 @@ if set -l --query extract
 end
 
 if set -l --query _flag_dry_run
-    # On a dry run, we do not modify po/ but write to a temporary directory instead and check if
+    # On a dry run, we do not modify localization/po/ but write to a temporary directory instead
-    # there is a difference between po/ and the tmpdir after re-generating the PO files.
+    # and check if there is a difference between localization/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.
@@ -146,7 +148,7 @@ end
 if set -g --query tmpdir[1]
     diff -ur $po_dir $tmpdir
     or begin
-        echo ERROR: translations in ./po/ are stale. Try running build_tools/update_translations.fish
+        echo ERROR: translations in localization/po/ are stale. Try running build_tools/update_translations.fish
         cleanup_exit
     end
 end

cmake/Docs.cmake

@@ -12,11 +12,21 @@ 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.
+set(FISH_INDENT_FOR_BUILDING_DOCS "" CACHE FILEPATH "Path to fish_indent executable for building HTML docs")
-# Prepend the output dir of fish_indent to PATH.
+
+if(FISH_INDENT_FOR_BUILDING_DOCS)
+    get_filename_component(FISH_INDENT_DIR "${FISH_INDENT_FOR_BUILDING_DOCS}" DIRECTORY)
+    set(SPHINX_HTML_FISH_INDENT_PATH ${FISH_INDENT_DIR})
+    set(SPHINX_HTML_FISH_INDENT_DEP)
+else()
+    set(SPHINX_HTML_FISH_INDENT_PATH ${CMAKE_BINARY_DIR})
+    set(SPHINX_HTML_FISH_INDENT_DEP fish_indent)
+endif()
+
 add_custom_target(sphinx-docs
     mkdir -p ${SPHINX_HTML_DIR}/_static/
-    COMMAND env PATH="${CMAKE_BINARY_DIR}:$$PATH"
+    COMMAND env FISH_BUILD_VERSION_FILE=${CMAKE_CURRENT_BINARY_DIR}/${FBVF}
+        PATH="${SPHINX_HTML_FISH_INDENT_PATH}:$$PATH"
         ${SPHINX_EXECUTABLE}
         -j auto
         -q -b html
@@ -24,10 +34,12 @@ add_custom_target(sphinx-docs
         -d "${SPHINX_ROOT_DIR}/.doctrees-html"
         "${SPHINX_SRC_DIR}"
         "${SPHINX_HTML_DIR}"
-    DEPENDS ${SPHINX_SRC_DIR}/fish_indent_lexer.py fish_indent
+    DEPENDS
+        CHECK-FISH-BUILD-VERSION-FILE
+        ${SPHINX_SRC_DIR}/fish_indent_lexer.py
+        ${SPHINX_HTML_FISH_INDENT_DEP}
     COMMENT "Building HTML documentation with Sphinx")
 
-# sphinx-manpages needs the fish_indent binary for the version number
 add_custom_target(sphinx-manpages
     env FISH_BUILD_VERSION_FILE=${CMAKE_CURRENT_BINARY_DIR}/${FBVF}
         ${SPHINX_EXECUTABLE}
@@ -36,51 +48,36 @@ add_custom_target(sphinx-manpages
         -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(SPHINX_EXECUTABLE)
+if(NOT DEFINED WITH_DOCS) # Don't check for legacy options if the new one is defined, to help bisecting.
-    option(BUILD_DOCS "build documentation (requires Sphinx)" ON)
+    if(DEFINED BUILD_DOCS)
-else(SPHINX_EXECUTABLE)
+        message(FATAL_ERROR "the BUILD_DOCS option is no longer supported, use -DWITH_DOCS=ON|OFF")
-    option(BUILD_DOCS "build documentation (requires Sphinx)" OFF)
+    endif()
-endif(SPHINX_EXECUTABLE)
+    if(DEFINED INSTALL_DOCS)
+        message(FATAL_ERROR "the INSTALL_DOCS option is no longer supported, use -DWITH_DOCS=ON|OFF")
+    endif()
+endif()
 
-if(BUILD_DOCS AND NOT SPHINX_EXECUTABLE)
+if(SPHINX_EXECUTABLE)
+    option(WITH_DOCS "build documentation (requires Sphinx)" ON)
+else()
+    option(WITH_DOCS "build documentation (requires Sphinx)" OFF)
+endif()
+
+if(WITH_DOCS AND NOT SPHINX_EXECUTABLE)
     message(FATAL_ERROR "build documentation selected, but sphinx-build could not be found")
 endif()
 
-if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/user_doc/html
+add_feature_info(Documentation WITH_DOCS "user manual and documentation")
-   AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/user_doc/man)
-    set(HAVE_PREBUILT_DOCS TRUE)
-else()
-    set(HAVE_PREBUILT_DOCS FALSE)
-endif()
 
-if(BUILD_DOCS OR HAVE_PREBUILT_DOCS)
+if(WITH_DOCS)
-    set(INSTALL_DOCS ON)
-else()
-    set(INSTALL_DOCS OFF)
-endif()
-
-add_feature_info(Documentation INSTALL_DOCS "user manual and documentation")
-
-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)
-    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)

cmake/Install.cmake

@@ -1,7 +1,5 @@
 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})
@@ -75,22 +73,30 @@ function(FISH_TRY_CREATE_DIRS)
   endforeach()
 endfunction(FISH_TRY_CREATE_DIRS)
 
-install(PROGRAMS ${PROGRAMS}
+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fish
         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/groff
+                 ${rel_datadir}/fish/functions
                  ${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/tools/web_config/sample_prompts
+                 ${rel_datadir}/fish/prompts
-                 ${rel_datadir}/fish/tools/web_config/themes
+                 ${rel_datadir}/fish/themes
                  )
 
 configure_file(share/__fish_build_paths.fish.in share/__fish_build_paths.fish)
@@ -125,8 +131,13 @@ install(DIRECTORY share/functions/
         DESTINATION ${rel_datadir}/fish/functions
         FILES_MATCHING PATTERN "*.fish")
 
-install(DIRECTORY share/groff
+install(DIRECTORY share/prompts/
-        DESTINATION ${rel_datadir}/fish)
+        DESTINATION ${rel_datadir}/fish/prompts
+        FILES_MATCHING PATTERN "*.fish")
+
+install(DIRECTORY share/themes/
+        DESTINATION ${rel_datadir}/fish/themes
+        FILES_MATCHING PATTERN "*.theme")
 
 # CONDEMNED_PAGE is managed by the conditional above
 # Building the man pages is optional: if sphinx isn't installed, they're not built
@@ -146,9 +157,7 @@ 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)

cmake/Rust.cmake

@@ -3,8 +3,6 @@ find_package(Rust REQUIRED)
 
 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")
@@ -21,7 +19,6 @@ 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>")
 
 option(WITH_GETTEXT "Build with gettext localization support. Requires `msgfmt` to work." ON)
 # Enable gettext feature unless explicitly disabled.

cmake/Tests.cmake

@@ -57,7 +57,15 @@ 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 ${CARGO_FLAGS} --workspace --target-dir ${rust_target_dir} ${cargo_test_flags}
+  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}
   WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
   DEPENDS fish fish_indent fish_key_reader fish_test_helper
   USES_TERMINAL

contrib/debian/changelog

@@ -0,0 +1,488 @@
+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

contrib/debian/control

@@ -3,33 +3,31 @@ Section: shells
 Priority: optional
 Maintainer: ridiculous_fish <corydoras@ridiculousfish.com>
 Uploaders: David Adam <zanchey@ucc.gu.uwa.edu.au>
-Build-Depends: debhelper (>= 12),
+Build-Depends: debhelper-compat (= 13),
 # -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,
+ sphinx-doc,
 # Test dependencies
  locales-all,
- ncurses-base,
+ man-db,
  python3
-Standards-Version: 4.1.5
+# 4.6.2 is Debian 12/Ubuntu Noble 24.04; Ubuntu Jammy is 4.6.0.1
+Standards-Version: 4.6.2
 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 - bsdmainutils is required in Ubuntu focal
+# for col and lock
-Depends: bsdextrautils | bsdmainutils,
+Depends: bsdextrautils,
  file,
-# for the msgfmt command
- gettext-base,
 # for man
  man-db,
-# for terminal definitions
- ncurses-base,
 # for kill
  procps,
  python3 (>=3.5),

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/tools/web_config/themes/Dracula.theme
+Files: share/themes/Dracula.theme
 Copyright: 2018 Dracula Team
 License: MIT
 
-Files: share/tools/web_config/themes/Nord.theme
+Files: share/themes/Nord.theme
 Copyright: 2016-2024 Sven Greb
 License: MIT
 

contrib/debian/rules

@@ -1,8 +1,11 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
+ifeq (,$(filter terse,$(DEB_BUILD_OPTIONS)))
-export DH_VERBOSE=1
+  export DH_VERBOSE=1
+  # VERBOSE to satisfy Debian policy 4.9, introduced in version 4.2.0
+  export CARGO_TERM_VERBOSE=true
+endif
 # 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

crates/build-helper/Cargo.toml

@@ -4,6 +4,7 @@ edition.workspace = true
 rust-version.workspace = true
 version = "0.0.0"
 repository.workspace = true
+license.workspace = true
 
 [dependencies]
 rsconf.workspace = true

crates/build-helper/src/lib.rs

@@ -45,3 +45,41 @@ 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"
+}

crates/build-man-pages/Cargo.toml

@@ -4,6 +4,7 @@ edition.workspace = true
 rust-version.workspace = true
 version = "0.0.0"
 repository.workspace = true
+license.workspace = true
 
 [build-dependencies]
 fish-build-helper.workspace = true

crates/build-man-pages/build.rs

@@ -1,33 +1,23 @@
-use fish_build_helper::env_var;
 use std::path::Path;
 
 fn main() {
     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
+    // Running `cargo clippy` on a clean build directory panics, because when rust-embed
-    // embed a directory which does not exist it will panic.
+    // tries to embed a directory which does not exist it will panic.
     let _ = std::fs::create_dir_all(&sec1_dir);
-
+    if !cfg!(clippy) {
-    let help_sections_path = Path::new(&env_var("OUT_DIR").unwrap()).join("help_sections.rs");
+        build_man(&man_dir, &sec1_dir);
-    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);
 }
 
-#[cfg(not(clippy))]
+fn build_man(man_dir: &Path, sec1_dir: &Path) {
-fn build_man(man_dir: &Path, sec1_dir: &Path, help_sections_path: &Path) {
+    use fish_build_helper::{env_var, workspace_root};
     use std::{
         ffi::OsStr,
         process::{Command, Stdio},
     };
 
-    use fish_build_helper::workspace_root;
-
     let workspace_root = workspace_root();
     let doc_src_dir = workspace_root.join("doc_src");
 
@@ -37,7 +27,6 @@ fn build_man(man_dir: &Path, sec1_dir: &Path, help_sections_path: &Path) {
         &doc_src_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()
@@ -63,8 +52,6 @@ macro_rules! as_os_strs {
             &man_dir,
             &doc_src_dir,
             &sec1_dir,
-            "-D",
-            &help_sections_arg,
         ])
     };
 

crates/build-man-pages/src/lib.rs

@@ -1 +1 @@
-include!(concat!(env!("OUT_DIR"), "/help_sections.rs"));
+

crates/common/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "fish-common"
+edition.workspace = true
+rust-version.workspace = true
+version = "0.0.0"
+repository.workspace = true
+license.workspace = true
+
+[dependencies]
+libc.workspace = true
+nix.workspace = true
+
+[lints]
+workspace = true

crates/common/src/lib.rs

@@ -0,0 +1,60 @@
+use libc::STDIN_FILENO;
+use std::env;
+use std::os::unix::ffi::OsStrExt;
+use std::sync::OnceLock;
+
+// These are in the Unicode private-use range. We really shouldn't use this
+// range but have little choice in the matter given how our lexer/parser works.
+// We can't use non-characters for these two ranges because there are only 66 of
+// them and we need at least 256 + 64.
+//
+// If sizeof(wchar_t))==4 we could avoid using private-use chars; however, that
+// would result in fish having different behavior on machines with 16 versus 32
+// bit wchar_t. It's better that fish behave the same on both types of systems.
+//
+// Note: We don't use the highest 8 bit range (0xF800 - 0xF8FF) because we know
+// of at least one use of a codepoint in that range: the Apple symbol (0xF8FF)
+// on Mac OS X. See http://www.unicode.org/faq/private_use.html.
+pub const ENCODE_DIRECT_BASE: char = '\u{F600}';
+pub const ENCODE_DIRECT_END: char = char_offset(ENCODE_DIRECT_BASE, 256);
+
+pub const fn char_offset(base: char, offset: u32) -> char {
+    match char::from_u32(base as u32 + offset) {
+        Some(c) => c,
+        None => panic!("not a valid char"),
+    }
+}
+
+pub fn subslice_position<T: Eq>(a: &[T], b: &[T]) -> Option<usize> {
+    if b.is_empty() {
+        return Some(0);
+    }
+    a.windows(b.len()).position(|aw| aw == b)
+}
+
+/// 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'-'))
+            })
+    })
+}

crates/fallback/Cargo.toml

@@ -0,0 +1,21 @@
+[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-wchar.workspace = true
+fish-widecharwidth.workspace = true
+libc.workspace = true
+widestring.workspace = true
+
+[build-dependencies]
+fish-build-helper.workspace = true
+rsconf.workspace = true
+
+[lints]
+workspace = true

crates/fallback/build.rs

@@ -0,0 +1,5 @@
+use fish_build_helper::target_os_is_cygwin;
+
+fn main() {
+    rsconf::declare_cfg("cygwin", target_os_is_cygwin())
+}

crates/fallback/src/lib.rs

@@ -3,11 +3,13 @@
 //!
 //! Many of these functions are more or less broken and incomplete.
 
-use crate::wchar::prelude::*;
+use fish_wchar::prelude::*;
-use crate::widecharwidth::{WcLookupTable, WcWidth};
+use fish_widecharwidth::{WcLookupTable, WcWidth};
-use once_cell::sync::Lazy;
 use std::cmp;
-use std::sync::atomic::{AtomicIsize, Ordering};
+use std::sync::{
+    LazyLock,
+    atomic::{AtomicIsize, Ordering},
+};
 
 /// Width of ambiguous East Asian characters and, as of TR11, all private-use characters.
 /// 1 is the typical default, but we accept any non-negative override via `$fish_ambiguous_width`.
@@ -25,7 +27,7 @@
 // For some reason, this is declared here and exposed here, but is set in `env_dispatch`.
 pub static FISH_EMOJI_WIDTH: AtomicIsize = AtomicIsize::new(1);
 
-static WC_LOOKUP_TABLE: Lazy<WcLookupTable> = Lazy::new(WcLookupTable::new);
+static WC_LOOKUP_TABLE: LazyLock<WcLookupTable> = LazyLock::new(WcLookupTable::new);
 
 /// A safe wrapper around the system `wcwidth()` function
 #[cfg(not(cygwin))]
@@ -46,7 +48,7 @@ pub fn fish_wcwidth(c: char) -> isize {
     // in the console session, but knows nothing about the capabilities of other terminal emulators
     // or ttys. Use it from the start only if we are logged in to the physical console.
     #[cfg(not(cygwin))]
-    if crate::common::is_console_session() {
+    if fish_common::is_console_session() {
         return wcwidth(c);
     }
 
@@ -116,21 +118,36 @@ pub fn wcscasecmp(lhs: &wstr, rhs: &wstr) -> cmp::Ordering {
 }
 
 /// Compare two wide strings in a case-insensitive fashion
-pub fn wcscasecmp_fuzzy(lhs: &wstr, rhs: &wstr, canonicalize: fn(char) -> char) -> cmp::Ordering {
+pub fn wcscasecmp_fuzzy(
-    use std::char::ToLowercase;
+    lhs: &wstr,
-    use widestring::utfstr::CharsUtf32;
+    rhs: &wstr,
+    extra_canonicalization: fn(char) -> char,
+) -> cmp::Ordering {
+    lowercase(lhs.chars())
+        .map(extra_canonicalization)
+        .cmp(lowercase(rhs.chars()).map(extra_canonicalization))
+}
 
-    /// This struct streams the underlying lowercase chars of a `UTF32String` without allocating.
+pub fn lowercase(chars: impl Iterator<Item = char>) -> impl Iterator<Item = char> {
-    ///
+    lowercase_impl(chars, |c| c.to_lowercase())
-    /// `char::to_lowercase()` returns an iterator of chars and we sometimes need to cmp the last
+}
-    /// char of one char's `to_lowercase()` with the first char of the other char's
+pub fn lowercase_rev(chars: impl DoubleEndedIterator<Item = char>) -> impl Iterator<Item = char> {
-    /// `to_lowercase()`. This makes that possible.
+    lowercase_impl(chars.rev(), |c| c.to_lowercase().rev())
-    struct ToLowerBuffer<'a, Canonicalize: Fn(char) -> char> {
+}
+fn lowercase_impl<ToLowercase: Iterator<Item = char>>(
+    chars: impl Iterator<Item = char>,
+    to_lowercase: fn(char) -> ToLowercase,
+) -> impl Iterator<Item = char> {
+    /// This struct streams the underlying lowercase chars of a string without allocating.
+    struct ToLowerBuffer<Chars: Iterator<Item = char>, ToLowercase: Iterator<Item = char>> {
+        to_lowercase: fn(char) -> ToLowercase,
         current: ToLowercase,
-        chars: std::iter::Map<CharsUtf32<'a>, Canonicalize>,
+        chars: Chars,
     }
 
-    impl<'a, Canonicalize: Fn(char) -> char> Iterator for ToLowerBuffer<'a, Canonicalize> {
+    impl<Chars: Iterator<Item = char>, ToLowercase: Iterator<Item = char>> Iterator
+        for ToLowerBuffer<Chars, ToLowercase>
+    {
         type Item = char;
 
         fn next(&mut self) -> Option<Self::Item> {
@@ -138,34 +155,37 @@ fn next(&mut self) -> Option<Self::Item> {
                 return Some(c);
             }
 
-            self.current = self.chars.next()?.to_lowercase();
+            self.current = (self.to_lowercase)(self.chars.next()?);
             self.current.next()
         }
     }
 
-    impl<'a, Canonicalize: Fn(char) -> char> ToLowerBuffer<'a, Canonicalize> {
+    impl<Chars: Iterator<Item = char>, ToLowercase: Iterator<Item = char>>
-        pub fn new(mut chars: std::iter::Map<CharsUtf32<'a>, Canonicalize>) -> Self {
+        ToLowerBuffer<Chars, ToLowercase>
+    {
+        pub fn new(mut chars: Chars, to_lowercase: fn(char) -> ToLowercase) -> Self {
             Self {
-                current: chars.next().map(|c| c.to_lowercase()).unwrap_or_else(|| {
+                to_lowercase,
-                    let mut empty = 'a'.to_lowercase();
+                current: chars.next().map_or_else(
-                    let _ = empty.next();
+                    || {
-                    debug_assert!(empty.next().is_none());
+                        let mut empty = to_lowercase('a');
-                    empty
+                        let _ = empty.next();
-                }),
+                        debug_assert!(empty.next().is_none());
+                        empty
+                    },
+                    to_lowercase,
+                ),
                 chars,
             }
         }
     }
-
+    ToLowerBuffer::new(chars, to_lowercase)
-    let lhs = ToLowerBuffer::new(lhs.chars().map(canonicalize));
-    let rhs = ToLowerBuffer::new(rhs.chars().map(canonicalize));
-    lhs.cmp(rhs)
 }
 
 #[cfg(test)]
 mod tests {
     use super::wcscasecmp;
-    use crate::wchar::prelude::*;
+    use fish_wchar::prelude::*;
     use std::cmp::Ordering;
 
     #[test]

crates/gettext-extraction/Cargo.toml

@@ -4,13 +4,18 @@ 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

crates/gettext-extraction/build.rs

@@ -0,0 +1,3 @@
+fn main() {
+    rsconf::rebuild_if_env_changed("FISH_GETTEXT_EXTRACTION_DIR");
+}

crates/gettext-extraction/src/lib.rs

@@ -1,6 +1,7 @@
 extern crate proc_macro;
+use fish_tempfile::random_filename;
 use proc_macro::TokenStream;
-use std::{ffi::OsString, fs::OpenOptions, io::Write};
+use std::{ffi::OsString, io::Write, path::PathBuf};
 
 fn unescape_multiline_rust_string(s: String) -> String {
     if !s.contains('\n') {
@@ -42,12 +43,9 @@ enum State {
     unescaped
 }
 
-fn append_po_entry_to_file(message: &TokenStream, file_name: &OsString) {
+// Each entry is written to a fresh file to avoid race conditions arising when there are multiple
-    let mut file = OpenOptions::new()
+// unsynchronized writers to the same file.
-        .create(true)
+fn write_po_entry_to_file(message: &TokenStream, dir: &OsString) {
-        .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());
     if message_string.contains('\n') {
         panic!(
@@ -61,25 +59,32 @@ fn append_po_entry_to_file(message: &TokenStream, file_name: &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_FILE` is defined in the environment,
+/// If `FISH_GETTEXT_EXTRACTION_DIR` is defined in the environment,
-/// this file is used to write the message,
+/// the message ID is written into a new file in this directory,
 /// so that it can then be used for generating gettext PO files.
 /// The `message` must be a string literal.
 ///
 /// # Panics
 ///
-/// This macro panics if the `FISH_GETTEXT_EXTRACTION_FILE` variable is set and `message` has an
+/// This macro panics if the `FISH_GETTEXT_EXTRACTION_DIR` variable is set and `message` has an
 /// unexpected format.
 /// Note that for example `concat!(...)` cannot be passed to this macro, because expansion works
 /// outside in, meaning this macro would still see the `concat!` macro invocation, instead of a
 /// string literal.
 #[proc_macro]
 pub fn gettext_extract(message: TokenStream) -> TokenStream {
-    if let Some(file_path) = std::env::var_os("FISH_GETTEXT_EXTRACTION_FILE") {
+    if let Some(dir_path) = std::env::var_os("FISH_GETTEXT_EXTRACTION_DIR") {
         let pm2_message = proc_macro2::TokenStream::from(message.clone());
         let mut token_trees = pm2_message.into_iter();
         let first_token = token_trees
@@ -103,7 +108,7 @@ pub fn gettext_extract(message: TokenStream) -> TokenStream {
             )
         }
         if let proc_macro2::TokenTree::Literal(_) = first_group_token {
-            append_po_entry_to_file(&message, &file_path);
+            write_po_entry_to_file(&message, &dir_path);
         } else {
             panic!("Expected literal in gettext_extract, but got: {first_group_token:?}");
         }

crates/gettext-maps/Cargo.toml

@@ -4,6 +4,7 @@ edition.workspace = true
 rust-version.workspace = true
 version = "0.0.0"
 repository.workspace = true
+license.workspace = true
 
 [dependencies]
 phf.workspace = true

crates/gettext-maps/build.rs

@@ -11,7 +11,11 @@ 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("po"));
+    fish_build_helper::rebuild_if_path_changed(
+        fish_build_helper::workspace_root()
+            .join("localization")
+            .join("po"),
+    );
 }
 
 fn embed_localizations(cache_dir: &Path) {
@@ -21,7 +25,9 @@ fn embed_localizations(cache_dir: &Path) {
         io::{BufWriter, Write},
     };
 
-    let po_dir = fish_build_helper::workspace_root().join("po");
+    let po_dir = fish_build_helper::workspace_root()
+        .join("localization")
+        .join("po");
 
     // Ensure that the directory is created, because clippy cannot compile the code if the
     // directory does not exist.
@@ -41,7 +47,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 po` followed by the build command."
+                 For example by running `touch localization/po` followed by the build command."
             );
         }
         Err(e) => {

crates/gettext-mo-file-parser/Cargo.toml

@@ -4,6 +4,7 @@ edition.workspace = true
 rust-version.workspace = true
 version = "0.0.0"
 repository.workspace = true
+license.workspace = true
 
 [lints]
 workspace = true

crates/gettext/Cargo.toml

@@ -0,0 +1,14 @@
+[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

crates/gettext/src/lib.rs

@@ -0,0 +1,60 @@
+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()
+}

crates/printf/src/arg.rs

@@ -233,7 +233,7 @@ fn test_to_arg() {
         assert!(matches!(42u64.to_arg(), Arg::UInt(42)));
         assert!(matches!(42usize.to_arg(), Arg::UInt(42)));
 
-        let ptr = &42f32 as *const f32;
+        let ptr = std::ptr::from_ref(&42f32);
         assert!(matches!(ptr.to_arg(), Arg::UInt(_)));
     }
 

crates/printf/src/tests.rs

@@ -1,7 +1,6 @@
 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;
@@ -890,10 +889,16 @@ 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() as *mut c_char;
+        let storage_ptr = storage.as_mut_ptr();
-        let len = libc::snprintf(storage_ptr, storage.len(), fmt.as_ptr(), preci, float_val);
+        let len = libc::snprintf(
+            storage_ptr.cast(),
+            storage.len(),
+            fmt.as_ptr(),
+            preci,
+            float_val,
+        );
         assert!(len >= 0);
-        let sl = std::slice::from_raw_parts(storage_ptr as *const u8, len as usize);
+        let sl = std::slice::from_raw_parts(storage_ptr, len as usize);
         std::str::from_utf8(sl).unwrap()
     }
 }

crates/tempfile/Cargo.toml

@@ -4,9 +4,11 @@ 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

crates/tempfile/src/lib.rs

@@ -1,4 +1,11 @@
-use std::{fs::File, path::PathBuf};
+use std::{
+    ffi::OsString,
+    fs::{File, OpenOptions},
+    io::ErrorKind,
+    path::PathBuf,
+};
+
+use rand::distr::{Alphanumeric, Distribution};
 
 pub struct TempFile {
     file: File,
@@ -41,20 +48,56 @@ fn drop(&mut self) {
     }
 }
 
-fn get_tmpdir() -> PathBuf {
+/// Creates a random filename with the given prefix.
-    PathBuf::from(std::env::var_os("TMPDIR").unwrap_or("/tmp".into()))
+/// 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_template() -> PathBuf {
+/// Tries to create a new file at the path returned by `generate_path`.
-    get_tmpdir().join("fish_tmp_XXXXXX")
+/// 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));
+                }
+            }
+        }
+    }
 }
 
-/// Tries to create a new temporary file using `mkstemp`.
+/// Tries to create a new temporary file in the operating system's default location for temporary
+/// files.
 /// 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 (fd, path) = nix::unistd::mkstemp(&get_template())?;
+    let (path, result) = create_file_with_retry(|| {
-    let file = File::from(fd);
+        std::env::temp_dir().join(random_filename(OsString::from("fish_tmp_")))
+    });
+    let file = result?;
     Ok(TempFile { file, path })
 }
 
@@ -62,7 +105,8 @@ 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 path = nix::unistd::mkdtemp(&get_template())?;
+    let template = std::env::temp_dir().join("fish_tmp_XXXXXX");
+    let path = nix::unistd::mkdtemp(&template)?;
     Ok(TempDir { path })
 }
 

crates/wchar/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "fish-wchar"
+edition.workspace = true
+rust-version.workspace = true
+version = "0.0.0"
+repository.workspace = true
+license.workspace = true
+
+[dependencies]
+fish-common.workspace = true
+widestring.workspace = true
+
+[lints]
+workspace = true

crates/wchar/src/lib.rs

@@ -1,11 +1,51 @@
-use std::{iter, slice};
+//! Support for wide strings.
+//!
+//! There are two wide string types that are commonly used:
+//!   - wstr: a string slice without a nul terminator. Like `&str` but wide chars.
+//!   - WString: an owning string without a nul terminator. Like `String` but wide chars.
 
-use crate::{
+use fish_common::{ENCODE_DIRECT_BASE, ENCODE_DIRECT_END, subslice_position};
-    L,
+use std::{iter, slice};
-    common::subslice_position,
+pub use widestring::{Utf32Str as wstr, Utf32String as WString, utfstr::CharsUtf32};
-    wchar::{WString, wstr},
+
-};
+pub mod prelude {
-use widestring::utfstr::CharsUtf32;
+    pub use crate::{IntoCharIter, L, ToWString, WExt, WString, wstr};
+}
+
+/// Creates a wstr string slice, like the "L" prefix of C++.
+/// The result is of type wstr.
+/// It is NOT nul-terminated.
+#[macro_export]
+macro_rules! L {
+    ($string:expr) => {
+        widestring::utf32str!($string)
+    };
+}
+
+/// Encode a literal byte in a UTF-32 character. This is required for e.g. the echo builtin, whose
+/// escape sequences can be used to construct raw byte sequences which are then interpreted as e.g.
+/// UTF-8 by the terminal. If we were to interpret each of those bytes as a codepoint and encode it
+/// as a UTF-32 character, printing them would result in several characters instead of one UTF-8
+/// character.
+///
+/// See <https://github.com/fish-shell/fish-shell/issues/1894>.
+pub fn encode_byte_to_char(byte: u8) -> char {
+    char::from_u32(u32::from(ENCODE_DIRECT_BASE) + u32::from(byte))
+        .expect("private-use codepoint should be valid char")
+}
+
+/// Decode a literal byte from a UTF-32 character.
+pub fn decode_byte_from_char(c: char) -> Option<u8> {
+    if c >= ENCODE_DIRECT_BASE && c < ENCODE_DIRECT_END {
+        Some(
+            (u32::from(c) - u32::from(ENCODE_DIRECT_BASE))
+                .try_into()
+                .unwrap(),
+        )
+    } else {
+        None
+    }
+}
 
 /// Helpers to convert things to widestring.
 /// This is like std::string::ToString.
@@ -73,6 +113,9 @@ fn to_wstring(&self) -> WString {
 pub trait IntoCharIter {
     type Iter: DoubleEndedIterator<Item = char> + Clone;
     fn chars(self) -> Self::Iter;
+    fn extend_wstring(&self, _out: &mut WString) -> bool {
+        false
+    }
 }
 
 impl IntoCharIter for char {
@@ -89,12 +132,23 @@ fn chars(self) -> Self::Iter {
     }
 }
 
+impl<'a> IntoCharIter for &'a String {
+    type Iter = std::str::Chars<'a>;
+    fn chars(self) -> Self::Iter {
+        str::chars(self)
+    }
+}
+
 impl<'a> IntoCharIter for &'a [char] {
     type Iter = iter::Copied<slice::Iter<'a, char>>;
 
     fn chars(self) -> Self::Iter {
         self.iter().copied()
     }
+    fn extend_wstring(&self, out: &mut WString) -> bool {
+        out.push_utfstr(wstr::from_char_slice(self));
+        true
+    }
 }
 
 impl<'a> IntoCharIter for &'a wstr {
@@ -102,6 +156,9 @@ impl<'a> IntoCharIter for &'a wstr {
     fn chars(self) -> Self::Iter {
         wstr::chars(self)
     }
+    fn extend_wstring(&self, out: &mut WString) -> bool {
+        self.as_char_slice().extend_wstring(out)
+    }
 }
 
 impl<'a> IntoCharIter for &'a WString {
@@ -109,6 +166,9 @@ impl<'a> IntoCharIter for &'a WString {
     fn chars(self) -> Self::Iter {
         wstr::chars(self)
     }
+    fn extend_wstring(&self, out: &mut WString) -> bool {
+        self.as_char_slice().extend_wstring(out)
+    }
 }
 
 // Also support `str.chars()` itself.
@@ -127,6 +187,23 @@ fn chars(self) -> Self::Iter {
     }
 }
 
+impl<'a: 'b, 'b> IntoCharIter for &'b std::borrow::Cow<'a, str> {
+    type Iter = std::str::Chars<'b>;
+    fn chars(self) -> Self::Iter {
+        str::chars(self)
+    }
+}
+
+impl<'a: 'b, 'b> IntoCharIter for &'b std::borrow::Cow<'a, wstr> {
+    type Iter = CharsUtf32<'b>;
+    fn chars(self) -> Self::Iter {
+        wstr::chars(self)
+    }
+    fn extend_wstring(&self, out: &mut WString) -> bool {
+        self.as_char_slice().extend_wstring(out)
+    }
+}
+
 /// Return true if `prefix` is a prefix of `contents`.
 fn iter_prefixes_iter<Prefix, Contents>(prefix: Prefix, mut contents: Contents) -> bool
 where
@@ -157,10 +234,10 @@ fn next(&mut self) -> Option<Self::Item> {
         if let Some(idx) = chars.iter().position(|c| *c == self.split) {
             let (prefix, rest) = chars.split_at(idx);
             self.chars = Some(&rest[1..]);
-            return Some(wstr::from_char_slice(prefix));
+            Some(wstr::from_char_slice(prefix))
         } else {
             self.chars = None;
-            return Some(wstr::from_char_slice(chars));
+            Some(wstr::from_char_slice(chars))
         }
     }
 }
@@ -303,7 +380,6 @@ fn as_char_slice(&self) -> &[char] {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::wchar::L;
 
     #[test]
     fn test_to_wstring() {

crates/widecharwidth/Cargo.toml

@@ -0,0 +1,10 @@
+[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

debian/compat

@@ -1 +0,0 @@
-12

deny.toml

@@ -6,9 +6,12 @@ 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",

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.
 

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::wchar::prelude::*;
+use crate::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 {
@@ -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.
 

doc_src/cmds/_.rst

@@ -23,6 +23,8 @@ 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
 -------
 

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
+    abbr [--show] [--color WHEN]
     abbr --list
     abbr --query NAME ...
 
@@ -75,7 +75,6 @@ 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
 ########
 

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] [KEYS]
+    bind [(-M | --mode) MODE] [--preset] [--user] [--color WHEN] [KEYS]
-    bind [-a | --all] [--preset] [--user]
+    bind [-a | --all] [--preset] [--user] [--color WHEN]
     bind (-f | --function-names)
     bind (-K | --key-names)
     bind (-L | --list-modes)
@@ -104,6 +104,10 @@ 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.
 
@@ -145,12 +149,17 @@ The following special input functions are available:
 ``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. The "word" here is everything up to punctuation or whitespace.
 
+``backward-path-component``
+    move one :ref:`path component <cmd-bind-backward-kill-path-component>` to the left.
+
 ``backward-word``
     move one word to the left
 
@@ -241,6 +250,9 @@ 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.
 
@@ -308,6 +320,9 @@ The following special input functions are available:
 ``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
 

doc_src/cmds/complete.rst

@@ -6,7 +6,7 @@ Synopsis
 
 .. synopsis::
 
-    complete ((-c | --command) | (-p | --path)) COMMAND [OPTIONS]
+    complete ((-c | --command) | (-p | --path)) COMMAND [OPTIONS] [--color WHEN]
     complete (-C | --do-complete) [--escape] STRING
 
 Description
@@ -74,6 +74,10 @@ The following options are available:
 **--escape**
     When used with ``-C``, escape special characters in completions.
 
+**--color** *WHEN*
+    Controls when to use syntax highlighting colors when printing completions.
+    *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.
 
@@ -103,6 +107,31 @@ When erasing completions, it is possible to either erase all completions for a s
 
 When ``complete`` is called without anything that would define or erase completions (options, arguments, wrapping, ...), it shows matching completions instead. So ``complete`` without any arguments shows all loaded completions, ``complete -c foo`` shows all loaded completions for ``foo``. Since completions are :ref:`autoloaded <syntax-function-autoloading>`, you will have to trigger them first.
 
+.. _completions-cygwin:
+
+Cygwin / MSYS2 / Windows
+------------------------
+
+On Windows, binary executables have a ``.exe`` extension, but this extension is not required when calling an application (and if the name is not ambiguous, i.e. there isn't also a script called ``myprog`` in the same directory as ``myprog.exe``).
+
+To unify completions between Windows and other OSes, on Cygwin/MSYS2/Windows, *COMMAND* does not require the ``.exe`` extension.
+Completions for ``myprog`` will also be used for ``myprog.exe`` if there are no ambiguities, i.e. if there are no completions for ``myprog.exe`` specifically.
+However, completions for ``myprog.exe`` will only be used when also using the ``.exe`` extension on the command line.
+
+In other words:
+
+::
+
+    complete -c myprog.exe ...  #1
+
+will only work for ``myprog.exe``
+
+::
+
+    complete -c myprog ...  #2
+
+can work for both ``myprog`` and ``myprog.exe``. But if both completions exist, #2 will only be used for ``myprog`` while ``myprog.exe`` will use #1.
+
 Examples
 --------
 

doc_src/cmds/fish_config.rst

@@ -8,7 +8,12 @@ Synopsis
 
     fish_config [browse]
     fish_config prompt (choose | list | save | show)
-    fish_config theme (choose | demo | dump | list | save | show)
+    fish_config theme
+    fish_config theme choose THEME [ --color-theme=(dark | light) ]
+    fish_config theme demo
+    fish_config theme dump
+    fish_config theme list
+    fish_config theme show [THEME...]
 
 Description
 -----------
@@ -32,15 +37,20 @@ With the ``theme`` command ``fish_config`` can be used to view and choose a them
 
 Available subcommands for the ``theme`` command:
 
-- ``choose`` loads a sample theme in the current session.
+- ``choose`` loads a theme in the current session.
+  If the theme has light and dark variants (see below), the one matching :envvar:`fish_terminal_color_theme` will be applied (also whenever that variable changes).
+  To override :envvar:`fish_terminal_color_theme`, pass the ``--color-theme`` argument.
 - ``demo`` displays some sample text in the current theme.
 - ``dump`` prints the current theme in a loadable format.
-- ``list`` lists the names of the available sample themes.
+- ``list`` lists the names of the available themes.
-- ``save`` saves the given theme to :ref:`universal variables <variables-universal>`.
+- ``show`` shows what the given themes (or all) would look like.
-- ``show`` shows what the given sample theme (or all) would look like.
+- *(not recommended)* ``save`` saves the given theme to :ref:`universal variables <variables-universal>`.
+  A theme set this way will not update as :envvar:`fish_terminal_color_theme` changes.
 
 The **-h** or **--help** option displays help about using this command.
 
+.. _fish-config-theme-files:
+
 Theme Files
 -----------
 
@@ -60,24 +70,38 @@ The format looks like this:
 
 ::
 
-   # name: 'Cool Beans'
+    # name: 'My Theme'
-   # preferred_background: black
 
-   fish_color_autosuggestion 666
+    [light]
-   fish_color_cancel -r
+    # preferred_background: ffffff
-   fish_color_command normal
+    fish_color_normal 000000
-   fish_color_comment '888'  '--italics'
+    fish_color_autosuggestion 7f7f7f
-   fish_color_cwd 0A0
+    fish_color_command 0000ee
-   fish_color_cwd_root A00
-   fish_color_end 009900
 
-The two comments at the beginning are the name and background that the web config tool shows.
+    [dark]
+    # preferred_background: 000000
+    fish_color_normal ffffff
+    fish_color_autosuggestion 7f7f7f
+    fish_color_command 5c5cff
+
+    [unknown]
+    fish_color_normal normal
+    fish_color_autosuggestion brblack
+    fish_color_cancel -r
+    fish_color_command normal
+
+The comments provide name and background color to the web config tool.
+
+Themes can have three variants,
+one for light mode,
+one for dark mode,
+and one for terminals that don't :ref:`report colors <term-compat-query-background-color>` (where :envvar:`fish_terminal_color_theme` is set to ``unknown``).
 
 The other lines are just like ``set variable value``, except that no expansions are allowed. Quotes are, but aren't necessary.
 
-Any color variable fish knows about that the theme doesn't set will be set to empty when it is loaded, so the old theme is completely overwritten.
+.. _fish_config-color-variables:
 
-Other than that, .theme files can contain any variable with a name that matches the regular expression ``'^fish_(?:pager_)?color.*$'`` - starts with ``fish_``, an optional ``pager_``, then ``color`` and then anything.
+Other than that, .theme files can contain any variable with a name that matches the regular expression ``'^fish_(?:pager_)?color_.*$'`` - starts with ``fish_``, an optional ``pager_``, then ``color_`` and then anything.
 
 Example
 -------

doc_src/cmds/fish_hg_prompt.rst

@@ -23,7 +23,7 @@ The fish_hg_prompt function displays information about the current Mercurial rep
 
 By default, only the current branch is shown because ``hg status`` can be slow on a large repository. You can enable a more informative prompt by setting the variable ``$fish_prompt_hg_show_informative_status``, for example::
 
-    set --universal fish_prompt_hg_show_informative_status
+    set fish_prompt_hg_show_informative_status
 
 If you enabled the informative status, there are numerous customization options, which can be controlled with fish variables.
 

doc_src/cmds/fish_opt.rst

@@ -72,7 +72,7 @@ Same as above but the value of the second flag cannot be the empty string:
 ::
 
     set -l options (fish_opt -s h -l help)
-    set options $options (fish_opt -s m -l max -rv test \$_flag_valu != "''")
+    set options $options (fish_opt -s m -l max -rv test \$_flag_value != "''")
     argparse $options -- $argv
 
 Same as above but with a third flag that can be given multiple times saving the value of each instance seen and only a long flag name (``--token``) is defined:
@@ -82,7 +82,7 @@ Same as above but with a third flag that can be given multiple times saving the
 ::
 
     set -l options (fish_opt --short=h --long=help)
-    set options $options (fish_opt --short=m --long=max --required-val --validate test \$_flag_valu != "''")
+    set options $options (fish_opt --short=m --long=max --required-val --validate test \$_flag_value != "''")
     set options $options (fish_opt --long=token --multiple-vals)
     argparse $options -- $argv
 

doc_src/cmds/functions.rst

@@ -6,8 +6,8 @@ Synopsis
 
 .. synopsis::
 
-    functions [-a | --all] [-n | --names]
+    functions [-a | --all] [-n | --names] [--color WHEN]
-    functions [-D | --details] [-v] FUNCTION
+    functions [-D | --details] [-v] [--color WHEN] FUNCTION
     functions -c OLDNAME NEWNAME
     functions -d DESCRIPTION FUNCTION
     functions [-e | -q] FUNCTION ...
@@ -60,6 +60,10 @@ The following options are available:
 **-t** or **--handlers-type** *TYPE*
     Show all event handlers matching the given *TYPE*.
 
+**--color** *WHEN*
+    Controls when to use syntax highlighting colors when printing function definitions.
+    *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.
 

doc_src/cmds/history.rst

@@ -75,6 +75,10 @@ These flags can appear before or immediately after one of the sub-commands liste
 **-R** or **--reverse**
     Causes the history search results to be ordered oldest to newest. Which is the order used by most shells. The default is newest to oldest.
 
+**--color** *WHEN*
+    Controls when to use syntax highlighting colors for the history entries.
+    *WHEN* can be ``auto`` (the default, colorize if the output :doc:`is a terminal <isatty>`), ``always``, or ``never``.
+
 **-h** or **--help**
     Displays help for this command.
 

doc_src/cmds/math.rst

@@ -29,6 +29,11 @@ When in doubt, use parentheses.
 ``math`` ignores whitespace between arguments and takes its input as multiple arguments (internally joined with a space), so ``math 2 +2`` and ``math "2 +    2"`` work the same.
 ``math 2 2`` is an error.
 
+.. note::
+
+   math is a simple tool for simple uses, provided for convenience. It internally works with floats for simplicity of implementation and can't do a number of things real calculators can.
+   If you find yourself limited by that, use a more full-featured tool.
+
 The following options are available:
 
 **-s** *N* or **--scale** *N*
@@ -153,7 +158,7 @@ Functions
 ``ln``
     the base-e logarithm
 ``log`` or ``log10``
-    the base-10 logarithm
+    the base-10 logarithm. To compute the logarithm for an arbitrary base ``b``, use ``log(x) / log(b)``.
 ``log2``
     the base-2 logarithm
 ``max``

doc_src/cmds/set.rst

@@ -12,7 +12,8 @@ Synopsis
     set [-Uflg] NAME[[INDEX ...]] [VALUE ...]
     set (-x | --export) (-u | --unexport) [-Uflg] NAME [VALUE ...]
     set (-a | --append) (-p | --prepend) [-Uflg] NAME VALUE ...
-    set (-q | --query) (-e | --erase) [-Uflg] [NAME][[INDEX]] ...]
+    set (-e | --erase) [-Uflg] [-xu] [NAME][[INDEX]] ...]
+    set (-q | --query) [-Uflg] [-xu] [NAME][[INDEX]] ...]
     set (-S | --show) (-L | --long) [NAME ...]
 
 Description
@@ -88,6 +89,7 @@ Further options:
 **-q** or **--query** *NAME*\[*INDEX*\]
     Test if the specified variable names are defined.
     If an *INDEX* is provided, check for items at that slot.
+    With a given scope (like **--global**) or attribute (like **--exported** or **--path**) check only variables that match.
     Does not output anything, but the shell status is set to the number of variables specified that were not defined, up to a maximum of 255.
     If no variable was given, it also returns 255.
 

doc_src/cmds/set_color.rst

@@ -57,6 +57,15 @@ The following options are available:
 **-u** or **--underline**, or **-uSTYLE** or **--underline=STYLE**
     Set the underline mode; supported styles are **single** (default), **double**, **curly**, **dotted** and **dashed**.
 
+**--theme=THEME**
+    Ignored.
+    :ref:`Color variables <variables-color>` that contain only this option are treated like missing / empty color variables,
+    i.e. fish will use the fallback color instead.
+    :doc:`fish_config theme choose <fish_config>` erases all :ref:`color variable <fish_config-color-variables>`
+    whose value includes this option, and adds this option to all color variables it sets.
+    This allows identifying variables set by a theme,
+    and it allows fish to update color variables whenever :envvar:`fish_terminal_color_theme` changes.
+
 **-h** or **--help**
     Displays help about using this command.
 

doc_src/cmds/status.rst

@@ -30,10 +30,10 @@ Synopsis
     status test-feature FEATURE
     status build-info
     status get-file FILE
-    status list-files [PATH]
+    status list-files [PATH ...]
-    status help-sections
     status terminal
     status test-terminal-feature FEATURE
+    status language [list-available|set [LANGUAGE ...]|unset]
 
 Description
 -----------
@@ -118,19 +118,12 @@ The following operations (subcommands) are available:
     as well as the man pages and themes. Which files are included depends on build settings.
     Returns 0 if the file was included, 1 otherwise.
 
-**list-files** *FILE*
+**list-files** *FILE...*
     NOTE: this subcommand is mainly intended for fish's internal use; let us know if you want to use it elsewhere.
 
     This lists the files embedded in the fish binary at compile time. Only files where the path starts with the optional *FILE* argument are shown.
     Returns 0 if something was printed, 1 otherwise.
 
-**help-sections**
-    NOTE: this subcommand is intended for fish's internal use.
-
-    List section arguments for the :doc:`help <help>` command.
-    If you have the latest version of fish, these URL fragments are valid on `<https://fishshell.com/docs/current/>`__.
-    Always returns 0.
-
 .. _status-terminal:
 
 **terminal**
@@ -138,6 +131,13 @@ The following operations (subcommands) are available:
     This is not available during early startup but only starting from when the first interactive prompt is shown, possibly via builtin :doc:`read <read>`,
     so before the first ``fish_prompt`` or ``fish_read`` :ref:`event <event>`.
 
+.. _status-terminal-os:
+
+**terminal-os**
+    Prints the name of the operating system (OS) the terminal is running on, as reported via :ref:`XTGETTCAP query-os-name <term-compat-xtgettcap>`.
+    Like :ref:`status terminal <status-terminal>`, this only works once the first interactive prompt is shown.
+    Returns 1 if the OS name is not available.
+
 .. _status-test-terminal-features:
 
 **test-terminal-feature** *FEATURE*
@@ -147,6 +147,32 @@ The following operations (subcommands) are available:
     Currently the only available *FEATURE* is :ref:`scroll-content-up <term-compat-indn>`.
     An error will be printed when passed an unrecognized feature.
 
+.. _status-language:
+
+**language**
+    Show or modify message localization settings.
+    When invoked without arguments, the current language settings are shown.
+
+    Available subcommands:
+
+    **list-available**
+    prints the language names for which fish has translations.
+    These names can be used with the **set** subcommand.
+
+    **set**
+    sets the language precedence for fish's messages.
+    Overrides language settings configured via :ref:`environment variables <variables-locale>`, but only applies to fish itself, not to any child processes.
+    Takes a list of language names from the set shown by the **list-available** subcommand.
+    For some languages, fish's translation catalogs are incomplete, meaning not all messages can be shown in these languages.
+    Therefore, we allow specifying a list here, with translations taken from the first specified language which has a translation available for a message.
+    For example, after running ``status language set pt_BR fr``, all messages which have a translation into Brazilian Portuguese will be shown in that language.
+    The remaining messages will be shown in French, if a French translation is available.
+    If none of the specified languages have a translation available for a message, the message will be shown in English.
+
+    **unset**
+    undoes the effects of the **set** subcommand.
+    Language settings will be taken from environment variables again.
+
 Notes
 -----
 

doc_src/cmds/type.rst

@@ -41,6 +41,10 @@ The following options are available:
 **-q** or **--query**
     Suppresses all output; this is useful when testing the exit status. For compatibility with old fish versions this is also **--quiet**.
 
+**--color** *WHEN*
+    Controls when to use syntax highlighting colors when printing function definitions.
+    *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.
 

doc_src/completions.rst

@@ -1,7 +1,7 @@
 Writing your own completions
 ============================
 
-To specify a completion, use the ``complete`` command. ``complete`` takes as a parameter the name of the command to specify a completion for. For example, to add a completion for the program ``myprog``, start the completion command with ``complete -c myprog ...``
+To specify a completion, use the ``complete`` command. ``complete`` takes as a parameter the name of the command to specify a completion for. For example, to add a completion for the program ``myprog`` (or ``myprog.exe`` on :ref:`Cygwin/MSYS2 <completions-cygwin>`), start the completion command with ``complete -c myprog ...``
 
 For a complete description of the various switches accepted by the ``complete`` command, see the documentation for the :doc:`complete <cmds/complete>` builtin, or write ``complete --help`` inside the ``fish`` shell.
 
@@ -160,4 +160,3 @@ This wide search may be confusing. If you are unsure, your completions probably
 If you have written new completions for a common Unix command, please consider sharing your work by submitting it via the instructions in :ref:`Further help and development <more-help>`.
 
 If you are developing another program and would like to ship completions with your program, install them to the "vendor" completions directory. As this path may vary from system to system, the ``pkgconfig`` framework should be used to discover this path with the output of ``pkg-config --variable completionsdir fish``.
-

doc_src/conf.py

@@ -74,9 +74,7 @@ def extract_sections(app, env):
             f"Unsupported characters in section path: {section}"
         )
     help_sections = "".join(f"{section}\n" for section in sections)
-    Path(output_file).write_text(
+    Path(output_file).write_text(help_sections)
-        f"""pub static HELP_SECTIONS: &str = "{help_sections}";"""
-    )
 
 
 def remove_fish_indent_lexer(app):
@@ -97,7 +95,12 @@ def setup(app):
     app.add_directive("synopsis", FishSynopsisDirective)
 
     app.add_config_value("issue_url", default=None, rebuild="html")
-    app.add_config_value("fish_help_sections_output", "", "man", str)
+    app.add_config_value(
+        "fish_help_sections_output",
+        default="",
+        rebuild="man",
+        types=str,
+    )
     app.add_role("issue", issue_role)
 
     app.connect("builder-inited", remove_fish_indent_lexer)
@@ -115,21 +118,16 @@ author = "fish-shell developers"
 issue_url = "https://github.com/fish-shell/fish-shell/issues"
 
 # Parsing FISH-BUILD-VERSION-FILE is possible but hard to ensure that it is in the right place
-# fish_indent is guaranteed to be on PATH for the Pygments highlighter anyway
 if "FISH_BUILD_VERSION_FILE" in os.environ:
+    # From Cmake
     f = open(os.environ["FISH_BUILD_VERSION_FILE"], "r")
     ret = f.readline().strip()
-elif "FISH_BUILD_VERSION" in os.environ:
-    ret = os.environ["FISH_BUILD_VERSION"]
 else:
+    # From Cargo, or no build system.
     ret = subprocess.check_output(
         ("../build_tools/git_version_gen.sh", "--stdout"), stderr=subprocess.STDOUT
     ).decode("utf-8")
 
-predetermined_timestamp = os.environ.get("FISH_SPHINX_BUILD_DATE")
-if predetermined_timestamp:
-    today = predetermined_timestamp
-
 # The full version, including alpha/beta/rc tags
 release = ret.strip().split(" ")[-1]
 # The short X.Y version
@@ -159,7 +157,8 @@ language = "en"
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This pattern also affects html_static_path and html_extra_path.
-exclude_patterns = []
+fish_exclude_patterns = "cmds/*.inc.rst"
+exclude_patterns = [fish_exclude_patterns]
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = None
@@ -262,7 +261,7 @@ man_pages = [
     ),
     ("faq", "fish-faq", "", [author], 1),
 ]
-for path in sorted(set(glob("cmds/*.rst")) - set(glob("cmds/*.inc.rst"))):
+for path in sorted(set(glob("cmds/*.rst")) - set(glob(fish_exclude_patterns))):
     docname = os.path.splitext(path)[0]
     cmd = os.path.basename(docname)
     man_pages.append((docname, cmd, get_command_description(path, cmd), "", 1))

doc_src/faq.rst

@@ -129,16 +129,14 @@ If you want to change or disable this display, modify the ``fish_mode_prompt`` f
 
 How do I customize my syntax highlighting colors?
 -------------------------------------------------
-Use the web configuration tool, :doc:`fish_config <cmds/fish_config>`, or alter the :ref:`fish_color family of environment variables <variables-color>`.
+Use the web configuration tool started by :doc:`fish_config <cmds/fish_config>`,
-
+or alter the :ref:`fish_color family of environment variables <variables-color>`,
-You can also use ``fish_config`` on the commandline, like::
+or use the :doc:`fish_config theme <cmds/fish_config>` subcommand, like::
 
   > fish_config theme show
   # to demonstrate all the colorschemes
   > fish_config theme choose coolbeans
   # to load the "coolbeans" theme
-  > fish_config theme save
-  # to make the change permanent
 
 How do I change the greeting message?
 -------------------------------------

doc_src/interactive.rst

@@ -72,16 +72,32 @@ Detected errors include:
 
 To customize the syntax highlighting, you can set the environment variables listed in the :ref:`Variables for changing highlighting colors <variables-color>` section.
 
-Fish also provides pre-made color themes you can pick with :doc:`fish_config <cmds/fish_config>`. Running just ``fish_config`` opens a browser interface, or you can use ``fish_config theme`` in the terminal.
+Fish also provides pre-made color themes you can pick with :doc:`fish_config <cmds/fish_config>`.
+Running just ``fish_config`` opens a browser interface, or you can use ``fish_config theme`` from fish::
 
-For example, to disable nearly all coloring::
+  # disable nearly all coloring
-
+  fish_config theme choose none
-  fish_config theme choose None
+  # restore fish's default theme
+  fish_config theme choose default
 
 Or, to see all themes, right in your terminal::
 
   fish_config theme show
 
+.. _syntax-highlighting-instant-update:
+
+To update the theme of all shell sessions without restarting them,
+first have those sessions define an :ref:`event handler <event>` by adding the following to your :ref:`config.fish <configuration>` and restarting them::
+
+    function apply-my-theme --on-variable=my_theme
+        fish_config theme choose $my_theme
+    end
+
+Then, set the corresponding :ref:`universal variable <variables-universal>` from any session::
+
+    > set -U my_theme lava
+    > set -U my_theme snow-day
+
 .. _variables-color:
 
 Syntax highlighting variables
@@ -117,7 +133,7 @@ Variable                                          Meaning
 .. envvar:: fish_color_end                        process separators like ``;`` and ``&``
 .. envvar:: fish_color_error                      syntax errors
 .. envvar:: fish_color_param                      ordinary command parameters
-.. envvar:: fish_color_valid_path                 parameters that are filenames (if the file exists)
+.. envvar:: fish_color_valid_path                 parameters and redirection targets that are filenames (if the file exists)
 .. envvar:: fish_color_option                     options starting with "-", up to the first "--" parameter
 .. envvar:: fish_color_comment                    comments like '# important'
 .. envvar:: fish_color_selection                  selected text in vi visual mode
@@ -136,7 +152,8 @@ Variable                                          Meaning
 
 ==========================================        =====================================================================
 
-If a variable isn't set or is empty, fish usually tries ``$fish_color_normal``, except for:
+If a variable isn't set or is empty after subtracting any ``--theme=THEME`` options,
+fish usually tries ``$fish_color_normal``, except for:
 
 - ``$fish_color_keyword``, where it tries ``$fish_color_command`` first.
 - ``$fish_color_option``, where it tries ``$fish_color_param`` first.

doc_src/language.rst

@@ -1235,11 +1235,6 @@ If you want to set something in config.fish, or set something in a function and
     # Set my language
     set -gx LANG de_DE.UTF-8
 
-If you want to set some personal customization, universal variables are nice::
-
-     # Typically you'd run this interactively, fish takes care of keeping it.
-     set -U fish_color_autosuggestion 555
-
 Here is an example of local vs function-scoped variables::
 
   function test-scopes
@@ -1317,9 +1312,8 @@ This syntax is supported since fish 3.1.
 Universal Variables
 ^^^^^^^^^^^^^^^^^^^
 
-Universal variables are variables that are shared between all the user's fish sessions on the computer. Fish stores many of its configuration options as universal variables. This means that in order to change fish settings, all you have to do is change the variable value once, and it will be automatically updated for all sessions, and preserved across computer reboots and login/logout.
+Universal variables are variables that are shared between all the user's fish sessions on the computer.
-
+All changes to universal variables are persistent and instantly propagated across fish sessions.
-To see universal variables in action, start two fish sessions side by side, and issue the following command in one of them ``set fish_color_cwd blue``. Since ``fish_color_cwd`` is a universal variable, the color of the current working directory listing in the prompt will instantly change to blue on both terminals.
 
 :ref:`Universal variables <variables-universal>` are stored in the file ``.config/fish/fish_variables``. Do not edit this file directly, as your edits may be overwritten. Edit the variables through fish scripts or by using fish interactively instead.
 
@@ -1555,7 +1549,8 @@ You can change the settings of fish by changing the values of certain variables.
 
 .. describe:: Locale Variables
 
-   Locale variables such as :envvar:`LANG`, :envvar:`LC_ALL`, :envvar:`LC_MESSAGES`, :envvar:`LC_NUMERIC` and :envvar:`LC_TIME`  set the language option for the shell and subprograms. See the section :ref:`Locale variables <variables-locale>` for more information.
+   Locale variables such as :envvar:`LANG`, :envvar:`LC_ALL`, :envvar:`LC_MESSAGES`, :envvar:`LC_NUMERIC` and :envvar:`LC_TIME` set the language option for the shell and subprograms.
+   See the section :ref:`Locale variables <variables-locale>` and :ref:`status language <status-language>` for more information.
 
 .. describe:: Color variables
 
@@ -1630,8 +1625,10 @@ You can change the settings of fish by changing the values of certain variables.
 
 .. envvar:: fish_trace
 
-   if set and not empty, will cause fish to print commands before they execute, similar to ``set -x``
+   if set and not empty, will cause fish to print commands before they execute, similar to ``set -x`` in bash.
-   in bash. The trace is printed to the path given by the `--debug-output` option to fish or the :envvar:`FISH_DEBUG_OUTPUT` variable. It goes to stderr by default.
+   The trace is printed to the path given by the `--debug-output` option to fish or the :envvar:`FISH_DEBUG_OUTPUT` variable.
+   It goes to stderr by default.
+   Set it to ``all`` to also trace execution of key bindings, event handlers as well as prompt and title functions.
 
 .. envvar:: FISH_DEBUG
 
@@ -1691,6 +1688,15 @@ Fish also provides additional information through the values of certain environm
 
    the process ID (PID) of the shell.
 
+.. envvar:: fish_terminal_color_theme
+
+   a read-only variable;
+   set to ``light`` or ``dark`` when the terminal uses a light or dark color theme respectively;
+   set to ``unknown`` if the terminal does not :ref:`report its colors <term-compat-query-background-color>`.
+   Like :ref:`status terminal <status-terminal>`, this is only populated once the first interactive prompt is shown.
+   This is used in an :ref:`--on-variable event handler <event>` to update :ref:`syntax highlighting <syntax-highlighting>` variables whenever the terminal's color theme changes.
+   See :ref:`here <fish-config-theme-files>` for how to specify ``light`` and ``dark`` variants in your theme.
+
 .. envvar:: history
 
    a list containing the last commands that were entered.
@@ -2027,13 +2033,14 @@ You can see the current list of features via ``status features``::
     mark-prompt             on  4.0 write OSC 133 prompt markers to the terminal
     ignore-terminfo         on  4.1 do not look up $TERM in terminfo database
     query-term              on  4.1 query the TTY to enable extra functionality
+    omit-term-workarounds   off 4.3 skip workarounds for incompatible terminals
 
 Here is what they mean:
 
 - ``stderr-nocaret`` was introduced in fish 3.0 and cannot be turned off since fish 3.5. It can still be tested for compatibility, but a ``no-stderr-nocaret`` value will be ignored. The flag made ``^`` an ordinary character instead of denoting an stderr redirection. Use ``2>`` instead.
 - ``qmark-noglob`` was also introduced in fish 3.0 (and made the default in 4.0). It makes ``?`` an ordinary character instead of a single-character glob. Use a ``*`` instead (which will match multiple characters) or find other ways to match files like ``find``.
 - ``regex-easyesc`` was introduced in 3.1 (and made the default in 3.5). It makes it so the replacement expression in ``string replace -r`` does one fewer round of escaping. Before, to escape a backslash you would have to use ``string replace -ra '([ab])' '\\\\\\\\$1'``. After, just ``'\\\\$1'`` is enough. Check your ``string replace`` calls if you use this anywhere.
-- ``ampersand-nobg-in-token`` was introduced in fish 3.4 (and made the default in 3.5). It makes it so a ``&`` i no longer interpreted as the backgrounding operator in the middle of a token, so dealing with URLs becomes easier. Either put spaces or a semicolon after the ``&``. This is recommended formatting anyway, and ``fish_indent`` will have done it for you already.
+- ``ampersand-nobg-in-token`` was introduced in fish 3.4 (and made the default in 3.5). It makes it so a ``&`` is no longer interpreted as the backgrounding operator in the middle of a token, so dealing with URLs becomes easier. Either put spaces or a semicolon after the ``&``. This is recommended formatting anyway, and ``fish_indent`` will have done it for you already.
 - ``remove-percent-self`` turns off the special ``%self`` expansion. It was introduced in 4.0. To get fish's pid, you can use the :envvar:`fish_pid` variable.
 - ``test-require-arg`` removes :doc:`builtin test <cmds/test>`'s one-argument form (``test "string"``. It was introduced in 4.0. To test if a string is non-empty, use ``test -n "string"``. If disabled, any call to ``test`` that would change sends a :ref:`debug message <debugging-fish>` of category "deprecated-test", so starting fish with ``fish --debug=deprecated-test`` can be used to find offending calls.
 - ``mark-prompt`` makes fish report to the terminal the beginning and and of both shell prompts and command output.
@@ -2041,6 +2048,7 @@ Here is what they mean:
 - ``query-term`` allows fish to query the terminal by writing escape sequences and reading the terminal's response.
   This enables features such as :ref:`scrolling <term-compat-cursor-position-report>`.
   If you use an incompatible terminal, you can -- for the time being -- work around it by running (once) ``set -Ua fish_features no-query-term``.
+- ``omit-term-workarounds`` prevents fish from trying to work around incompatible terminals.
 
 
 These changes are introduced off by default. They can be enabled on a per session basis::

doc_src/terminal-compatibility.rst

@@ -8,6 +8,7 @@ while others enable optional features and may be ignored by the terminal.
 The terminal must be able to parse Control Sequence Introducer (CSI) commands, Operating System Commands (OSC) and :ref:`optionally <term-compat-dcs-gnu-screen>` Device Control Strings (DCS).
 These are defined by ECMA-48.
 If a valid CSI, OSC or DCS sequence does not represent a command implemented by the terminal, the terminal must ignore it.
+For historical reasons, OSC sequences may be terminated with ``\x07`` instead of ``\e\\``.
 
 Control sequences are denoted in a fish-like syntax.
 Special characters other than ``\`` are not escaped.
@@ -214,15 +215,23 @@ Optional Commands
    * - ``\e[?2004l``
      -
      - Disable bracketed paste.
+   * - ``\e[?2031h``
+     -
+     - Enable unsolicited `color theme reporting <https://contour-terminal.org/vt-extensions/color-palette-update-notifications/>`_.
+       When enabled, the terminal should send ``\e[?997;1n`` or ``\e[?997;2n`` whenever its color theme has changed.
+       This prompts fish to query for :ref:`background color <term-compat-query-background-color>`.
+   * - ``\e[?2031l``
+     -
+     - Disable unsolicited color theme reporting.
    * - .. _term-compat-osc-0:
 
-       ``\e]0; Pt \x07``
+       ``\e]0; Pt \e\\``
      - ts
      - Set terminal window title (OSC 0). Used in :doc:`fish_title <cmds/fish_title>`.
-   * - ``\e]2; Pt \x07``
+   * - ``\e]2; Pt \e\\``
      - ts
      - Set terminal tab title (OSC 1). Used in :doc:`fish_tab_title <cmds/fish_tab_title>`.
-   * - ``\e]7;file:// Pt / Pt \x07``
+   * - ``\e]7;file:// Pt / Pt \e\\``
      -
      - Report working directory (OSC 7).
        Since the terminal may be running on a different system than a (remote) shell,
@@ -233,43 +242,64 @@ Optional Commands
      -
      - Create a `hyperlink (OSC 8) <https://gist.github.com/egmontkob/eb114294efbcd5adb1944c9f3cb5feda>`_.
        This is used in fish's man pages.
+   * - .. _term-compat-query-background-color:
+
+       ``\e]11;?\e\\``
+     - n/a
+     - Query background color.
+
+       A valid response would be of the form ``\e]11;rgb: Pt / Pt / Pt \e\\`` or ``\e]11;rgba: Pt / Pt / Pt / Pt\e\\``
+       where the first three parameters consist of one to four hex digits each, representing red, blue and green components.
+
+       This is used to populate :envvar:`fish_terminal_color_theme`,
+       which is used to select a :ref:`theme variant <fish-config-theme-files>` optimized for the terminal's color theme.
    * - .. _term-compat-osc-52:
 
-       ``\e]52;c; Pt \x07``
+       ``\e]52;c; Pt \e\\``
      -
      - Copy to clipboard (OSC 52). Used by :doc:`fish_clipboard_copy <cmds/fish_clipboard_copy>`.
    * - .. _term-compat-osc-133:
 
-       ``\e]133;A; click_events=1\x07``
+       ``\e]133;A; click_events=1\e\\``
      -
      - Mark prompt start (OSC 133), with kitty's ``click_events`` extension.
        The ``click_events`` extension enables mouse clicks to move the cursor or select pager items,
        assuming that :ref:`cursor position reporting <term-compat-cursor-position-report>` is available.
-   * - ``\e]133;C; cmdline_url= Pt \x07``
+   * - ``\e]133;B\e\\``
+     -
+     - Mark prompt end (OSC 133).
+   * - ``\e]133;C; cmdline_url= Pt \e\\``
      -
      - Mark command start (OSC 133), with kitty's ``cmdline_url`` extension whose parameter is the URL-encoded command line.
-   * - ``\e]133;D; Ps \x07``
+   * - ``\e]133;D; Ps \e\\``
      -
      - Mark command end (OSC 133);  Ps is the exit status.
    * - .. _term-compat-xtgettcap:
 
-        ``\eP+q Pt \e\\``
+       ``\eP+q Pt \e\\``
      -
      - Request terminfo capability (XTGETTCAP).
        The parameter is the capability's hex-encoded terminfo code.
-       To advertise a capability, the response must be of the form
-       ``\eP1+q Pt \e\\`` or ``\eP1+q Pt = Pt \e\\``.
-       In either variant the first parameter must be the hex-encoded terminfo code.
-       The second variant's second parameter is ignored.
 
-       Currently, fish only queries the :ref:`indn <term-compat-indn>` string capability.
+       The response must be of the form
+       ``\eP1+q Pt \e\\`` ("boolean") or ``\eP1+q Pt = Pt \e\\`` ("string").
+       In either variant, the first parameter must be the same as the request parameter.
+
+       fish queries the following string capabilities:
+
+       * :ref:`indn <term-compat-indn>`
+
+         The response's second parameter is ignored.
+       * ``query-os-name`` (for :ref:`status terminal-os <status-terminal-os>`)
+
+         Terminals running on Unix should respond with the hex encoding of ``$(uname -s)`` as second parameter.
 
 .. _term-compat-dcs-gnu-screen:
 
 DCS commands and GNU screen
 ---------------------------
 
-Fully-correct DCS parsing is optional because fish switches to the alternate screen before printing any DCS commands.
+DCS parsing is optional because fish temporarily switches to the alternate screen before printing any DCS commands.
 However, since GNU screen neither allows turning on the alternate screen buffer by default,
 nor treats DCS commands in a compatible way,
 fish's initial prompt may be garbled by a DCS payload like ``+q696e646e``.

doc_src/tutorial.rst

@@ -113,7 +113,7 @@ These colors, and many more, can be changed by running ``fish_config``, or by mo
 
 For example, if you want to disable (almost) all coloring::
 
-  fish_config theme choose None
+  fish_config theme choose none
 
 This picks the "none" theme. To see all themes::
 

docker/alpine.Dockerfile

@@ -1,5 +1,5 @@
 # Version set by updatecli.d/docker.yml
-FROM alpine:3.22
+FROM alpine:3.23
 LABEL org.opencontainers.image.source=https://github.com/fish-shell/fish-shell
 
 ENV LANG=C.UTF-8

fish.spec.in

@@ -13,29 +13,21 @@ Source1:                %{name}_@VERSION@.orig-cargo-vendor.tar.xz
 BuildRequires:          cargo gettext gcc xz pcre2-devel
 BuildRequires:          rust >= 1.85
 # Packaging guidelines say to use a BuildRequires: rust-packaging, but it adds no value for our package
-
+BuildRequires:          /usr/bin/sphinx-build
+# OBS: add eg "FileProvides: /usr/bin/sphinx-build python3-sphinx python3-Sphinx" to project config
+BuildRequires:          /usr/bin/man
+# OBS: add eg "FileProvides: /usr/bin/man man-db man" to project config
 BuildRequires: cmake >= 3.15
 
-%if 0%{?suse_version}
-# for tests
-BuildRequires: groff
-%else
-BuildRequires: groff-base
-%endif
-
 # for tests
+BuildRequires:          python3 procps
 %if 0%{?fedora}
 # Need the en_US.utf-8 locale at a minimum
 BuildRequires: glibc-langpack-en
 %endif
-BuildRequires: python3 procps
 
-%if 0%{?suse_version}
-Requires:      terminfo-base groff
-%else
-Requires:      ncurses-base groff-base
-%endif
 Requires:      file
+Requires:      /usr/bin/man
 Requires:      python3
 Requires:      procps