Release 4.1.2

Created by ./build_tools/release.sh 4.1.2

.github/workflows/main.yml

@@ -163,7 +163,7 @@ jobs:
         # --break-system-packages because homebrew has now declared itself "externally managed".
         # this is CI so we don't actually care.
         sudo pip3 install --break-system-packages pexpect
-        brew install gettext tmux
+        brew install tmux
     - name: cmake
       run: |
         mkdir build && cd build

.github/workflows/release.yml

@@ -150,8 +150,6 @@ jobs:
         uses: ./.github/actions/rust-toolchain@stable
         with:
           targets: aarch64-apple-darwin
-      - name: Install dependencies
-        run: brew install gettext
       - name: Build and codesign
         run: |
           die() { echo >&2 "$*"; exit 1; }

.github/workflows/update-event-feeds.yml

@@ -1,56 +0,0 @@
-on:
-  pull_request_target:
-    types: [opened, synchronize]
-  workflow_dispatch:
-    inputs:
-      pr_number:
-        description: Pull request number
-        required: true
-        type: number
-
-permissions:
-  contents: write
-
-jobs:
-  update-event-feeds:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Install dependencies
-      run: |
-        sudo apt install python3-git python3-polib
-        sudo pip3 install --break-system-packages feedgen==1.0.0
-    - name: Update event feeds
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-      run: |
-        set -x
-        if [ "${{ github.event_name }}" = pull_request ]; then
-          pr_number=${{ github.event.pull_request.number }}
-        else
-          pr_number=${{ inputs.pr_number }}
-        fi
-        # E.g. https://github.com/fish-shell/fish-shell
-        repo_url=${{ github.server_url }}/${{ github.repository }}
-        workflow_sha=${{ github.workflow_sha }}
-        run_id=${{ github.run_id }}
-        events_ref=refs/fish-shell-events
-        git clone "$repo_url" --revision="$events_ref" worktree --depth=1
-        cd worktree
-        git fetch origin "$workflow_sha" --depth=1
-        set -o pipefail
-        git show "$workflow_sha":build_tools/event-feeds.py |
-          python - "$pr_number"
-        git add .
-        if git diff --cached --exit-code; then
-          exit
-        fi
-        git config user.name fish-shell-bot
-        git config user.email fish-shell-bot
-        git commit -m "update via github run ID $run_id"
-        cat >>.git/config <<'EOF'
-        [credential]
-          username = fish-shell-bot
-          helper = !sh -c 'echo "password=$GITHUB_TOKEN"'
-        EOF
-        # Might fail due to a race; that's usually fine to ignore...
-        git push origin HEAD:"$events_ref" ||:

CHANGELOG.rst

@@ -1,8 +1,22 @@
-fish ?.?.? (released ???)
-=========================
+fish 4.1.2 (released October 07, 2025)
+======================================
 
-fish 4.1.1 (released ???)
-=========================
+This release fixes the following regressions identified in 4.1.0:
+
+- Fixed spurious error output when completing remote file paths for ``scp`` (:issue:`11860`).
+- Fixed the :kbd:`alt-l` binding not formatting ``ls`` output correctly (one entry per line, no colors) (:issue:`11888`).
+- Fixed an issue where focus events (currently only enabled in ``tmux``) would cause multiline prompts to be redrawn in the wrong line (:issue:`11870`).
+- Stopped printing output that would cause a glitch on old versions of Midnight Commander (:issue:`11869`).
+- Added a fix for some configurations of Zellij where :kbd:`escape` key processing was delayed (:issue:`11868`).
+- Fixed a case where the :doc:`web-based configuration tool <cmds/fish_config>` would generate invalid configuration (:issue:`11861`).
+- Fixed a case where pasting into ``fish -c read`` would fail with a noisy error (:issue:`11836`).
+- Fixed a case where upgrading fish would break old versions of fish that were still running.
+
+  In general, fish still needs to be restarted after it is upgraded,
+  except for `standalone builds <https://github.com/fish-shell/fish-shell/?tab=readme-ov-file#building-fish-with-embedded-data-experimental>`__.
+
+fish 4.1.1 (released September 30, 2025)
+========================================
 
 This release fixes the following regressions identified in 4.1.0:
 

Cargo.lock

@@ -105,7 +105,7 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
 [[package]]
 name = "fish"
-version = "4.1.0-snapshot"
+version = "4.1.2"
 dependencies = [
  "bitflags",
  "cc",

Cargo.toml

@@ -64,7 +64,7 @@ debug = true
 
 [package]
 name = "fish"
-version = "4.1.0-snapshot"
+version = "4.1.2"
 edition.workspace = true
 rust-version.workspace = true
 default-run = "fish"

build.rs

@@ -16,7 +16,7 @@ fn main() {
     // language server.
 
     rsconf::set_env_value(
-        "FISH_BUILD_DIR",
+        "FISH_RESOLVED_BUILD_DIR",
         // If set by CMake, this might include symlinks. Since we want to compare this to the
         // dir fish is executed in we need to canonicalize it.
         canonicalize(fish_build_dir()).to_str().unwrap(),

build_tools/event-feeds.py

@@ -1,155 +0,0 @@
-from datetime import datetime
-from pathlib import Path
-from typing import Tuple
-import dateutil.tz
-import json
-import re
-import os
-import subprocess
-import sys
-import xml.etree.ElementTree as ET
-
-# TODO maybe use https://github.com/getpelican/feedgenerator instead?
-from feedgen.feed import FeedGenerator
-import git
-import polib
-
-
-def message_dictionary(repo, ref, file: Path):
-    po_contents = repo.git().show(f"{ref}:{file}")
-    messages = polib.pofile(po_contents)
-    return {e.msgid: e.msgstr for e in messages}
-
-
-def write_feed(
-    feed_path: Path,
-    base_ref_oid: str,
-    title: str,
-    subtitle: str,
-    this_pr: Tuple[str, str] | None,
-):
-    fg = FeedGenerator()
-    tree_url = (
-        "https://raw.githubusercontent.com/fish-shell/fish-shell/fish-shell-events"
-    )
-    feed_url = f"{tree_url}/{feed_path}"
-    fg.id(feed_url)
-    fg.title(title)
-    fg.subtitle(subtitle)
-    fg.link(href=feed_url, rel="self")
-    generator_url = f"https://github.com/fish-shell/fish-shell/blob/{base_ref_oid}/.github/workflows/update-event-feeds.yml"
-    fg.link(href=generator_url, rel="alternate")
-
-    entries = {}
-    if feed_path.exists():
-        tree = ET.parse(feed_path)
-        root = tree.getroot()
-        xmlns = "{http://www.w3.org/2005/Atom}"
-        for child in root.findall(f"{xmlns}entry"):
-            pr_url = child.find(f"{xmlns}id").text
-            pr_title = child.find(f"{xmlns}title").text
-            updated = child.find(f"{xmlns}updated").text
-            updated = datetime.fromisoformat(updated)
-            entries[pr_url] = (pr_title, updated)
-    if this_pr is not None:
-        (this_pr_title, this_pr_url) = this_pr
-        if this_pr_url not in entries:
-            entries[this_pr_url] = (this_pr_title, datetime.now(dateutil.tz.tzutc()))
-    for pr_url, (pr_title, updated) in entries.items():
-        fe = fg.add_entry()
-        fe.id(pr_url)
-        fe.title(pr_title)
-        fe.updated(updated)
-        fe.link(href=pr_url)
-    atomfeed = fg.atom_str(pretty=True).decode()
-    feed_path.write_text(atomfeed)
-
-
-def pull_request_data(pr_number: str):
-    data = json.loads(
-        subprocess.check_output(
-            (
-                "gh",
-                "pr",
-                "view",
-                "--json",
-                "baseRefOid,headRefOid,title,url",
-                str(pr_number),
-            ),
-            text=True,
-        )
-    )
-    base_ref_oid = data["baseRefOid"]
-    head_ref_oid = data["headRefOid"]
-    this_pr_title = data["title"]
-    this_pr_url = data["url"]
-    return (base_ref_oid, head_ref_oid, this_pr_title, this_pr_url)
-
-
-def main():
-    pr_number = sys.argv[1]
-
-    (base_ref_oid, head_ref_oid, this_pr_title, this_pr_url) = pull_request_data(
-        pr_number
-    )
-
-    repo = git.Repo()
-    repo.git().execute(("git", "fetch", "origin", base_ref_oid, head_ref_oid))
-    po_files = (
-        Path(file)
-        for file in repo.git()
-        .execute(("git", "ls-tree", "--name-only", base_ref_oid, ":/po/"))
-        .splitlines()
-    )
-    changed_files = {
-        Path(file)
-        for file in subprocess.check_output(
-            ("git", "diff", "--name-only", base_ref_oid, head_ref_oid), text=True
-        ).splitlines()
-        if re.match(r"^po/\w+\.po$", file)
-    }
-    Path("po").mkdir(exist_ok=True)
-    for po_file in po_files:
-        file_without_extension = str(po_file).removesuffix(".po")
-        ll_CC = os.path.basename(file_without_extension)
-        feed_additions_path = Path(f"{file_without_extension}-additions.atom")
-        feed_removals_path = Path(f"{file_without_extension}-removals.atom")
-
-        def title(verb: str):
-            return f"fish-shell PRs {verb} {ll_CC} translations"
-
-        def write_additions(this_pr):
-            subtitle = "PRs that add new translations"
-            write_feed(
-                feed_additions_path, base_ref_oid, title("adding"), subtitle, this_pr
-            )
-
-        def write_removals(this_pr):
-            subtitle = "PRs that remove translations, often due to a change in the messages source"
-            write_feed(
-                feed_removals_path, base_ref_oid, title("removing"), subtitle, this_pr
-            )
-
-        if not feed_additions_path.exists():
-            write_additions(None)
-        if not feed_removals_path.exists():
-            write_removals(None)
-
-        if po_file not in changed_files:
-            continue
-        old = message_dictionary(repo, base_ref_oid, po_file)
-        new = message_dictionary(repo, head_ref_oid, po_file)
-        if any(
-            new_msgstr != old.get(new_msgid) and new_msgstr != ""
-            for (new_msgid, new_msgstr) in new.items()
-        ):
-            write_additions((this_pr_title, this_pr_url))
-        elif any(
-            old_msgstr != "" and new.get(old_msgid, "") == ""
-            for (old_msgid, old_msgstr) in old.items()
-        ):
-            write_removals((this_pr_title, this_pr_url))
-
-
-if __name__ == "__main__":
-    main()

build_tools/fish_xgettext.fish

@@ -27,19 +27,11 @@ begin
     else
         set rust_extraction_file (mktemp)
         # We need to build to ensure that the proc macro for extracting strings runs.
-        FISH_GETTEXT_EXTRACTION_FILE=$rust_extraction_file cargo check --no-default-features --features=gettext-extract
+        FISH_GETTEXT_EXTRACTION_FILE=$rust_extraction_file cargo check --features=gettext-extract
         or exit 1
     end
 
-    function mark_section
-        set -l section_name $argv[1]
-        echo 'msgid "fish-section-'$section_name'"'
-        echo 'msgstr ""'
-        echo ''
-    end
-
-    mark_section tier1-from-rust
-
+    echo '# fish-section-tier1-from-rust'
     # Get rid of duplicates and sort.
     msguniq --no-wrap --strict --sort-output $rust_extraction_file
     or exit 1
@@ -85,13 +77,13 @@ begin
         # This regex handles explicit requests to translate a message. These are more important to translate
         # than messages which should be implicitly translated.
         set -l explicit_regex '.*\( *_ (([\'"]).+?(?<!\\\\)\\2) *\).*'
-        mark_section "$tier-from-script-explicitly-added"
+        echo "# fish-section-$tier-from-script-explicitly-added"
         extract_fish_script_messages_impl $explicit_regex $argv
 
         # This regex handles descriptions for `complete` and `function` statements. These messages are not
         # particularly important to translate. Hence the "implicit" label.
         set -l implicit_regex '^(?:\s|and |or )*(?:complete|function).*? (?:-d|--description) (([\'"]).+?(?<!\\\\)\\2).*'
-        mark_section "$tier-from-script-implicitly-added"
+        echo "# fish-section-$tier-from-script-implicitly-added"
         extract_fish_script_messages_impl $implicit_regex $argv
     end
 

build_tools/release.sh

@@ -32,6 +32,7 @@ done
 
 repo_root="$(dirname "$0")/.."
 fish_site=$repo_root/../fish-site
+fish_site_repo=git@github.com:$repository_owner/fish-site
 
 for path in . "$fish_site"
 do
@@ -42,6 +43,13 @@ do
     fi
 done
 
+(
+    cd "$fish_site"
+    [ "$(git rev-parse HEAD)" = \
+        "$(git ls-remote "$fish_site_repo" refs/heads/master |
+            awk '{print $1}')" ]
+)
+
 if git tag | grep -qxF "$version"; then
     echo >&2 "$0: tag $version already exists"
     exit 1
@@ -147,15 +155,21 @@ rm -rf "$tmpdir"
     " | sed 's,^\s*| \?,,')"
 )
 
-# Approve macos-codesign
-# TODO what if current user can't approve?
-gh_pending_deployments() {
+gh_api_repo() {
+    path=$1
+    shift
     command gh api \
         -H "Accept: application/vnd.github+json" \
         -H "X-GitHub-Api-Version: 2022-11-28" \
-        "/repos/$repository_owner/fish-shell/actions/runs/$run_id/pending_deployments" \
+        "/repos/$repository_owner/fish-shell/$path" \
         "$@"
 }
+
+# Approve macos-codesign
+# TODO what if current user can't approve?
+gh_pending_deployments() {
+    gh_api_repo "actions/runs/$run_id/pending_deployments" "$@"
+}
 while {
     environment_id=$(gh_pending_deployments | jq .[].environment.id)
     [ -z "$environment_id" ]
@@ -170,7 +184,7 @@ echo '
             "comment": "Approved via ./build_tools/release.sh"
         }
     ' |
-gh_pending_deployments -XPOST --input=-
+gh_pending_deployments --method POST --input=-
 
 # Await completion.
 gh run watch "$run_id"
@@ -198,12 +212,12 @@ done
     " | sed 's,^\s*| \?,,')"
     # This takes care to support remote names that are different from
     # fish-shell remote name. Also, support detached HEAD state.
-    git push git@github.com:$repository_owner/fish-site HEAD:master
+    git push "$fish_site_repo" HEAD:master
 )
 
 if [ -n "$integration_branch" ]; then {
     git push $remote "$version^{commit}":refs/heads/$integration_branch
-else
+} else {
     changelog=$(cat - CHANGELOG.rst <<EOF
 fish ?.?.? (released ???)
 =========================
@@ -215,6 +229,25 @@ EOF
     git push $remote HEAD:master
 } fi
 
+milestone_number=$(
+    gh_api_repo milestones?state=open |
+        jq '.[] | select(.title == "fish '"$version"'") | .number'
+)
+gh_api_repo --method PATCH milestones/$milestone_number \
+    --raw-field state=closed
+
+next_patch_version=$(
+    echo "$version" | awk -F. '
+        NF == 3 && $3 ~ /[0-9]+/ {
+            printf "%s.%s.%s", $1, $2, $3+1
+        }
+    '
+)
+if [ -n "$next_patch_version" ]; then
+    gh_api_repo --method POST milestones \
+        --raw-field title="fish $next_patch_version"
+fi
+
 exit
 
 }

build_tools/update_translations.fish

@@ -31,6 +31,7 @@
 set -gx LC_ALL C.UTF-8
 
 set -l build_tools (status dirname)
+set -g tmpdir
 set -l po_dir $build_tools/../po
 
 set -l extract
@@ -45,8 +46,8 @@ if test -z $argv[1]
 else
     set -l po_dir_id (stat --format='%d:%i' -- $po_dir)
     for arg in $argv
-        set -l arg_dir_id (stat --format='%d:%i' -- (dirname $arg) 2>/dev/null)
-        if test $po_dir_id != "$arg_dir_id"
+        set -l arg_dir_id (stat --format='%d:%i' -- (dirname $arg))
+        if test $po_dir_id != $arg_dir_id
             echo "Argument $arg is not a file in the directory $(realpath $po_dir)."
             echo "Non-option arguments must specify paths to files in this directory."
             echo ""
@@ -98,38 +99,44 @@ if set -l --query _flag_dry_run
     cp -r $po_dir/* $tmpdir
 end
 
-# This is used to identify lines which should be set here via $header_lines.
-# Make sure that this prefix does not appear elsewhere in the file and only contains characters
-# without special meaning in a sed pattern.
-set -g header_prefix "# fish-note: "
-
-function print_header -a po_file
-    set -l ll_CC (basename $po_file .po)
-    set -l header_lines \
-        "To subscribe to proposed updates, point your feed reader at:" \
-        https://raw.githubusercontent.com/fish-shell/fish-shell/fish-shell-events/po/$ll_CC-additions.atom \
-        https://raw.githubusercontent.com/fish-shell/fish-shell/fish-shell-events/po/$ll_CC-removals.atom \
-        "Translations are divided into sections, each starting with a fish-section-* pseudo-message." \
-        "The first few sections are more important." \
-        "Ignore the tier3 sections unless you have a lot of time."
-    for line in $header_lines
-        printf '%s%s\n' $header_prefix $line
-    end
-end
-
 function merge_po_files --argument-names template_file po_file
     msgmerge --no-wrap --update --no-fuzzy-matching --backup=none --quiet \
         $po_file $template_file
     or cleanup_exit
     set -l new_po_file (mktemp) # TODO Remove on failure.
-    # Remove obsolete messages instead of keeping them as #~ entries.
     and msgattrib --no-wrap --no-obsolete -o $new_po_file $po_file
     or cleanup_exit
 
     begin
-        print_header $po_file
-        # Paste PO file without old header lines.
-        sed '/^'$header_prefix'/d' $new_po_file
+        echo "# fish-note-sections: Translations are divided into sections, each starting with a fish-section-* comment."
+        echo "# fish-note-sections: The first few sections are more important."
+        echo "# fish-note-sections: Ignore the tier3 sections unless you have a lot of time."
+        sed -i '
+            /^# fish-note-sections:/d;
+            /^# fish-section-/d;
+        ' $new_po_file
+
+        set -l next_line 1
+        set -l section
+        awk <$template_file '
+            /^# fish-section-\S*$/ {
+                section = $0
+            }
+            section != "" && /^msgid ".+"$/ {
+                print section
+                print $0
+                section = ""
+            }
+        ' |
+            while read -l section
+                read -l msgid_line
+                set -l line_number (grep -m1 -Fxn $msgid_line $new_po_file | string split :)[1]
+                sed -n "$next_line,$(math $line_number - 1)"p $new_po_file
+                echo $section
+                set next_line $line_number
+                # set section
+            end
+        sed -n "$next_line,\$"p $new_po_file
     end >$po_file
     rm $new_po_file
 end
@@ -142,10 +149,7 @@ for po_file in $po_files
         if test -e $po_file
             merge_po_files $template_file $po_file
         else
-            begin
-                print_header $po_file
-                cat $template_file
-            end >$po_file
+            cp $template_file $po_file
         end
     end
 end

crates/build-helper/src/lib.rs

@@ -12,7 +12,7 @@ fn cargo_target_dir() -> Cow<'static, Path> {
 }
 
 pub fn fish_build_dir() -> Cow<'static, Path> {
-    // FISH_BUILD_DIR is set by CMake, if we are using it.
+    // This is set if using CMake.
     option_env!("FISH_BUILD_DIR")
         .map(|d| Cow::Borrowed(Path::new(d)))
         .unwrap_or(cargo_target_dir())

crates/gettext-maps/build.rs

@@ -2,7 +2,7 @@
     env,
     ffi::OsStr,
     path::{Path, PathBuf},
-    process::{Command, Stdio},
+    process::Command,
 };
 
 fn main() {
@@ -34,11 +34,7 @@ fn embed_localizations(cache_dir: &Path) {
     // for the respective language.
     let mut catalogs = phf_codegen::Map::new();
 
-    match Command::new("msgfmt")
-        .arg("-h")
-        .stdout(Stdio::null())
-        .status()
-    {
+    match Command::new("msgfmt").arg("-h").status() {
         Err(e) if e.kind() == std::io::ErrorKind::NotFound => {
             rsconf::warn!(
                 "Cannot find msgfmt to build gettext message catalogs. Localization will not work."
@@ -101,12 +97,6 @@ fn embed_localizations(cache_dir: &Path) {
                     .arg(&po_file_path)
                     .output()
                     .unwrap();
-                if !output.status.success() {
-                    panic!(
-                        "msgfmt failed:\n{}",
-                        String::from_utf8(output.stderr).unwrap()
-                    );
-                }
                 let mo_data = output.stdout;
 
                 // Extract map from MO data.

po/de.po

@@ -1,9 +1,6 @@
-# fish-note: To subscribe to proposed updates, point your feed reader at:
-# fish-note: https://raw.githubusercontent.com/fish-shell/fish-shell/fish-shell-events/po/de-additions.atom
-# fish-note: https://raw.githubusercontent.com/fish-shell/fish-shell/fish-shell-events/po/de-removals.atom
-# fish-note: Translations are divided into sections, each starting with a fish-section-* pseudo-message.
-# fish-note: The first few sections are more important.
-# fish-note: Ignore the tier3 sections unless you have a lot of time.
+# fish-note-sections: Translations are divided into sections, each starting with a fish-section-* comment.
+# fish-note-sections: The first few sections are more important.
+# fish-note-sections: Ignore the tier3 sections unless you have a lot of time.
 # translation of de.po to deutsch
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
@@ -24,9 +21,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 3.5\n"
 
-msgid "fish-section-tier1-from-rust"
-msgstr ""
-
 msgid ""
 "\n"
 "   PID  Command\n"
@@ -35,6 +29,7 @@ msgstr ""
 "   PID  Befehl\n"
 
 #, c-format
+# fish-section-tier1-from-rust
 msgid " (%ls)\n"
 msgstr " (%ls)\n"
 
@@ -205,6 +200,7 @@ msgstr "%ls: %ls: ungültiger Unterbefehl\n"
 msgid "%ls: %ls: invalid variable name. See `help identifiers`\n"
 msgstr ""
 
+#
 #, c-format
 msgid "%ls: %ls: option does not take an argument\n"
 msgstr ""
@@ -413,6 +409,7 @@ msgstr ""
 msgid "%ls: Invalid --min-args value '%ls'\n"
 msgstr ""
 
+#
 #, c-format
 msgid "%ls: Invalid --unknown-arguments value '%ls'\n"
 msgstr ""
@@ -705,6 +702,7 @@ msgstr ""
 msgid "%ls: expected a numeric value"
 msgstr "%ls: Erwartete numerischen Wert"
 
+#
 #, c-format
 msgid "%ls: fish was not built with embedded files"
 msgstr ""
@@ -801,14 +799,17 @@ msgstr ""
 msgid "%s"
 msgstr ""
 
+#
 #, c-format
 msgid "%s %s: unrecognized feature '%ls'"
 msgstr ""
 
+#
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr ""
 
+#
 #, c-format
 msgid "%s could not read response to Primary Device Attribute query after waiting for %d seconds. This is often due to a missing feature in your terminal. See 'help terminal-compatibility' or 'man fish-terminal-compatibility'. This %s process will no longer wait for outstanding queries, which disables some optional features."
 msgstr ""
@@ -1116,6 +1117,7 @@ msgstr ""
 msgid "Failed to assign shell to its own process group"
 msgstr "Konnte Shell nicht einer eigenen Prozessgruppe zuweisen"
 
+#
 #, c-format
 msgid "Failed to set terminal mode (%s)"
 msgstr ""
@@ -1193,6 +1195,7 @@ msgstr "Illegale Instruktion"
 msgid "Incomplete escape sequence '%ls'"
 msgstr "Unvollständige Escapesequenz '%ls'"
 
+#
 msgid "Information request"
 msgstr ""
 
@@ -1519,6 +1522,7 @@ msgstr "Derzeit ausführende Funktion stoppen"
 msgid "Stop the innermost loop"
 msgstr "Innerste Schleife beenden"
 
+#
 msgid "Synchronized file access"
 msgstr ""
 
@@ -1706,6 +1710,7 @@ msgstr "Nicht passender Platzhalter"
 msgid "Unsupported use of '='. In fish, please use 'set %ls %ls'."
 msgstr ""
 
+#
 msgid "Unused signal"
 msgstr ""
 
@@ -1733,6 +1738,7 @@ msgstr ""
 msgid "Variables cannot be bracketed. In fish, please use {$%ls}."
 msgstr ""
 
+#
 msgid "Virtual timer expired"
 msgstr ""
 
@@ -1896,9 +1902,7 @@ msgstr "unbegrenzt\n"
 msgid "|& is not valid. In fish, use &| to pipe both stdout and stderr."
 msgstr "|& ist ungültig. In fish, nutze &| um stdout und stderr gleichzeitig zu pipen"
 
-msgid "fish-section-tier1-from-script-explicitly-added"
-msgstr ""
-
+# fish-section-tier1-from-script-explicitly-added
 msgid "%ls: %ls: expected %d arguments; got %d\\n"
 msgstr ""
 
@@ -2121,9 +2125,7 @@ msgstr "oder die Datei war leer"
 msgid "python executable not found"
 msgstr ""
 
-msgid "fish-section-tier1-from-script-implicitly-added"
-msgstr ""
-
+# fish-section-tier1-from-script-implicitly-added
 msgid "# comments"
 msgstr ""
 
@@ -3825,12 +3827,7 @@ msgstr ""
 msgid "~ expansion"
 msgstr ""
 
-msgid "fish-section-tier3-from-script-explicitly-added"
-msgstr ""
-
-msgid "fish-section-tier3-from-script-implicitly-added"
-msgstr ""
-
+# fish-section-tier3-from-script-implicitly-added
 msgid " "
 msgstr ""
 

po/en.po

@@ -1,9 +1,6 @@
-# fish-note: To subscribe to proposed updates, point your feed reader at:
-# fish-note: https://raw.githubusercontent.com/fish-shell/fish-shell/fish-shell-events/po/en-additions.atom
-# fish-note: https://raw.githubusercontent.com/fish-shell/fish-shell/fish-shell-events/po/en-removals.atom
-# fish-note: Translations are divided into sections, each starting with a fish-section-* pseudo-message.
-# fish-note: The first few sections are more important.
-# fish-note: Ignore the tier3 sections unless you have a lot of time.
+# fish-note-sections: Translations are divided into sections, each starting with a fish-section-* comment.
+# fish-note-sections: The first few sections are more important.
+# fish-note-sections: Ignore the tier3 sections unless you have a lot of time.
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -24,15 +21,13 @@ msgstr ""
 "X-Poedit-Basepath: /home/david/src/fish-shell\n"
 "X-Generator: Poedit 1.8.11\n"
 
-msgid "fish-section-tier1-from-rust"
-msgstr ""
-
 msgid ""
 "\n"
 "   PID  Command\n"
 msgstr ""
 
 #, c-format
+# fish-section-tier1-from-rust
 msgid " (%ls)\n"
 msgstr ""
 
@@ -203,6 +198,7 @@ msgstr ""
 msgid "%ls: %ls: invalid variable name. See `help identifiers`\n"
 msgstr ""
 
+#
 #, c-format
 msgid "%ls: %ls: option does not take an argument\n"
 msgstr ""
@@ -383,6 +379,7 @@ msgstr "%ls: Expected exactly two names (current function name, and new function
 msgid "%ls: Expected generic | variable | signal | exit | job-id for --handlers-type\n"
 msgstr ""
 
+#
 #, c-format
 msgid "%ls: Function '%ls' already exists. Cannot create copy of '%ls'\n"
 msgstr ""
@@ -411,6 +408,7 @@ msgstr ""
 msgid "%ls: Invalid --min-args value '%ls'\n"
 msgstr ""
 
+#
 #, c-format
 msgid "%ls: Invalid --unknown-arguments value '%ls'\n"
 msgstr ""
@@ -703,6 +701,7 @@ msgstr ""
 msgid "%ls: expected a numeric value"
 msgstr "%ls: expected a numeric value"
 
+#
 #, c-format
 msgid "%ls: fish was not built with embedded files"
 msgstr ""
@@ -799,14 +798,17 @@ msgstr ""
 msgid "%s"
 msgstr ""
 
+#
 #, c-format
 msgid "%s %s: unrecognized feature '%ls'"
 msgstr ""
 
+#
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr ""
 
+#
 #, c-format
 msgid "%s could not read response to Primary Device Attribute query after waiting for %d seconds. This is often due to a missing feature in your terminal. See 'help terminal-compatibility' or 'man fish-terminal-compatibility'. This %s process will no longer wait for outstanding queries, which disables some optional features."
 msgstr ""
@@ -910,6 +912,7 @@ msgstr "An error occurred while setting up pipe"
 msgid "Argument is not a number: '%ls'"
 msgstr ""
 
+#
 msgid "Await background process completion"
 msgstr ""
 
@@ -1114,6 +1117,7 @@ msgstr ""
 msgid "Failed to assign shell to its own process group"
 msgstr ""
 
+#
 #, c-format
 msgid "Failed to set terminal mode (%s)"
 msgstr ""
@@ -1517,6 +1521,7 @@ msgstr "Stop the currently evaluated function"
 msgid "Stop the innermost loop"
 msgstr "Stop the innermost loop"
 
+#
 msgid "Synchronized file access"
 msgstr ""
 
@@ -1731,6 +1736,7 @@ msgstr ""
 msgid "Variables cannot be bracketed. In fish, please use {$%ls}."
 msgstr ""
 
+#
 msgid "Virtual timer expired"
 msgstr ""
 
@@ -1894,9 +1900,7 @@ msgstr ""
 msgid "|& is not valid. In fish, use &| to pipe both stdout and stderr."
 msgstr ""
 
-msgid "fish-section-tier1-from-script-explicitly-added"
-msgstr ""
-
+# fish-section-tier1-from-script-explicitly-added
 msgid "%ls: %ls: expected %d arguments; got %d\\n"
 msgstr ""
 
@@ -2119,9 +2123,7 @@ msgstr ""
 msgid "python executable not found"
 msgstr ""
 
-msgid "fish-section-tier1-from-script-implicitly-added"
-msgstr ""
-
+# fish-section-tier1-from-script-implicitly-added
 msgid "# comments"
 msgstr ""
 
@@ -3823,12 +3825,7 @@ msgstr ""
 msgid "~ expansion"
 msgstr ""
 
-msgid "fish-section-tier3-from-script-explicitly-added"
-msgstr ""
-
-msgid "fish-section-tier3-from-script-implicitly-added"
-msgstr ""
-
+# fish-section-tier3-from-script-implicitly-added
 msgid " "
 msgstr ""
 

po/fr.po

@@ -1,9 +1,6 @@
-# fish-note: To subscribe to proposed updates, point your feed reader at:
-# fish-note: https://raw.githubusercontent.com/fish-shell/fish-shell/fish-shell-events/po/fr-additions.atom
-# fish-note: https://raw.githubusercontent.com/fish-shell/fish-shell/fish-shell-events/po/fr-removals.atom
-# fish-note: Translations are divided into sections, each starting with a fish-section-* pseudo-message.
-# fish-note: The first few sections are more important.
-# fish-note: Ignore the tier3 sections unless you have a lot of time.
+# fish-note-sections: Translations are divided into sections, each starting with a fish-section-* comment.
+# fish-note-sections: The first few sections are more important.
+# fish-note-sections: Ignore the tier3 sections unless you have a lot of time.
 # translation of fr.po to Français
 # FRENCH TRANSLATION FOR FISH
 # Copyright (C) 2006 Xavier Douville
@@ -123,9 +120,6 @@ msgstr ""
 "X-Generator: Gtranslator 2.91.7\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-msgid "fish-section-tier1-from-rust"
-msgstr ""
-
 msgid ""
 "\n"
 "   PID  Command\n"
@@ -134,6 +128,7 @@ msgstr ""
 "   PID Commande\n"
 
 #, c-format
+# fish-section-tier1-from-rust
 msgid " (%ls)\n"
 msgstr ""
 
@@ -304,6 +299,7 @@ msgstr ""
 msgid "%ls: %ls: invalid variable name. See `help identifiers`\n"
 msgstr ""
 
+#
 #, c-format
 msgid "%ls: %ls: option does not take an argument\n"
 msgstr ""
@@ -484,6 +480,7 @@ msgstr "%ls : Exactement deux noms attendus (noms de fonctions actuel et projet
 msgid "%ls: Expected generic | variable | signal | exit | job-id for --handlers-type\n"
 msgstr ""
 
+#
 #, c-format
 msgid "%ls: Function '%ls' already exists. Cannot create copy of '%ls'\n"
 msgstr ""
@@ -512,6 +509,7 @@ msgstr "%ls : Valeur --max-args '%ls' invalide\n"
 msgid "%ls: Invalid --min-args value '%ls'\n"
 msgstr "%ls : Valeur --min-args '%ls' invalide\n"
 
+#
 #, c-format
 msgid "%ls: Invalid --unknown-arguments value '%ls'\n"
 msgstr ""
@@ -804,6 +802,7 @@ msgstr ""
 msgid "%ls: expected a numeric value"
 msgstr "%ls : valeur numérique attendue"
 
+#
 #, c-format
 msgid "%ls: fish was not built with embedded files"
 msgstr ""
@@ -900,14 +899,17 @@ msgstr ""
 msgid "%s"
 msgstr ""
 
+#
 #, c-format
 msgid "%s %s: unrecognized feature '%ls'"
 msgstr ""
 
+#
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr ""
 
+#
 #, c-format
 msgid "%s could not read response to Primary Device Attribute query after waiting for %d seconds. This is often due to a missing feature in your terminal. See 'help terminal-compatibility' or 'man fish-terminal-compatibility'. This %s process will no longer wait for outstanding queries, which disables some optional features."
 msgstr ""
@@ -1011,6 +1013,7 @@ msgstr "Une erreur est survenue lors du paramétrage du tube"
 msgid "Argument is not a number: '%ls'"
 msgstr ""
 
+#
 msgid "Await background process completion"
 msgstr ""
 
@@ -1215,6 +1218,7 @@ msgstr ""
 msgid "Failed to assign shell to its own process group"
 msgstr ""
 
+#
 #, c-format
 msgid "Failed to set terminal mode (%s)"
 msgstr ""
@@ -1618,6 +1622,7 @@ msgstr "Arrêter la fonction actuellement en évaluation"
 msgid "Stop the innermost loop"
 msgstr "Arrêter la boucle interne"
 
+#
 msgid "Synchronized file access"
 msgstr ""
 
@@ -1832,6 +1837,7 @@ msgstr "Les variables ne peuvent être placées entre crochets. Dans fish, veuil
 msgid "Variables cannot be bracketed. In fish, please use {$%ls}."
 msgstr "Les variables ne peuvent être placées entre crochets. Dans fish, veuillez utiliser {$%ls}."
 
+#
 msgid "Virtual timer expired"
 msgstr ""
 
@@ -1995,9 +2001,7 @@ msgstr ""
 msgid "|& is not valid. In fish, use &| to pipe both stdout and stderr."
 msgstr ""
 
-msgid "fish-section-tier1-from-script-explicitly-added"
-msgstr ""
-
+# fish-section-tier1-from-script-explicitly-added
 msgid "%ls: %ls: expected %d arguments; got %d\\n"
 msgstr ""
 
@@ -2220,9 +2224,7 @@ msgstr "ou le fichier était vide"
 msgid "python executable not found"
 msgstr "Exécutable python introuvable"
 
-msgid "fish-section-tier1-from-script-implicitly-added"
-msgstr ""
-
+# fish-section-tier1-from-script-implicitly-added
 msgid "# comments"
 msgstr ""
 
@@ -3924,12 +3926,7 @@ msgstr ""
 msgid "~ expansion"
 msgstr ""
 
-msgid "fish-section-tier3-from-script-explicitly-added"
-msgstr ""
-
-msgid "fish-section-tier3-from-script-implicitly-added"
-msgstr ""
-
+# fish-section-tier3-from-script-implicitly-added
 msgid " "
 msgstr ""
 

po/pl.po

@@ -1,9 +1,6 @@
-# fish-note: To subscribe to proposed updates, point your feed reader at:
-# fish-note: https://raw.githubusercontent.com/fish-shell/fish-shell/fish-shell-events/po/pl-additions.atom
-# fish-note: https://raw.githubusercontent.com/fish-shell/fish-shell/fish-shell-events/po/pl-removals.atom
-# fish-note: Translations are divided into sections, each starting with a fish-section-* pseudo-message.
-# fish-note: The first few sections are more important.
-# fish-note: Ignore the tier3 sections unless you have a lot of time.
+# fish-note-sections: Translations are divided into sections, each starting with a fish-section-* comment.
+# fish-note-sections: The first few sections are more important.
+# fish-note-sections: Ignore the tier3 sections unless you have a lot of time.
 # Translation of fish in Polish
 # This file is distributed under the same license as the fish package.
 # Author: m4sk1n <m4sk1n@vivaldi.net>
@@ -20,15 +17,13 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: GlotPress/2.2.2\n"
 
-msgid "fish-section-tier1-from-rust"
-msgstr ""
-
 msgid ""
 "\n"
 "   PID  Command\n"
 msgstr ""
 
 #, c-format
+# fish-section-tier1-from-rust
 msgid " (%ls)\n"
 msgstr ""
 
@@ -199,6 +194,7 @@ msgstr ""
 msgid "%ls: %ls: invalid variable name. See `help identifiers`\n"
 msgstr ""
 
+#
 #, c-format
 msgid "%ls: %ls: option does not take an argument\n"
 msgstr ""
@@ -379,6 +375,7 @@ msgstr "%ls: Oczekiwano dokładnie dwóch nazw (nazwa obecnej funkcji i nazwa no
 msgid "%ls: Expected generic | variable | signal | exit | job-id for --handlers-type\n"
 msgstr ""
 
+#
 #, c-format
 msgid "%ls: Function '%ls' already exists. Cannot create copy of '%ls'\n"
 msgstr ""
@@ -407,6 +404,7 @@ msgstr ""
 msgid "%ls: Invalid --min-args value '%ls'\n"
 msgstr ""
 
+#
 #, c-format
 msgid "%ls: Invalid --unknown-arguments value '%ls'\n"
 msgstr ""
@@ -699,6 +697,7 @@ msgstr ""
 msgid "%ls: expected a numeric value"
 msgstr "%ls: oczekiwano wartości liczbowej"
 
+#
 #, c-format
 msgid "%ls: fish was not built with embedded files"
 msgstr ""
@@ -795,14 +794,17 @@ msgstr ""
 msgid "%s"
 msgstr ""
 
+#
 #, c-format
 msgid "%s %s: unrecognized feature '%ls'"
 msgstr ""
 
+#
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr ""
 
+#
 #, c-format
 msgid "%s could not read response to Primary Device Attribute query after waiting for %d seconds. This is often due to a missing feature in your terminal. See 'help terminal-compatibility' or 'man fish-terminal-compatibility'. This %s process will no longer wait for outstanding queries, which disables some optional features."
 msgstr ""
@@ -906,6 +908,7 @@ msgstr ""
 msgid "Argument is not a number: '%ls'"
 msgstr ""
 
+#
 msgid "Await background process completion"
 msgstr ""
 
@@ -1110,6 +1113,7 @@ msgstr ""
 msgid "Failed to assign shell to its own process group"
 msgstr ""
 
+#
 #, c-format
 msgid "Failed to set terminal mode (%s)"
 msgstr ""
@@ -1513,6 +1517,7 @@ msgstr "Zatrzymaj obecnie używaną funkcję"
 msgid "Stop the innermost loop"
 msgstr ""
 
+#
 msgid "Synchronized file access"
 msgstr ""
 
@@ -1727,6 +1732,7 @@ msgstr "Zmienne nie mogą znajdować się w nawiasach. W fish używane jest \"$%
 msgid "Variables cannot be bracketed. In fish, please use {$%ls}."
 msgstr "Zmienne nie mogą znajdować się w nawiasach. W fish używane jest {$%ls}."
 
+#
 msgid "Virtual timer expired"
 msgstr ""
 
@@ -1890,9 +1896,7 @@ msgstr ""
 msgid "|& is not valid. In fish, use &| to pipe both stdout and stderr."
 msgstr ""
 
-msgid "fish-section-tier1-from-script-explicitly-added"
-msgstr ""
-
+# fish-section-tier1-from-script-explicitly-added
 msgid "%ls: %ls: expected %d arguments; got %d\\n"
 msgstr ""
 
@@ -2115,9 +2119,7 @@ msgstr ""
 msgid "python executable not found"
 msgstr ""
 
-msgid "fish-section-tier1-from-script-implicitly-added"
-msgstr ""
-
+# fish-section-tier1-from-script-implicitly-added
 msgid "# comments"
 msgstr ""
 
@@ -3819,12 +3821,7 @@ msgstr ""
 msgid "~ expansion"
 msgstr ""
 
-msgid "fish-section-tier3-from-script-explicitly-added"
-msgstr ""
-
-msgid "fish-section-tier3-from-script-implicitly-added"
-msgstr ""
-
+# fish-section-tier3-from-script-implicitly-added
 msgid " "
 msgstr ""
 

po/pt_BR.po

@@ -1,9 +1,6 @@
-# fish-note: To subscribe to proposed updates, point your feed reader at:
-# fish-note: https://raw.githubusercontent.com/fish-shell/fish-shell/fish-shell-events/po/pt_BR-additions.atom
-# fish-note: https://raw.githubusercontent.com/fish-shell/fish-shell/fish-shell-events/po/pt_BR-removals.atom
-# fish-note: Translations are divided into sections, each starting with a fish-section-* pseudo-message.
-# fish-note: The first few sections are more important.
-# fish-note: Ignore the tier3 sections unless you have a lot of time.
+# fish-note-sections: Translations are divided into sections, each starting with a fish-section-* comment.
+# fish-note-sections: The first few sections are more important.
+# fish-note-sections: Ignore the tier3 sections unless you have a lot of time.
 # Portuguese translations for fish package.
 # Copyright (C) 2014 THE fish'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the fish package.
@@ -25,15 +22,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.4\n"
 
-msgid "fish-section-tier1-from-rust"
-msgstr ""
-
 msgid ""
 "\n"
 "   PID  Command\n"
 msgstr ""
 
 #, c-format
+# fish-section-tier1-from-rust
 msgid " (%ls)\n"
 msgstr ""
 
@@ -204,6 +199,7 @@ msgstr ""
 msgid "%ls: %ls: invalid variable name. See `help identifiers`\n"
 msgstr ""
 
+#
 #, c-format
 msgid "%ls: %ls: option does not take an argument\n"
 msgstr ""
@@ -384,6 +380,7 @@ msgstr "%ls: Esperava exatamente dois nomes (nome atual da função, e novo nome
 msgid "%ls: Expected generic | variable | signal | exit | job-id for --handlers-type\n"
 msgstr ""
 
+#
 #, c-format
 msgid "%ls: Function '%ls' already exists. Cannot create copy of '%ls'\n"
 msgstr ""
@@ -412,6 +409,7 @@ msgstr ""
 msgid "%ls: Invalid --min-args value '%ls'\n"
 msgstr ""
 
+#
 #, c-format
 msgid "%ls: Invalid --unknown-arguments value '%ls'\n"
 msgstr ""
@@ -704,6 +702,7 @@ msgstr ""
 msgid "%ls: expected a numeric value"
 msgstr "%ls: esperava valor numérico"
 
+#
 #, c-format
 msgid "%ls: fish was not built with embedded files"
 msgstr ""
@@ -800,14 +799,17 @@ msgstr ""
 msgid "%s"
 msgstr ""
 
+#
 #, c-format
 msgid "%s %s: unrecognized feature '%ls'"
 msgstr ""
 
+#
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr ""
 
+#
 #, c-format
 msgid "%s could not read response to Primary Device Attribute query after waiting for %d seconds. This is often due to a missing feature in your terminal. See 'help terminal-compatibility' or 'man fish-terminal-compatibility'. This %s process will no longer wait for outstanding queries, which disables some optional features."
 msgstr ""
@@ -911,6 +913,7 @@ msgstr "Ocorreu um erro ao preparar pipe"
 msgid "Argument is not a number: '%ls'"
 msgstr ""
 
+#
 msgid "Await background process completion"
 msgstr ""
 
@@ -1115,6 +1118,7 @@ msgstr ""
 msgid "Failed to assign shell to its own process group"
 msgstr ""
 
+#
 #, c-format
 msgid "Failed to set terminal mode (%s)"
 msgstr ""
@@ -1518,6 +1522,7 @@ msgstr "Pára a função em execução"
 msgid "Stop the innermost loop"
 msgstr "Pára o laço mais interno"
 
+#
 msgid "Synchronized file access"
 msgstr ""
 
@@ -1732,6 +1737,7 @@ msgstr ""
 msgid "Variables cannot be bracketed. In fish, please use {$%ls}."
 msgstr ""
 
+#
 msgid "Virtual timer expired"
 msgstr ""
 
@@ -1895,9 +1901,7 @@ msgstr ""
 msgid "|& is not valid. In fish, use &| to pipe both stdout and stderr."
 msgstr ""
 
-msgid "fish-section-tier1-from-script-explicitly-added"
-msgstr ""
-
+# fish-section-tier1-from-script-explicitly-added
 msgid "%ls: %ls: expected %d arguments; got %d\\n"
 msgstr ""
 
@@ -2120,9 +2124,7 @@ msgstr ""
 msgid "python executable not found"
 msgstr "executável python não encontrado"
 
-msgid "fish-section-tier1-from-script-implicitly-added"
-msgstr ""
-
+# fish-section-tier1-from-script-implicitly-added
 msgid "# comments"
 msgstr ""
 
@@ -3824,12 +3826,7 @@ msgstr ""
 msgid "~ expansion"
 msgstr ""
 
-msgid "fish-section-tier3-from-script-explicitly-added"
-msgstr ""
-
-msgid "fish-section-tier3-from-script-implicitly-added"
-msgstr ""
-
+# fish-section-tier3-from-script-implicitly-added
 msgid " "
 msgstr ""
 
@@ -19607,6 +19604,11 @@ msgstr ""
 msgid "Do not list files that match the given pattern"
 msgstr ""
 
+# Notas:
+# Adicionar nota
+#
+# Caminhos:
+# share/functions/__fish_complete_ls.fish:49
 msgid "Do not list implied entries matching specified shell pattern"
 msgstr "Não lista entradas com o padrão especificado"
 
@@ -26015,6 +26017,11 @@ msgstr ""
 msgid "File is on filesystem of specified type"
 msgstr ""
 
+# Notas:
+# Adicionar nota
+#
+# Caminhos:
+# share/functions/__fish_complete_ls.fish:49
 msgid "File is symlink matching specified case insensitive pattern"
 msgstr ""
 
@@ -36551,6 +36558,12 @@ msgstr ""
 msgid "Machine-readable description of custom origin"
 msgstr ""
 
+# Notas:
+# Adicionar nota
+#
+# Caminhos:
+# proc.cpp:1279
+# proc.cpp:1305
 msgid "Mail address to send alerts to"
 msgstr ""
 
@@ -46049,6 +46062,12 @@ msgstr ""
 msgid "Process last file first"
 msgstr ""
 
+# Notas:
+# Adicionar nota
+#
+# Caminhos:
+# proc.cpp:1279
+# proc.cpp:1305
 msgid "Process log file"
 msgstr ""
 

po/sv.po

@@ -1,9 +1,6 @@
-# fish-note: To subscribe to proposed updates, point your feed reader at:
-# fish-note: https://raw.githubusercontent.com/fish-shell/fish-shell/fish-shell-events/po/sv-additions.atom
-# fish-note: https://raw.githubusercontent.com/fish-shell/fish-shell/fish-shell-events/po/sv-removals.atom
-# fish-note: Translations are divided into sections, each starting with a fish-section-* pseudo-message.
-# fish-note: The first few sections are more important.
-# fish-note: Ignore the tier3 sections unless you have a lot of time.
+# fish-note-sections: Translations are divided into sections, each starting with a fish-section-* comment.
+# fish-note-sections: The first few sections are more important.
+# fish-note-sections: Ignore the tier3 sections unless you have a lot of time.
 # Copyright © 2006
 # This file is distributed under the same license as the fish package.
 # Axel Liljencrantz <liljencrantz@gmail.com>, 2006
@@ -21,15 +18,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "fish-section-tier1-from-rust"
-msgstr ""
-
 msgid ""
 "\n"
 "   PID  Command\n"
 msgstr ""
 
 #, c-format
+# fish-section-tier1-from-rust
 msgid " (%ls)\n"
 msgstr ""
 
@@ -200,6 +195,7 @@ msgstr ""
 msgid "%ls: %ls: invalid variable name. See `help identifiers`\n"
 msgstr ""
 
+#
 #, c-format
 msgid "%ls: %ls: option does not take an argument\n"
 msgstr ""
@@ -380,6 +376,7 @@ msgstr ""
 msgid "%ls: Expected generic | variable | signal | exit | job-id for --handlers-type\n"
 msgstr ""
 
+#
 #, c-format
 msgid "%ls: Function '%ls' already exists. Cannot create copy of '%ls'\n"
 msgstr ""
@@ -408,6 +405,7 @@ msgstr ""
 msgid "%ls: Invalid --min-args value '%ls'\n"
 msgstr ""
 
+#
 #, c-format
 msgid "%ls: Invalid --unknown-arguments value '%ls'\n"
 msgstr ""
@@ -700,6 +698,7 @@ msgstr ""
 msgid "%ls: expected a numeric value"
 msgstr ""
 
+#
 #, c-format
 msgid "%ls: fish was not built with embedded files"
 msgstr ""
@@ -796,14 +795,17 @@ msgstr ""
 msgid "%s"
 msgstr ""
 
+#
 #, c-format
 msgid "%s %s: unrecognized feature '%ls'"
 msgstr ""
 
+#
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr ""
 
+#
 #, c-format
 msgid "%s could not read response to Primary Device Attribute query after waiting for %d seconds. This is often due to a missing feature in your terminal. See 'help terminal-compatibility' or 'man fish-terminal-compatibility'. This %s process will no longer wait for outstanding queries, which disables some optional features."
 msgstr ""
@@ -907,6 +909,7 @@ msgstr "Ett fel inträffade under skapandet av ett rör"
 msgid "Argument is not a number: '%ls'"
 msgstr ""
 
+#
 msgid "Await background process completion"
 msgstr ""
 
@@ -1111,6 +1114,7 @@ msgstr ""
 msgid "Failed to assign shell to its own process group"
 msgstr ""
 
+#
 #, c-format
 msgid "Failed to set terminal mode (%s)"
 msgstr ""
@@ -1514,6 +1518,7 @@ msgstr "Avbryt den nuvarande funktionen"
 msgid "Stop the innermost loop"
 msgstr "Avbryt den innersta loopen"
 
+#
 msgid "Synchronized file access"
 msgstr ""
 
@@ -1728,6 +1733,7 @@ msgstr ""
 msgid "Variables cannot be bracketed. In fish, please use {$%ls}."
 msgstr ""
 
+#
 msgid "Virtual timer expired"
 msgstr ""
 
@@ -1891,9 +1897,7 @@ msgstr ""
 msgid "|& is not valid. In fish, use &| to pipe both stdout and stderr."
 msgstr ""
 
-msgid "fish-section-tier1-from-script-explicitly-added"
-msgstr ""
-
+# fish-section-tier1-from-script-explicitly-added
 msgid "%ls: %ls: expected %d arguments; got %d\\n"
 msgstr ""
 
@@ -2065,12 +2069,14 @@ msgstr ""
 msgid "Too many args for cd command"
 msgstr ""
 
+#
 msgid "Type %shelp%s for instructions on how to use fish"
 msgstr "Skriv %shelp%s för instruktioner om hur man använder fish"
 
 msgid "Warning: the file containing this function has not been saved. Changes may be lost when fish is closed."
 msgstr ""
 
+#
 msgid "Welcome to fish, the friendly interactive shell"
 msgstr "Välkommen till fish, det vänliga interaktiva skalet"
 
@@ -2116,9 +2122,7 @@ msgstr ""
 msgid "python executable not found"
 msgstr ""
 
-msgid "fish-section-tier1-from-script-implicitly-added"
-msgstr ""
-
+# fish-section-tier1-from-script-implicitly-added
 msgid "# comments"
 msgstr ""
 
@@ -3820,12 +3824,7 @@ msgstr ""
 msgid "~ expansion"
 msgstr ""
 
-msgid "fish-section-tier3-from-script-explicitly-added"
-msgstr ""
-
-msgid "fish-section-tier3-from-script-implicitly-added"
-msgstr ""
-
+# fish-section-tier3-from-script-implicitly-added
 msgid " "
 msgstr ""
 

po/zh_CN.po

@@ -1,10 +1,20 @@
-# fish-note: To subscribe to proposed updates, point your feed reader at:
-# fish-note: https://raw.githubusercontent.com/fish-shell/fish-shell/fish-shell-events/po/zh_CN-additions.atom
-# fish-note: https://raw.githubusercontent.com/fish-shell/fish-shell/fish-shell-events/po/zh_CN-removals.atom
-# fish-note: Translations are divided into sections, each starting with a fish-section-* pseudo-message.
-# fish-note: The first few sections are more important.
-# fish-note: Ignore the tier3 sections unless you have a lot of time.
-#
+# fish-note-sections: Translations are divided into sections, each starting with a fish-section-* comment.
+# fish-note-sections: The first few sections are more important.
+# fish-note-sections: Ignore the tier3 sections unless you have a lot of time.
+msgid ""
+msgstr ""
+"Project-Id-Version: fish 1.21.8\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-03-10 16:38+0100\n"
+"PO-Revision-Date: 2025-09-30 19:14+0800\n"
+"Last-Translator: Yuyi Wang <Strawberry_Str@hotmail.com>\n"
+"Language-Team: \n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 3.7\n"
+
 # General Notices 凡例
 # abort: 中止
 # argument: 参数
@@ -31,23 +41,6 @@
 # token: 记号
 # universal (variable): 通用
 # valid & invalid: 有效 & 无效
-msgid ""
-msgstr ""
-"Project-Id-Version: fish 1.21.8\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-10 16:38+0100\n"
-"PO-Revision-Date: 2025-09-30 19:14+0800\n"
-"Last-Translator: Yuyi Wang <Strawberry_Str@hotmail.com>\n"
-"Language-Team: \n"
-"Language: zh_CN\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 3.7\n"
-
-msgid "fish-section-tier1-from-rust"
-msgstr ""
-
 msgid ""
 "\n"
 "   PID  Command\n"
@@ -56,6 +49,7 @@ msgstr ""
 "   PID  命令\n"
 
 #, c-format
+# fish-section-tier1-from-rust
 msgid " (%ls)\n"
 msgstr " (%ls)\n"
 
@@ -1923,9 +1917,7 @@ msgstr "无限制\n"
 msgid "|& is not valid. In fish, use &| to pipe both stdout and stderr."
 msgstr "|& 无效。在 fish 中，用 &| 来同时管道链接 stdout 和 stderr。"
 
-msgid "fish-section-tier1-from-script-explicitly-added"
-msgstr ""
-
+# fish-section-tier1-from-script-explicitly-added
 msgid "%ls: %ls: expected %d arguments; got %d\\n"
 msgstr "%ls: %ls: 期望 %d 个参数；收到 %d 个\\n"
 
@@ -2148,9 +2140,7 @@ msgstr "或文件为空"
 msgid "python executable not found"
 msgstr "找不到 python 可执行文件"
 
-msgid "fish-section-tier1-from-script-implicitly-added"
-msgstr ""
-
+# fish-section-tier1-from-script-implicitly-added
 msgid "# comments"
 msgstr "# 注释"
 
@@ -3676,7 +3666,7 @@ msgid "What characters are allowed in names"
 msgstr "名称中允许什么字符"
 
 msgid "What set -x does"
-msgstr "`set -x` 做什么"
+msgstr "设置 -x 做什么"
 
 msgid "Where to direct debug output to"
 msgstr "将调试输出导向何处"
@@ -3852,12 +3842,7 @@ msgstr "{a,b} 大括号展开"
 msgid "~ expansion"
 msgstr "~ 展开"
 
-msgid "fish-section-tier3-from-script-explicitly-added"
-msgstr ""
-
-msgid "fish-section-tier3-from-script-implicitly-added"
-msgstr ""
-
+# fish-section-tier3-from-script-implicitly-added
 msgid " "
 msgstr " "
 
@@ -40063,7 +40048,7 @@ msgid "Operate quietly and do not report progress"
 msgstr "安静操作，不报告进度"
 
 msgid "Operate recursively"
-msgstr "递归操作"
+msgstr "递归操"
 
 msgid "Operate recursively on datasets"
 msgstr "在数据集上递归操作"

share/completions/scp.fish

@@ -47,7 +47,7 @@ complete -c scp -d "Local Path" -n "not string match @ -- (commandline -ct)"
 complete -c scp -d "Remote Path" -f -n "commandline -ct | string match -e ':'" -a '
     (__scp_remote_target):(
         if not set -q __fish_scp_sftp
-            set -l tmp (__fish_mktemp fish-scp)
+            set -l tmp (__fish_mktemp_relative fish-scp)
             if scp -P(__scp2ssh_port_number) -o "BatchMode yes" -q -O $tmp (__scp_remote_target):/dev/null
                 set -g __fish_scp_sftp true
             else

share/functions/__fish_echo.fish

@@ -10,7 +10,8 @@ set -l erase_line "$(
 function __fish_echo --inherit-variable erase_line --description 'run the given command after the current commandline and redraw the prompt'
     set -l line (commandline --line)
     string >&2 repeat -N \n --count=(math (commandline | count) - $line + 1)
-    printf %s\n $erase_line($argv) >&2
+    printf %s $erase_line >&2
+    $argv >&2
     string >&2 repeat -N \n --count=(math (count (fish_prompt)) - 1)
     string >&2 repeat -N \n --count=(math $line - 1)
     commandline -f repaint

share/functions/fish_config.fish

@@ -87,11 +87,11 @@ function fish_config --description "Launch fish's web based configuration"
                 return 1
             end
 
-            set -l prompt_dir $__fish_data_dir/tools/web_config/sample_prompts
+            set -l prompt_dir $__fish_data_dir/sample_prompts $__fish_data_dir/tools/web_config/sample_prompts
             switch $cmd
                 case show
                     set -l fish (status fish-path)
-                    set -l prompts (__fish_config_matching tools/web_config/sample_prompts .fish $argv)
+                    set -l prompts (dirs=$prompt_dir __fish_config_matching tools/web_config/sample_prompts .fish $argv)
                     for p in $prompts
                         set -l promptname (string replace -r '.*/([^/]*).fish$' '$1' $p)
                         echo -s (set_color --underline) $promptname (set_color normal)
@@ -240,8 +240,7 @@ function fish_config --description "Launch fish's web based configuration"
                 case show
                     set -l fish (status fish-path)
                     set -l themes \
-                        (path filter $dirs/$argv.theme) \
-                        (__fish_config_matching tools/web_config/themes .theme $argv)
+                        (dirs=$dirs __fish_config_matching tools/web_config/themes .theme $argv)
                     set -l used_themes
 
                     echo -s (set_color normal; set_color --underline) Current (set_color normal)
@@ -384,17 +383,16 @@ function __fish_config_matching
     set -l suffix $argv[2]
     set -e argv[1..2]
     set -l paths
-    if set -q __fish_data_dir[1]
-        if not set -q argv[1]
-            set paths $__fish_data_dir/$prefix/*$suffix
-        else
-            set paths (path filter $__fish_data_dir/$prefix/$argv$suffix)
-        end
+    if not set -q argv[1]
+        set paths $dirs/*$suffix
     else
+        set paths (path filter $dirs/$argv$suffix)
+    end
+    if not set -q __fish_data_dir[1]
         if not set -q argv[1]
-            set paths (status list-files $prefix)
+            set -a paths (status list-files $prefix)
         else
-            set paths (status list-files $prefix | grep -Fx -e"$prefix/"$argv$suffix)
+            set -a paths (status list-files $prefix | grep -Fx -e"$prefix/"$argv$suffix)
         end
     end
     string join \n $paths

share/tools/web_config/webconfig.py

@@ -229,7 +229,7 @@ def parse_color(color_str):
     background_color = ""
     underline_color = ""
     bold = False
-    underline = False
+    underline = None
     italics = False
     dim = False
     reverse = False
@@ -263,6 +263,10 @@ def parse_color(color_str):
             ) -> str:
                 if comp.startswith(long_opt):
                     c = comp[len(long_opt) :]
+                    if c[0] == "=":
+                        # There was a = between the long option and the value.
+                        # i.e. support also --background=red, not just --background red
+                        c = c[1:]
                     parsed_c = parse_one_color(c)
                     # We prefer the unparsed version - if it says "brgreen", we use brgreen,
                     # instead of 00ff00

src/builtins/commandline.rs

@@ -635,7 +635,7 @@ pub fn commandline(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr])
         transient = parser.libdata().transient_commandline.clone().unwrap();
         current_buffer = &transient;
         current_cursor_pos = transient.len();
-    } else if is_interactive_session() {
+    } else if parser.interactive_initialized.load() || is_interactive_session() {
         current_buffer = &rstate.text;
         current_cursor_pos = rstate.cursor_pos;
     } else {

src/builtins/complete.rs

@@ -458,7 +458,7 @@ pub fn complete(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) ->
             None => {
                 // No argument given, try to use the current commandline.
                 let commandline_state = commandline_get_state(true);
-                if !is_interactive_session() {
+                if !parser.interactive_initialized.load() && !is_interactive_session() {
                     streams.err.append(cmd);
                     streams
                         .err

src/common.rs

@@ -32,6 +32,8 @@
 use std::sync::{Arc, MutexGuard};
 use std::time;
 
+pub const BUILD_DIR: &str = env!("FISH_RESOLVED_BUILD_DIR");
+
 pub const PACKAGE_NAME: &str = env!("CARGO_PKG_NAME");
 
 // Highest legal ASCII value.
@@ -1654,7 +1656,7 @@ pub fn get_executable_path(argv0: impl AsRef<Path>) -> PathBuf {
         // When /proc/self/exe points to a file that was deleted (or overwritten on update!)
         // then linux adds a " (deleted)" suffix.
         // If that's not a valid path, let's remove that awkward suffix.
-        if !path.ends_with(" (deleted)") {
+        if path.as_os_str().as_bytes().ends_with(b" (deleted)") {
             return path;
         }
 

src/env/config_paths.rs

@@ -1,7 +1,7 @@
 use crate::common::wcs2string;
+use crate::common::BUILD_DIR;
 use crate::wchar::prelude::*;
 use crate::{common::get_executable_path, FLOG, FLOGF};
-#[cfg(not(feature = "embed-data"))]
 use fish_build_helper::workspace_root;
 use std::ffi::OsString;
 use std::os::unix::ffi::OsStringExt;
@@ -63,7 +63,14 @@ fn static_paths() -> Self {
     fn from_exec_path(exec_path: PathBuf) -> Self {
         FLOG!(config, "embed-data feature is active, ignoring data paths");
         Self {
-            sysconf: PathBuf::from(SYSCONF_DIR).join("fish"),
+            sysconf: if exec_path
+                .canonicalize()
+                .is_ok_and(|exec_path| exec_path.starts_with(BUILD_DIR))
+            {
+                workspace_root().join("etc")
+            } else {
+                PathBuf::from(SYSCONF_DIR).join("fish")
+            },
             bin: exec_path.parent().map(|x| x.to_path_buf()),
         }
     }
@@ -116,7 +123,7 @@ fn from_exec_path(unresolved_exec_path: PathBuf) -> Self {
         }
 
         // If we're in Cargo's target directory or in CMake's build directory, use the source files.
-        if exec_path.starts_with(env!("FISH_BUILD_DIR")) {
+        if exec_path.starts_with(BUILD_DIR) {
             FLOG!(
                 config,
                 format!(

src/env_dispatch.rs

@@ -452,6 +452,8 @@ fn update_fish_color_support(vars: &EnvStack) {
     crate::terminal::set_color_support(color_support);
 }
 
+pub const MIDNIGHT_COMMANDER_SID: &wstr = L!("MC_SID");
+
 // Initialize the terminal subsystem
 fn init_terminal(vars: &EnvStack) {
     let term = vars.get(L!("TERM"));
@@ -464,7 +466,7 @@ fn init_terminal(vars: &EnvStack) {
     IS_DUMB.store(term == "dumb");
     ONLY_GRAYSCALE.store(term == "ansi-m" || term == "linux-m" || term == "xterm-mono");
 
-    if vars.get(L!("MC_SID")).is_some() {
+    if vars.get(MIDNIGHT_COMMANDER_SID).is_some() {
         screen_set_midnight_commander_hack();
     }
 

src/input_common.rs

@@ -12,8 +12,8 @@
 use crate::reader::reader_test_and_clear_interrupted;
 use crate::threads::iothread_port;
 use crate::tty_handoff::{
-    get_kitty_keyboard_capability, maybe_set_kitty_keyboard_capability,
-    maybe_set_scroll_content_up_capability, SCROLL_CONTENT_UP_TERMINFO_CODE, XTVERSION,
+    maybe_set_kitty_keyboard_capability, maybe_set_scroll_content_up_capability,
+    SCROLL_CONTENT_UP_TERMINFO_CODE, XTVERSION,
 };
 use crate::universal_notifier::default_notifier;
 use crate::wchar::{encode_byte_to_char, prelude::*};
@@ -983,16 +983,13 @@ fn try_readb(&mut self, buffer: &mut Vec<u8>) -> Option<u8> {
         let fd = self.get_in_fd();
         if !check_fd_readable(
             fd,
-            Duration::from_millis(
-                if self.paste_is_buffering()
-                    || self.is_blocked_querying()
-                    || get_kitty_keyboard_capability() == Some(&true)
-                {
-                    300
-                } else {
-                    1
-                },
-            ),
+            Duration::from_millis(if self.paste_is_buffering() || self.is_blocked_querying() {
+                300
+            } else if buffer == b"\x1b" {
+                1 // distinguish legacy escape
+            } else {
+                30
+            }),
         ) {
             FLOG!(
                 reader,

src/path.rs

@@ -585,10 +585,10 @@ fn make_base_directory(xdg_var: &wstr, non_xdg_homepath: &wstr) -> BaseDirectory
     // the actual $HOME or $XDG_XXX directories. This prevents the tests from failing and/or stops
     // the tests polluting the user's actual $HOME if a sandbox environment has not been set up.
     {
-        use crate::common::str2wcstring;
+        use crate::common::{str2wcstring, BUILD_DIR};
         use std::path::PathBuf;
 
-        let mut build_dir = PathBuf::from(env!("FISH_BUILD_DIR"));
+        let mut build_dir = PathBuf::from(BUILD_DIR);
         build_dir.push("fish-test-home");
 
         let err = match std::fs::create_dir_all(&build_dir) {

src/reader.rs

@@ -66,6 +66,7 @@
 use crate::env::EnvStack;
 use crate::env::{EnvMode, Environment, Statuses};
 use crate::env_dispatch::guess_emoji_width;
+use crate::env_dispatch::MIDNIGHT_COMMANDER_SID;
 use crate::exec::exec_subshell;
 use crate::expand::expand_one;
 use crate::expand::{expand_string, expand_tilde, ExpandFlags, ExpandResultCode};
@@ -260,9 +261,9 @@ fn redirect_tty_after_sighup() {
     }
 }
 
-fn querying_allowed() -> bool {
+fn querying_allowed(vars: &dyn Environment) -> bool {
     future_feature_flags::test(FeatureFlag::query_term) &&
-    !is_dumb() && std::env::var_os("MC_TMPDIR").is_none()
+    !is_dumb() && vars.get(MIDNIGHT_COMMANDER_SID).is_none()
         // Could use /dev/tty in future.
         && isatty(STDOUT_FILENO)
 }
@@ -278,10 +279,10 @@ pub fn terminal_init(vars: &dyn Environment, inputfd: RawFd) -> InputEventQueue
     );
 
     let _init_tty_metadata = ScopeGuard::new((), |()| {
-        initialize_tty_protocols();
+        initialize_tty_protocols(vars);
     });
 
-    if !querying_allowed() {
+    if !querying_allowed(vars) {
         return input_queue;
     }
 
@@ -1586,7 +1587,7 @@ pub fn mouse_left_click(&mut self, cursor: ViewportPosition, click_position: Vie
                 self.pager.selected_completion_idx = Some(idx);
                 self.pager_selection_changed();
             }
-            _ => {}
+            CharOffset::Pager(_) | CharOffset::None => {}
         }
     }
 }
@@ -1644,7 +1645,7 @@ pub fn combine_command_and_autosuggestion(
 
 impl<'a> Reader<'a> {
     pub fn request_cursor_position(&mut self, out: &mut Outputter, q: CursorPositionQuery) {
-        if !querying_allowed() {
+        if !querying_allowed(self.vars()) {
             return;
         }
         let mut query = self.blocking_query();
@@ -2629,9 +2630,11 @@ fn handle_char_event(&mut self, injected_event: Option<CharEvent>) -> ControlFlo
                 ImplicitEvent::QueryInterrupted => (),
                 ImplicitEvent::FocusIn => {
                     event::fire_generic(self.parser, L!("fish_focus_in").to_owned(), vec![]);
+                    self.save_screen_state();
                 }
                 ImplicitEvent::FocusOut => {
                     event::fire_generic(self.parser, L!("fish_focus_out").to_owned(), vec![]);
+                    self.save_screen_state();
                 }
                 ImplicitEvent::DisableMouseTracking => {
                     Outputter::stdoutput()

src/screen.rs

@@ -629,8 +629,26 @@ pub fn offset_in_cmdline_given_cursor(
                 0
             });
         let y = y.min(self.actual.line_count() - 1);
-        let viewport_prompt_x = viewport_cursor.x - self.actual.cursor.x;
-        let x = viewport_position.x - viewport_prompt_x;
+        let Some(viewport_prompt_x) = viewport_cursor.x.checked_sub(self.actual.cursor.x) else {
+            FLOGF!(
+                reader,
+                "Actual cursor x=%d exceeds reported cursor x=%d, \
+                     was the cursor moved by printing to the TTY?",
+                self.actual.cursor.x,
+                viewport_cursor.x
+            );
+            return CharOffset::None;
+        };
+        let Some(x) = viewport_position.x.checked_sub(viewport_prompt_x) else {
+            FLOGF!(
+                reader,
+                "Computed prompt x=%d exceeds mouse click x=%d, \
+                 was the cursor moved by printing to the TTY?",
+                viewport_prompt_x,
+                viewport_position.x
+            );
+            return CharOffset::None;
+        };
         let line = self.actual.line(y);
         let x = x.max(line.indentation);
         let offset = line

src/tests/mod.rs

@@ -29,7 +29,7 @@
 mod wgetopt;
 
 pub mod prelude {
-    use crate::common::{ScopeGuard, ScopeGuarding};
+    use crate::common::{ScopeGuard, ScopeGuarding, BUILD_DIR};
     use crate::env::{env_init, misc_init};
     use crate::parser::{CancelBehavior, Parser};
     use crate::reader::{reader_deinit, reader_init};
@@ -88,9 +88,9 @@ fn deref(&self) -> &Self::Target {
     pub fn test_init() -> impl ScopeGuarding<Target = ()> {
         static DONE: OnceCell<()> = OnceCell::new();
         DONE.get_or_init(|| {
-            // If we are building with `cargo build` and have build w/ `cmake`, FISH_BUILD_DIR might
-            // not yet exist.
-            let mut test_dir = PathBuf::from(env!("FISH_BUILD_DIR"));
+            // If we are building with `cargo build` and have build w/ `cmake`, this might not
+            // yet exist.
+            let mut test_dir = PathBuf::from(BUILD_DIR);
             test_dir.push("fish-test");
             std::fs::create_dir_all(&test_dir).unwrap();
             set_current_dir(&test_dir).unwrap();

src/tty_handoff.rs

@@ -2,6 +2,8 @@
 //! and reclaiming it after.
 
 use crate::common::{self, safe_write_loop};
+use crate::env::Environment;
+use crate::env_dispatch::MIDNIGHT_COMMANDER_SID;
 use crate::flog::{FLOG, FLOGF};
 use crate::global_safety::RelaxedAtomicBool;
 use crate::job_group::JobGroup;
@@ -25,11 +27,6 @@
 /// Whether kitty keyboard protocol support is present in the TTY.
 static KITTY_KEYBOARD_SUPPORTED: OnceCell<bool> = OnceCell::new();
 
-/// Get whether the TTY supports the kitty keyboard protocol.
-pub fn get_kitty_keyboard_capability() -> Option<&'static bool> {
-    KITTY_KEYBOARD_SUPPORTED.get()
-}
-
 /// Set that the TTY supports the kitty keyboard protocol.
 pub fn maybe_set_kitty_keyboard_capability() {
     KITTY_KEYBOARD_SUPPORTED.get_or_init(|| true);
@@ -60,6 +57,8 @@ pub fn xtversion() -> Option<&'static wstr> {
 #[derive(Debug, Copy, Clone, Eq, PartialEq)]
 pub enum TtyQuirks {
     None,
+    // Running Midnight Commander which can't parse CSI yet.
+    PreCsiMidnightCommander,
     // Running in iTerm2 before 3.5.12, which causes issues when using the kitty keyboard protocol.
     PreKittyIterm2,
     // Whether we are running under tmux.
@@ -70,9 +69,13 @@ pub enum TtyQuirks {
 
 impl TtyQuirks {
     // Create a new TtyQuirks instance with the current environment.
-    fn detect(xtversion: &wstr) -> Self {
+    fn detect(vars: &dyn Environment, xtversion: &wstr) -> Self {
         use TtyQuirks::*;
-        if get_iterm2_version(xtversion).is_some_and(|v| v < (3, 5, 12)) {
+        if vars.get(MIDNIGHT_COMMANDER_SID).is_some()
+            && vars.get(L!("__mc_kitty_keyboard")).is_none()
+        {
+            PreCsiMidnightCommander
+        } else if get_iterm2_version(xtversion).is_some_and(|v| v < (3, 5, 12)) {
             PreKittyIterm2
         } else if xtversion.starts_with(L!("tmux ")) {
             Tmux
@@ -148,7 +151,10 @@ impl TtyQuirks {
     // Determine which keyboard protocol.
     // This is used from a signal handler.
     fn safe_get_supported_protocol(&self) -> ProtocolKind {
-        use TtyQuirks::{PreKittyIterm2, Wezterm};
+        use TtyQuirks::{PreCsiMidnightCommander, PreKittyIterm2, Wezterm};
+        if *self == PreCsiMidnightCommander {
+            return ProtocolKind::None;
+        }
         if *self == PreKittyIterm2 {
             return ProtocolKind::Other;
         }
@@ -232,7 +238,7 @@ fn tty_protocols() -> Option<&'static TtyProtocolsSet> {
 }
 
 // Initialize serialized commands for enabling/disabling TTY protocols in signal handlers.
-pub fn initialize_tty_protocols() {
+pub fn initialize_tty_protocols(vars: &dyn Environment) {
     // Default missing query responses.
     KITTY_KEYBOARD_SUPPORTED.get_or_init(|| false);
     SCROLL_CONTENT_UP_SUPPORTED.get_or_init(|| false);
@@ -243,7 +249,7 @@ pub fn initialize_tty_protocols() {
     let mut p = TTY_PROTOCOLS.load(Acquire);
     if p.is_null() {
         // Try to swap in a new TTY protocols set.
-        p = Box::into_raw(Box::new(TtyQuirks::detect(xtversion).get_protocols()));
+        p = Box::into_raw(Box::new(TtyQuirks::detect(vars, xtversion).get_protocols()));
         if let Err(_e) = TTY_PROTOCOLS.compare_exchange(std::ptr::null_mut(), p, Release, Acquire) {
             // Safety: p comes from Box::into_raw right above,
             // and wasn't shared with any other thread.

tests/checks/config-paths-standalone.fish

@@ -0,0 +1,12 @@
+# RUN: %fish -d config | grep -v ^Debug.enabled
+# REQUIRES: %fish -c 'status build-info' | grep '^Features:.*embed-data'
+
+# CHECKERR: config: executable path: {{.*}}/fish
+# CHECKERR: config: embed-data feature is active, ignoring data paths
+
+# NOTE: When our executable is located outside the workspace, this is "/etc".
+# CHECKERR: config: paths.sysconf: {{.+}}/etc
+
+# CHECKERR: config: paths.bin: {{.*}}
+# CHECKERR: config: sourcing {{.+}}/etc/config.fish
+# CHECKERR: config: not sourcing {{.*}}/xdg_config_home/fish/config.fish (not readable or does not exist)

tests/checks/fish_config.fish

@@ -1,13 +1,13 @@
  #RUN: %fish %s
 
 # This still demos the current theme.
-fish_config theme show non-existent-theme
+fish_config theme show non-existant-theme
 # CHECK: {{\x1b\[m}}{{\x1b\[4m}}Current{{\x1b\[m}}
 # CHECK: /bright/vixens{{\x1b\[m}} jump{{\x1b\[m}} |{{\x1b\[m}} "fowl"{{\x1b\[m}} > quack{{\x1b\[m}} &{{\x1b\[m}} # This is a comment
 # CHECK: {{\x1b\[m}}echo{{\x1b\[m}} 'Errors are the portal to discovery
 # CHECK: {{\x1b\[m}}Th{{\x1b\[m}}is an autosuggestion
 
-fish_config prompt show non-existent-prompt
+fish_config prompt show non-existant-prompt
 
 fish_config prompt show default
 # CHECK: {{\x1b\[4m}}default{{\x1b\[m}}
@@ -23,6 +23,21 @@ fish_config theme show "fish default"
 # CHECK: {{\x1b\[m}}{{\x1b\[m}}echo{{\x1b\[m}} {{\x1b\[91m}}'{{\x1b\[33m}}Errors are the portal to discovery
 # CHECK: {{\x1b\[m}}{{\x1b\[m}}Th{{\x1b\[m}}{{\x1b\[90m}}is an autosuggestion
 
-fish_config theme show | grep -E 'fish default|Default Dark'
+mkdir $__fish_config_dir/themes
+touch $__fish_config_dir/themes/custom-from-userconf.theme
+fish_config theme show | grep -E 'fish default|Default Dark|custom-from-userconf'
+# CHECK: {{\x1b\[m}}{{\x1b\[4m}}custom-from-userconf{{\x1b\[m}}
 # CHECK: {{\x1b\[m}}{{\x1b\[4m}}Base16 Default Dark{{\x1b\[m}}
 # CHECK: {{\x1b\[m}}{{\x1b\[4m}}fish default{{\x1b\[m}}
+
+# Override a default theme with different colors.
+{
+    status get-file tools/web_config/themes/None.theme 2>/dev/null ||
+    cat $__fish_data_dir/tools/web_config/themes/None.theme
+} >$__fish_config_dir/themes/"fish default.theme"
+fish_config theme show | grep -E 'fish default|Base16 Default Dark' -A1
+# CHECK: {{\x1b\[m}}{{\x1b\[4m}}fish default{{\x1b\[m}}
+# CHECK: {{\x1b\[m}}/bright/vixens{{\x1b\[m}} {{\x1b\[m}}jump{{\x1b\[m}}{{.*}}
+# CHECK: --
+# CHECK: {{\x1b\[m}}{{\x1b\[4m}}Base16 Default Dark{{\x1b\[m}}
+# CHECK: {{.*}}/bright/vixens{{.*}}

tests/test_driver.py

@@ -61,7 +61,6 @@ def makeenv(script_path: Path, home: Path) -> Dict[str, str]:
         "XDG_DATA_DIRS",
         "LANGUAGE",
         "MC_SID",
-        "MC_TMPDIR",
         "COLORTERM",
         "KONSOLE_VERSION",
         "STY",