From 745129e8251cd5faab345a8cd7359e9d3c80d417 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Mon, 22 Nov 2021 21:08:56 +0100
Subject: [PATCH 001/262] builtin string: don't print final newline if it's
 missing from stdin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A command like "printf nonewline | sed s/x/y/" does not print a
concluding newline, whereas "printf nnl | string replace x y" does.
This is an edge case -- usually the user input does have a newline at
the end -- but it seems still better for this command to just forward
the user's data.

Teach most string subcommands to check if stdin is missing the trailing
newline, and stop adding one in that case.
This does not apply when input is read from commandline arguments.

* Most subcommands stop adding the final newline, because they don't
  really care about newlines, so besides their normal processing,
  they just want to preserve user input. They are:
  * string collect
  * string escape/unescape
  * string join¹
  * string lower/upper
  * string pad
  * string replace
  * string repeat
  * string sub
  * string trim

* string match keeps adding the newline, following "grep". Additionally,
  for string match --regex, it's important to output capture groups
  separated by newlines, resulting in multiple output lines for an
  input line. So it is not obvious where to leave out the newline.

* string split/split0 keep adding the newline for the same reason --
  they are meant to output multiple elements for a single input line.

¹) string join0 is not changed because it already printed a trailing
   zero byte instead of the trailing newline. This is consistent
   with other tools like "find -print0".

Closes #3847
---
 CHANGELOG.rst               |  1 +
 src/builtins/string.cpp     | 74 +++++++++++++++++++++++++++----------
 src/io.cpp                  | 10 +++--
 src/io.h                    | 12 ++++--
 tests/checks/expansion.fish |  1 +
 tests/checks/string.fish    | 21 ++++++++---
 6 files changed, 85 insertions(+), 34 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 37b497089..29160a079 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -77,6 +77,7 @@ Scripting improvements
 - ``cd ""`` no longer crashes fish (:issue:`8147`).
 - ``set --query`` can now query whether a variable is a pathvar via ``--path`` or ``--unpath`` (:issue:`8494`).
 - Tilde characters (``~``) produced by custom completions are no longer escaped when applied to the command line, making it easier to use the output of a recursive ``complete -C`` in completion scripts (:issue:`4570`).
+- Most ``string`` subcommands no longer print a final newline if such is missing from stdin (:issue:`3847`).
 
 Interactive improvements
 ------------------------
diff --git a/src/builtins/string.cpp b/src/builtins/string.cpp
index c4c1a138c..f24e9db28 100644
--- a/src/builtins/string.cpp
+++ b/src/builtins/string.cpp
@@ -79,6 +79,11 @@ class arg_iterator_t {
     // Backing storage for the next() string.
     wcstring storage_;
     const io_streams_t &streams_;
+    // If set, we have consumed all of stdin and its last line is missing a newline character.
+    // This is an edge case -- we expect text input, which is conventionally terminated by a
+    // newline character. But if it isn't, we use this to avoid creating one out of thin air,
+    // to not corrupt input data.
+    bool missing_trailing_newline = false;
 
     /// Reads the next argument from stdin, returning true if an argument was produced and false if
     /// not. On true, the string is stored in storage_.
@@ -94,6 +99,7 @@ class arg_iterator_t {
                 // If we still have buffer contents, flush them,
                 // in case there was no trailing sep.
                 if (buffer_.empty()) return false;
+                missing_trailing_newline = true;
                 storage_ = str2wcstring(buffer_);
                 buffer_.clear();
                 return true;
@@ -131,6 +137,11 @@ class arg_iterator_t {
             return nullptr;
         }
     }
+
+    /// Returns true if we should add a newline after printing output for the current item.
+    /// This is only ever false in an edge case, namely after we have consumed stdin and the
+    /// last line is missing a trailing newline.
+    bool want_newline() const { return !missing_trailing_newline; }
 };
 
 // This is used by the string subcommands to communicate with the option parser which flags are
@@ -688,7 +699,9 @@ static int string_escape(parser_t &parser, io_streams_t &streams, int argc, cons
     arg_iterator_t aiter(argv, optind, streams);
     while (const wcstring *arg = aiter.nextstr()) {
         streams.out.append(escape_string(*arg, flags, opts.escape_style));
-        streams.out.append(L'\n');
+        if (aiter.want_newline()) {
+            streams.out.append(L'\n');
+        }
         nesc++;
     }
 
@@ -713,7 +726,9 @@ static int string_unescape(parser_t &parser, io_streams_t &streams, int argc,
         wcstring result;
         if (unescape_string(*arg, &result, flags, opts.escape_style)) {
             streams.out.append(result);
-            streams.out.append(L'\n');
+            if (aiter.want_newline()) {
+                streams.out.append(L'\n');
+            }
             nesc++;
         }
     }
@@ -745,7 +760,11 @@ static int string_join_maybe0(parser_t &parser, io_streams_t &streams, int argc,
         nargs++;
     }
     if (nargs > 0 && !opts.quiet) {
-        streams.out.push_back(is_join0 ? L'\0' : L'\n');
+        if (is_join0) {
+            streams.out.push_back(L'\0');
+        } else if (aiter.want_newline()) {
+            streams.out.push_back(L'\n');
+        }
     }
 
     return nargs > 1 ? STATUS_CMD_OK : STATUS_CMD_ERROR;
@@ -1323,7 +1342,9 @@ static int string_pad(parser_t &parser, io_streams_t &streams, int argc, const w
                 padded.append(pad, opts.char_to_pad);
             }
         }
-        padded.push_back(L'\n');
+        if (aiter_width.want_newline()) {
+            padded.push_back(L'\n');
+        }
         streams.out.append(padded);
     }
 
@@ -1343,7 +1364,7 @@ class string_replacer_t {
 
     virtual ~string_replacer_t() = default;
     int replace_count() const { return total_replaced; }
-    virtual bool replace_matches(const wcstring &arg) = 0;
+    virtual bool replace_matches(const wcstring &arg, bool want_newline) = 0;
 };
 
 class literal_replacer_t : public string_replacer_t {
@@ -1360,7 +1381,7 @@ class literal_replacer_t : public string_replacer_t {
           patlen(pattern.length()) {}
 
     ~literal_replacer_t() override = default;
-    bool replace_matches(const wcstring &arg) override;
+    bool replace_matches(const wcstring &arg, bool want_newline) override;
 };
 
 static maybe_t<wcstring> interpret_escapes(const wcstring &arg) {
@@ -1400,12 +1421,12 @@ class regex_replacer_t : public string_replacer_t {
         }
     }
 
-    bool replace_matches(const wcstring &arg) override;
+    bool replace_matches(const wcstring &arg, bool want_newline) override;
 };
 
 /// A return value of true means all is well (even if no replacements were performed), false
 /// indicates an unrecoverable error.
-bool literal_replacer_t::replace_matches(const wcstring &arg) {
+bool literal_replacer_t::replace_matches(const wcstring &arg, bool want_newline) {
     wcstring result;
     bool replacement_occurred = false;
 
@@ -1432,7 +1453,9 @@ bool literal_replacer_t::replace_matches(const wcstring &arg) {
 
     if (!opts.quiet && (!opts.filter || replacement_occurred)) {
         streams.out.append(result);
-        streams.out.append(L'\n');
+        if (want_newline) {
+            streams.out.append(L'\n');
+        }
     }
 
     return true;
@@ -1440,7 +1463,7 @@ bool literal_replacer_t::replace_matches(const wcstring &arg) {
 
 /// A return value of true means all is well (even if no replacements were performed), false
 /// indicates an unrecoverable error.
-bool regex_replacer_t::replace_matches(const wcstring &arg) {
+bool regex_replacer_t::replace_matches(const wcstring &arg, bool want_newline) {
     if (!regex.code) return false;   // pcre2_compile() failed
     if (!replacement) return false;  // replacement was an invalid string
 
@@ -1488,7 +1511,9 @@ bool regex_replacer_t::replace_matches(const wcstring &arg) {
         bool replacement_occurred = pcre2_rc > 0;
         if (!opts.quiet && (!opts.filter || replacement_occurred)) {
             streams.out.append(outstr);
-            streams.out.append(L'\n');
+            if (want_newline) {
+                streams.out.append(L'\n');
+            }
         }
         total_replaced += pcre2_rc;
     }
@@ -1520,7 +1545,7 @@ static int string_replace(parser_t &parser, io_streams_t &streams, int argc, con
 
     arg_iterator_t aiter(argv, optind, streams);
     while (const wcstring *arg = aiter.nextstr()) {
-        if (!replacer->replace_matches(*arg)) return STATUS_INVALID_ARGS;
+        if (!replacer->replace_matches(*arg, aiter.want_newline())) return STATUS_INVALID_ARGS;
         if (opts.quiet && replacer->replace_count() > 0) return STATUS_CMD_OK;
     }
 
@@ -1601,12 +1626,12 @@ static int string_split_maybe0(parser_t &parser, io_streams_t &streams, int argc
                 for (const auto &field : opts.fields) {
                     if (field - 1 < (long)splits.size()) {
                         streams.out.append_with_separation(splits.at(field - 1),
-                                                           separation_type_t::explicitly);
+                                                           separation_type_t::explicitly, true);
                     }
                 }
             } else {
                 for (const wcstring &split : splits) {
-                    streams.out.append_with_separation(split, separation_type_t::explicitly);
+                    streams.out.append_with_separation(split, separation_type_t::explicitly, true);
                 }
             }
         }
@@ -1641,7 +1666,8 @@ static int string_collect(parser_t &parser, io_streams_t &streams, int argc, con
                 len -= 1;
             }
         }
-        streams.out.append_with_separation(s, len, separation_type_t::explicitly);
+        streams.out.append_with_separation(s, len, separation_type_t::explicitly,
+                                           aiter.want_newline());
         appended += len;
     }
 
@@ -1650,7 +1676,9 @@ static int string_collect(parser_t &parser, io_streams_t &streams, int argc, con
     // echo (true | string collect --allow-empty)"bar"
     // prints "bar".
     if (opts.allow_empty && appended == 0) {
-        streams.out.append_with_separation(L"", 0, separation_type_t::explicitly);
+        streams.out.append_with_separation(
+            L"", 0, separation_type_t::explicitly,
+            true /* historical behavior is to always print a newline */);
     }
 
     return appended > 0 ? STATUS_CMD_OK : STATUS_CMD_ERROR;
@@ -1718,7 +1746,7 @@ static int string_repeat(parser_t &parser, io_streams_t &streams, int argc, cons
     }
 
     // Historical behavior is to never append a newline if all strings were empty.
-    if (!opts.quiet && !opts.no_newline && !all_empty) {
+    if (!opts.quiet && !opts.no_newline && !all_empty && aiter.want_newline()) {
         streams.out.append(L'\n');
     }
 
@@ -1780,7 +1808,9 @@ static int string_sub(parser_t &parser, io_streams_t &streams, int argc, const w
         // Note that std::string permits count to extend past end of string.
         if (!opts.quiet) {
             streams.out.append(s->substr(pos, count));
-            streams.out.append(L'\n');
+            if (aiter.want_newline()) {
+                streams.out.append(L'\n');
+            }
         }
         nsub++;
         if (opts.quiet) return STATUS_CMD_OK;
@@ -1823,7 +1853,9 @@ static int string_trim(parser_t &parser, io_streams_t &streams, int argc, const
         ntrim += arg->size() - (end - begin);
         if (!opts.quiet) {
             streams.out.append(wcstring(*arg, begin, end - begin));
-            streams.out.append(L'\n');
+            if (aiter.want_newline()) {
+                streams.out.append(L'\n');
+            }
         } else if (ntrim > 0) {
             return STATUS_CMD_OK;
         }
@@ -1849,7 +1881,9 @@ static int string_transform(parser_t &parser, io_streams_t &streams, int argc, c
         if (transformed != *arg) n_transformed++;
         if (!opts.quiet) {
             streams.out.append(transformed);
-            streams.out.append(L'\n');
+            if (aiter.want_newline()) {
+                streams.out.append(L'\n');
+            }
         } else if (n_transformed > 0) {
             return STATUS_CMD_OK;
         }
diff --git a/src/io.cpp b/src/io.cpp
index 63565bae1..9e86ebebc 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -309,13 +309,14 @@ shared_ptr<const io_data_t> io_chain_t::io_for_fd(int fd) const {
 
 void output_stream_t::append_narrow_buffer(separated_buffer_t buffer) {
     for (const auto &rhs_elem : buffer.elements()) {
-        append_with_separation(str2wcstring(rhs_elem.contents), rhs_elem.separation);
+        append_with_separation(str2wcstring(rhs_elem.contents), rhs_elem.separation, false);
     }
 }
 
-void output_stream_t::append_with_separation(const wchar_t *s, size_t len, separation_type_t type) {
+void output_stream_t::append_with_separation(const wchar_t *s, size_t len, separation_type_t type,
+                                             bool want_newline) {
     append(s, len);
-    if (type == separation_type_t::explicitly) {
+    if (type == separation_type_t::explicitly && want_newline) {
         append(L'\n');
     }
 }
@@ -352,7 +353,8 @@ void buffered_output_stream_t::append(const wchar_t *s, size_t amt) {
 }
 
 void buffered_output_stream_t::append_with_separation(const wchar_t *s, size_t len,
-                                                      separation_type_t type) {
+                                                      separation_type_t type, bool want_newline) {
+    UNUSED(want_newline);
     buffer_->append(wcs2string(s, len), type);
 }
 
diff --git a/src/io.h b/src/io.h
index 14ed800c2..55247f9a8 100644
--- a/src/io.h
+++ b/src/io.h
@@ -365,11 +365,14 @@ class output_stream_t : noncopyable_t, nonmovable_t {
     virtual int flush_and_check_error();
 
     /// An optional override point. This is for explicit separation.
-    virtual void append_with_separation(const wchar_t *s, size_t len, separation_type_t type);
+    /// \param want_newline this is true if the output item should be ended with a newline. This
+    /// is only relevant if we are printing the output to a stream,
+    virtual void append_with_separation(const wchar_t *s, size_t len, separation_type_t type,
+                                        bool want_newline);
 
     /// The following are all convenience overrides.
-    void append_with_separation(const wcstring &s, separation_type_t type) {
-        append_with_separation(s.data(), s.size(), type);
+    void append_with_separation(const wcstring &s, separation_type_t type, bool want_newline) {
+        append_with_separation(s.data(), s.size(), type, want_newline);
     }
 
     /// Append a string.
@@ -443,7 +446,8 @@ class buffered_output_stream_t final : public output_stream_t {
     }
 
     void append(const wchar_t *s, size_t amt) override;
-    void append_with_separation(const wchar_t *s, size_t len, separation_type_t type) override;
+    void append_with_separation(const wchar_t *s, size_t len, separation_type_t type,
+                                bool want_newline) override;
     int flush_and_check_error() override;
 
    private:
diff --git a/tests/checks/expansion.fish b/tests/checks/expansion.fish
index 0cff88d14..15435161f 100644
--- a/tests/checks/expansion.fish
+++ b/tests/checks/expansion.fish
@@ -40,6 +40,7 @@ echo \'{ hello , world }\'
 for phrase in {good\,,   beautiful ,morning}
     echo -n "$phrase "
 end | string trim
+echo
 for phrase in {goodbye\,,\ cruel\ ,world\n}
     echo -n $phrase
 end
diff --git a/tests/checks/string.fish b/tests/checks/string.fish
index 8aaa400dd..b77e09e9f 100644
--- a/tests/checks/string.fish
+++ b/tests/checks/string.fish
@@ -601,12 +601,12 @@ and echo uppercasing a uppercase string did not fail as expected
 
 # 'Check NUL'
 # Note: We do `string escape` at the end to make a `\0` literal visible.
-printf 'a\0b' | string escape
-printf 'a\0c' | string match -e a | string escape
-printf 'a\0d' | string split '' | string escape
-printf 'a\0b' | string match -r '.*b$' | string escape
-printf 'a\0b' | string replace b g | string escape
-printf 'a\0b' | string replace -r b g | string escape
+printf 'a\0b\n' | string escape
+printf 'a\0c\n' | string match -e a | string escape
+printf 'a\0d\n' | string split '' | string escape
+printf 'a\0b\n' | string match -r '.*b$' | string escape
+printf 'a\0b\n' | string replace b g | string escape
+printf 'a\0b\n' | string replace -r b g | string escape
 # TODO: These do not yet work!
 # printf 'a\0b' | string match '*b' | string escape
 # CHECK: a\x00b
@@ -797,3 +797,12 @@ echo "foo1x foo2x foo3x" | string match -arg 'foo(\d)x'
 # CHECK: 1
 # CHECK: 2
 # CHECK: 3
+
+# Most subcommands preserve missing newline (#3847).
+echo -n abc | string upper
+echo '<eol>'
+# CHECK: ABC<eol>
+printf \<
+printf my-password | string replace -ra . \*
+printf \>\n
+# CHECK: <***********>

From 8e60f1b4a3ae9390f26206766328d46d3a0dcf24 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 14 Jan 2022 18:54:01 +0100
Subject: [PATCH 002/262] docs: Set doc language

This sets the html lang= attribute, which should be useful for
accessibility (screenreaders).
---
 doc_src/conf.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc_src/conf.py b/doc_src/conf.py
index abcab794f..def07e916 100644
--- a/doc_src/conf.py
+++ b/doc_src/conf.py
@@ -93,12 +93,14 @@ source_suffix = ".rst"
 # The master toctree document.
 master_doc = "index"
 
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
+# The languages this uses, also used for content autogenerated by Sphinx.
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+#
+# It also sets the html lang= attribute which would be useful to e.g. screenreaders.
+# Currently we only have english.
+language = "en"
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.

From 0781473564dd89d13c646659a9d957d46607fcf3 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 15 Jan 2022 12:17:43 +0100
Subject: [PATCH 003/262] argparse: Jump to the next option after an unknown
 one

Previously, when we got an unknown option with --ignore-unknown, we
would increment woptind but still try to read the same contents.

This means in e.g.

```
argparse -i h -- -ooo -h
```

The `-h` would also be skipped as an option, because after the first
`-o` getopt reads the other two `-o` and skips that many options.

This could be handled more extensively in wgetopt, but the simpler fix
is to just skip to the next argv entry once we have an unknown option
- there's nothing more we can do with it anyway!

Additionally, document this and clearly explain that we currently
don't transform the option.

Fixes #8637
---
 doc_src/cmds/argparse.rst  | 15 +++++++++++++++
 src/builtins/argparse.cpp  |  3 +++
 tests/checks/argparse.fish | 11 +++++++++++
 3 files changed, 29 insertions(+)

diff --git a/doc_src/cmds/argparse.rst b/doc_src/cmds/argparse.rst
index dd6e8e674..dff27444c 100644
--- a/doc_src/cmds/argparse.rst
+++ b/doc_src/cmds/argparse.rst
@@ -184,3 +184,18 @@ Some OPTION_SPEC examples:
 After parsing the arguments the ``argv`` variable is set with local scope to any values not already consumed during flag processing. If there are no unbound values the variable is set but ``count $argv`` will be zero.
 
 If an error occurs during argparse processing it will exit with a non-zero status and print error messages to stderr.
+
+Limitations
+-----------
+
+One limitation with **--ignore-unknown** is that, if an unknown option is given in a group with known options, the entire group will be kept in $argv. ``argparse`` will not do any permutations here.
+
+For instance::
+
+  argparse --ignore-unknown h -- -ho
+  echo $_flag_h # is -h, because -h was given
+  echo $argv # is still -ho
+
+This limitation may be lifted in future.
+
+Additionally, it can only parse known options up to the first unknown option in the group - the unknown option could take options, so it isn't clear what any character after an unknown option means.
diff --git a/src/builtins/argparse.cpp b/src/builtins/argparse.cpp
index 53824abc3..9f06d19ac 100644
--- a/src/builtins/argparse.cpp
+++ b/src/builtins/argparse.cpp
@@ -596,6 +596,9 @@ static int argparse_parse_flags(parser_t &parser, argparse_cmd_opts_t &opts,
                 opts.argv.push_back(arg_contents - 1);
                 // Work around weirdness with wgetopt, which crashes if we `continue` here.
                 if (w.woptind == argc) break;
+                // Explain to wgetopt that we want to skip to the next arg,
+                // because we can't handle this opt group.
+                w.nextchar = nullptr;
             }
             if (retval != STATUS_CMD_OK) return retval;
             long_idx = -1;
diff --git a/tests/checks/argparse.fish b/tests/checks/argparse.fish
index a55844b63..9a5885de1 100644
--- a/tests/checks/argparse.fish
+++ b/tests/checks/argparse.fish
@@ -498,3 +498,14 @@ begin
     #CHECKERR: ^
     #CHECKERR: (Type 'help argparse' for related documentation)
 end
+
+begin
+    argparse --ignore-unknown h i -- -hoa -oia
+    echo -- $argv
+    #CHECK: -hoa -oia
+    echo $_flag_h
+    #CHECK: -h
+    set -q _flag_i
+    or echo No flag I
+    #CHECK: No flag I
+end

From ca12ce249443d413e9ed655c4b8d31163d52e51b Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 15 Jan 2022 12:22:11 +0100
Subject: [PATCH 004/262] CHANGELOG

---
 CHANGELOG.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 69d832b7a..000918698 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -88,6 +88,7 @@ Scripting improvements
 - The ``la`` function no longer lists entries for "." and "..", matching other systems defaults (:issue:`8519`).
 - ``abbr -q`` returns the correct exit status when given multiple abbreviation names as arguments (:issue:`8431`).
 - ``command -v`` returns an exit status of 127 instead of 1 if no command was found (:issue:`8547`).
+- ``argparse`` with ``--ignore-unknown`` no longer breaks with multiple unknown options in a short option group (:issue:`8637`).
 
 Interactive improvements
 ------------------------

From 698b8189356c8224443fdfc4399408f932d53aca Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 16 Jan 2022 11:14:11 +0100
Subject: [PATCH 005/262] Shorten default title

This now skips the "fish" bit and uses prompt_pwd to print a shorter title.

See #8641.
---
 CHANGELOG.rst                   |  1 +
 share/functions/fish_title.fish | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 000918698..50b000bd6 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -115,6 +115,7 @@ Interactive improvements
 - The clipboard bindings ignore X-based clipboard programs if the ``DISPLAY`` environment variable is not set, which helps prefer the Windows clipboard when it is available (such as on WSL).
 - ``funcsave`` will remove a saved copy of a function that has been erased with ``functions --erase``.
 - The Web-based configuration tool gained a number of improvements, including the ability to set pager colors.
+- The default ``fish_title`` prints a shorter title with shortened $PWD and no more redundant "fish" (:issue:`8641`).
 
 New or improved bindings
 ^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/share/functions/fish_title.fish b/share/functions/fish_title.fish
index 800f2d8f1..ec3d3e5ff 100644
--- a/share/functions/fish_title.fish
+++ b/share/functions/fish_title.fish
@@ -3,6 +3,15 @@ function fish_title
     if not set -q INSIDE_EMACS; or string match -vq '*,term:*' -- $INSIDE_EMACS
         # An override for the current command is passed as the first parameter.
         # This is used by `fg` to show the true process name, among others.
-        echo (set -q argv[1] && echo $argv[1] || status current-command) (__fish_pwd)
+        if set -q argv[1]
+            echo -- $argv[1] (prompt_pwd -d 1 -D 0)
+        else
+            # Don't print "fish" because it's redundant
+            set -l command (status current-command)
+            if test "$command" = fish
+                set command
+            end
+            echo -- $command (prompt_pwd -d 1 -D 1)
+        end
     end
 end

From 6df86c6c23e3668ad8490310d77ef6440b054e7d Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 9 Jan 2022 12:26:18 +0100
Subject: [PATCH 006/262] math.rst: use 4 spaces instead of a tab for
 indentation

I personally prefer tabs but we always use spaces, so this is much
less surprising.
---
 doc_src/cmds/fish_hg_prompt.rst |  2 +-
 doc_src/cmds/math.rst           | 46 ++++++++++++++++-----------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/doc_src/cmds/fish_hg_prompt.rst b/doc_src/cmds/fish_hg_prompt.rst
index 8db66c21c..0fa7dc3aa 100644
--- a/doc_src/cmds/fish_hg_prompt.rst
+++ b/doc_src/cmds/fish_hg_prompt.rst
@@ -22,7 +22,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 --universal fish_prompt_hg_show_informative_status
 
 If you enabled the informative status, there are numerous customization options, which can be controlled with fish variables.
 
diff --git a/doc_src/cmds/math.rst b/doc_src/cmds/math.rst
index ee3104c76..5f64fa563 100644
--- a/doc_src/cmds/math.rst
+++ b/doc_src/cmds/math.rst
@@ -106,56 +106,56 @@ Functions
 ``abs``
     the absolute value, with positive sign
 ``acos``
-	arc cosine
+    arc cosine
 ``asin``
-	arc sine
+    arc sine
 ``atan``
-	arc tangent
+    arc tangent
 ``atan2``
-	arc tangent of two variables
+    arc tangent of two variables
 ``bitand``, ``bitor`` and ``bitxor``
     perform bitwise operations.
     These will throw away any non-integer parts andd interpret the rest as an int.
 ``ceil``
-	round number up to nearest integer
+    round number up to nearest integer
 ``cos``
-	the cosine
+    the cosine
 ``cosh``
-	hyperbolic cosine
+    hyperbolic cosine
 ``exp``
-	the base-e exponential function
+    the base-e exponential function
 ``fac``
-	factorial - also known as ``x!`` (``x * (x - 1) * (x - 2) * ... * 1``)
+    factorial - also known as ``x!`` (``x * (x - 1) * (x - 2) * ... * 1``)
 ``floor``
-	round number down to nearest integer
+    round number down to nearest integer
 ``ln``
-	the base-e logarithm
+    the base-e logarithm
 ``log`` or ``log10``
-	the base-10 logarithm
+    the base-10 logarithm
 ``log2``
-	the base-2 logarithm
+    the base-2 logarithm
 ``max``
-	returns the larger of two numbers
+    returns the larger of two numbers
 ``min``
-	returns the smaller of two numbers
+    returns the smaller of two numbers
 ``ncr``
-	"from n choose r" combination function - how many subsets of size r can be taken from n (order doesn't matter)
+    "from n choose r" combination function - how many subsets of size r can be taken from n (order doesn't matter)
 ``npr``
-	the number of subsets of size r that can be taken from a set of n elements (including different order)
+    the number of subsets of size r that can be taken from a set of n elements (including different order)
 ``pow(x,y)``
     returns x to the y (and can be written as ``x ^ y``)
 ``round``
-	rounds to the nearest integer, away from 0
+    rounds to the nearest integer, away from 0
 ``sin``
-	the sine function
+    the sine function
 ``sinh``
-	the hyperbolic sine
+    the hyperbolic sine
 ``sqrt``
-	the square root - (can also be written as ``x ^ 0.5``)
+    the square root - (can also be written as ``x ^ 0.5``)
 ``tan``
-	the tangent
+    the tangent
 ``tanh``
-	the hyperbolic tangent
+    the hyperbolic tangent
 
 All of the trigonometric functions use radians (the pi-based scale, not 360°).
 

From 19aebebb95a406135ebce6240ffeb203283de5c4 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 9 Jan 2022 09:23:29 +0100
Subject: [PATCH 007/262] math.rst: remove stray mention of -- separator from
 synopsis

The -- is not special here and we don't mention it in other synopses.

It was originally added for a good reason in 98449fec5 (fix `math`
regression, 2017-07-14), along this addition to math.rst:

> You should always place a `--` flag separator before the expression. [...]

However, since 56d913453 (Cache math expressions, 2017-08-24) that
line was changed to

> You don't need to use `--` before the expression even if it begins with a minus sign [...]
---
 doc_src/cmds/math.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc_src/cmds/math.rst b/doc_src/cmds/math.rst
index 5f64fa563..8553e37d6 100644
--- a/doc_src/cmds/math.rst
+++ b/doc_src/cmds/math.rst
@@ -6,7 +6,7 @@ math - perform mathematics calculations
 Synopsis
 --------
 
-``math`` [**-s** | **--scale** *N*] [**-b** | **--base** *BASE*] [--] *EXPRESSION...*
+``math`` [**-s** | **--scale** *N*] [**-b** | **--base** *BASE*] *EXPRESSION...*
 
 
 Description

From 0d6bad966084117aecbc9644eb7df03a62043ac1 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 9 Jan 2022 12:11:32 +0100
Subject: [PATCH 008/262] history.rst: don't mention the --show-time option for
 "history delete"

It's ignored.  We could support it in future (and maybe throw an
"unsupported" error until then).
---
 doc_src/cmds/history.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc_src/cmds/history.rst b/doc_src/cmds/history.rst
index 48b9dc3b0..ab96488f9 100644
--- a/doc_src/cmds/history.rst
+++ b/doc_src/cmds/history.rst
@@ -9,7 +9,7 @@ Synopsis
 | ``history`` [**search**] [**--show-time** **--case-sensitive**]
 	\	\   [**--exact** | **--prefix** | **--contains**] [**--max** *n*] [**--null** **--reverse**]
 	\	\   [ *SEARCH_STRING...* ]
-| ``history`` **delete** [**--show-time** **--case-sensitive**]
+| ``history`` **delete** [**--case-sensitive**]
 	\	\   [**--exact** | **--prefix** | **--contains**] *SEARCH_STRING...*
 | ``history`` { **merge** | **save** | **clear** | **clear_session** }
 

From a7f45b05b731bd6bc84c675d29502a5cc8ec6c65 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 9 Jan 2022 11:49:03 +0100
Subject: [PATCH 009/262] history.rst: fix wrong subcommand name and
 unconventional braces

For alteration we usually use "(a | b)", not "{a | b}".

While at it, instead of writing 4/6 subcommands in one line, write them
on separate lines, so it's very obvious that all these are separate
subcommands. We mainly use the (a | b) syntax for long/short options.
---
 doc_src/cmds/history.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc_src/cmds/history.rst b/doc_src/cmds/history.rst
index ab96488f9..e84277624 100644
--- a/doc_src/cmds/history.rst
+++ b/doc_src/cmds/history.rst
@@ -11,7 +11,10 @@ Synopsis
 	\	\   [ *SEARCH_STRING...* ]
 | ``history`` **delete** [**--case-sensitive**]
 	\	\   [**--exact** | **--prefix** | **--contains**] *SEARCH_STRING...*
-| ``history`` { **merge** | **save** | **clear** | **clear_session** }
+| ``history`` **merge**
+| ``history`` **save**
+| ``history`` **clear**
+| ``history`` **clear-session**
 
 Description
 -----------

From dd8351d1b40086278e775dd783b83f872cd99ac9 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 9 Jan 2022 09:08:10 +0100
Subject: [PATCH 010/262] history.rst: fix BNF syntax for orthogonal options

These can be used alone, or in combination, let's reflect that in
the synopsis.
---
 doc_src/cmds/history.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc_src/cmds/history.rst b/doc_src/cmds/history.rst
index e84277624..5d21de7ab 100644
--- a/doc_src/cmds/history.rst
+++ b/doc_src/cmds/history.rst
@@ -6,8 +6,8 @@ history - show and manipulate command history
 Synopsis
 --------
 
-| ``history`` [**search**] [**--show-time** **--case-sensitive**]
-	\	\   [**--exact** | **--prefix** | **--contains**] [**--max** *n*] [**--null** **--reverse**]
+| ``history`` [**search**] [**--show-time**] [**--case-sensitive**]
+	\	\   [**--exact** | **--prefix** | **--contains**] [**--max** *n*] [**--null**] [**--reverse**]
 	\	\   [ *SEARCH_STRING...* ]
 | ``history`` **delete** [**--case-sensitive**]
 	\	\   [**--exact** | **--prefix** | **--contains**] *SEARCH_STRING...*

From d9287ec471e6c038c2b540c6d36ac61b2539003c Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 9 Jan 2022 08:34:11 +0100
Subject: [PATCH 011/262] set.rst: fix synopsis glitch and make placeholder
 uppercase
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

One synopsis misrenders as

    set [options] VARIABLE*[*INDICES]… VALUES…

Add a missing backslash to fix that.  Also go back to uppercase
because I'm not sure why this was changed to lowercase.

Finally, remove the spurious ellipsis after VARIABLE[INDICES].
This element cannot be repeated. Multiple index values and ranges
can be specified but that's already implied by the plural INDICES.
---
 doc_src/cmds/set.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc_src/cmds/set.rst b/doc_src/cmds/set.rst
index 00d6f71f3..eec73aa49 100644
--- a/doc_src/cmds/set.rst
+++ b/doc_src/cmds/set.rst
@@ -8,10 +8,10 @@ Synopsis
 
 | ``set`` [*scope options*]
 | ``set`` [*options*] *VARIABLE* *VALUES*...
-| ``set`` [*options*] *VARIABLE*[*indicies*]... *VALUES*...
+| ``set`` [*options*] *VARIABLE*\[*INDICES*] *VALUES*...
 | ``set`` ( **-q** | **--query** ) [*scope options*] *VARIABLE* ...
 | ``set`` ( **-e** | **--erase** ) [*scope options*] *VARIABLE* ...
-| ``set`` ( **-e** | **--erase** ) [*scope options*] *VARIABLE*\[*indicies*] ...
+| ``set`` ( **-e** | **--erase** ) [*scope options*] *VARIABLE*\[*INDICES*] ...
 | ``set`` ( **-S** | **--show** ) *VARIABLE*...
 
 Description

From 115615b8313745b7e8b717ef12d9609ab11b2eb1 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 9 Jan 2022 09:04:56 +0100
Subject: [PATCH 012/262] psub.rst: add long option to synopsis

---
 doc_src/cmds/psub.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc_src/cmds/psub.rst b/doc_src/cmds/psub.rst
index cdd4008f0..f83e086cc 100644
--- a/doc_src/cmds/psub.rst
+++ b/doc_src/cmds/psub.rst
@@ -6,7 +6,7 @@ psub - perform process substitution
 Synopsis
 --------
 
-*COMMAND1* ( *COMMAND2* | ``psub`` [**-F** | -**-fifo**] [**-f** | **--file**] [**-s** *SUFFIX*] )
+*COMMAND1* ( *COMMAND2* | ``psub`` [**-F** | -**-fifo**] [**-f** | **--file**] [(**-s** | **--suffix**) *SUFFIX*] )
 
 Description
 -----------

From 851512a7ccc7e53e907546aaed061268447eed46 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 9 Jan 2022 09:11:06 +0100
Subject: [PATCH 013/262] complete.rst: clarify in synopsis that -c/-p take an
 argument

Correct the grammar by moving the options after the command argument.
Also group the -c/--command and -p/--path pairs, to convey that the
short and long variants are equivalent.

While at it, consolidate the -C/--do-complete forms, like we usually
do.
---
 doc_src/cmds/complete.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc_src/cmds/complete.rst b/doc_src/cmds/complete.rst
index 8bb0cb77d..91c17c31c 100644
--- a/doc_src/cmds/complete.rst
+++ b/doc_src/cmds/complete.rst
@@ -6,8 +6,8 @@ complete - edit command specific tab-completions
 Synopsis
 --------
 
-``complete`` **-c** | **--command** | **-p** | **--path** [*options*] *COMMAND*
-``complete`` **-C** *STRING* | **--do-complete** *STRING*
+``complete`` ((**-c** | **--command**) | (**-p** | **--path**)) *COMMAND* [*options*] 
+``complete`` ((**-C** | **--do-complete**)) *STRING*
 
 Description
 -----------

From adccd6e6f55874c777d2bb47c9610913545f094f Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 9 Jan 2022 09:42:36 +0100
Subject: [PATCH 014/262] function.rst: remove ellipsis since there is no
 repetition

Alternatively we could say *COMMANDS*... or similar.
---
 doc_src/cmds/function.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc_src/cmds/function.rst b/doc_src/cmds/function.rst
index 0e5b9dce5..2ec3d990a 100644
--- a/doc_src/cmds/function.rst
+++ b/doc_src/cmds/function.rst
@@ -6,7 +6,7 @@ function - create a function
 Synopsis
 --------
 
-**function** *NAME* [*OPTIONS*]; BODY ...; **end**
+**function** *NAME* [*OPTIONS*]; *BODY*; **end**
 
 
 Description

From 4a4905aaa50996cff13d99a1ea82490bc98cdff3 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 9 Jan 2022 08:44:27 +0100
Subject: [PATCH 015/262] docs synopses: fix RST syntax

---
 doc_src/cmds/functions.rst   | 2 +-
 doc_src/cmds/string-trim.rst | 2 +-
 doc_src/cmds/string.rst      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc_src/cmds/functions.rst b/doc_src/cmds/functions.rst
index 2eca671ca..21cced1ec 100644
--- a/doc_src/cmds/functions.rst
+++ b/doc_src/cmds/functions.rst
@@ -6,7 +6,7 @@ functions - print or erase functions
 Synopsis
 --------
 
-| **functions** [ **-a** | **--all** ] [ **-n | **--names** ]
+| **functions** [ **-a** | **--all** ] [ **-n** | **--names** ]
 | **functions** [ **-D** | **--details** ] [ **-v** ] *FUNCTION*
 | **functions** **-c** *OLDNAME* *NEWNAME*
 | **functions** **-d** *DESCRIPTION* *FUNCTION*
diff --git a/doc_src/cmds/string-trim.rst b/doc_src/cmds/string-trim.rst
index 15d9d2b99..7a2aa6c1e 100644
--- a/doc_src/cmds/string-trim.rst
+++ b/doc_src/cmds/string-trim.rst
@@ -6,7 +6,7 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-``string`` trim [**-l** | **--left**] [**-r** | **--right**] [**-c** | **--chars** CHARS*]
+``string`` trim [**-l** | **--left**] [**-r** | **--right**] [**-c** | **--chars** *CHARS*]
     \   \   [**-q** | **--quiet**] [*STRING*...]
 
 .. END SYNOPSIS
diff --git a/doc_src/cmds/string.rst b/doc_src/cmds/string.rst
index 40ab5066a..8b65b1967 100644
--- a/doc_src/cmds/string.rst
+++ b/doc_src/cmds/string.rst
@@ -27,7 +27,7 @@ Synopsis
 	\	\	  [**-r** | **--right**] [*STRING*...]
 | ``string`` sub [**-s** | **--start** *START*] [**-l** | **--length** *LENGTH*]
 	\	     [**-q** | **--quiet**] [*STRING*...]
-| ``string`` trim [**-l** | **--left**] [**-r** | **--right**] [**-c** | **--chars** CHARS*]
+| ``string`` trim [**-l** | **--left**] [**-r** | **--right**] [**-c** | **--chars** *CHARS*]
 	\	\	[**-q** | **--quiet**] [*STRING*...]
 | ``string`` unescape [**--style=**] [*STRING*...]
 | ``string`` upper [**-q** | **--quiet**] [*STRING*...]

From f8e8c23ac3d499fbffe6f7177c23d079f7ff224c Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 9 Jan 2022 09:01:51 +0100
Subject: [PATCH 016/262] docs synopses: use parenthesis to indicate that
 short/long option pairs take same args

Matches Git, see for example the -O option in git-grep(1).
---
 doc_src/cmds/bind.rst          | 10 +++++-----
 doc_src/cmds/math.rst          |  2 +-
 doc_src/cmds/string-pad.rst    |  2 +-
 doc_src/cmds/string-repeat.rst |  2 +-
 doc_src/cmds/string-split.rst  |  4 ++--
 doc_src/cmds/string-sub.rst    |  2 +-
 doc_src/cmds/string-trim.rst   |  2 +-
 doc_src/cmds/string.rst        | 10 +++++-----
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/doc_src/cmds/bind.rst b/doc_src/cmds/bind.rst
index e2a91397b..e708704a1 100644
--- a/doc_src/cmds/bind.rst
+++ b/doc_src/cmds/bind.rst
@@ -6,11 +6,11 @@ Synopsis
 --------
 
 | ``bind`` [(**-M** | **--mode**) *MODE*] [(*-m* | *--sets-mode*) **NEW_MODE**] [*--preset* | *--user*] [*-s* | *--silent*] [**-k** | **--key**] *SEQUENCE* *COMMAND* ...
-| ``bind`` [**-M** | **--mode** *MODE*] [**-k** | **--key**] [**--preset**] [**--user**] *SEQUENCE*
-| ``bind`` **-K** | **--key-names** [**-a** | **--all**] [**--preset**] [**--user**]
-| ``bind`` **-f** | **--function-names**
-| ``bind`` **-L** | **--list-modes**
-| ``bind`` **-e** | **--erase** [**-M** | **--mode** *MODE*] [**--preset**] [**--user**] [**-a** | **--all**] | [**-k** | **--key**] *SEQUENCE* ...
+| ``bind`` [(**-M** | **--mode**) *MODE*] [**-k** | **--key**] [**--preset**] [**--user**] *SEQUENCE*
+| ``bind`` (**-K** | **--key-names**) [**-a** | **--all**] [**--preset**] [**--user**]
+| ``bind`` (**-f** | **--function-names**)
+| ``bind`` (**-L** | **--list-modes**)
+| ``bind`` (**-e** | **--erase**) [(**-M** | **--mode**) *MODE*] [**--preset**] [**--user**] [**-a** | **--all**] | [**-k** | **--key**] *SEQUENCE* ...
 
 Description
 -----------
diff --git a/doc_src/cmds/math.rst b/doc_src/cmds/math.rst
index 8553e37d6..e0bc7856e 100644
--- a/doc_src/cmds/math.rst
+++ b/doc_src/cmds/math.rst
@@ -6,7 +6,7 @@ math - perform mathematics calculations
 Synopsis
 --------
 
-``math`` [**-s** | **--scale** *N*] [**-b** | **--base** *BASE*] *EXPRESSION...*
+``math`` [(**-s** | **--scale**) *N*] [(**-b** | **--base**) *BASE*] *EXPRESSION...*
 
 
 Description
diff --git a/doc_src/cmds/string-pad.rst b/doc_src/cmds/string-pad.rst
index ec107318a..5680e9f88 100644
--- a/doc_src/cmds/string-pad.rst
+++ b/doc_src/cmds/string-pad.rst
@@ -6,7 +6,7 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-``string`` pad [**-r** | **--right**] [**-c** | **--char** *CHAR*] [**-w** | **--width** *INTEGER*]
+``string`` pad [**-r** | **--right**] [(**-c** | **--char**) *CHAR*] [(**-w** | **--width**) *INTEGER*]
     \   \      [*STRING*...]
 
 .. END SYNOPSIS
diff --git a/doc_src/cmds/string-repeat.rst b/doc_src/cmds/string-repeat.rst
index 11ba29bbb..6f64070b0 100644
--- a/doc_src/cmds/string-repeat.rst
+++ b/doc_src/cmds/string-repeat.rst
@@ -6,7 +6,7 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-``string`` repeat [**-n** | **--count** *COUNT*] [**-m** | **--max** *MAX*] [**-N** | **--no-newline**]
+``string`` repeat [(**-n** | **--count**) *COUNT*] [(**-m** | **--max**) *MAX*] [**-N** | **--no-newline**]
     \   \     [**-q** | **--quiet**] [*STRING*...]
 
 .. END SYNOPSIS
diff --git a/doc_src/cmds/string-split.rst b/doc_src/cmds/string-split.rst
index 6a2ae06e9..ca24edd91 100644
--- a/doc_src/cmds/string-split.rst
+++ b/doc_src/cmds/string-split.rst
@@ -6,9 +6,9 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-| ``string`` split [**-m** | **--max** *MAX*] [**-n** | **--no-empty**] [**-q** | **--quiet**]
+| ``string`` split [(**-m** | **--max**) *MAX*] [**-n** | **--no-empty**] [**-q** | **--quiet**]
     \   \    [**-r** | **--right**] *SEP* [*STRING*...]
-| ``string`` split0 [**-m** | **--max** *MAX*] [**-n** | **--no-empty**] [**-q** | **--quiet**]
+| ``string`` split0 [(**-m** | **--max**) *MAX*] [**-n** | **--no-empty**] [**-q** | **--quiet**]
     \   \     [**-r** | **--right**] [*STRING*...]
 
 .. END SYNOPSIS
diff --git a/doc_src/cmds/string-sub.rst b/doc_src/cmds/string-sub.rst
index aa9272622..a3bdbc01e 100644
--- a/doc_src/cmds/string-sub.rst
+++ b/doc_src/cmds/string-sub.rst
@@ -6,7 +6,7 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-``string`` sub [**-s** | **--start** *START*] [**-l** | **--length** *LENGTH*]
+``string`` sub [(**-s** | **--start**) *START*] [(**-l** | **--length**) *LENGTH*]
     \        [**-q** | **--quiet**] [*STRING*...]
 
 .. END SYNOPSIS
diff --git a/doc_src/cmds/string-trim.rst b/doc_src/cmds/string-trim.rst
index 7a2aa6c1e..a8ac42570 100644
--- a/doc_src/cmds/string-trim.rst
+++ b/doc_src/cmds/string-trim.rst
@@ -6,7 +6,7 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-``string`` trim [**-l** | **--left**] [**-r** | **--right**] [**-c** | **--chars** *CHARS*]
+``string`` trim [**-l** | **--left**] [**-r** | **--right**] [(**-c** | **--chars**) *CHARS*]
     \   \   [**-q** | **--quiet**] [*STRING*...]
 
 .. END SYNOPSIS
diff --git a/doc_src/cmds/string.rst b/doc_src/cmds/string.rst
index 8b65b1967..50dc2f96a 100644
--- a/doc_src/cmds/string.rst
+++ b/doc_src/cmds/string.rst
@@ -17,17 +17,17 @@ Synopsis
 	\	 \	 *PATTERN* [*STRING*...]
 | ``string`` pad [**-r** | **--right**] [**-c** | **--char** *CHAR*] [**-w** | **--width** *INTEGER*]
 	\	\      [*STRING*...]
-| ``string`` repeat [**-n** | **--count** *COUNT*] [**-m** | **--max** *MAX*] [**-N** | **--no-newline**]
+| ``string`` repeat [(**-n** | **--count**) *COUNT*] [(**-m** | **--max**) *MAX*] [**-N** | **--no-newline**]
 	\	\	  [**-q** | **--quiet**] [*STRING*...]
 | ``string`` replace [**-a** | **--all**] [**-f** | **--filter**] [**-i** | **--ignore-case**]
 	\	\	   [**-r** | **--regex**] [**-q** | **--quiet**] *PATTERN* *REPLACE* [*STRING*...]
-| ``string`` split [**-m** | **--max** *MAX*] [**-n** | **--no-empty**] [**-q** | **--quiet**]
+| ``string`` split [(**-m** | **--max**) *MAX*] [**-n** | **--no-empty**] [**-q** | **--quiet**]
 	\	\	 [**-r** | **--right**] *SEP* [*STRING*...]
-| ``string`` split0 [**-m** | **--max** *MAX*] [**-n** | **--no-empty**] [**-q** | **--quiet**]
+| ``string`` split0 [(**-m** | **--max**) *MAX*] [**-n** | **--no-empty**] [**-q** | **--quiet**]
 	\	\	  [**-r** | **--right**] [*STRING*...]
-| ``string`` sub [**-s** | **--start** *START*] [**-l** | **--length** *LENGTH*]
+| ``string`` sub [(**-s** | **--start**) *START*] [(**-l** | **--length**) *LENGTH*]
 	\	     [**-q** | **--quiet**] [*STRING*...]
-| ``string`` trim [**-l** | **--left**] [**-r** | **--right**] [**-c** | **--chars** *CHARS*]
+| ``string`` trim [**-l** | **--left**] [**-r** | **--right**] [(**-c** | **--chars**) *CHARS*]
 	\	\	[**-q** | **--quiet**] [*STRING*...]
 | ``string`` unescape [**--style=**] [*STRING*...]
 | ``string`` upper [**-q** | **--quiet**] [*STRING*...]

From be451091d4c1ea0e63cb77a9ae53b2f6d6849dc2 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 9 Jan 2022 09:42:36 +0100
Subject: [PATCH 017/262] docs synopses: use ellipsis with singular words

We use plural "*OPTIONS*" more often than "*OPTION*...", so let's do
that everywhere.

In some other places where we do have an ellipsis, make sure to use
singular, since the ellipsis already means repetition.  This change
is incomplete, and I'm not sure if this is worth it, since it's
subjective, so I might drop it.
---
 doc_src/cmds/block.rst     | 2 +-
 doc_src/cmds/builtin.rst   | 4 ++--
 doc_src/cmds/fish.rst      | 4 ++--
 doc_src/cmds/functions.rst | 2 +-
 doc_src/cmds/while.rst     | 2 +-
 doc_src/language.rst       | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc_src/cmds/block.rst b/doc_src/cmds/block.rst
index 8e2f4e6ec..7a4ed2abb 100644
--- a/doc_src/cmds/block.rst
+++ b/doc_src/cmds/block.rst
@@ -6,7 +6,7 @@ block - temporarily block delivery of events
 Synopsis
 --------
 
-**block** [*OPTIONS* ...]
+**block** [*OPTIONS*]
 
 Description
 -----------
diff --git a/doc_src/cmds/builtin.rst b/doc_src/cmds/builtin.rst
index 7a782a4ea..69261ef46 100644
--- a/doc_src/cmds/builtin.rst
+++ b/doc_src/cmds/builtin.rst
@@ -6,8 +6,8 @@ builtin - run a builtin command
 Synopsis
 --------
 
-| **builtin** [*OPTIONS* ...] *BUILTINNAME*
-| **builtin** --query *BUILTINNAMES* ...
+| **builtin** [*OPTIONS*] *BUILTINNAME*
+| **builtin** --query *BUILTINNAME* ...
 
 Description
 -----------
diff --git a/doc_src/cmds/fish.rst b/doc_src/cmds/fish.rst
index 02a4a2adb..22670453d 100644
--- a/doc_src/cmds/fish.rst
+++ b/doc_src/cmds/fish.rst
@@ -7,8 +7,8 @@ fish - the friendly interactive shell
 Synopsis
 --------
 
-| ``fish`` [*OPTIONS*] [*FILE* [ARGS ...]]
-| ``fish`` [*OPTIONS*] [**-c** *COMMAND* [ARGS ...]]
+| ``fish`` [*OPTIONS*] [*FILE* [ARG ...]]
+| ``fish`` [*OPTIONS*] [**-c** *COMMAND* [ARG ...]]
 
 Description
 -----------
diff --git a/doc_src/cmds/functions.rst b/doc_src/cmds/functions.rst
index 21cced1ec..293c4ab43 100644
--- a/doc_src/cmds/functions.rst
+++ b/doc_src/cmds/functions.rst
@@ -10,7 +10,7 @@ Synopsis
 | **functions** [ **-D** | **--details** ] [ **-v** ] *FUNCTION*
 | **functions** **-c** *OLDNAME* *NEWNAME*
 | **functions** **-d** *DESCRIPTION* *FUNCTION*
-| **functions** [ **-e** | **-q** ] *FUNCTIONS...*
+| **functions** [ **-e** | **-q** ] *FUNCTION...*
 
 Description
 -----------
diff --git a/doc_src/cmds/while.rst b/doc_src/cmds/while.rst
index 4d7b6c319..eaa08ce11 100644
--- a/doc_src/cmds/while.rst
+++ b/doc_src/cmds/while.rst
@@ -6,7 +6,7 @@ while - perform a set of commands multiple times
 Synopsis
 --------
 
-**while** *CONDITION*; *COMMANDS...*; **end**
+**while** *CONDITION*; *COMMANDS*; **end**
 
 Description
 -----------
diff --git a/doc_src/language.rst b/doc_src/language.rst
index 5b279f1e5..ff4cfe6d6 100644
--- a/doc_src/language.rst
+++ b/doc_src/language.rst
@@ -1207,7 +1207,7 @@ A more robust approach to argument handling is :ref:`argparse <cmd-argparse>`, w
 
       # If -h or --help is given, we print a little help text and return
       if set -q _flag_help
-          echo "mybetterfunction [-h|--help] [-s|--second] [ARGUMENTS...]"
+          echo "mybetterfunction [-h|--help] [-s|--second] [ARGUMENT...]"
           return 0
       end
 

From ad4530acd3457c2b761e709dd9c8b50ae2800000 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 9 Jan 2022 09:49:51 +0100
Subject: [PATCH 018/262] docs synopses: add space before ellipsis
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This matches the style in man(1) (except that we use the … ligature).

A previous iteration did the reverse (never use a space before the
ellipsis). That would be a smaller change.
---
 doc_src/cmds/abbr.rst           |  2 +-
 doc_src/cmds/argparse.rst       |  2 +-
 doc_src/cmds/case.rst           |  2 +-
 doc_src/cmds/continue.rst       |  2 +-
 doc_src/cmds/count.rst          |  2 +-
 doc_src/cmds/else.rst           |  2 +-
 doc_src/cmds/emit.rst           |  2 +-
 doc_src/cmds/end.rst            | 12 ++++++------
 doc_src/cmds/eval.rst           |  2 +-
 doc_src/cmds/fish_add_path.rst  |  4 ++--
 doc_src/cmds/fish_indent.rst    |  2 +-
 doc_src/cmds/for.rst            |  2 +-
 doc_src/cmds/functions.rst      |  2 +-
 doc_src/cmds/history.rst        |  4 ++--
 doc_src/cmds/if.rst             |  6 +++---
 doc_src/cmds/math.rst           |  2 +-
 doc_src/cmds/not.rst            |  2 +-
 doc_src/cmds/open.rst           |  2 +-
 doc_src/cmds/random.rst         |  2 +-
 doc_src/cmds/set.rst            |  6 +++---
 doc_src/cmds/source.rst         |  2 +-
 doc_src/cmds/string-collect.rst |  2 +-
 doc_src/cmds/string-escape.rst  |  4 ++--
 doc_src/cmds/string-join.rst    |  4 ++--
 doc_src/cmds/string-length.rst  |  2 +-
 doc_src/cmds/string-lower.rst   |  2 +-
 doc_src/cmds/string-match.rst   |  2 +-
 doc_src/cmds/string-pad.rst     |  2 +-
 doc_src/cmds/string-repeat.rst  |  2 +-
 doc_src/cmds/string-replace.rst |  2 +-
 doc_src/cmds/string-split.rst   |  4 ++--
 doc_src/cmds/string-sub.rst     |  2 +-
 doc_src/cmds/string-trim.rst    |  2 +-
 doc_src/cmds/string-upper.rst   |  2 +-
 doc_src/cmds/string.rst         | 32 ++++++++++++++++----------------
 doc_src/cmds/switch.rst         |  2 +-
 doc_src/language.rst            |  2 +-
 37 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/doc_src/cmds/abbr.rst b/doc_src/cmds/abbr.rst
index 9678e39c2..ea4e9e0a6 100644
--- a/doc_src/cmds/abbr.rst
+++ b/doc_src/cmds/abbr.rst
@@ -38,7 +38,7 @@ The following options are available:
 **-l** or **--list**
     Lists all abbreviated words
 
-**-e** *WORD* or **--erase** *WORD*...
+**-e** *WORD* or **--erase** *WORD* ...
     Erase the given abbreviations
 
 **-q** or **--query**
diff --git a/doc_src/cmds/argparse.rst b/doc_src/cmds/argparse.rst
index dff27444c..bd87f247b 100644
--- a/doc_src/cmds/argparse.rst
+++ b/doc_src/cmds/argparse.rst
@@ -6,7 +6,7 @@ argparse - parse options passed to a fish script or function
 Synopsis
 --------
 
-``argparse`` [*OPTIONS*] *OPTION_SPEC*... -- [*ARG*...]
+``argparse`` [*OPTIONS*] *OPTION_SPEC* ... -- [*ARG* ...]
 
 
 Description
diff --git a/doc_src/cmds/case.rst b/doc_src/cmds/case.rst
index 1b8ef0b59..6f33d3dc9 100644
--- a/doc_src/cmds/case.rst
+++ b/doc_src/cmds/case.rst
@@ -7,7 +7,7 @@ Synopsis
 --------
 
 | **switch** *VALUE*
-|    [**case** [*GLOB*...]
+|    [**case** [*GLOB* ...]
 |        [*COMMAND* ...]]
 | **end**
 
diff --git a/doc_src/cmds/continue.rst b/doc_src/cmds/continue.rst
index b245057c5..208f37ff1 100644
--- a/doc_src/cmds/continue.rst
+++ b/doc_src/cmds/continue.rst
@@ -6,7 +6,7 @@ continue - skip the remainder of the current iteration of the current inner loop
 Synopsis
 --------
 
-**LOOP_CONSTRUCT**; [*COMMANDS*...;] **continue**; [*COMMANDS*...;] **end**
+**LOOP_CONSTRUCT**; [*COMMANDS* ...;] **continue**; [*COMMANDS* ...;] **end**
 
 Description
 -----------
diff --git a/doc_src/cmds/count.rst b/doc_src/cmds/count.rst
index b6257399a..2ebd5859f 100644
--- a/doc_src/cmds/count.rst
+++ b/doc_src/cmds/count.rst
@@ -6,7 +6,7 @@ count - count the number of elements of a list
 Synopsis
 --------
 
-| ``count`` string1 string2...
+| ``count`` string1 string2 ...
 | *command* | ``count``
 | ``count`` [...] < *FILE*
 
diff --git a/doc_src/cmds/else.rst b/doc_src/cmds/else.rst
index 93edfbce8..2d93270b1 100644
--- a/doc_src/cmds/else.rst
+++ b/doc_src/cmds/else.rst
@@ -6,7 +6,7 @@ else - execute command if a condition is not met
 Synopsis
 --------
 
-**if** *CONDITION*; *COMMANDS_TRUE*...; [**else**; *COMMANDS_FALSE*...;] **end**
+**if** *CONDITION*; *COMMANDS_TRUE* ...; [**else**; *COMMANDS_FALSE* ...;] **end**
 
 Description
 -----------
diff --git a/doc_src/cmds/emit.rst b/doc_src/cmds/emit.rst
index 5eaf0ae2f..b4696b08d 100644
--- a/doc_src/cmds/emit.rst
+++ b/doc_src/cmds/emit.rst
@@ -6,7 +6,7 @@ emit - emit a generic event
 Synopsis
 --------
 
-``emit`` *EVENT_NAME* [*ARGUMENTS*...]
+``emit`` *EVENT_NAME* [*ARGUMENTS* ...]
 
 Description
 -----------
diff --git a/doc_src/cmds/end.rst b/doc_src/cmds/end.rst
index f2d5c40f5..4300a7cd8 100644
--- a/doc_src/cmds/end.rst
+++ b/doc_src/cmds/end.rst
@@ -7,14 +7,14 @@ Synopsis
 --------
 
 | **begin**
-|     [*COMMANDS*...] 
+|     [*COMMANDS* ...] 
 | **end**
 
-| **function** *NAME* [*OPTIONS*]; *COMMANDS*...; **end**
-| **if** *CONDITION*; *COMMANDS_TRUE*...; [**else**; *COMMANDS_FALSE*...;] **end**
-| **switch** *VALUE*; [**case** [*WILDCARD*...]; [*COMMANDS*...]; ...] **end**
-| **while** *CONDITION*; *COMMANDS*...; **end**
-| **for** *VARNAME* in [*VALUES*...]; **COMMANDS**...; **end**
+| **function** *NAME* [*OPTIONS*]; *COMMANDS* ...; **end**
+| **if** *CONDITION*; *COMMANDS_TRUE* ...; [**else**; *COMMANDS_FALSE* ...;] **end**
+| **switch** *VALUE*; [**case** [*WILDCARD* ...]; [*COMMANDS* ...]; ...] **end**
+| **while** *CONDITION*; *COMMANDS* ...; **end**
+| **for** *VARNAME* in [*VALUES* ...]; **COMMANDS** ...; **end**
 
 Description
 -----------
diff --git a/doc_src/cmds/eval.rst b/doc_src/cmds/eval.rst
index 8434298db..867158c2f 100644
--- a/doc_src/cmds/eval.rst
+++ b/doc_src/cmds/eval.rst
@@ -6,7 +6,7 @@ eval - evaluate the specified commands
 Synopsis
 --------
 
-**eval** [*COMMANDS*...]
+**eval** [*COMMANDS* ...]
 
 Description
 -----------
diff --git a/doc_src/cmds/fish_add_path.rst b/doc_src/cmds/fish_add_path.rst
index e81e5ee20..d397e0ff8 100644
--- a/doc_src/cmds/fish_add_path.rst
+++ b/doc_src/cmds/fish_add_path.rst
@@ -7,8 +7,8 @@ fish_add_path - add to the path
 Synopsis
 --------
 
-| ``fish_add_path`` *path*...
-| ``fish_add_path`` [(*-g* | *--global*) | (*-U* | *--universal*) | (*-P* | *--path*)] [(*-m* | *--move*)] [(*-a* | *--append*) | (*-p* | *--prepend*)] [(*-v* | *--verbose*) | (*-n* | *--dry-run*)] *paths*...
+| ``fish_add_path`` *path* ...
+| ``fish_add_path`` [(*-g* | *--global*) | (*-U* | *--universal*) | (*-P* | *--path*)] [(*-m* | *--move*)] [(*-a* | *--append*) | (*-p* | *--prepend*)] [(*-v* | *--verbose*) | (*-n* | *--dry-run*)] *paths* ...
 
 
 Description
diff --git a/doc_src/cmds/fish_indent.rst b/doc_src/cmds/fish_indent.rst
index e7ec1650c..855def6f4 100644
--- a/doc_src/cmds/fish_indent.rst
+++ b/doc_src/cmds/fish_indent.rst
@@ -7,7 +7,7 @@ fish_indent - indenter and prettifier
 Synopsis
 --------
 
-**fish_indent** [*OPTIONS*] [*FILE*...]
+**fish_indent** [*OPTIONS*] [*FILE* ...]
 
 
 Description
diff --git a/doc_src/cmds/for.rst b/doc_src/cmds/for.rst
index 99369b7d0..36e15ddce 100644
--- a/doc_src/cmds/for.rst
+++ b/doc_src/cmds/for.rst
@@ -6,7 +6,7 @@ for - perform a set of commands multiple times
 Synopsis
 --------
 
-**for** *VARNAME* in [*VALUES*...]; *COMMANDS*...; **end**
+**for** *VARNAME* in [*VALUES* ...]; *COMMANDS* ...; **end**
 
 Description
 -----------
diff --git a/doc_src/cmds/functions.rst b/doc_src/cmds/functions.rst
index 293c4ab43..81cff7738 100644
--- a/doc_src/cmds/functions.rst
+++ b/doc_src/cmds/functions.rst
@@ -10,7 +10,7 @@ Synopsis
 | **functions** [ **-D** | **--details** ] [ **-v** ] *FUNCTION*
 | **functions** **-c** *OLDNAME* *NEWNAME*
 | **functions** **-d** *DESCRIPTION* *FUNCTION*
-| **functions** [ **-e** | **-q** ] *FUNCTION...*
+| **functions** [ **-e** | **-q** ] *FUNCTION ...*
 
 Description
 -----------
diff --git a/doc_src/cmds/history.rst b/doc_src/cmds/history.rst
index 5d21de7ab..b8d5f5648 100644
--- a/doc_src/cmds/history.rst
+++ b/doc_src/cmds/history.rst
@@ -8,9 +8,9 @@ Synopsis
 
 | ``history`` [**search**] [**--show-time**] [**--case-sensitive**]
 	\	\   [**--exact** | **--prefix** | **--contains**] [**--max** *n*] [**--null**] [**--reverse**]
-	\	\   [ *SEARCH_STRING...* ]
+	\	\   [ *SEARCH_STRING ...* ]
 | ``history`` **delete** [**--case-sensitive**]
-	\	\   [**--exact** | **--prefix** | **--contains**] *SEARCH_STRING...*
+	\	\   [**--exact** | **--prefix** | **--contains**] *SEARCH_STRING ...*
 | ``history`` **merge**
 | ``history`` **save**
 | ``history`` **clear**
diff --git a/doc_src/cmds/if.rst b/doc_src/cmds/if.rst
index 0fd9defb3..2f6aa65ce 100644
--- a/doc_src/cmds/if.rst
+++ b/doc_src/cmds/if.rst
@@ -6,9 +6,9 @@ if - conditionally execute a command
 Synopsis
 --------
 
-| **if** *CONDITION*; *COMMANDS_TRUE*...;
-| [**else** **if** *CONDITION2*; *COMMANDS_TRUE2*...;]
-| [**else**; *COMMANDS_FALSE*...;]
+| **if** *CONDITION*; *COMMANDS_TRUE* ...;
+| [**else** **if** *CONDITION2*; *COMMANDS_TRUE2* ...;]
+| [**else**; *COMMANDS_FALSE* ...;]
 | **end**
 
 Description
diff --git a/doc_src/cmds/math.rst b/doc_src/cmds/math.rst
index e0bc7856e..914c94005 100644
--- a/doc_src/cmds/math.rst
+++ b/doc_src/cmds/math.rst
@@ -6,7 +6,7 @@ math - perform mathematics calculations
 Synopsis
 --------
 
-``math`` [(**-s** | **--scale**) *N*] [(**-b** | **--base**) *BASE*] *EXPRESSION...*
+``math`` [(**-s** | **--scale**) *N*] [(**-b** | **--base**) *BASE*] *EXPRESSION ...*
 
 
 Description
diff --git a/doc_src/cmds/not.rst b/doc_src/cmds/not.rst
index a6dfe2fa4..3168f1956 100644
--- a/doc_src/cmds/not.rst
+++ b/doc_src/cmds/not.rst
@@ -6,7 +6,7 @@ not - negate the exit status of a job
 Synopsis
 --------
 
-**not** *COMMAND* [*options*...]
+**not** *COMMAND* [*options* ...]
 
 
 Description
diff --git a/doc_src/cmds/open.rst b/doc_src/cmds/open.rst
index b04f15efc..3bff34c4e 100644
--- a/doc_src/cmds/open.rst
+++ b/doc_src/cmds/open.rst
@@ -6,7 +6,7 @@ open - open file in its default application
 Synopsis
 --------
 
-``open`` *FILES*...
+``open`` *FILES* ...
 
 
 Description
diff --git a/doc_src/cmds/random.rst b/doc_src/cmds/random.rst
index 93696b04a..6f77da8d1 100644
--- a/doc_src/cmds/random.rst
+++ b/doc_src/cmds/random.rst
@@ -10,7 +10,7 @@ Synopsis
 | ``random`` *SEED*
 | ``random`` *START* *END*
 | ``random`` *START* *STEP* *END*
-| ``random`` choice [*ITEMS*...]
+| ``random`` choice [*ITEMS* ...]
 
 Description
 -----------
diff --git a/doc_src/cmds/set.rst b/doc_src/cmds/set.rst
index eec73aa49..4be28cfe4 100644
--- a/doc_src/cmds/set.rst
+++ b/doc_src/cmds/set.rst
@@ -7,12 +7,12 @@ Synopsis
 --------
 
 | ``set`` [*scope options*]
-| ``set`` [*options*] *VARIABLE* *VALUES*...
-| ``set`` [*options*] *VARIABLE*\[*INDICES*] *VALUES*...
+| ``set`` [*options*] *VARIABLE* *VALUES* ...
+| ``set`` [*options*] *VARIABLE*\[*INDICES*] *VALUES* ...
 | ``set`` ( **-q** | **--query** ) [*scope options*] *VARIABLE* ...
 | ``set`` ( **-e** | **--erase** ) [*scope options*] *VARIABLE* ...
 | ``set`` ( **-e** | **--erase** ) [*scope options*] *VARIABLE*\[*INDICES*] ...
-| ``set`` ( **-S** | **--show** ) *VARIABLE*...
+| ``set`` ( **-S** | **--show** ) *VARIABLE* ...
 
 Description
 -----------
diff --git a/doc_src/cmds/source.rst b/doc_src/cmds/source.rst
index faf2845c8..7baf42e15 100644
--- a/doc_src/cmds/source.rst
+++ b/doc_src/cmds/source.rst
@@ -6,7 +6,7 @@ source - evaluate contents of file
 Synopsis
 --------
 
-| **source** *FILE* [*arguments*...]
+| **source** *FILE* [*arguments* ...]
 | ``somecommand`` | **source**
 
 
diff --git a/doc_src/cmds/string-collect.rst b/doc_src/cmds/string-collect.rst
index 0374e046d..2851c09d2 100644
--- a/doc_src/cmds/string-collect.rst
+++ b/doc_src/cmds/string-collect.rst
@@ -6,7 +6,7 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-``string`` collect [**-N** | **--no-trim-newlines**] [*STRING*...]
+``string`` collect [**-N** | **--no-trim-newlines**] [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-escape.rst b/doc_src/cmds/string-escape.rst
index 81599b371..4fffcae9b 100644
--- a/doc_src/cmds/string-escape.rst
+++ b/doc_src/cmds/string-escape.rst
@@ -6,8 +6,8 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-| ``string`` escape [**-n** | **--no-quoted**] [**--style=**] [*STRING*...]
-| ``string`` unescape [**--style=**] [*STRING*...]
+| ``string`` escape [**-n** | **--no-quoted**] [**--style=**] [*STRING* ...]
+| ``string`` unescape [**--style=**] [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-join.rst b/doc_src/cmds/string-join.rst
index a6c6caaac..658077b55 100644
--- a/doc_src/cmds/string-join.rst
+++ b/doc_src/cmds/string-join.rst
@@ -6,8 +6,8 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-| ``string`` join [**-q** | **--quiet**] SEP [*STRING*...]
-| ``string`` join0 [**-q** | **--quiet**] [*STRING*...]
+| ``string`` join [**-q** | **--quiet**] SEP [*STRING* ...]
+| ``string`` join0 [**-q** | **--quiet**] [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-length.rst b/doc_src/cmds/string-length.rst
index 096b2363f..03728116c 100644
--- a/doc_src/cmds/string-length.rst
+++ b/doc_src/cmds/string-length.rst
@@ -8,7 +8,7 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-``string`` length [**-q** | **--quiet**] [*STRING*...]
+``string`` length [**-q** | **--quiet**] [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-lower.rst b/doc_src/cmds/string-lower.rst
index 25dbe6bf0..a265bd049 100644
--- a/doc_src/cmds/string-lower.rst
+++ b/doc_src/cmds/string-lower.rst
@@ -6,7 +6,7 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-``string`` lower [**-q** | **--quiet**] [*STRING*...]
+``string`` lower [**-q** | **--quiet**] [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-match.rst b/doc_src/cmds/string-match.rst
index dd1f879d2..61249facc 100644
--- a/doc_src/cmds/string-match.rst
+++ b/doc_src/cmds/string-match.rst
@@ -8,7 +8,7 @@ Synopsis
 
 ``string`` match [**-a** | **--all**] [**-e** | **--entire**] [**-i** | **--ignore-case**]
     \   \    [**-r** | **--regex**] [**-n** | **--index**] [**-q** | **--quiet**] [**-v** | **--invert**]
-    \    \   *PATTERN* [*STRING*...]
+    \    \   *PATTERN* [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-pad.rst b/doc_src/cmds/string-pad.rst
index 5680e9f88..032138b63 100644
--- a/doc_src/cmds/string-pad.rst
+++ b/doc_src/cmds/string-pad.rst
@@ -7,7 +7,7 @@ Synopsis
 .. BEGIN SYNOPSIS
 
 ``string`` pad [**-r** | **--right**] [(**-c** | **--char**) *CHAR*] [(**-w** | **--width**) *INTEGER*]
-    \   \      [*STRING*...]
+    \   \      [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-repeat.rst b/doc_src/cmds/string-repeat.rst
index 6f64070b0..dd6a188a2 100644
--- a/doc_src/cmds/string-repeat.rst
+++ b/doc_src/cmds/string-repeat.rst
@@ -7,7 +7,7 @@ Synopsis
 .. BEGIN SYNOPSIS
 
 ``string`` repeat [(**-n** | **--count**) *COUNT*] [(**-m** | **--max**) *MAX*] [**-N** | **--no-newline**]
-    \   \     [**-q** | **--quiet**] [*STRING*...]
+    \   \     [**-q** | **--quiet**] [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-replace.rst b/doc_src/cmds/string-replace.rst
index cbe398777..96fc6087b 100644
--- a/doc_src/cmds/string-replace.rst
+++ b/doc_src/cmds/string-replace.rst
@@ -7,7 +7,7 @@ Synopsis
 .. BEGIN SYNOPSIS
 
 ``string`` replace [**-a** | **--all**] [**-f** | **--filter**] [**-i** | **--ignore-case**]
-    \   \      [**-r** | **--regex**] [**-q** | **--quiet**] *PATTERN* *REPLACE* [*STRING*...]
+    \   \      [**-r** | **--regex**] [**-q** | **--quiet**] *PATTERN* *REPLACE* [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-split.rst b/doc_src/cmds/string-split.rst
index ca24edd91..4e2ccd53b 100644
--- a/doc_src/cmds/string-split.rst
+++ b/doc_src/cmds/string-split.rst
@@ -7,9 +7,9 @@ Synopsis
 .. BEGIN SYNOPSIS
 
 | ``string`` split [(**-m** | **--max**) *MAX*] [**-n** | **--no-empty**] [**-q** | **--quiet**]
-    \   \    [**-r** | **--right**] *SEP* [*STRING*...]
+    \   \    [**-r** | **--right**] *SEP* [*STRING* ...]
 | ``string`` split0 [(**-m** | **--max**) *MAX*] [**-n** | **--no-empty**] [**-q** | **--quiet**]
-    \   \     [**-r** | **--right**] [*STRING*...]
+    \   \     [**-r** | **--right**] [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-sub.rst b/doc_src/cmds/string-sub.rst
index a3bdbc01e..1a0301111 100644
--- a/doc_src/cmds/string-sub.rst
+++ b/doc_src/cmds/string-sub.rst
@@ -7,7 +7,7 @@ Synopsis
 .. BEGIN SYNOPSIS
 
 ``string`` sub [(**-s** | **--start**) *START*] [(**-l** | **--length**) *LENGTH*]
-    \        [**-q** | **--quiet**] [*STRING*...]
+    \        [**-q** | **--quiet**] [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-trim.rst b/doc_src/cmds/string-trim.rst
index a8ac42570..d1cc677a2 100644
--- a/doc_src/cmds/string-trim.rst
+++ b/doc_src/cmds/string-trim.rst
@@ -7,7 +7,7 @@ Synopsis
 .. BEGIN SYNOPSIS
 
 ``string`` trim [**-l** | **--left**] [**-r** | **--right**] [(**-c** | **--chars**) *CHARS*]
-    \   \   [**-q** | **--quiet**] [*STRING*...]
+    \   \   [**-q** | **--quiet**] [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-upper.rst b/doc_src/cmds/string-upper.rst
index 5f5661bff..e8c7fe441 100644
--- a/doc_src/cmds/string-upper.rst
+++ b/doc_src/cmds/string-upper.rst
@@ -6,7 +6,7 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-``string`` upper [**-q** | **--quiet**] [*STRING*...]
+``string`` upper [**-q** | **--quiet**] [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string.rst b/doc_src/cmds/string.rst
index 50dc2f96a..7a363e6e6 100644
--- a/doc_src/cmds/string.rst
+++ b/doc_src/cmds/string.rst
@@ -6,31 +6,31 @@ string - manipulate strings
 Synopsis
 --------
 
-| ``string`` collect [**-N** | **--no-trim-newlines**] [*STRING*...]
-| ``string`` escape [**-n** | **--no-quoted**] [**--style=**] [*STRING*...]
-| ``string`` join [**-q** | **--quiet**] SEP [*STRING*...]
-| ``string`` join0 [**-q** | **--quiet**] [*STRING*...]
-| ``string`` length [**-q** | **--quiet**] [*STRING*...]
-| ``string`` lower [**-q** | **--quiet**] [*STRING*...]
+| ``string`` collect [**-N** | **--no-trim-newlines**] [*STRING* ...]
+| ``string`` escape [**-n** | **--no-quoted**] [**--style=**] [*STRING* ...]
+| ``string`` join [**-q** | **--quiet**] SEP [*STRING* ...]
+| ``string`` join0 [**-q** | **--quiet**] [*STRING* ...]
+| ``string`` length [**-q** | **--quiet**] [*STRING* ...]
+| ``string`` lower [**-q** | **--quiet**] [*STRING* ...]
 | ``string`` match [**-a** | **--all**] [**-e** | **--entire**] [**-i** | **--ignore-case**]
 	\	\	 [**-r** | **--regex**] [**-n** | **--index**] [**-q** | **--quiet**] [**-v** | **--invert**]
-	\	 \	 *PATTERN* [*STRING*...]
+	\	 \	 *PATTERN* [*STRING* ...]
 | ``string`` pad [**-r** | **--right**] [**-c** | **--char** *CHAR*] [**-w** | **--width** *INTEGER*]
-	\	\      [*STRING*...]
+	\	\      [*STRING* ...]
 | ``string`` repeat [(**-n** | **--count**) *COUNT*] [(**-m** | **--max**) *MAX*] [**-N** | **--no-newline**]
-	\	\	  [**-q** | **--quiet**] [*STRING*...]
+	\	\	  [**-q** | **--quiet**] [*STRING* ...]
 | ``string`` replace [**-a** | **--all**] [**-f** | **--filter**] [**-i** | **--ignore-case**]
-	\	\	   [**-r** | **--regex**] [**-q** | **--quiet**] *PATTERN* *REPLACE* [*STRING*...]
+	\	\	   [**-r** | **--regex**] [**-q** | **--quiet**] *PATTERN* *REPLACE* [*STRING* ...]
 | ``string`` split [(**-m** | **--max**) *MAX*] [**-n** | **--no-empty**] [**-q** | **--quiet**]
-	\	\	 [**-r** | **--right**] *SEP* [*STRING*...]
+	\	\	 [**-r** | **--right**] *SEP* [*STRING* ...]
 | ``string`` split0 [(**-m** | **--max**) *MAX*] [**-n** | **--no-empty**] [**-q** | **--quiet**]
-	\	\	  [**-r** | **--right**] [*STRING*...]
+	\	\	  [**-r** | **--right**] [*STRING* ...]
 | ``string`` sub [(**-s** | **--start**) *START*] [(**-l** | **--length**) *LENGTH*]
-	\	     [**-q** | **--quiet**] [*STRING*...]
+	\	     [**-q** | **--quiet**] [*STRING* ...]
 | ``string`` trim [**-l** | **--left**] [**-r** | **--right**] [(**-c** | **--chars**) *CHARS*]
-	\	\	[**-q** | **--quiet**] [*STRING*...]
-| ``string`` unescape [**--style=**] [*STRING*...]
-| ``string`` upper [**-q** | **--quiet**] [*STRING*...]
+	\	\	[**-q** | **--quiet**] [*STRING* ...]
+| ``string`` unescape [**--style=**] [*STRING* ...]
+| ``string`` upper [**-q** | **--quiet**] [*STRING* ...]
 
 Description
 -----------
diff --git a/doc_src/cmds/switch.rst b/doc_src/cmds/switch.rst
index 8105c0453..735b6ba40 100644
--- a/doc_src/cmds/switch.rst
+++ b/doc_src/cmds/switch.rst
@@ -6,7 +6,7 @@ switch - conditionally execute a block of commands
 Synopsis
 --------
 
-**switch** *VALUE*; [**case** [*GLOB*...]; [*COMMANDS*...]; ...] **end**
+**switch** *VALUE*; [**case** [*GLOB* ...]; [*COMMANDS* ...]; ...] **end**
 
 Description
 -----------
diff --git a/doc_src/language.rst b/doc_src/language.rst
index ff4cfe6d6..1b6e97f28 100644
--- a/doc_src/language.rst
+++ b/doc_src/language.rst
@@ -1207,7 +1207,7 @@ A more robust approach to argument handling is :ref:`argparse <cmd-argparse>`, w
 
       # If -h or --help is given, we print a little help text and return
       if set -q _flag_help
-          echo "mybetterfunction [-h|--help] [-s|--second] [ARGUMENT...]"
+          echo "mybetterfunction [-h|--help] [-s|--second] [ARGUMENT ...]"
           return 0
       end
 

From 78101364c354e9f242cb2381320d6f784f63cc6d Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 9 Jan 2022 10:00:47 +0100
Subject: [PATCH 019/262] docs synopses: remove unconventional spaces inside []
 and ()

We usually write "[a | b]", not "[ a | b ]".
---
 doc_src/cmds/command.rst   | 2 +-
 doc_src/cmds/disown.rst    | 2 +-
 doc_src/cmds/fish_opt.rst  | 4 ++--
 doc_src/cmds/functions.rst | 6 +++---
 doc_src/cmds/history.rst   | 2 +-
 doc_src/cmds/jobs.rst      | 2 +-
 doc_src/cmds/nextd.rst     | 2 +-
 doc_src/cmds/prevd.rst     | 2 +-
 doc_src/cmds/set.rst       | 8 ++++----
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/doc_src/cmds/command.rst b/doc_src/cmds/command.rst
index 69b968106..598172169 100644
--- a/doc_src/cmds/command.rst
+++ b/doc_src/cmds/command.rst
@@ -6,7 +6,7 @@ command - run a program
 Synopsis
 --------
 
-**command** [ **OPTIONS** ] [*COMMANDNAME* [ARG ...]]
+**command** [**OPTIONS**] [*COMMANDNAME* [ARG ...]]
 
 Description
 -----------
diff --git a/doc_src/cmds/disown.rst b/doc_src/cmds/disown.rst
index 864fed62c..c6b972604 100644
--- a/doc_src/cmds/disown.rst
+++ b/doc_src/cmds/disown.rst
@@ -6,7 +6,7 @@ disown - remove a process from the list of jobs
 Synopsis
 --------
 
-``disown`` [ **PID** ... ]
+``disown`` [**PID** ...]
 
 Description
 -----------
diff --git a/doc_src/cmds/fish_opt.rst b/doc_src/cmds/fish_opt.rst
index 2e437a5a2..4ff8ac573 100644
--- a/doc_src/cmds/fish_opt.rst
+++ b/doc_src/cmds/fish_opt.rst
@@ -5,8 +5,8 @@ fish_opt - create an option spec for the argparse command
 
 Synopsis
 --------
-| ``fish_opt`` [ **--help** ]
-| ``fish_opt`` [ (**-slor**, **--multiple-vals=**) *optname*]
+| ``fish_opt`` [**--help**]
+| ``fish_opt`` [(**-slor**, **--multiple-vals=**) *optname*]
 
 Description
 -----------
diff --git a/doc_src/cmds/functions.rst b/doc_src/cmds/functions.rst
index 81cff7738..2bf3ac124 100644
--- a/doc_src/cmds/functions.rst
+++ b/doc_src/cmds/functions.rst
@@ -6,11 +6,11 @@ functions - print or erase functions
 Synopsis
 --------
 
-| **functions** [ **-a** | **--all** ] [ **-n** | **--names** ]
-| **functions** [ **-D** | **--details** ] [ **-v** ] *FUNCTION*
+| **functions** [**-a** | **--all**] [**-n** | **--names**]
+| **functions** [**-D** | **--details**] [**-v**] *FUNCTION*
 | **functions** **-c** *OLDNAME* *NEWNAME*
 | **functions** **-d** *DESCRIPTION* *FUNCTION*
-| **functions** [ **-e** | **-q** ] *FUNCTION ...*
+| **functions** [**-e** | **-q**] *FUNCTION ...*
 
 Description
 -----------
diff --git a/doc_src/cmds/history.rst b/doc_src/cmds/history.rst
index b8d5f5648..2f2572a11 100644
--- a/doc_src/cmds/history.rst
+++ b/doc_src/cmds/history.rst
@@ -8,7 +8,7 @@ Synopsis
 
 | ``history`` [**search**] [**--show-time**] [**--case-sensitive**]
 	\	\   [**--exact** | **--prefix** | **--contains**] [**--max** *n*] [**--null**] [**--reverse**]
-	\	\   [ *SEARCH_STRING ...* ]
+	\	\   [*SEARCH_STRING ...*]
 | ``history`` **delete** [**--case-sensitive**]
 	\	\   [**--exact** | **--prefix** | **--contains**] *SEARCH_STRING ...*
 | ``history`` **merge**
diff --git a/doc_src/cmds/jobs.rst b/doc_src/cmds/jobs.rst
index db4ebad76..0453247de 100644
--- a/doc_src/cmds/jobs.rst
+++ b/doc_src/cmds/jobs.rst
@@ -6,7 +6,7 @@ jobs - print currently running jobs
 Synopsis
 --------
 
-``jobs`` [*OPTIONS*] [ *PID* | %*JOBID* ]
+``jobs`` [*OPTIONS*] [*PID* | %*JOBID*]
 
 
 Description
diff --git a/doc_src/cmds/nextd.rst b/doc_src/cmds/nextd.rst
index 66572b064..72f6d1b8b 100644
--- a/doc_src/cmds/nextd.rst
+++ b/doc_src/cmds/nextd.rst
@@ -6,7 +6,7 @@ nextd - move forward through directory history
 Synopsis
 --------
 
-``nextd`` [ **-l** | **--list** ] [*POS*]
+``nextd`` [**-l** | **--list**] [*POS*]
 
 Description
 -----------
diff --git a/doc_src/cmds/prevd.rst b/doc_src/cmds/prevd.rst
index 1214c6a36..2a1345b52 100644
--- a/doc_src/cmds/prevd.rst
+++ b/doc_src/cmds/prevd.rst
@@ -6,7 +6,7 @@ prevd - move backward through directory history
 Synopsis
 --------
 
-``prevd`` [ **-l** | **--list** ] [*POS*]
+``prevd`` [**-l** | **--list**] [*POS*]
 
 Description
 -----------
diff --git a/doc_src/cmds/set.rst b/doc_src/cmds/set.rst
index 4be28cfe4..d0c36871e 100644
--- a/doc_src/cmds/set.rst
+++ b/doc_src/cmds/set.rst
@@ -9,10 +9,10 @@ Synopsis
 | ``set`` [*scope options*]
 | ``set`` [*options*] *VARIABLE* *VALUES* ...
 | ``set`` [*options*] *VARIABLE*\[*INDICES*] *VALUES* ...
-| ``set`` ( **-q** | **--query** ) [*scope options*] *VARIABLE* ...
-| ``set`` ( **-e** | **--erase** ) [*scope options*] *VARIABLE* ...
-| ``set`` ( **-e** | **--erase** ) [*scope options*] *VARIABLE*\[*INDICES*] ...
-| ``set`` ( **-S** | **--show** ) *VARIABLE* ...
+| ``set`` (**-q** | **--query**) [*scope options*] *VARIABLE* ...
+| ``set`` (**-e** | **--erase**) [*scope options*] *VARIABLE* ...
+| ``set`` (**-e** | **--erase**) [*scope options*] *VARIABLE*\[*INDICES*] ...
+| ``set`` (**-S** | **--show**) *VARIABLE* ...
 
 Description
 -----------

From 18467457c679292f3dad2e94e0f62ecc00be2550 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 9 Jan 2022 10:25:55 +0100
Subject: [PATCH 020/262] docs synopses: do not add markup to the ellipsis
 character
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The ellipsis is a grammar metacharacter, just like the []()|.
Write *FOO*… instead of *FOO…*, so the ellipsis is not underlined
in the man page. Not super sure about this one.
---
 doc_src/cmds/functions.rst | 2 +-
 doc_src/cmds/history.rst   | 4 ++--
 doc_src/cmds/math.rst      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc_src/cmds/functions.rst b/doc_src/cmds/functions.rst
index 2bf3ac124..bb7b0e801 100644
--- a/doc_src/cmds/functions.rst
+++ b/doc_src/cmds/functions.rst
@@ -10,7 +10,7 @@ Synopsis
 | **functions** [**-D** | **--details**] [**-v**] *FUNCTION*
 | **functions** **-c** *OLDNAME* *NEWNAME*
 | **functions** **-d** *DESCRIPTION* *FUNCTION*
-| **functions** [**-e** | **-q**] *FUNCTION ...*
+| **functions** [**-e** | **-q**] *FUNCTION* ...
 
 Description
 -----------
diff --git a/doc_src/cmds/history.rst b/doc_src/cmds/history.rst
index 2f2572a11..0b5128ac7 100644
--- a/doc_src/cmds/history.rst
+++ b/doc_src/cmds/history.rst
@@ -8,9 +8,9 @@ Synopsis
 
 | ``history`` [**search**] [**--show-time**] [**--case-sensitive**]
 	\	\   [**--exact** | **--prefix** | **--contains**] [**--max** *n*] [**--null**] [**--reverse**]
-	\	\   [*SEARCH_STRING ...*]
+	\	\   [*SEARCH_STRING* ...]
 | ``history`` **delete** [**--case-sensitive**]
-	\	\   [**--exact** | **--prefix** | **--contains**] *SEARCH_STRING ...*
+	\	\   [**--exact** | **--prefix** | **--contains**] *SEARCH_STRING* ...
 | ``history`` **merge**
 | ``history`` **save**
 | ``history`` **clear**
diff --git a/doc_src/cmds/math.rst b/doc_src/cmds/math.rst
index 914c94005..7f0b043f1 100644
--- a/doc_src/cmds/math.rst
+++ b/doc_src/cmds/math.rst
@@ -6,7 +6,7 @@ math - perform mathematics calculations
 Synopsis
 --------
 
-``math`` [(**-s** | **--scale**) *N*] [(**-b** | **--base**) *BASE*] *EXPRESSION ...*
+``math`` [(**-s** | **--scale**) *N*] [(**-b** | **--base**) *BASE*] *EXPRESSION* ...
 
 
 Description

From 97db9d5c38e03487278d6ec67cb1fc4ac812c8bd Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 9 Jan 2022 11:03:31 +0100
Subject: [PATCH 021/262] docs synopses: fix alignment of continuation lines
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This corrects what looks like wrong alignment of some synopsis lines.
(I think the alignment is not a bad idea but it makes us do more
manual work, maybe we can automate that in future.  We still need to
figure out how to translate it to HTML.)

"man -l build/user_doc/man/man1/history.1" before:

	string match [-a | --all] [-e | --entire] [-i | --ignore-case]
	            [-r | --regex] [-n | --index] [-q | --quiet] [-v | --invert]
	            PATTERN [STRING…]

and after:

	string match [-a | --all] [-e | --entire] [-i | --ignore-case]
	             [-r | --regex] [-n | --index] [-q | --quiet] [-v | --invert]
	             PATTERN [STRING…]

Also make the lines align the same way in the RST source by carefully
choosing the position of the backslash. I'm not sure why we used
two backslashes per line. Use only one; this gives us no choice
of where to put it so both source and man page output are aligned.
Change tabs to spaces to make the alignment in the source work.
---
 doc_src/cmds/history.rst        |  6 +++---
 doc_src/cmds/string-match.rst   |  4 ++--
 doc_src/cmds/string-pad.rst     |  2 +-
 doc_src/cmds/string-repeat.rst  |  2 +-
 doc_src/cmds/string-replace.rst |  2 +-
 doc_src/cmds/string-split.rst   |  4 ++--
 doc_src/cmds/string-sub.rst     |  2 +-
 doc_src/cmds/string-trim.rst    |  2 +-
 doc_src/cmds/string.rst         | 18 +++++++++---------
 9 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/doc_src/cmds/history.rst b/doc_src/cmds/history.rst
index 0b5128ac7..46be50164 100644
--- a/doc_src/cmds/history.rst
+++ b/doc_src/cmds/history.rst
@@ -7,10 +7,10 @@ Synopsis
 --------
 
 | ``history`` [**search**] [**--show-time**] [**--case-sensitive**]
-	\	\   [**--exact** | **--prefix** | **--contains**] [**--max** *n*] [**--null**] [**--reverse**]
-	\	\   [*SEARCH_STRING* ...]
+        \                  [**--exact** | **--prefix** | **--contains**] [**--max** *n*] [**--null**] [**--reverse**]
+        \                  [*SEARCH_STRING* ...]
 | ``history`` **delete** [**--case-sensitive**]
-	\	\   [**--exact** | **--prefix** | **--contains**] *SEARCH_STRING* ...
+        \                [**--exact** | **--prefix** | **--contains**] *SEARCH_STRING* ...
 | ``history`` **merge**
 | ``history`` **save**
 | ``history`` **clear**
diff --git a/doc_src/cmds/string-match.rst b/doc_src/cmds/string-match.rst
index 61249facc..555ca6468 100644
--- a/doc_src/cmds/string-match.rst
+++ b/doc_src/cmds/string-match.rst
@@ -7,8 +7,8 @@ Synopsis
 .. BEGIN SYNOPSIS
 
 ``string`` match [**-a** | **--all**] [**-e** | **--entire**] [**-i** | **--ignore-case**]
-    \   \    [**-r** | **--regex**] [**-n** | **--index**] [**-q** | **--quiet**] [**-v** | **--invert**]
-    \    \   *PATTERN* [*STRING* ...]
+         \       [**-r** | **--regex**] [**-n** | **--index**] [**-q** | **--quiet**] [**-v** | **--invert**]
+         \       *PATTERN* [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-pad.rst b/doc_src/cmds/string-pad.rst
index 032138b63..4daaccbf6 100644
--- a/doc_src/cmds/string-pad.rst
+++ b/doc_src/cmds/string-pad.rst
@@ -7,7 +7,7 @@ Synopsis
 .. BEGIN SYNOPSIS
 
 ``string`` pad [**-r** | **--right**] [(**-c** | **--char**) *CHAR*] [(**-w** | **--width**) *INTEGER*]
-    \   \      [*STRING* ...]
+         \     [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-repeat.rst b/doc_src/cmds/string-repeat.rst
index dd6a188a2..dce27c6ba 100644
--- a/doc_src/cmds/string-repeat.rst
+++ b/doc_src/cmds/string-repeat.rst
@@ -7,7 +7,7 @@ Synopsis
 .. BEGIN SYNOPSIS
 
 ``string`` repeat [(**-n** | **--count**) *COUNT*] [(**-m** | **--max**) *MAX*] [**-N** | **--no-newline**]
-    \   \     [**-q** | **--quiet**] [*STRING* ...]
+         \        [**-q** | **--quiet**] [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-replace.rst b/doc_src/cmds/string-replace.rst
index 96fc6087b..0dcc6039e 100644
--- a/doc_src/cmds/string-replace.rst
+++ b/doc_src/cmds/string-replace.rst
@@ -7,7 +7,7 @@ Synopsis
 .. BEGIN SYNOPSIS
 
 ``string`` replace [**-a** | **--all**] [**-f** | **--filter**] [**-i** | **--ignore-case**]
-    \   \      [**-r** | **--regex**] [**-q** | **--quiet**] *PATTERN* *REPLACE* [*STRING* ...]
+         \         [**-r** | **--regex**] [**-q** | **--quiet**] *PATTERN* *REPLACE* [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-split.rst b/doc_src/cmds/string-split.rst
index 4e2ccd53b..70e68b30b 100644
--- a/doc_src/cmds/string-split.rst
+++ b/doc_src/cmds/string-split.rst
@@ -7,9 +7,9 @@ Synopsis
 .. BEGIN SYNOPSIS
 
 | ``string`` split [(**-m** | **--max**) *MAX*] [**-n** | **--no-empty**] [**-q** | **--quiet**]
-    \   \    [**-r** | **--right**] *SEP* [*STRING* ...]
+    \              [**-r** | **--right**] *SEP* [*STRING* ...]
 | ``string`` split0 [(**-m** | **--max**) *MAX*] [**-n** | **--no-empty**] [**-q** | **--quiet**]
-    \   \     [**-r** | **--right**] [*STRING* ...]
+    \               [**-r** | **--right**] [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-sub.rst b/doc_src/cmds/string-sub.rst
index 1a0301111..368a0419a 100644
--- a/doc_src/cmds/string-sub.rst
+++ b/doc_src/cmds/string-sub.rst
@@ -7,7 +7,7 @@ Synopsis
 .. BEGIN SYNOPSIS
 
 ``string`` sub [(**-s** | **--start**) *START*] [(**-l** | **--length**) *LENGTH*]
-    \        [**-q** | **--quiet**] [*STRING* ...]
+         \     [**-q** | **--quiet**] [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-trim.rst b/doc_src/cmds/string-trim.rst
index d1cc677a2..89832ac7a 100644
--- a/doc_src/cmds/string-trim.rst
+++ b/doc_src/cmds/string-trim.rst
@@ -7,7 +7,7 @@ Synopsis
 .. BEGIN SYNOPSIS
 
 ``string`` trim [**-l** | **--left**] [**-r** | **--right**] [(**-c** | **--chars**) *CHARS*]
-    \   \   [**-q** | **--quiet**] [*STRING* ...]
+         \      [**-q** | **--quiet**] [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string.rst b/doc_src/cmds/string.rst
index 7a363e6e6..b101d6e7a 100644
--- a/doc_src/cmds/string.rst
+++ b/doc_src/cmds/string.rst
@@ -13,22 +13,22 @@ Synopsis
 | ``string`` length [**-q** | **--quiet**] [*STRING* ...]
 | ``string`` lower [**-q** | **--quiet**] [*STRING* ...]
 | ``string`` match [**-a** | **--all**] [**-e** | **--entire**] [**-i** | **--ignore-case**]
-	\	\	 [**-r** | **--regex**] [**-n** | **--index**] [**-q** | **--quiet**] [**-v** | **--invert**]
-	\	 \	 *PATTERN* [*STRING* ...]
+    \              [**-r** | **--regex**] [**-n** | **--index**] [**-q** | **--quiet**] [**-v** | **--invert**]
+    \              *PATTERN* [*STRING* ...]
 | ``string`` pad [**-r** | **--right**] [**-c** | **--char** *CHAR*] [**-w** | **--width** *INTEGER*]
-	\	\      [*STRING* ...]
+    \            [*STRING* ...]
 | ``string`` repeat [(**-n** | **--count**) *COUNT*] [(**-m** | **--max**) *MAX*] [**-N** | **--no-newline**]
-	\	\	  [**-q** | **--quiet**] [*STRING* ...]
+    \               [**-q** | **--quiet**] [*STRING* ...]
 | ``string`` replace [**-a** | **--all**] [**-f** | **--filter**] [**-i** | **--ignore-case**]
-	\	\	   [**-r** | **--regex**] [**-q** | **--quiet**] *PATTERN* *REPLACE* [*STRING* ...]
+    \                [**-r** | **--regex**] [**-q** | **--quiet**] *PATTERN* *REPLACE* [*STRING* ...]
 | ``string`` split [(**-m** | **--max**) *MAX*] [**-n** | **--no-empty**] [**-q** | **--quiet**]
-	\	\	 [**-r** | **--right**] *SEP* [*STRING* ...]
+    \              [**-r** | **--right**] *SEP* [*STRING* ...]
 | ``string`` split0 [(**-m** | **--max**) *MAX*] [**-n** | **--no-empty**] [**-q** | **--quiet**]
-	\	\	  [**-r** | **--right**] [*STRING* ...]
+    \               [**-r** | **--right**] [*STRING* ...]
 | ``string`` sub [(**-s** | **--start**) *START*] [(**-l** | **--length**) *LENGTH*]
-	\	     [**-q** | **--quiet**] [*STRING* ...]
+    \            [**-q** | **--quiet**] [*STRING* ...]
 | ``string`` trim [**-l** | **--left**] [**-r** | **--right**] [(**-c** | **--chars**) *CHARS*]
-	\	\	[**-q** | **--quiet**] [*STRING* ...]
+    \             [**-q** | **--quiet**] [*STRING* ...]
 | ``string`` unescape [**--style=**] [*STRING* ...]
 | ``string`` upper [**-q** | **--quiet**] [*STRING* ...]
 

From 7aa0f4a2cf5ae6a499deba9fa53b08c7725ed8b7 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 16 Jan 2022 12:09:51 +0100
Subject: [PATCH 022/262] test.rst: fix runaway space

---
 doc_src/cmds/test.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc_src/cmds/test.rst b/doc_src/cmds/test.rst
index f0d550227..a1b44921b 100644
--- a/doc_src/cmds/test.rst
+++ b/doc_src/cmds/test.rst
@@ -21,7 +21,7 @@ Description
 
 Tests the expression given and sets the exit status to 0 if true, and 1 if false. An expression is made up of one or more operators and their arguments.
 
-The first form (``test``) is preferred. For compatibility with other shells, the second form is available: a matching pair of square brackets (``[ [EXPRESSION ] ]``).
+The first form (``test``) is preferred. For compatibility with other shells, the second form is available: a matching pair of square brackets (``[ [EXPRESSION] ]``).
 
 This test is mostly POSIX-compatible.
 

From 557d8b0334a453235605ddda654d0fe74e6644b1 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 16 Jan 2022 12:26:13 +0100
Subject: [PATCH 023/262] docs: restore default highlighting keywords and
 options in HTML

Keywords and options recently got dedicated highlighting roles in
b3626d48e (Highlight keywords differently, 2021-02-04) and
711796ad1 (Highlight options differently, 2021-10-19)
but still default to "command" and "parameter", respectively.

The dedicated roles were not colored by our CSS theme,
which makes a "test -f foo.txt" look weird:
- "test" is dark blue (since it's a command)
- "foo.txt" is light blue (since it's a parameter)
- "-f" is black (weird!)

The CSS theme doesn't support configuration, so the dedicated
highlighting roles should always default to their fallback
options. Make it so.
---
 doc_src/fish_indent_lexer.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/doc_src/fish_indent_lexer.py b/doc_src/fish_indent_lexer.py
index c3d5750d5..f4b154e8c 100644
--- a/doc_src/fish_indent_lexer.py
+++ b/doc_src/fish_indent_lexer.py
@@ -5,7 +5,6 @@
 
 from pygments.lexer import Lexer
 from pygments.token import (
-    Keyword,
     Name,
     Comment,
     String,
@@ -30,10 +29,10 @@ ROLE_TO_TOKEN = {
     "normal": Name.Variable,
     "error": Generic.Error,
     "command": Name.Function,
-    "keyword": Keyword,
+    "keyword": Name.Function,
     "statement_terminator": Punctuation,
     "param": Name.Constant,
-    "option": Name.Literal,
+    "option": Name.Constant,
     "comment": Comment,
     "match": DEFAULT,
     "search_match": DEFAULT,

From 04a905961dcc8bad395c0b39b91b8587562c2e05 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 16 Jan 2022 15:02:19 +0100
Subject: [PATCH 024/262] completions/conda.fish: use __fish_is_first_token

Closes #8614
---
 share/completions/conda.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/completions/conda.fish b/share/completions/conda.fish
index d89e87a9c..8fbb8dca7 100644
--- a/share/completions/conda.fish
+++ b/share/completions/conda.fish
@@ -23,7 +23,7 @@ end
 
 # Complete for the first argument only
 function __fish_conda_top
-    complete -c conda -n "test (count (commandline -opc)) -eq 1" $argv
+    complete -c conda -n __fish_is_first_token $argv
 end
 
 function __fish_conda_config_keys

From 49a0362c12ddbf26e66237a61cb0eb93c03f2a72 Mon Sep 17 00:00:00 2001
From: Max Nordlund gmail <max.nordlund@gmail.com>
Date: Fri, 14 Jan 2022 13:22:54 +0100
Subject: [PATCH 025/262] Fix nmap --script completion

It's using GNU specific flags, which doesn't work on BSDs like macOS.

Instead this just formats the current time into
seconds and then the `math` builtin for calculating the 5 min timeout.
---
 share/completions/nmap.fish | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/share/completions/nmap.fish b/share/completions/nmap.fish
index 61b9842c8..213a9f4d9 100644
--- a/share/completions/nmap.fish
+++ b/share/completions/nmap.fish
@@ -71,9 +71,12 @@ complete -c nmap -l max-os-tries -d 'Set the maximum number of OS detection trie
 # NMAP SCRIPTING ENGINE (NSE)
 complete -c nmap -o sC -d 'Scan: Scripts (default)'
 function __fish_complete_nmap_script
+    set -l now (date "+%s")
+
     # cache completion for 5 minutes (`nmap --script-help all` is slow)
-    if test -z "$__fish_nmap_script_completion_cache" -o (date -d "now - 5min" +"%s") -gt "$__fish_nmap_script_completion_cache_time"
-        set -g __fish_nmap_script_completion_cache_time (date +"%s")
+    # must use `math` because of differences between BSD and GNU `date`
+    if test -z "$__fish_nmap_script_completion_cache" -o (math $now - 5 "*" 60) -gt "$__fish_nmap_script_completion_cache_time"
+        set -g __fish_nmap_script_completion_cache_time $now
         set -g __fish_nmap_script_completion_cache ""
         set -l cmd
         for l in (nmap --script-help all 2> /dev/null | grep -A2 -B1 Categories: | grep -v '^\\(--\\|Categories:\\|https:\\)')

From 1f8ce5ff6c51eca7b696e8014801e0a95b8e78dd Mon Sep 17 00:00:00 2001
From: ridiculousfish <rf@fishshell.com>
Date: Sun, 16 Jan 2022 13:34:45 -0800
Subject: [PATCH 026/262] Stop ignoring initial command in read -c

`read` allows specifying the initial command line text. This was
text got accidentally ignored starting in a32248277f026fb. Fix this
regression and add a test.

Fixes #8633
---
 src/reader.cpp         |  7 ++++++-
 tests/pexpects/read.py | 12 ++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index 08f2f323b..62c3af304 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -4189,7 +4189,12 @@ bool reader_data_t::jump(jump_direction_t dir, jump_precision_t precision, edita
     return success;
 }
 
-maybe_t<wcstring> reader_readline(int nchars) { return current_data()->readline(nchars); }
+maybe_t<wcstring> reader_readline(int nchars) {
+    auto *data = current_data();
+    // Apply any outstanding commandline changes (#8633).
+    data->apply_commandline_state_changes();
+    return data->readline(nchars);
+}
 
 int reader_reading_interrupted() {
     int res = reader_test_and_clear_interrupted();
diff --git a/tests/pexpects/read.py b/tests/pexpects/read.py
index 3e0d416ef..929f7a796 100644
--- a/tests/pexpects/read.py
+++ b/tests/pexpects/read.py
@@ -54,6 +54,18 @@ expect_prompt()
 expect_marker(2)
 print_var_contents("foo", "bar")
 
+# read -c (see #8633)
+sendline(r"read -c init_text somevar && echo $somevar")
+expect_re("\r\n?read> init_text$")
+sendline("someval")
+expect_prompt("someval\r\n")
+
+sendline(r"read --command='some other text' somevar && echo $somevar")
+expect_re("\r\n?read> some other text$")
+sendline("another value")
+expect_prompt("another value\r\n")
+
+
 # read -s
 
 sendline("read -s foo")

From d5076572c830efc803bba852a01a4488f27c4360 Mon Sep 17 00:00:00 2001
From: Jakub Panek <me@panekj.dev>
Date: Fri, 14 Jan 2022 00:02:16 +0000
Subject: [PATCH 027/262] completions(apk.fish): force file/parameter
 completion

Signed-off-by: Jakub Panek <me@panekj.dev>
---
 share/completions/apk.fish | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/share/completions/apk.fish b/share/completions/apk.fish
index 6a6d204f8..ce7010e11 100644
--- a/share/completions/apk.fish
+++ b/share/completions/apk.fish
@@ -6,8 +6,8 @@ complete -f -c apk -n "__fish_seen_subcommand_from del fix version manifest" -a
 
 # Global options
 complete -f -c apk -s h -l help -d "Show help"
-complete -x -c apk -s p -l root -d "Install packages to DIR"
-complete -x -c apk -s X -l repository -d "Use packages from REPO"
+complete -r -c apk -s p -l root -d "Install packages to DIR"
+complete -r -c apk -s X -l repository -d "Use packages from REPO"
 complete -f -c apk -s q -l quiet -d "Print less information"
 complete -f -c apk -s v -l verbose -d "Print more information"
 complete -f -c apk -s i -l interactive -d "Ask confirmation for certain operations"
@@ -20,18 +20,18 @@ complete -f -c apk -l force-overwrite -d "Overwrite files in other packages"
 complete -f -c apk -l force-refresh -d "Don't use cached files"
 complete -f -c apk -s U -l update-cache -d "Alias for --cache-max-age 1"
 complete -f -c apk -l progress -d "Show a progress bar"
-complete -f -c apk -l progress-fd -d "Write progress to FD"
+complete -x -c apk -l progress-fd -d "Write progress to FD"
 complete -f -c apk -l no-progress -d "Disable progress bar even for TTYs"
 complete -f -c apk -l purge -d "Delete also modified configuration files and uninstalled packages from cache"
 complete -f -c apk -l allow-untrusted -d "Install packages with untrusted signature or no signature"
-complete -f -c apk -l wait -d "Wait for TIME seconds to get an exclusive repository lock before failing"
-complete -f -c apk -l keys-dir -d "Override directory of trusted keys"
-complete -f -c apk -l repositories-file -d "Override repositories file"
+complete -x -c apk -l wait -d "Wait for TIME seconds to get an exclusive repository lock before failing"
+complete -r -c apk -l keys-dir -d "Override directory of trusted keys"
+complete -r -c apk -l repositories-file -d "Override repositories file"
 complete -f -c apk -l no-network -d "Don't use network"
 complete -f -c apk -l no-cache -d "Don't use any local cache path"
-complete -f -c apk -l cache-dir -d "Override cache directory"
-complete -f -c apk -l cache-max-age -d "Maximum AGE for index in cache before refresh"
-complete -f -c apk -l arch -d "Use architecture with --root"
+complete -r -c apk -l cache-dir -d "Override cache directory"
+complete -x -c apk -l cache-max-age -d "Maximum AGE for index in cache before refresh"
+complete -x -c apk -l arch -d "Use architecture with --root"
 complete -f -c apk -l print-arch -d "Print default architecture"
 
 # Commands
@@ -82,7 +82,7 @@ complete -f -c apk -n "__fish_seen_subcommand_from fix" -l directory-permissions
 # Info options
 complete -f -c apk -n "__fish_seen_subcommand_from info" -s L -l contents -d "List included files"
 complete -f -c apk -n "__fish_seen_subcommand_from info" -s e -l installed -d "Check PACKAGE installed status"
-complete -f -c apk -n "__fish_seen_subcommand_from info" -s W -l who-owns -d "Print who owns the file"
+complete -r -c apk -n "__fish_seen_subcommand_from info" -s W -l who-owns -d "Print who owns the file"
 complete -f -c apk -n "__fish_seen_subcommand_from info" -s R -l depends -d "List the dependencies"
 complete -f -c apk -n "__fish_seen_subcommand_from info" -s P -l provides -d "List virtual packages provided"
 complete -f -c apk -n "__fish_seen_subcommand_from info" -s r -l rdepends -d "List reverse dependencies"
@@ -132,8 +132,8 @@ complete -f -c apk -n "__fish_seen_subcommand_from version" -s a -l all -d "Cons
 complete -x -c apk -n "__fish_seen_subcommand_from version" -s l -l limit -d "Limit to packages with output matching given operand"
 
 # Index options
-complete -x -c apk -n "__fish_seen_subcommand_from index" -s o -l output -d "Write the generated index to FILE"
-complete -x -c apk -n "__fish_seen_subcommand_from index" -s x -l index -d "Read an existing index from INDEX"
+complete -r -c apk -n "__fish_seen_subcommand_from index" -s o -l output -d "Write the generated index to FILE"
+complete -r -c apk -n "__fish_seen_subcommand_from index" -s x -l index -d "Read an existing index from INDEX"
 complete -x -c apk -n "__fish_seen_subcommand_from index" -s d -l description -d "Add a description to the index"
 complete -x -c apk -n "__fish_seen_subcommand_from index" -l rewrite-arch -d "Use ARCH as architecture for all packages"
 complete -f -c apk -n "__fish_seen_subcommand_from index" -l no-warnings -d "Disable the warning about missing dependencies"
@@ -143,7 +143,7 @@ complete -f -c apk -n "__fish_seen_subcommand_from fetch" -s L -l link -d "Creat
 complete -f -c apk -n "__fish_seen_subcommand_from fetch" -s R -l recursive -d "Fetch all dependencies too"
 complete -f -c apk -n "__fish_seen_subcommand_from fetch" -l simulate -d "Simulate the requested operation"
 complete -f -c apk -n "__fish_seen_subcommand_from fetch" -s s -l stdout -d "Dump the .apk to stdout"
-complete -x -c apk -n "__fish_seen_subcommand_from fetch" -s o -l output -d "Write the downloaded files to DIR"
+complete -r -c apk -n "__fish_seen_subcommand_from fetch" -s o -l output -d "Write the downloaded files to DIR"
 
 # Audit options
 complete -f -c apk -n "__fish_seen_subcommand_from audit" -l backup -d "Audit configuration files only"

From 0127b237e722d4d55f6872c359627826d509cbb9 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 17 Jan 2022 17:49:00 +0100
Subject: [PATCH 028/262] completions/git: Complete heads for push

Fixes #8650
---
 share/completions/git.fish | 1 +
 1 file changed, 1 insertion(+)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index e4002b26b..2495cb16e 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1669,6 +1669,7 @@ complete -f -c git -n __fish_git_needs_command -a push -d 'Update remote refs al
 complete -f -c git -n '__fish_git_using_command push; and not __fish_git_branch_for_remote' -a '(__fish_git_remotes)' -d 'Remote alias'
 complete -f -c git -n '__fish_git_using_command push; and __fish_git_branch_for_remote' -ka '(__fish_git_tags)' -d Tag
 complete -f -c git -n '__fish_git_using_command push; and __fish_git_branch_for_remote' -ka '(__fish_git_branches)'
+complete -f -c git -n '__fish_git_using_command push; and __fish_git_branch_for_remote' -ka '(__fish_git_heads)'
 # The "refspec" here is an optional "+" to signify a force-push
 complete -f -c git -n '__fish_git_using_command push; and __fish_git_branch_for_remote; and string match -q "+*" -- (commandline -ct)' -a '+(__fish_git_branches | string replace -r \t".*" "")' -d 'Force-push branch'
 # git push REMOTE :BRANCH deletes BRANCH on remote REMOTE

From 9b3783d54ad6c55116beb05b604f255f0d80b224 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Mon, 17 Jan 2022 20:06:05 +0100
Subject: [PATCH 029/262] completions: shorten descriptions for p4 (#8647)

Work towards #6981
---
 share/completions/p4.fish | 148 +++++++++++++++++++-------------------
 1 file changed, 74 insertions(+), 74 deletions(-)

diff --git a/share/completions/p4.fish b/share/completions/p4.fish
index d5de08778..b83804d20 100644
--- a/share/completions/p4.fish
+++ b/share/completions/p4.fish
@@ -323,25 +323,25 @@ end
 ### global options -- can be used before any command
 #########################################################
 
-complete -c p4 -n __fish_p4_not_in_command -s b -x -d 'Specifies a batch size (number of arguments) to use when processing a command from a file with the -x argfile option'
-complete -c p4 -n __fish_p4_not_in_command -s c -x -d 'Overrides any P4CLIENT setting with the specified client name'
-complete -c p4 -n __fish_p4_not_in_command -s d -r -d 'Overrides any PWD setting (current working directory) and replaces it with the specified directory'
-complete -c p4 -n __fish_p4_not_in_command -s I -d 'Specify that progress indicators, if available, are desired. This option is not compatible with the -s and -G options'
-complete -c p4 -n __fish_p4_not_in_command -s G -d 'Causes all output (and batch input for form commands with -i) to be formatted as marshalled Python dictionary objects'
-complete -c p4 -n __fish_p4_not_in_command -s H -x -a '(__fish_print_hostnames)' -d 'Overrides any P4HOST setting and replaces it with the specified hostname'
-complete -c p4 -n __fish_p4_not_in_command -s p -x -d 'Overrides any P4PORT setting with the specified protocol:host:port'
-complete -c p4 -n __fish_p4_not_in_command -s P -x -d 'Overrides any P4PASSWD setting with the specified password.'
-complete -c p4 -n __fish_p4_not_in_command -s r -x -d 'Specifies the number of times to retry a command (notably, p4 sync) if the network times out.'
-complete -c p4 -n __fish_p4_not_in_command -s s -d 'Prepends a descriptive field (for example, text:, info:, error:, exit:) to each line of output produced by a Perforce command. This is most often used when scripting.'
-complete -c p4 -n __fish_p4_not_in_command -s u -x -a '(__fish_print_p4_users)' -d 'Overrides any P4USER, USER, or USERNAME setting with the specified user name.'
-complete -c p4 -n __fish_p4_not_in_command -s x -r -d 'Instructs Perforce to read arguments, one per line, from the specified file. If file is a single hyphen (-), then standard input is read.'
-complete -c p4 -n __fish_p4_not_in_command -s C -x -a '(__fish_print_encodings)' -d 'Overrides any P4CHARSET setting with the specified character set.'
-complete -c p4 -n __fish_p4_not_in_command -s Q -x -a '(__fish_print_encodings)' -d 'Overrides any P4COMMANDCHARSET setting with the specified character set.'
-complete -c p4 -n __fish_p4_not_in_command -s L -x -d 'This feature is reserved for system integrators.'
-complete -c p4 -n __fish_p4_not_in_command -s z -x -d 'Causes output of many reporting commands to be in the same tagged format as that generated by p4 fstat.'
-complete -c p4 -n __fish_p4_not_in_command -s q -d 'Quiet mode; suppress all informational message and report only warnings or errors.'
-complete -c p4 -n __fish_p4_not_in_command -s V -d 'Displays the version of the p4 application and exits.'
-complete -c p4 -n __fish_p4_not_in_command -s h -d 'Displays basic usage information and exits.'
+complete -c p4 -n __fish_p4_not_in_command -s b -x -d 'Number of arguments when using -x flag'
+complete -c p4 -n __fish_p4_not_in_command -s c -x -d 'Overrides P4CLIENT settings'
+complete -c p4 -n __fish_p4_not_in_command -s d -r -d 'Overrides PWD settings'
+complete -c p4 -n __fish_p4_not_in_command -s I -d 'Show process indicators'
+complete -c p4 -n __fish_p4_not_in_command -s G -d 'python dict in/output'
+complete -c p4 -n __fish_p4_not_in_command -s H -x -a '(__fish_print_hostnames)' -d 'Overrides P4HOST settings'
+complete -c p4 -n __fish_p4_not_in_command -s p -x -d 'Overrides P4PORT settings'
+complete -c p4 -n __fish_p4_not_in_command -s P -x -d 'Overrides P4PASSWD settings'
+complete -c p4 -n __fish_p4_not_in_command -s r -x -d 'Number of retry attempts'
+complete -c p4 -n __fish_p4_not_in_command -s s -d 'Prefix for each line'
+complete -c p4 -n __fish_p4_not_in_command -s u -x -a '(__fish_print_p4_users)' -d 'Overrides P4USER/USER/USERNAME settings'
+complete -c p4 -n __fish_p4_not_in_command -s x -r -d 'Read arguments from file'
+complete -c p4 -n __fish_p4_not_in_command -s C -x -a '(__fish_print_encodings)' -d 'Overrides P4CHARSET settings'
+complete -c p4 -n __fish_p4_not_in_command -s Q -x -a '(__fish_print_encodings)' -d 'Overrides P4COMMANDCHARSET settings'
+complete -c p4 -n __fish_p4_not_in_command -s L -x -d 'Feature reserved for system integrators'
+complete -c p4 -n __fish_p4_not_in_command -s z -x -d 'fstat output'
+complete -c p4 -n __fish_p4_not_in_command -s q -d 'Quiet mode'
+complete -c p4 -n __fish_p4_not_in_command -s V -d 'Display version'
+complete -c p4 -n __fish_p4_not_in_command -s h -d 'Display help'
 
 #########################################################
 ### sub-commands
@@ -457,23 +457,23 @@ __fish_p4_register_command_option info -s s -d "Short output (removes informatio
 
 # clean
 __fish_p4_register_command_option clean -a '(__fish_print_p4_opened_files)'
-__fish_p4_register_command_option clean -s a -d "Added files: Find files in the workspace that have no corresponding files in the depot and delete them"
-__fish_p4_register_command_option clean -s d -d "Deleted files: Find those files in the depot that do not exist in your workspace and add them to the workspace"
-__fish_p4_register_command_option clean -s e -d "Edited files: Find files in the workspace that have been modified and restore them to the last file version that has synced from the depot"
-__fish_p4_register_command_option clean -s I -d "Do not perform any ignore checking; ignore any settings specified by P4IGNORE for added files"
-__fish_p4_register_command_option clean -s l -d "Display output in local file syntax with relative paths, similar to the workspace-centric view of p4 status"
-__fish_p4_register_command_option clean -s n -d "Preview the results of the operation without performing any action"
+__fish_p4_register_command_option clean -s a -d "Delete files not in depot"
+__fish_p4_register_command_option clean -s d -d "Restore deleted files"
+__fish_p4_register_command_option clean -s e -d "Restore edited files"
+__fish_p4_register_command_option clean -s I -d "Ignore P4IGNORE settings for added files"
+__fish_p4_register_command_option clean -s l -d "Display output in local file syntax with relative paths"
+__fish_p4_register_command_option clean -s n -d "Preview what would be done"
 
 # client, workspace @TODO: -Fs (only in -f), -c (only in -S stream)
 for a in client workspace
     __fish_p4_register_command_option $a -x -a '(__fish_print_p4_workspaces)'
-    __fish_p4_register_command_option $a -s f -d "Allows the last modification date, which is normally read-only, to be set"
-    __fish_p4_register_command_option $a -s d -f -a '(__fish_print_p4_workspaces)' -d "Delete the specified client workspace whether or not the workspace is owned by the user"
+    __fish_p4_register_command_option $a -s f -d "Allows the last modification date to be set"
+    __fish_p4_register_command_option $a -s d -f -a '(__fish_print_p4_workspaces)' -d "Delete client workspace even if not owned by user"
     # __fish_p4_register_command_option $a -a '-Fs' -d 'Deletes client with shelves (must follow -f)'
     __fish_p4_register_command_option $a -s F -a s -d 'Deletes client with shelves (must follow -f)'
     __fish_p4_register_command_option $a -s o -d "Write the client workspace spec to standard output"
     __fish_p4_register_command_option $a -s i -d "Read the client workspace spec from standard input"
-    __fish_p4_register_command_option $a -s c -x -a '(__fish_print_p4_workspace_changelists)' -d "When used with -S stream, displays the workspace spec that would have been created for a stream at the moment the change was submitted"
+    __fish_p4_register_command_option $a -s c -x -a '(__fish_print_p4_workspace_changelists)' -d "When used with -S stream, preview the workspace spec"
     __fish_p4_register_command_option $a -s s -d "Switch workspace view"
     __fish_p4_register_command_option $a -s t -x -d "Specify a client workspace Template"
     __fish_p4_register_command_option $a -l serverid -x -d "Forcefully delete workspace that is bound to another server"
@@ -482,13 +482,13 @@ end
 
 # clients, workspaces @TODO -U and others are mutually exclusive
 for a in clients workspaces
-    __fish_p4_register_command_option $a -s a -d "List all client workspaces, not just workspaces bound to this server"
-    __fish_p4_register_command_option $a -s e -x -d "List only client workspaces matching filter (case-sensitive)"
-    __fish_p4_register_command_option $a -s E -x -d "List only client workspaces matching filter (case-insensitive)"
-    __fish_p4_register_command_option $a -s m -x -d "List only the first max client workspaces"
-    __fish_p4_register_command_option $a -s s -x -d "List only client workspaces bound to the specified serverID. On an edge server, the -s option defaults to the edge server’s serverID"
+    __fish_p4_register_command_option $a -s a -d "List all client workspaces"
+    __fish_p4_register_command_option $a -s e -x -d "List client workspaces matching filter (case-sensitive)"
+    __fish_p4_register_command_option $a -s E -x -d "List client workspaces matching filter (case-insensitive)"
+    __fish_p4_register_command_option $a -s m -x -d "List the first max client workspaces"
+    __fish_p4_register_command_option $a -s s -x -d "List client workspaces bound to the specified serverID"
     __fish_p4_register_command_option $a -s S -x -a '(__fish_print_p4_streams)' -d "List client workspaces associated with the specified stream"
-    __fish_p4_register_command_option $a -s t -d "Display the time as well as the date of the last update to the workspace"
+    __fish_p4_register_command_option $a -s t -d "Display time and date last update to the workspace"
     __fish_p4_register_command_option $a -s u -x -a '(__fish_print_p4_users)' -d "List only client workspaces owned by user"
     __fish_p4_register_command_option $a -s U -d "List only client workspaces unloaded with p4 unload"
 end
@@ -500,15 +500,15 @@ end
 # sync @TODO --parallel has unique key-value pair syntax: --parallel=optq1=n,opt2=n,opt3=n,opt4=n
 __fish_p4_register_command_option sync -s f -d "Force sync, overwrite all unopened files"
 __fish_p4_register_command_option sync -s k -d "Keep existing workspace files, alias for p4 flush"
-__fish_p4_register_command_option sync -s L -d "perform the sync on a list of valid file arguments in full depot syntax with a valid revision number"
+__fish_p4_register_command_option sync -s L -d "Perform sync on a list of valid file arguments"
 __fish_p4_register_command_option sync -s m -x -d "Sync only the first max files specified"
-__fish_p4_register_command_option sync -s n -d "Preview mode: Display the results of the sync without actually syncing"
-__fish_p4_register_command_option sync -s N -d "Preview mode: Display network traffic estimates, don't actually sync"
-__fish_p4_register_command_option sync -s p -d "Populate a client workspace, but do not update the have list"
+__fish_p4_register_command_option sync -s n -d "Display sync results without actually syncing"
+__fish_p4_register_command_option sync -s N -d "Display network traffic estimates without actually syncing"
+__fish_p4_register_command_option sync -s p -d "Populate a client workspace, but don't update the have list"
 __fish_p4_register_command_option sync -l parallel -x -a '(__fish_print_p4_parallel_options)' -d "Specify options for parallel file transfer"
 __fish_p4_register_command_option sync -s q -d "Quiet operation: suppress normal output messages"
-__fish_p4_register_command_option sync -s r -d "Reopen files that are mapped to new locations in the depot, in the new location"
-__fish_p4_register_command_option sync -s s -d "Safe sync: Compare the content in your client workspace against what was last synced"
+__fish_p4_register_command_option sync -s r -d "Reopen files mapped to new locations, in the new location"
+__fish_p4_register_command_option sync -s s -d "Compare client workspace against what was last synced"
 
 # update @TODO
 # where @TODO
@@ -534,7 +534,7 @@ __fish_p4_register_command_option add -s t -x -a '(__fish_print_p4_file_types)'
 
 # edit
 __fish_p4_register_command_option edit -s c -x -a '(__fish_print_p4_pending_changelists default)' -d "Changelist number"
-__fish_p4_register_command_option edit -s k -d "Keep existing workspace files; mark the file as open for edit even if the file is not in the client view"
+__fish_p4_register_command_option edit -s k -d "Keep existing workspace files; mark file as open for edit"
 __fish_p4_register_command_option edit -s n -d "Preview operation, don't change files"
 __fish_p4_register_command_option edit -s t -x -a '(__fish_print_p4_file_types)' -d "File type"
 
@@ -558,9 +558,9 @@ __fish_p4_register_command_option edit -s t -x -a '(__fish_print_p4_file_types)'
 # change, changelist
 for a in change changelist
     __fish_p4_register_command_option $a -x -a '(__fish_print_p4_pending_changelists)'
-    __fish_p4_register_command_option $a -s s -d "Allows jobs to be assigned arbitrary status values on submission of the changelist, rather than the default status of closed"
-    __fish_p4_register_command_option $a -s f -d "Force operation (The -u and the -f options are mutually exclusive)"
-    __fish_p4_register_command_option $a -s u -d "Update a submitted changelist (The -u and the -f options are mutually exclusive)"
+    __fish_p4_register_command_option $a -s s -d "Allows jobs to be assigned any status values on submission"
+    __fish_p4_register_command_option $a -s f -d "Force operation"
+    __fish_p4_register_command_option $a -s u -d "Update a submitted changelist"
     __fish_p4_register_command_option $a -s O -x -a '(__fish_print_p4_pending_changelists)' -d "Changelist number"
     __fish_p4_register_command_option $a -s d -x -a '(__fish_print_p4_pending_changelists)' -d "Delete a changelist"
     __fish_p4_register_command_option $a -s o -d "Writes the changelist spec to standard output"
@@ -571,10 +571,10 @@ end
 
 # changes, changelists
 for a in changes changelists
-    __fish_p4_register_command_option $a -s i -d "Include changelists that affected files that were integrated with the specified files"
+    __fish_p4_register_command_option $a -s i -d "Include changelists of integrated, affected files"
     __fish_p4_register_command_option $a -s t -d "Display the time as well as the date of each change"
-    __fish_p4_register_command_option $a -s l -d "List long output, with the full text of each changelist description"
-    __fish_p4_register_command_option $a -s L -d "List long output, with the full text of each changelist description truncated at 250 characters"
+    __fish_p4_register_command_option $a -s l -d "List long output, with full changelist"
+    __fish_p4_register_command_option $a -s L -d "List long output, with full changelist (truncated)"
     __fish_p4_register_command_option $a -s f -d "View restricted changes (requires admin permission)"
     __fish_p4_register_command_option $a -c c -x -a '(__fish_print_p4_workspace_changelists)' -d "List only changes made from the named client workspace"
     __fish_p4_register_command_option $a -c m -x -d "List only the highest numbered max changes"
@@ -585,7 +585,7 @@ end
 
 # describe @TODO: -dc<n>, -du<n>
 __fish_p4_register_command_option describe -x -a '(__fish_print_p4_workspace_changelists)'
-__fish_p4_register_command_option describe -s f -d 'Force the display of descriptions for restricted changelists'
+__fish_p4_register_command_option describe -s f -d 'Force display of descriptions for restricted changelists'
 __fish_p4_register_command_option describe -s O -d 'Specify the original changelist number'
 __fish_p4_register_command_option describe -s s -d 'Short output without diffs'
 __fish_p4_register_command_option describe -s S -d 'Display shelved files with diffs'
@@ -596,9 +596,9 @@ __fish_p4_register_command_option describe -s d -x -a '(__fish_print_p4_diff_opt
 # opened
 __fish_p4_register_command_option opened -s a -d "List opened files in all client workspaces"
 __fish_p4_register_command_option opened -s c -x -a '(__fish_print_p4_pending_changelists default)' -d "List the files in a pending changelist"
-__fish_p4_register_command_option opened -s C -x -a '(__fish_print_p4_workspaces)' -d "List only files that are open in the specified client workspace"
+__fish_p4_register_command_option opened -s C -x -a '(__fish_print_p4_workspaces)' -d "List files that are open in the specified client workspace"
 __fish_p4_register_command_option opened -s m -x -d "List only the first max open files"
-__fish_p4_register_command_option opened -s s -d "Short output; do not output the revision number or file type"
+__fish_p4_register_command_option opened -s s -d "Short output; don't output the revision number or file type"
 __fish_p4_register_command_option opened -s u -x -a '(__fish_print_p4_users)' -d "List only those files that were opened by user"
 __fish_p4_register_command_option opened -s x -d "List all files that have the +l filetype over all servers"
 
@@ -611,31 +611,31 @@ __fish_p4_register_command_option reopen -s t -x -a '(__fish_print_p4_file_types
 
 # shelve
 __fish_p4_register_command_option shelve -a '(__fish_print_p4_opened_files)'
-__fish_p4_register_command_option shelve -s a -x -a 'submitunchanged leaveunchanged' -d "Options: 'submitunchanged' shelves all files, 'leaveunchanged' shelves only changed files"
+__fish_p4_register_command_option shelve -s a -x -a 'submitunchanged leaveunchanged' -d "Choose which files to shelve"
 __fish_p4_register_command_option shelve -s c -x -a '(__fish_print_p4_pending_changelists)' -d "Changelist number"
 __fish_p4_register_command_option shelve -s d -d 'Discard the shelved files'
 __fish_p4_register_command_option shelve -s f -d 'Force overwrite of shelved files'
 __fish_p4_register_command_option shelve -s i -d 'Read a changelist description from standard input'
-__fish_p4_register_command_option shelve -s p -d "Promote a shelved change from an Edge server to a Commit server"
-__fish_p4_register_command_option shelve -s r -d 'Replace all shelved files in the changelist with the files that are opened in your workspace'
+__fish_p4_register_command_option shelve -s p -d "Promote shelved change from Edge server to Commit server"
+__fish_p4_register_command_option shelve -s r -d 'Replace shelved files in changelist with opened files'
 
 # submit @TODO: parallel syntax
 __fish_p4_register_command_option submit -a '(__fish_print_p4_opened_files)'
 __fish_p4_register_command_option submit -s c -x -a '(__fish_print_p4_pending_changelists)' -d "Submit specific changelist"
-__fish_p4_register_command_option submit -s d -x -d "Immediately submit the changelist with supplied description and bypass the interactive form"
+__fish_p4_register_command_option submit -s d -x -d "Submit changelist and bypass interactive form"
 __fish_p4_register_command_option submit -s e -x -a '(__fish_print_p4_shelved_changelists)' -d "Submit specific shelved changelist"
 __fish_p4_register_command_option submit -s f -x -a '(__fish_print_p4_submit_options)' -d "Override the SubmitOptions setting in the p4 client form"
 __fish_p4_register_command_option submit -s i -d "Read a changelist specification from standard input"
 __fish_p4_register_command_option submit -l noretransfer -x -a '(__fish_print_p4_noretransfer_options)'
 __fish_p4_register_command_option submit -l parallel -x -a '(__fish_print_p4_parallel_options "submit")' -d "Specify options for parallel file transfer"
-__fish_p4_register_command_option submit -s r -d "Reopen files for edit in the default changelist after submission"
-__fish_p4_register_command_option submit -s s -d "Allows jobs to be assigned arbitrary status values on submission of the changelist"
+__fish_p4_register_command_option submit -s r -d "Reopen files for edit in default changelist"
+__fish_p4_register_command_option submit -s s -d "Allow jobs to be assigned arbitrary status values"
 
 # unshelve @TODO: Streams
 __fish_p4_register_command_option unshelve -s b -x -a '(__fish_print_p4_branches)' -d "Specifies a branch spec for unshelving from"
 __fish_p4_register_command_option unshelve -s c -x -a '(__fish_print_p4_pending_changelists)' -d "Changelist number into which to unshelve"
 __fish_p4_register_command_option unshelve -s f -d 'Force the overwriting of writable (but unopened) files'
-__fish_p4_register_command_option unshelve -s n -d "Preview result of unshelve operation without restoring files to workspace"
+__fish_p4_register_command_option unshelve -s n -d "Preview result of unshelve operation"
 __fish_p4_register_command_option unshelve -s P -x -a '(__fish_print_p4_streams)' -d "Unshelve to the specified parent stream"
 __fish_p4_register_command_option unshelve -s s -x -a '(__fish_print_p4_shelved_changelists)' -d "Specify the source shelved pending changelist number"
 __fish_p4_register_command_option unshelve -s S -x -a '(__fish_print_p4_streams)' -d "Specifies a stream spec for unshelving from"
@@ -661,19 +661,19 @@ __fish_p4_register_command_option unshelve -s S -x -a '(__fish_print_p4_streams)
 
 # integ, integrate @TODO -s fromFile is based on -b branchname, try resolving
 for a in integ integrate
-    __fish_p4_register_command_option $a -s b -x -a '(__fish_print_p4_branches)' -d "Integrate the files using the sourceFile/targetFile mappings included in the branch view of branchname. If the toFiles argument is included, include only those target files in the branch view that match the pattern specified by toFiles"
-    __fish_p4_register_command_option $a -s n -d "Display the integrations this command would perform without actually performing them"
-    __fish_p4_register_command_option $a -s v -d "Open files for branching without copying toFiles into the client workspace"
-    __fish_p4_register_command_option $a -s c -x -a '(__fish_print_p4_pending_changelists)' -d "Open the toFiles for branch, integrate, or delete in the specified pending changelist"
+    __fish_p4_register_command_option $a -s b -x -a '(__fish_print_p4_branches)' -d "Integrate files using sourceFile/targetFile mappings"
+    __fish_p4_register_command_option $a -s n -d "Preview the integrations"
+    __fish_p4_register_command_option $a -s v -d "Open files for branching without copying toFiles"
+    __fish_p4_register_command_option $a -s c -x -a '(__fish_print_p4_pending_changelists)' -d "Open the toFiles in the specified pending changelist"
     __fish_p4_register_command_option $a -s q -d "Quiet mode"
-    __fish_p4_register_command_option $a -a -Di -d "f the source file has been deleted and re-added, revisions that precede the deletion will be considered to be part of the same source file"
-    __fish_p4_register_command_option $a -s f -d "Force the integration on all revisions of fromFile and toFile, even if some revisions have been integrated in the past"
+    __fish_p4_register_command_option $a -a -Di -d "If file is deleted and re-added, consider it the same file"
+    __fish_p4_register_command_option $a -s f -d "Force integration on all revisions of fromFile and toFile"
     __fish_p4_register_command_option $a -s h -d "Use the have revision"
     __fish_p4_register_command_option $a -s O -x -a '(__fish_print_p4_integrate_output_options)' -d "Specify output options"
     __fish_p4_register_command_option $a -s m -x -d "Limit the command to integrating only the first N files"
     __fish_p4_register_command_option $a -s R -x -a '(__fish_print_p4_integrate_resolve_options)' -d "Specify resolve options"
     __fish_p4_register_command_option $a -s s -r -d "Source file and revision"
-    __fish_p4_register_command_option $a -s r -r -d "Reverse the mappings in the branch view, integrating from the target files to the source files"
+    __fish_p4_register_command_option $a -s r -r -d "Reverse the mappings in the branch view"
     __fish_p4_register_command_option $a -s S -x -a '(__fish_print_p4_streams)' -d "Source stream"
     __fish_p4_register_command_option $a -s P -x -a '(__fish_print_p4_streams)' -d "Custom parent stream"
 end
@@ -691,15 +691,15 @@ end
 
 # resolve
 __fish_p4_register_command_option resolve -s a -x -a '(__fish_print_p4_resolve_options a)' -d "Resolve automatically"
-__fish_p4_register_command_option resolve -s A -x -a '(__fish_print_p4_resolve_options A)' -d "Constrain the type of resolve to branching, deletion, file type change, or move/rename"
-__fish_p4_register_command_option resolve -s d -x -a '(__fish_print_p4_resolve_options d)' -d "Ignore specified differences in whitespace or line-ending convention"
-__fish_p4_register_command_option resolve -s f -d "Allow already resolved, but not yet submitted, files to be resolved again"
-__fish_p4_register_command_option resolve -s n -d "List the files that need resolving without actually performing the resolve"
-__fish_p4_register_command_option resolve -s N -d "Preview the operation with additional information about any non-content resolve actions that are scheduled"
-__fish_p4_register_command_option resolve -s o -d "Output the base file name and revision to be used during the resolve"
+__fish_p4_register_command_option resolve -s A -x -a '(__fish_print_p4_resolve_options A)' -d "Constrain the type of resolve"
+__fish_p4_register_command_option resolve -s d -x -a '(__fish_print_p4_resolve_options d)' -d "Ignore whitespace/line-ending convention"
+__fish_p4_register_command_option resolve -s f -d "Re-resolve already resolved files if they're not submitted"
+__fish_p4_register_command_option resolve -s n -d "List files that need resolving"
+__fish_p4_register_command_option resolve -s N -d "Preview based on scheduled non-content resolve actions"
+__fish_p4_register_command_option resolve -s o -d "Show base file name and revision on resolve"
 __fish_p4_register_command_option resolve -s t -d "Force a three-way merge, even on binary (non-text) files"
-__fish_p4_register_command_option resolve -s v -d "Include conflict markers in the file for all changes between yours and base, and between theirs and base"
-__fish_p4_register_command_option resolve -s c -x -a '(__fish_print_p4_workspace_changelists)' -d "Limit the scope of the resolve operation to the files opened in the specified changelist number"
+__fish_p4_register_command_option resolve -s v -d "Include conflict markers in the file"
+__fish_p4_register_command_option resolve -s c -x -a '(__fish_print_p4_workspace_changelists)' -d "Limit scope of resolve based on specified changelist number"
 
 # resolved @TODO
 # stream @TODO
@@ -774,5 +774,5 @@ __fish_p4_register_command_option resolve -s c -x -a '(__fish_print_p4_workspace
 # set
 __fish_p4_register_command_option set -x -a '(__fish_print_p4_env_vars)'
 __fish_p4_register_command_option set -s q -d "Reduce the output"
-__fish_p4_register_command_option set -s s -d "Set the value of the registry variable for the local machine"
-__fish_p4_register_command_option set -s S -x -d "Set the value of the registry variables as used by the service"
+__fish_p4_register_command_option set -s s -d "Set value of the registry variable for the local machine"
+__fish_p4_register_command_option set -s S -x -d "Set value of the registry variables as used by the service"

From 48652eebc18b97cda83136df28ab396963eeaf8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dundar=20G=C3=B6c?= <gocdundar@gmail.com>
Date: Mon, 17 Jan 2022 19:59:06 +0100
Subject: [PATCH 030/262] completion: add completions for topgrade

---
 share/completions/topgrade.fish | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 share/completions/topgrade.fish

diff --git a/share/completions/topgrade.fish b/share/completions/topgrade.fish
new file mode 100644
index 000000000..0c1f86796
--- /dev/null
+++ b/share/completions/topgrade.fish
@@ -0,0 +1,22 @@
+# Flags
+complete -f -c topgrade -s c -l cleanup -d "Cleanup temporary or old files"
+complete -f -c topgrade -l disable-predefined-git-repos -d "Don't pull the predefined git repos"
+complete -f -c topgrade -s n -l dry-run -d "Print what would be done"
+complete -f -c topgrade -l edit-config -d "Edit the configuration file"
+complete -f -c topgrade -s h -l help -d "Prints help information"
+complete -f -c topgrade -s k -l keep -d "Prompt for a key before exiting"
+complete -f -c topgrade -l no-retry -d "Do not ask to retry failed steps"
+complete -f -c topgrade -s t -l tmux -d "Run inside tmux"
+complete -f -c topgrade -l config-reference -d "Show config reference"
+complete -f -c topgrade -l show-skipped -d "Show the reason for skipped steps"
+complete -f -c topgrade -s V -l version -d "Prints version information"
+complete -f -c topgrade -s v -l verbose -d "Output logs"
+
+# Options
+complete -f -c topgrade -l config -r -d "Alternative configuration file"
+complete -f -c topgrade -l disable -r -a "asdf atom brew_cask brew_formula bin cargo chezmoi chocolatey choosenim composer custom_commands deno dotnet emacs firmware flatpak flutter fossil gcloud gem git_repos haxelib gnome_shell_extensions home_manager jetpack krew macports mas micro myrepos nix node opam pacdiff pacstall pearl pipx pip3 pkg pkgin pnpm powershell raco remotes restarts rtcl rustup scoop sdkman silnite sheldon shell snap spicetify stack system tldr tlmgr tmux vagrant vcpkg vim winget wsl yadm" -d "Do not perform upgrades for the given steps"
+
+complete -f -c topgrade -l only -r -a "asdf atom brew_cask brew_formula bin cargo chezmoi chocolatey choosenim composer custom_commands deno dotnet emacs firmware flatpak flutter fossil gcloud gem git_repos haxelib gnome_shell_extensions home_manager jetpack krew macports mas micro myrepos nix node opam pacdiff pacstall pearl pipx pip3 pkg pkgin pnpm powershell raco remotes restarts rtcl rustup scoop sdkman silnite sheldon shell snap spicetify stack system tldr tlmgr tmux vagrant vcpkg vim winget wsl yadm" -d "Perform only the specified steps (experimental)"
+
+complete -f -c topgrade -l remote-host-limit -r -d "A regular expression for restricting remote host execution"
+complete -f -c topgrade -s y -l yes -d "Say yes to package manager's prompt"

From a22779e807617ab555144f36af78b627d89a25bd Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 18 Jan 2022 23:34:36 +0800
Subject: [PATCH 031/262] CHANGELOG: work on 3.4.0

---
 CHANGELOG.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 50b000bd6..44a3d56af 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,7 +2,7 @@ fish 3.4.0 (released ???)
 =========================
 
 ..
-   Ignore for 3.4.0 changelog: 1363 3625 3954 6477 7602 8059 8077 8079 8084 8096 8118 8127 8128 8130 8137 8139 8146 8151 8153 8161 8170 8176 8183 8184 8191 8192 8195 8202 8204 8205 8206 8219 8221 8222 8224 8227 8228 8229 8230 8231 8235 8236 8237 8238 8239 8241 8243 8249 8252 8253 8256 8257 8260 8268 8270 8271 8277 8280 8285 8287 8289 8295 8299 8305 8306 8308 8310 8311 8314 8321 8323 8326 8327 8334 8335 8337 8338 8344 8353 8358 8365 8367 8368 8380 8381 8385 8391 8394 8403 8406 8409 8410 8419 8429 8430 8433 8438 8439 8441 8444 8446 8449 8456 8457 8471 8472 8476 8477 8478 8479 8480 8487 8492 8495 8497 8500 8511 8518 8521 8522 8526 8527 8528 8548 8549 8559 8575 8584 8587 8588 8570 8591 8596 8597 8601 8608 8612 8613 8615 8623
+   Ignore for 3.4.0 changelog: 1363 3625 3954 6477 7602 8059 8077 8079 8084 8096 8118 8127 8128 8130 8137 8139 8146 8151 8153 8161 8170 8176 8183 8184 8191 8192 8195 8202 8204 8205 8206 8219 8221 8222 8224 8227 8228 8229 8230 8231 8235 8236 8237 8238 8239 8241 8243 8249 8252 8253 8256 8257 8260 8268 8270 8271 8277 8280 8285 8287 8289 8295 8299 8305 8306 8308 8310 8311 8314 8321 8323 8326 8327 8334 8335 8337 8338 8344 8353 8358 8365 8367 8368 8380 8381 8385 8391 8394 8403 8406 8409 8410 8419 8429 8430 8433 8438 8439 8441 8444 8446 8449 8456 8457 8471 8472 8476 8477 8478 8479 8480 8487 8492 8495 8497 8500 8511 8518 8521 8522 8526 8527 8528 8548 8549 8559 8575 8584 8587 8588 8570 8591 8596 8597 8601 8608 8612 8613 8614 8615 8621 8623 8626 8630 8633 8636 8639 8647 8650
 
 
 Notable improvements and fixes
@@ -160,6 +160,7 @@ Completions
   - ``roswell`` (:issue:`8330`)
   - ``sbcl`` (:issue:`8330`)
   - ``starship`` (:issue:`8520`)
+  - ``topgrade`` (:issue:`8651`)
   -  ``wine``, ``wineboot`` and ``winemaker`` (:issue:`8411`)
   -  Windows Subsystem for Linux (WSL)'s ``wslpath`` (:issue:`8364`)
   -  Windows' ``color`` (:issue:`8483`)

From 6315cf67ecd92d95cf66f012b71bf5e615be7d2f Mon Sep 17 00:00:00 2001
From: Pablo Santiago Blum de Aguiar <scorphus@gmail.com>
Date: Thu, 13 Jan 2022 22:12:13 +0100
Subject: [PATCH 032/262] Assert `and` and `or` create no new scope

---
 tests/checks/set.fish | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/tests/checks/set.fish b/tests/checks/set.fish
index 7849800b5..31f82b3d5 100644
--- a/tests/checks/set.fish
+++ b/tests/checks/set.fish
@@ -635,6 +635,34 @@ end
 #CHECK: $var6[1]: |ghi|
 #CHECK: $var6[2]: |jkl|
 
+# `and` creates no new scope on its own
+true; and set -l var7a 89 179
+set -q var7a
+echo $status
+#CHECK: 0
+
+# `begin` of an `and` creates a new scope
+true; and begin
+    set -l var7b 359 719
+end
+set -q var7b
+echo $status
+#CHECK: 1
+
+# `or` creates no new scope on its own
+false; or set -l var8a 1439 2879
+set -q var8a
+echo $status
+#CHECK: 0
+
+# `begin` of an `or` creates a new scope
+false; or begin
+    set -l var8b 9091 9901
+end
+set -q var8b
+echo $status
+#CHECK: 1
+
 # Exporting works
 set -x TESTVAR0
 set -x TESTVAR1 a

From f612ade5d9a30d890acf106d6b70b80df6eca9e0 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 18 Jan 2022 18:09:29 +0100
Subject: [PATCH 033/262] CHANGELOG for 3.4.0

---
 CHANGELOG.rst | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 44a3d56af..ce428d51a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,7 +2,7 @@ fish 3.4.0 (released ???)
 =========================
 
 ..
-   Ignore for 3.4.0 changelog: 1363 3625 3954 6477 7602 8059 8077 8079 8084 8096 8118 8127 8128 8130 8137 8139 8146 8151 8153 8161 8170 8176 8183 8184 8191 8192 8195 8202 8204 8205 8206 8219 8221 8222 8224 8227 8228 8229 8230 8231 8235 8236 8237 8238 8239 8241 8243 8249 8252 8253 8256 8257 8260 8268 8270 8271 8277 8280 8285 8287 8289 8295 8299 8305 8306 8308 8310 8311 8314 8321 8323 8326 8327 8334 8335 8337 8338 8344 8353 8358 8365 8367 8368 8380 8381 8385 8391 8394 8403 8406 8409 8410 8419 8429 8430 8433 8438 8439 8441 8444 8446 8449 8456 8457 8471 8472 8476 8477 8478 8479 8480 8487 8492 8495 8497 8500 8511 8518 8521 8522 8526 8527 8528 8548 8549 8559 8575 8584 8587 8588 8570 8591 8596 8597 8601 8608 8612 8613 8614 8615 8621 8623 8626 8630 8633 8636 8639 8647 8650
+   Ignore for 3.4.0 changelog: 1363 3625 3954 6477 7602 8059 8077 8079 8084 8096 8118 8127 8128 8130 8137 8139 8146 8151 8153 8161 8170 8176 8183 8184 8191 8192 8195 8202 8204 8205 8206 8219 8221 8222 8224 8227 8228 8229 8230 8231 8235 8236 8237 8238 8239 8241 8243 8249 8252 8253 8256 8257 8260 8268 8270 8271 8277 8280 8285 8287 8289 8295 8299 8305 8306 8308 8310 8311 8314 8321 8323 8326 8327 8334 8335 8337 8338 8344 8353 8358 8365 8367 8368 8380 8381 8385 8391 8394 8403 8406 8409 8410 8419 8429 8430 8433 8438 8439 8441 8444 8446 8449 8456 8457 8471 8472 8476 8477 8478 8479 8480 8487 8492 8495 8497 8500 8511 8518 8521 8522 8526 8527 8528 8548 8549 8559 8575 8584 8587 8588 8570 8591 8596 8597 8601 8608 8612 8613 8614 8615 8621 8623 8626 8630 8633 8636 8639 8647 8650 8643
 
 
 Notable improvements and fixes
@@ -49,6 +49,10 @@ Deprecations and removed features
     # with both ampersand-nobg-in-token and qmark-noglob, this argument has no special characters anymore
     > open https://www.youtube.com/watch?v=dQw4w9WgXcQ&feature=youtu.be
 
+  As a reminder, feature flags can be set on startup with ``fish --features ampersand-nobg-in-token,qmark-noglob`` or with a universal variable called ``fish_features``::
+
+    > set -Ua fish_features ampersand-nobg-in-token
+
 - ``$status`` is now forbidden as a command, to prevent a surprisingly common error among new users: Running ``if $status`` (:issue:`8171`). This applies *only* to ``$status``, other variables are still allowed.
 - ``set --query`` now returns an exit status of 255 if given no variable names. This means ``if set -q $foo`` will not enter the if-block if ``$foo`` is empty or unset. To restore the previous behavior, use ``if not set -q foo; or set -q $foo`` - but this is unlikely to be desireable (:issue:`8214`).
 - ``_`` is now a reserved keyword (:issue:`8342`).
@@ -84,7 +88,7 @@ Scripting improvements
 - ``set --query`` can now query whether a variable is a path variable via ``--path`` or ``--unpath`` (:issue:`8494`).
 - Tilde characters (``~``) produced by custom completions are no longer escaped when applied to the command line, making it easier to use the output of a recursive ``complete -C`` in completion scripts (:issue:`4570`).
 - ``set --show`` reports when a variable is read-only (:issue:`8179`).
-- Erasing ``$fish_emoji_width`` will reset fish to the default emoji width (:issue:`8274`).
+- Erasing ``$fish_emoji_width`` will reset fish to the default guessed emoji width (:issue:`8274`).
 - The ``la`` function no longer lists entries for "." and "..", matching other systems defaults (:issue:`8519`).
 - ``abbr -q`` returns the correct exit status when given multiple abbreviation names as arguments (:issue:`8431`).
 - ``command -v`` returns an exit status of 127 instead of 1 if no command was found (:issue:`8547`).
@@ -184,7 +188,7 @@ Improved terminal support
 
 Other improvements
 ------------------
-- Fish's test suite now uses ``ctest``, and has become much faster to run. It is now also possible to run only specific tests. (:issue:`7851`)
+- Fish's test suite now uses ``ctest``, and has become much faster to run. It is now also possible to run only specific tests with targets named ``test_$filename`` - ``make test_set.fish`` only runs the set.fish test. (:issue:`7851`)
 - The HTML version of the documentation now includes copy buttons for code examples (:issue:`8218`).
 - The HTML version of the documentation and the web-based configuration tool now pick more modern system fonts instead of falling back to Arial and something like Courier New most of the time (:issue:`8632`).
 - The Debian & Ubuntu package linked from fishshell.com is now a single package, rather than split into ``fish`` and ``fish-common`` (:issue:`7845`).
@@ -195,7 +199,7 @@ For distributors
 - The minimum version of CMake required to build fish is now 3.5.0.
 - The CMake installation supports absolute paths for ``CMAKE_INSTALL_DATADIR`` (:issue:`8150`).
 - Building using NetBSD curses works on any platform (:issue:`8087`).
-- The build system does not choose a different linker (:issue:`8152`).
+- The build system now uses the default linker instead of forcing use of the gold or lld linker (:issue:`8152`).
 
 --------------
 

From 89e85e05e0e31f2bc0d31db040d3fd85203d1ab6 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 18 Jan 2022 19:20:27 +0100
Subject: [PATCH 034/262] completions/git: Add add --chmod option

Fixes #8652.
---
 share/completions/git.fish | 1 +
 1 file changed, 1 insertion(+)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 2495cb16e..7b950f18a 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -980,6 +980,7 @@ complete -c git -n '__fish_git_using_command add' -s u -l update -d 'Only match
 complete -c git -n '__fish_git_using_command add' -s A -l all -d 'Match files both in working tree and index'
 complete -c git -n '__fish_git_using_command add' -s N -l intent-to-add -d 'Record only the fact that the path will be added later'
 complete -c git -n '__fish_git_using_command add' -l refresh -d "Don't add the file(s), but only refresh their stat"
+complete -c git -n '__fish_git_using_command add' -l chmod -xa "-x\t'Track file as non-executable' +x\t'Track file as executable'"
 complete -c git -n '__fish_git_using_command add' -l ignore-errors -d 'Ignore errors'
 complete -c git -n '__fish_git_using_command add' -l ignore-missing -d 'Check if any of the given files would be ignored'
 # Renames also show up as untracked + deleted, and to get git to show it as a rename _both_ need to be added.

From 1c21e26d08f636410ddca44c896083b1b203318f Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 16 Jan 2022 13:23:09 +0100
Subject: [PATCH 035/262] docs: load custom lexer with plain Python import

The next commit will load another of our Python extensions from a
separate file. That extension will contain more than just a Pygments
lexer, so instead of using a function that can only load a lexer,
just import from the module to keep things consistent.
---
 doc_src/conf.py | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/doc_src/conf.py b/doc_src/conf.py
index def07e916..22708e950 100644
--- a/doc_src/conf.py
+++ b/doc_src/conf.py
@@ -8,8 +8,8 @@
 
 import glob
 import os.path
-import pygments
 import subprocess
+import sys
 from sphinx.errors import SphinxWarning
 from docutils import nodes
 
@@ -41,10 +41,10 @@ def setup(app):
     from sphinx.highlighting import lexers
 
     this_dir = os.path.dirname(os.path.realpath(__file__))
-    fish_indent_lexer = pygments.lexers.load_lexer_from_file(
-        os.path.join(this_dir, "fish_indent_lexer.py"), lexername="FishIndentLexer"
-    )
-    lexers["fish-docs-samples"] = fish_indent_lexer
+    sys.path.insert(0, this_dir)
+    from fish_indent_lexer import FishIndentLexer
+
+    lexers["fish-docs-samples"] = FishIndentLexer()
 
     app.add_config_value("issue_url", default=None, rebuild="html")
     app.add_role("issue", issue_role)
@@ -53,17 +53,6 @@ def setup(app):
 # The default language to assume
 highlight_language = "fish-docs-samples"
 
-# -- Path setup --------------------------------------------------------------
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#
-# import os
-# import sys
-# sys.path.insert(0, os.path.abspath('.'))
-
-
 # -- Project information -----------------------------------------------------
 
 project = "fish-shell"

From c0d1e41313244063112d48b67794cba200be8ba3 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 9 Jan 2022 15:09:46 +0100
Subject: [PATCH 036/262] docs synopsis: add HTML highlighing and automate
 manpage markup

Recent synopsis changes move from literal code blocks to
[RST line blocks].  This does not translate well to HTML: it's not
rendered in monospace, so aligment is lost.  Additionally, we don't
get syntax highlighting in HTML, which adds differences to our code
samples which are highlighted.

We hard-wrap synopsis lines (like code blocks). To align continuation
lines in manpages we need [backslashes in weird places]. Combined with
the **, *, and `` markup, it's a bit hard to get the alignment right.

Fix these by moving synopsis sources back to code blocks and compute
HTML syntax highlighting and manpage markup with a custom Sphinx
extension.

The new Pygments lexer can tokenize a synopsis and assign the various
highlighting roles, which closely matches fish's syntax highlighing:
- command/keyword (dark blue)
- parameter (light blue)
- operator like and/or/not/&&/|| (cyan)
- grammar metacharacter (black)

For manpage output, we don't project the fish syntax highlighting
but follow the markup convention in GNU's man(1):

	bold text          type exactly as shown.
	italic text        replace with appropriate argument.

To make it easy to separate these two automatically, formalize that
(italic) placeholders must be uppercase; while all lowercase text is
interpreted literally (so rendered bold).
This makes manpages more consistent, see string-join(1) and and(1).

Implementation notes:
Since we want manpage formatting but Sphinx's Pygments highlighing
plugin does not support manpage output, add our custom "synopsis"
directive.  This directive parses differently when manpage output is
specified. This means that the HTML and manpage build processes must
not share a cache, because the parsed doctrees are cached.  Work around
this by using separate cache locations for build targets "sphinx-docs"
(which creates HTML) and "sphinx-manpages".  A better solution would
be to only override Sphinx's ManualPageBuilder but that would take a
bit more code (ideally we could override ManualPageWriter but Sphinx
4.3.2 doesn't really support that).

---

Alternative solution: stick with line blocks but use roles like
:command: or :option: (or custom ones). While this would make it
possible to produce HTML that is consistent with code blocks (by adding
a bit of CSS), the source would look uglier and is harder to maintain.
(Let's say we want to add custom formatting to the [|] metacharacters
in HTML.  This is much easier with the proposed patch.)

---

[RST line blocks]: https://docutils.sourceforge.io/docs/ref/rst/restructuredtext.html#line-blocks
[backslashes in weird places]: https://github.com/fish-shell/fish-shell/pull/8626#discussion_r782837750
---
 cmake/Docs.cmake                         |   5 +-
 doc_src/cmds/_.rst                       |   4 +-
 doc_src/cmds/abbr.rst                    |  14 +-
 doc_src/cmds/alias.rst                   |   8 +-
 doc_src/cmds/and.rst                     |   4 +-
 doc_src/cmds/argparse.rst                |   4 +-
 doc_src/cmds/begin.rst                   |   4 +-
 doc_src/cmds/bg.rst                      |   4 +-
 doc_src/cmds/bind.rst                    |  14 +-
 doc_src/cmds/block.rst                   |   4 +-
 doc_src/cmds/break.rst                   |  12 +-
 doc_src/cmds/breakpoint.rst              |   4 +-
 doc_src/cmds/builtin.rst                 |   6 +-
 doc_src/cmds/case.rst                    |  10 +-
 doc_src/cmds/cd.rst                      |   4 +-
 doc_src/cmds/cdh.rst                     |   4 +-
 doc_src/cmds/command.rst                 |   4 +-
 doc_src/cmds/commandline.rst             |   4 +-
 doc_src/cmds/complete.rst                |   6 +-
 doc_src/cmds/contains.rst                |   4 +-
 doc_src/cmds/continue.rst                |   4 +-
 doc_src/cmds/count.rst                   |   8 +-
 doc_src/cmds/dirh.rst                    |   4 +-
 doc_src/cmds/dirs.rst                    |   4 +-
 doc_src/cmds/disown.rst                  |   4 +-
 doc_src/cmds/echo.rst                    |   4 +-
 doc_src/cmds/else.rst                    |   4 +-
 doc_src/cmds/emit.rst                    |   4 +-
 doc_src/cmds/end.rst                     |  20 +--
 doc_src/cmds/eval.rst                    |   4 +-
 doc_src/cmds/exec.rst                    |   4 +-
 doc_src/cmds/exit.rst                    |   4 +-
 doc_src/cmds/false.rst                   |   4 +-
 doc_src/cmds/fg.rst                      |   4 +-
 doc_src/cmds/fish.rst                    |   6 +-
 doc_src/cmds/fish_add_path.rst           |   6 +-
 doc_src/cmds/fish_breakpoint_prompt.rst  |   5 +-
 doc_src/cmds/fish_command_not_found.rst  |   8 +-
 doc_src/cmds/fish_config.rst             |   8 +-
 doc_src/cmds/fish_git_prompt.rst         |  11 +-
 doc_src/cmds/fish_greeting.rst           |   5 +-
 doc_src/cmds/fish_hg_prompt.rst          |   5 +-
 doc_src/cmds/fish_indent.rst             |   4 +-
 doc_src/cmds/fish_is_root_user.rst       |   4 +-
 doc_src/cmds/fish_key_reader.rst         |   4 +-
 doc_src/cmds/fish_mode_prompt.rst        |   5 +-
 doc_src/cmds/fish_opt.rst                |   7 +-
 doc_src/cmds/fish_prompt.rst             |   5 +-
 doc_src/cmds/fish_status_to_signal.rst   |   5 +-
 doc_src/cmds/fish_svn_prompt.rst         |   5 +-
 doc_src/cmds/fish_title.rst              |   5 +-
 doc_src/cmds/fish_update_completions.rst |   4 +-
 doc_src/cmds/fish_vcs_prompt.rst         |   5 +-
 doc_src/cmds/for.rst                     |   4 +-
 doc_src/cmds/funced.rst                  |   4 +-
 doc_src/cmds/funcsave.rst                |   6 +-
 doc_src/cmds/function.rst                |   4 +-
 doc_src/cmds/functions.rst               |  12 +-
 doc_src/cmds/help.rst                    |   4 +-
 doc_src/cmds/history.rst                 |  20 +--
 doc_src/cmds/if.rst                      |  10 +-
 doc_src/cmds/isatty.rst                  |   4 +-
 doc_src/cmds/jobs.rst                    |   4 +-
 doc_src/cmds/math.rst                    |   4 +-
 doc_src/cmds/nextd.rst                   |   4 +-
 doc_src/cmds/not.rst                     |   4 +-
 doc_src/cmds/open.rst                    |   4 +-
 doc_src/cmds/or.rst                      |   4 +-
 doc_src/cmds/popd.rst                    |   4 +-
 doc_src/cmds/prevd.rst                   |   4 +-
 doc_src/cmds/printf.rst                  |   4 +-
 doc_src/cmds/prompt_hostname.rst         |   4 +-
 doc_src/cmds/prompt_login.rst            |   4 +-
 doc_src/cmds/prompt_pwd.rst              |   4 +-
 doc_src/cmds/psub.rst                    |   4 +-
 doc_src/cmds/pushd.rst                   |   4 +-
 doc_src/cmds/pwd.rst                     |   6 +-
 doc_src/cmds/random.rst                  |  12 +-
 doc_src/cmds/read.rst                    |   4 +-
 doc_src/cmds/realpath.rst                |   4 +-
 doc_src/cmds/return.rst                  |   4 +-
 doc_src/cmds/set.rst                     |  16 ++-
 doc_src/cmds/set_color.rst               |   4 +-
 doc_src/cmds/source.rst                  |   6 +-
 doc_src/cmds/status.rst                  |  42 +++---
 doc_src/cmds/string-collect.rst          |   4 +-
 doc_src/cmds/string-escape.rst           |   6 +-
 doc_src/cmds/string-join.rst             |   6 +-
 doc_src/cmds/string-length.rst           |   4 +-
 doc_src/cmds/string-lower.rst            |   4 +-
 doc_src/cmds/string-match.rst            |   8 +-
 doc_src/cmds/string-pad.rst              |   6 +-
 doc_src/cmds/string-repeat.rst           |   6 +-
 doc_src/cmds/string-replace.rst          |   6 +-
 doc_src/cmds/string-split.rst            |  10 +-
 doc_src/cmds/string-sub.rst              |   6 +-
 doc_src/cmds/string-trim.rst             |   6 +-
 doc_src/cmds/string-upper.rst            |   4 +-
 doc_src/cmds/string.rst                  |  52 ++++----
 doc_src/cmds/suspend.rst                 |   4 +-
 doc_src/cmds/switch.rst                  |   4 +-
 doc_src/cmds/test.rst                    |   6 +-
 doc_src/cmds/time.rst                    |   4 +-
 doc_src/cmds/trap.rst                    |   4 +-
 doc_src/cmds/true.rst                    |   4 +-
 doc_src/cmds/type.rst                    |   4 +-
 doc_src/cmds/ulimit.rst                  |   4 +-
 doc_src/cmds/umask.rst                   |   4 +-
 doc_src/cmds/vared.rst                   |   4 +-
 doc_src/cmds/wait.rst                    |   4 +-
 doc_src/cmds/while.rst                   |   4 +-
 doc_src/conf.py                          |   5 +-
 doc_src/fish_synopsis.py                 | 158 +++++++++++++++++++++++
 113 files changed, 631 insertions(+), 238 deletions(-)
 create mode 100644 doc_src/fish_synopsis.py

diff --git a/cmake/Docs.cmake b/cmake/Docs.cmake
index e5c81c852..27e94be22 100644
--- a/cmake/Docs.cmake
+++ b/cmake/Docs.cmake
@@ -9,7 +9,6 @@ include(FeatureSummary)
 set(SPHINX_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/doc_src")
 set(SPHINX_ROOT_DIR "${CMAKE_CURRENT_BINARY_DIR}/user_doc")
 set(SPHINX_BUILD_DIR "${SPHINX_ROOT_DIR}/build")
-set(SPHINX_CACHE_DIR "${SPHINX_ROOT_DIR}/doctrees")
 set(SPHINX_HTML_DIR "${SPHINX_ROOT_DIR}/html")
 set(SPHINX_MANPAGE_DIR "${SPHINX_ROOT_DIR}/man")
 
@@ -22,7 +21,7 @@ add_custom_target(sphinx-docs
         -j auto
         -q -b html
         -c "${SPHINX_SRC_DIR}"
-        -d "${SPHINX_CACHE_DIR}"
+        -d "${SPHINX_ROOT_DIR}/.doctrees-html"
         "${SPHINX_SRC_DIR}"
         "${SPHINX_HTML_DIR}"
     DEPENDS ${SPHINX_SRC_DIR}/fish_indent_lexer.py fish_indent
@@ -35,7 +34,7 @@ add_custom_target(sphinx-manpages
         -j auto
         -q -b man
         -c "${SPHINX_SRC_DIR}"
-        -d "${SPHINX_CACHE_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"
diff --git a/doc_src/cmds/_.rst b/doc_src/cmds/_.rst
index 1be26a12c..a8d11e8b8 100644
--- a/doc_src/cmds/_.rst
+++ b/doc_src/cmds/_.rst
@@ -6,7 +6,9 @@ _ - call fish's translations
 Synopsis
 --------
 
-``_`` *STRING*
+.. synopsis::
+
+    _ STRING
 
 Description
 -----------
diff --git a/doc_src/cmds/abbr.rst b/doc_src/cmds/abbr.rst
index ea4e9e0a6..544f41809 100644
--- a/doc_src/cmds/abbr.rst
+++ b/doc_src/cmds/abbr.rst
@@ -6,12 +6,14 @@ abbr - manage fish abbreviations
 Synopsis
 --------
 
-| ``abbr`` --add [*SCOPE*] *WORD* *EXPANSION*
-| ``abbr`` --erase *WORD* ...
-| ``abbr`` --rename [*SCOPE*] *OLD_WORD* *NEW_WORD*
-| ``abbr`` --show
-| ``abbr`` --list
-| ``abbr`` --query *WORD* ...
+.. synopsis::
+
+    abbr --add [SCOPE] WORD EXPANSION
+    abbr --erase WORD ...
+    abbr --rename [SCOPE] OLD_WORD NEW_WORD
+    abbr --show
+    abbr --list
+    abbr --query WORD ...
 
 Description
 -----------
diff --git a/doc_src/cmds/alias.rst b/doc_src/cmds/alias.rst
index 576e45585..29d5c239a 100644
--- a/doc_src/cmds/alias.rst
+++ b/doc_src/cmds/alias.rst
@@ -6,9 +6,11 @@ alias - create a function
 Synopsis
 --------
 
-| ``alias``
-| ``alias`` [*OPTIONS*] *NAME* *DEFINITION*
-| ``alias`` [*OPTIONS*] *NAME*=*DEFINITION*
+.. synopsis::
+
+    alias
+    alias [OPTIONS] NAME DEFINITION
+    alias [OPTIONS] NAME=DEFINITION
 
 
 Description
diff --git a/doc_src/cmds/and.rst b/doc_src/cmds/and.rst
index 6e5956ca1..f43a45bdd 100644
--- a/doc_src/cmds/and.rst
+++ b/doc_src/cmds/and.rst
@@ -6,7 +6,9 @@ and - conditionally execute a command
 Synopsis
 --------
 
-PREVIOUS; **and** *COMMAND*
+.. synopsis::
+
+    PREVIOUS; and COMMAND
 
 Description
 -----------
diff --git a/doc_src/cmds/argparse.rst b/doc_src/cmds/argparse.rst
index bd87f247b..29216c034 100644
--- a/doc_src/cmds/argparse.rst
+++ b/doc_src/cmds/argparse.rst
@@ -6,7 +6,9 @@ argparse - parse options passed to a fish script or function
 Synopsis
 --------
 
-``argparse`` [*OPTIONS*] *OPTION_SPEC* ... -- [*ARG* ...]
+.. synopsis::
+
+    argparse [OPTIONS] OPTION_SPEC ... -- [ARG ...]
 
 
 Description
diff --git a/doc_src/cmds/begin.rst b/doc_src/cmds/begin.rst
index b670faa18..5664db3ad 100644
--- a/doc_src/cmds/begin.rst
+++ b/doc_src/cmds/begin.rst
@@ -6,7 +6,9 @@ begin - start a new block of code
 Synopsis
 --------
 
-**begin**; [*COMMANDS* ...]; **end**
+.. synopsis::
+
+    begin; [COMMANDS ...]; end
 
 Description
 -----------
diff --git a/doc_src/cmds/bg.rst b/doc_src/cmds/bg.rst
index 731d26d36..8d9b0635c 100644
--- a/doc_src/cmds/bg.rst
+++ b/doc_src/cmds/bg.rst
@@ -6,7 +6,9 @@ bg - send jobs to background
 Synopsis
 --------
 
-``bg`` [*PID* ...]
+.. synopsis::
+
+    bg [PID ...]
 
 Description
 -----------
diff --git a/doc_src/cmds/bind.rst b/doc_src/cmds/bind.rst
index e708704a1..9de9ed5ca 100644
--- a/doc_src/cmds/bind.rst
+++ b/doc_src/cmds/bind.rst
@@ -5,12 +5,14 @@ bind - handle fish key bindings
 Synopsis
 --------
 
-| ``bind`` [(**-M** | **--mode**) *MODE*] [(*-m* | *--sets-mode*) **NEW_MODE**] [*--preset* | *--user*] [*-s* | *--silent*] [**-k** | **--key**] *SEQUENCE* *COMMAND* ...
-| ``bind`` [(**-M** | **--mode**) *MODE*] [**-k** | **--key**] [**--preset**] [**--user**] *SEQUENCE*
-| ``bind`` (**-K** | **--key-names**) [**-a** | **--all**] [**--preset**] [**--user**]
-| ``bind`` (**-f** | **--function-names**)
-| ``bind`` (**-L** | **--list-modes**)
-| ``bind`` (**-e** | **--erase**) [(**-M** | **--mode**) *MODE*] [**--preset**] [**--user**] [**-a** | **--all**] | [**-k** | **--key**] *SEQUENCE* ...
+.. synopsis::
+
+    bind [(-M | --mode) MODE] [(-m | --sets-mode) NEW_MODE] [--preset | --user] [-s | --silent] [-k | --key] SEQUENCE COMMAND ...
+    bind [(-M | --mode) MODE] [-k | --key] [--preset] [--user] SEQUENCE
+    bind (-K | --key-names) [-a | --all] [--preset] [--user]
+    bind (-f | --function-names)
+    bind (-L | --list-modes)
+    bind (-e | --erase) [(-M | --mode) MODE] [--preset] [--user] [-a | --all] | [-k | --key] SEQUENCE ...
 
 Description
 -----------
diff --git a/doc_src/cmds/block.rst b/doc_src/cmds/block.rst
index 7a4ed2abb..521d05dbc 100644
--- a/doc_src/cmds/block.rst
+++ b/doc_src/cmds/block.rst
@@ -6,7 +6,9 @@ block - temporarily block delivery of events
 Synopsis
 --------
 
-**block** [*OPTIONS*]
+.. synopsis::
+
+    block [OPTIONS]
 
 Description
 -----------
diff --git a/doc_src/cmds/break.rst b/doc_src/cmds/break.rst
index 523709be1..b625caa76 100644
--- a/doc_src/cmds/break.rst
+++ b/doc_src/cmds/break.rst
@@ -6,11 +6,13 @@ break - stop the current inner loop
 Synopsis
 --------
 
-| loop_construct
-|    [*COMMANDS* ...]
-|    **break**
-|    [*COMMANDS* ...]
-| end
+.. synopsis::
+
+    loop_construct
+       [COMMANDS ...]
+       break
+       [COMMANDS ...]
+    end
 
 Description
 -----------
diff --git a/doc_src/cmds/breakpoint.rst b/doc_src/cmds/breakpoint.rst
index a076f760f..48c225e5f 100644
--- a/doc_src/cmds/breakpoint.rst
+++ b/doc_src/cmds/breakpoint.rst
@@ -6,7 +6,9 @@ breakpoint - launch debug mode
 Synopsis
 --------
 
-``breakpoint``
+.. synopsis::
+
+    breakpoint
 
 Description
 -----------
diff --git a/doc_src/cmds/builtin.rst b/doc_src/cmds/builtin.rst
index 69261ef46..dd443ce71 100644
--- a/doc_src/cmds/builtin.rst
+++ b/doc_src/cmds/builtin.rst
@@ -6,8 +6,10 @@ builtin - run a builtin command
 Synopsis
 --------
 
-| **builtin** [*OPTIONS*] *BUILTINNAME*
-| **builtin** --query *BUILTINNAME* ...
+.. synopsis::
+
+    builtin [OPTIONS] BUILTINNAME
+    builtin --query BUILTINNAME ...
 
 Description
 -----------
diff --git a/doc_src/cmds/case.rst b/doc_src/cmds/case.rst
index 6f33d3dc9..e971108b8 100644
--- a/doc_src/cmds/case.rst
+++ b/doc_src/cmds/case.rst
@@ -6,10 +6,12 @@ case - conditionally execute a block of commands
 Synopsis
 --------
 
-| **switch** *VALUE*
-|    [**case** [*GLOB* ...]
-|        [*COMMAND* ...]]
-| **end**
+.. synopsis::
+
+    switch VALUE
+       [case [GLOB ...]
+           [COMMAND ...]]
+    end
 
 Description
 -----------
diff --git a/doc_src/cmds/cd.rst b/doc_src/cmds/cd.rst
index 38ea70d94..99e6a691e 100644
--- a/doc_src/cmds/cd.rst
+++ b/doc_src/cmds/cd.rst
@@ -6,7 +6,9 @@ cd - change directory
 Synopsis
 --------
 
-**cd** [*DIRECTORY*]
+.. synopsis::
+
+    cd [DIRECTORY]
 
 Description
 -----------
diff --git a/doc_src/cmds/cdh.rst b/doc_src/cmds/cdh.rst
index d85a494fd..4a47b1656 100644
--- a/doc_src/cmds/cdh.rst
+++ b/doc_src/cmds/cdh.rst
@@ -6,7 +6,9 @@ cdh - change to a recently visited directory
 Synopsis
 --------
 
-``cdh`` [*DIR*]
+.. synopsis::
+
+    cdh [DIR]
 
 Description
 -----------
diff --git a/doc_src/cmds/command.rst b/doc_src/cmds/command.rst
index 598172169..c0249fc14 100644
--- a/doc_src/cmds/command.rst
+++ b/doc_src/cmds/command.rst
@@ -6,7 +6,9 @@ command - run a program
 Synopsis
 --------
 
-**command** [**OPTIONS**] [*COMMANDNAME* [ARG ...]]
+.. synopsis::
+
+    command [OPTIONS] [COMMANDNAME [ARG ...]]
 
 Description
 -----------
diff --git a/doc_src/cmds/commandline.rst b/doc_src/cmds/commandline.rst
index b58835944..411bd83f3 100644
--- a/doc_src/cmds/commandline.rst
+++ b/doc_src/cmds/commandline.rst
@@ -6,7 +6,9 @@ commandline - set or get the current command line buffer
 Synopsis
 --------
 
-``commandline`` [*OPTIONS*] [*CMD*]
+.. synopsis::
+
+    commandline [OPTIONS] [CMD]
 
 Description
 -----------
diff --git a/doc_src/cmds/complete.rst b/doc_src/cmds/complete.rst
index 91c17c31c..501dbe1c0 100644
--- a/doc_src/cmds/complete.rst
+++ b/doc_src/cmds/complete.rst
@@ -6,8 +6,10 @@ complete - edit command specific tab-completions
 Synopsis
 --------
 
-``complete`` ((**-c** | **--command**) | (**-p** | **--path**)) *COMMAND* [*options*] 
-``complete`` ((**-C** | **--do-complete**)) *STRING*
+.. synopsis::
+
+    complete ((-c | --command) | (-p | --path)) COMMAND [options] 
+    complete ((-C | --do-complete)) STRING
 
 Description
 -----------
diff --git a/doc_src/cmds/contains.rst b/doc_src/cmds/contains.rst
index 283c765b3..7d79238c5 100644
--- a/doc_src/cmds/contains.rst
+++ b/doc_src/cmds/contains.rst
@@ -6,7 +6,9 @@ contains - test if a word is present in a list
 Synopsis
 --------
 
-``contains`` [**options**] *KEY* [*VALUES* ...]
+.. synopsis::
+
+    contains [options] KEY [VALUES ...]
 
 Description
 -----------
diff --git a/doc_src/cmds/continue.rst b/doc_src/cmds/continue.rst
index 208f37ff1..275976c76 100644
--- a/doc_src/cmds/continue.rst
+++ b/doc_src/cmds/continue.rst
@@ -6,7 +6,9 @@ continue - skip the remainder of the current iteration of the current inner loop
 Synopsis
 --------
 
-**LOOP_CONSTRUCT**; [*COMMANDS* ...;] **continue**; [*COMMANDS* ...;] **end**
+.. synopsis::
+
+    LOOP_CONSTRUCT; [COMMANDS ...;] continue; [COMMANDS ...;] end
 
 Description
 -----------
diff --git a/doc_src/cmds/count.rst b/doc_src/cmds/count.rst
index 2ebd5859f..cda64bd3c 100644
--- a/doc_src/cmds/count.rst
+++ b/doc_src/cmds/count.rst
@@ -6,9 +6,11 @@ count - count the number of elements of a list
 Synopsis
 --------
 
-| ``count`` string1 string2 ...
-| *command* | ``count``
-| ``count`` [...] < *FILE*
+.. synopsis::
+
+    count string1 string2 ...
+    command | count
+    count [...] < FILE
 
 Description
 -----------
diff --git a/doc_src/cmds/dirh.rst b/doc_src/cmds/dirh.rst
index d55a6de85..d226a257d 100644
--- a/doc_src/cmds/dirh.rst
+++ b/doc_src/cmds/dirh.rst
@@ -6,7 +6,9 @@ dirh - print directory history
 Synopsis
 --------
 
-``dirh``
+.. synopsis::
+
+    dirh
 
 Description
 -----------
diff --git a/doc_src/cmds/dirs.rst b/doc_src/cmds/dirs.rst
index 837f892ca..613ec96e9 100644
--- a/doc_src/cmds/dirs.rst
+++ b/doc_src/cmds/dirs.rst
@@ -6,7 +6,9 @@ dirs - print directory stack
 Synopsis
 --------
 
-``dirs`` [*-c*]
+.. synopsis::
+
+    dirs [-c]
 
 Description
 -----------
diff --git a/doc_src/cmds/disown.rst b/doc_src/cmds/disown.rst
index c6b972604..678f33c39 100644
--- a/doc_src/cmds/disown.rst
+++ b/doc_src/cmds/disown.rst
@@ -6,7 +6,9 @@ disown - remove a process from the list of jobs
 Synopsis
 --------
 
-``disown`` [**PID** ...]
+.. synopsis::
+
+    disown [PID ...]
 
 Description
 -----------
diff --git a/doc_src/cmds/echo.rst b/doc_src/cmds/echo.rst
index 5cf5de3e7..9fb0adb05 100644
--- a/doc_src/cmds/echo.rst
+++ b/doc_src/cmds/echo.rst
@@ -6,7 +6,9 @@ echo - display a line of text
 Synopsis
 --------
 
-``echo`` [*options*] [*STRING*]
+.. synopsis::
+
+    echo [options] [STRING]
 
 Description
 -----------
diff --git a/doc_src/cmds/else.rst b/doc_src/cmds/else.rst
index 2d93270b1..62aa655d0 100644
--- a/doc_src/cmds/else.rst
+++ b/doc_src/cmds/else.rst
@@ -6,7 +6,9 @@ else - execute command if a condition is not met
 Synopsis
 --------
 
-**if** *CONDITION*; *COMMANDS_TRUE* ...; [**else**; *COMMANDS_FALSE* ...;] **end**
+.. synopsis::
+
+    if CONDITION; COMMANDS_TRUE ...; [else; COMMANDS_FALSE ...;] end
 
 Description
 -----------
diff --git a/doc_src/cmds/emit.rst b/doc_src/cmds/emit.rst
index b4696b08d..6b11a15f3 100644
--- a/doc_src/cmds/emit.rst
+++ b/doc_src/cmds/emit.rst
@@ -6,7 +6,9 @@ emit - emit a generic event
 Synopsis
 --------
 
-``emit`` *EVENT_NAME* [*ARGUMENTS* ...]
+.. synopsis::
+
+    emit EVENT_NAME [ARGUMENTS ...]
 
 Description
 -----------
diff --git a/doc_src/cmds/end.rst b/doc_src/cmds/end.rst
index 4300a7cd8..9ceb17e1e 100644
--- a/doc_src/cmds/end.rst
+++ b/doc_src/cmds/end.rst
@@ -6,15 +6,19 @@ end - end a block of commands
 Synopsis
 --------
 
-| **begin**
-|     [*COMMANDS* ...] 
-| **end**
+.. synopsis::
 
-| **function** *NAME* [*OPTIONS*]; *COMMANDS* ...; **end**
-| **if** *CONDITION*; *COMMANDS_TRUE* ...; [**else**; *COMMANDS_FALSE* ...;] **end**
-| **switch** *VALUE*; [**case** [*WILDCARD* ...]; [*COMMANDS* ...]; ...] **end**
-| **while** *CONDITION*; *COMMANDS* ...; **end**
-| **for** *VARNAME* in [*VALUES* ...]; **COMMANDS** ...; **end**
+    begin
+        [COMMANDS ...] 
+    end
+
+.. synopsis::
+
+    function NAME [OPTIONS]; COMMANDS ...; end
+    if CONDITION; COMMANDS_TRUE ...; [else; COMMANDS_FALSE ...;] end
+    switch VALUE; [case [WILDCARD ...]; [COMMANDS ...]; ...] end
+    while CONDITION; COMMANDS ...; end
+    for VARNAME in [VALUES ...]; COMMANDS ...; end
 
 Description
 -----------
diff --git a/doc_src/cmds/eval.rst b/doc_src/cmds/eval.rst
index 867158c2f..2b05fdb84 100644
--- a/doc_src/cmds/eval.rst
+++ b/doc_src/cmds/eval.rst
@@ -6,7 +6,9 @@ eval - evaluate the specified commands
 Synopsis
 --------
 
-**eval** [*COMMANDS* ...]
+.. synopsis::
+
+    eval [COMMANDS ...]
 
 Description
 -----------
diff --git a/doc_src/cmds/exec.rst b/doc_src/cmds/exec.rst
index 25987acf9..28be61f50 100644
--- a/doc_src/cmds/exec.rst
+++ b/doc_src/cmds/exec.rst
@@ -6,7 +6,9 @@ exec - execute command in current process
 Synopsis
 --------
 
-**exec** *COMMAND*
+.. synopsis::
+
+    exec COMMAND
 
 Description
 -----------
diff --git a/doc_src/cmds/exit.rst b/doc_src/cmds/exit.rst
index 8ff971896..f3f481c9a 100644
--- a/doc_src/cmds/exit.rst
+++ b/doc_src/cmds/exit.rst
@@ -7,7 +7,9 @@ exit - exit the shell
 Synopsis
 --------
 
-**exit** [*code*]
+.. synopsis::
+
+    exit [code]
 
 Description
 -----------
diff --git a/doc_src/cmds/false.rst b/doc_src/cmds/false.rst
index e7c5ec9f6..1910e8647 100644
--- a/doc_src/cmds/false.rst
+++ b/doc_src/cmds/false.rst
@@ -6,7 +6,9 @@ false - return an unsuccessful result
 Synopsis
 --------
 
-**false**
+.. synopsis::
+
+    false
 
 Description
 -----------
diff --git a/doc_src/cmds/fg.rst b/doc_src/cmds/fg.rst
index 6bf4be662..7db7cc1dd 100644
--- a/doc_src/cmds/fg.rst
+++ b/doc_src/cmds/fg.rst
@@ -6,7 +6,9 @@ fg - bring job to foreground
 Synopsis
 --------
 
-``fg`` [*PID*]
+.. synopsis::
+
+    fg [PID]
 
 Description
 -----------
diff --git a/doc_src/cmds/fish.rst b/doc_src/cmds/fish.rst
index 22670453d..559c1f8c0 100644
--- a/doc_src/cmds/fish.rst
+++ b/doc_src/cmds/fish.rst
@@ -7,8 +7,10 @@ fish - the friendly interactive shell
 Synopsis
 --------
 
-| ``fish`` [*OPTIONS*] [*FILE* [ARG ...]]
-| ``fish`` [*OPTIONS*] [**-c** *COMMAND* [ARG ...]]
+.. synopsis::
+
+    fish [OPTIONS] [FILE [ARG ...]]
+    fish [OPTIONS] [-c COMMAND [ARG ...]]
 
 Description
 -----------
diff --git a/doc_src/cmds/fish_add_path.rst b/doc_src/cmds/fish_add_path.rst
index d397e0ff8..9fedec533 100644
--- a/doc_src/cmds/fish_add_path.rst
+++ b/doc_src/cmds/fish_add_path.rst
@@ -7,8 +7,10 @@ fish_add_path - add to the path
 Synopsis
 --------
 
-| ``fish_add_path`` *path* ...
-| ``fish_add_path`` [(*-g* | *--global*) | (*-U* | *--universal*) | (*-P* | *--path*)] [(*-m* | *--move*)] [(*-a* | *--append*) | (*-p* | *--prepend*)] [(*-v* | *--verbose*) | (*-n* | *--dry-run*)] *paths* ...
+.. synopsis::
+
+    fish_add_path path ...
+    fish_add_path [(-g | --global) | (-U | --universal) | (-P | --path)] [(-m | --move)] [(-a | --append) | (-p | --prepend)] [(-v | --verbose) | (-n | --dry-run)] paths ...
 
 
 Description
diff --git a/doc_src/cmds/fish_breakpoint_prompt.rst b/doc_src/cmds/fish_breakpoint_prompt.rst
index 8eeb4025c..af8f12838 100644
--- a/doc_src/cmds/fish_breakpoint_prompt.rst
+++ b/doc_src/cmds/fish_breakpoint_prompt.rst
@@ -6,7 +6,10 @@ fish_breakpoint_prompt - define the prompt when stopped at a breakpoint
 Synopsis
 --------
 
-**fish_breakpoint_prompt**
+.. synopsis::
+
+    fish_breakpoint_prompt
+
 ::
 
     function fish_breakpoint_prompt
diff --git a/doc_src/cmds/fish_command_not_found.rst b/doc_src/cmds/fish_command_not_found.rst
index bed9071e8..007f4ef00 100644
--- a/doc_src/cmds/fish_command_not_found.rst
+++ b/doc_src/cmds/fish_command_not_found.rst
@@ -6,9 +6,11 @@ fish_command_not_found - what to do when a command wasn't found
 Synopsis
 --------
 
-| **function** ``fish_command_not_found``
-|    ...
-| **end**
+.. synopsis::
+
+    function fish_command_not_found
+       ...
+    end
 
 
 Description
diff --git a/doc_src/cmds/fish_config.rst b/doc_src/cmds/fish_config.rst
index 08503d723..1ae913680 100644
--- a/doc_src/cmds/fish_config.rst
+++ b/doc_src/cmds/fish_config.rst
@@ -6,9 +6,11 @@ fish_config - start the web-based configuration interface
 Synopsis
 --------
 
-| ``fish_config`` [browse]
-| ``fish_config`` **prompt** (choose | list | save | show)
-| ``fish_config`` **theme** (choose | demo | dump | list | save | show)
+.. synopsis::
+
+    fish_config [browse]
+    fish_config prompt (choose | list | save | show)
+    fish_config theme (choose | demo | dump | list | save | show)
 
 Description
 -----------
diff --git a/doc_src/cmds/fish_git_prompt.rst b/doc_src/cmds/fish_git_prompt.rst
index 88b0dadfa..3d8a1623c 100644
--- a/doc_src/cmds/fish_git_prompt.rst
+++ b/doc_src/cmds/fish_git_prompt.rst
@@ -6,12 +6,15 @@ fish_git_prompt - output git information for use in a prompt
 Synopsis
 --------
 
-``fish_git_prompt``
+.. synopsis::
+
+    fish_git_prompt
+
 ::
 
-     function fish_prompt
-          printf '%s' $PWD (fish_git_prompt) ' $ '
-     end
+    function fish_prompt
+         printf '%s' $PWD (fish_git_prompt) ' $ '
+    end
 
 
 Description
diff --git a/doc_src/cmds/fish_greeting.rst b/doc_src/cmds/fish_greeting.rst
index 722addee8..c5c06b903 100644
--- a/doc_src/cmds/fish_greeting.rst
+++ b/doc_src/cmds/fish_greeting.rst
@@ -6,7 +6,10 @@ fish_greeting - display a welcome message in interactive shells
 Synopsis
 --------
 
-**fish_greeting**
+.. synopsis::
+
+    fish_greeting
+
 ::
 
   function fish_greeting
diff --git a/doc_src/cmds/fish_hg_prompt.rst b/doc_src/cmds/fish_hg_prompt.rst
index 0fa7dc3aa..b2f96dbc1 100644
--- a/doc_src/cmds/fish_hg_prompt.rst
+++ b/doc_src/cmds/fish_hg_prompt.rst
@@ -6,7 +6,10 @@ fish_hg_prompt - output Mercurial information for use in a prompt
 Synopsis
 --------
 
-**fish_hg_prompt**
+.. synopsis::
+
+    fish_hg_prompt
+
 ::
 
      function fish_prompt
diff --git a/doc_src/cmds/fish_indent.rst b/doc_src/cmds/fish_indent.rst
index 855def6f4..bab448292 100644
--- a/doc_src/cmds/fish_indent.rst
+++ b/doc_src/cmds/fish_indent.rst
@@ -7,7 +7,9 @@ fish_indent - indenter and prettifier
 Synopsis
 --------
 
-**fish_indent** [*OPTIONS*] [*FILE* ...]
+.. synopsis::
+
+    fish_indent [OPTIONS] [FILE ...]
 
 
 Description
diff --git a/doc_src/cmds/fish_is_root_user.rst b/doc_src/cmds/fish_is_root_user.rst
index 45c030a89..9bfb73ba5 100644
--- a/doc_src/cmds/fish_is_root_user.rst
+++ b/doc_src/cmds/fish_is_root_user.rst
@@ -6,7 +6,9 @@ fish_is_root_user - check if the current user is root
 Synopsis
 --------
 
-**fish_is_root_user**
+.. synopsis::
+
+    fish_is_root_user
 
 Description
 -----------
diff --git a/doc_src/cmds/fish_key_reader.rst b/doc_src/cmds/fish_key_reader.rst
index 32074a63c..ed26554a7 100644
--- a/doc_src/cmds/fish_key_reader.rst
+++ b/doc_src/cmds/fish_key_reader.rst
@@ -6,7 +6,9 @@ fish_key_reader - explore what characters keyboard keys send
 Synopsis
 --------
 
-**fish_key_reader** [*OPTIONS*]
+.. synopsis::
+
+    fish_key_reader [OPTIONS]
 
 Description
 -----------
diff --git a/doc_src/cmds/fish_mode_prompt.rst b/doc_src/cmds/fish_mode_prompt.rst
index 62ffa09b9..42632f12c 100644
--- a/doc_src/cmds/fish_mode_prompt.rst
+++ b/doc_src/cmds/fish_mode_prompt.rst
@@ -6,7 +6,10 @@ fish_mode_prompt - define the appearance of the mode indicator
 Synopsis
 --------
 
-**fish_mode_prompt**
+.. synopsis::
+
+    fish_mode_prompt
+
 ::
 
      function fish_mode_prompt
diff --git a/doc_src/cmds/fish_opt.rst b/doc_src/cmds/fish_opt.rst
index 4ff8ac573..140c5aaf2 100644
--- a/doc_src/cmds/fish_opt.rst
+++ b/doc_src/cmds/fish_opt.rst
@@ -5,8 +5,11 @@ fish_opt - create an option spec for the argparse command
 
 Synopsis
 --------
-| ``fish_opt`` [**--help**]
-| ``fish_opt`` [(**-slor**, **--multiple-vals=**) *optname*]
+
+.. synopsis::
+
+    fish_opt [--help]
+    fish_opt [(-slor | --multiple-vals=) optname]
 
 Description
 -----------
diff --git a/doc_src/cmds/fish_prompt.rst b/doc_src/cmds/fish_prompt.rst
index 74ace8422..097bac4bd 100644
--- a/doc_src/cmds/fish_prompt.rst
+++ b/doc_src/cmds/fish_prompt.rst
@@ -6,7 +6,10 @@ fish_prompt - define the appearance of the command line prompt
 Synopsis
 --------
 
-``fish_prompt``
+.. synopsis::
+
+    fish_prompt
+
 ::
 
   function fish_prompt
diff --git a/doc_src/cmds/fish_status_to_signal.rst b/doc_src/cmds/fish_status_to_signal.rst
index 2ef79dee0..4d81db8c1 100644
--- a/doc_src/cmds/fish_status_to_signal.rst
+++ b/doc_src/cmds/fish_status_to_signal.rst
@@ -6,7 +6,10 @@ fish_status_to_signal - convert exit codes to human-friendly signals
 Synopsis
 --------
 
-``fish_status_to_signal`` *NUM*
+.. synopsis::
+
+    fish_status_to_signal NUM
+
 ::
 
     function fish_prompt
diff --git a/doc_src/cmds/fish_svn_prompt.rst b/doc_src/cmds/fish_svn_prompt.rst
index 589faf9cb..edc86b65d 100644
--- a/doc_src/cmds/fish_svn_prompt.rst
+++ b/doc_src/cmds/fish_svn_prompt.rst
@@ -6,7 +6,10 @@ fish_svn_prompt - output Subversion information for use in a prompt
 Synopsis
 --------
 
-``fish_svn_prompt``
+.. synopsis::
+
+    fish_svn_prompt
+
 ::
 
      function fish_prompt
diff --git a/doc_src/cmds/fish_title.rst b/doc_src/cmds/fish_title.rst
index 7c4046a1f..d286d1445 100644
--- a/doc_src/cmds/fish_title.rst
+++ b/doc_src/cmds/fish_title.rst
@@ -6,7 +6,10 @@ fish_title - define the terminal's title
 Synopsis
 --------
 
-``fish_title``
+.. synopsis::
+
+    fish_title
+
 ::
 
   function fish_title
diff --git a/doc_src/cmds/fish_update_completions.rst b/doc_src/cmds/fish_update_completions.rst
index b8d155dbb..340dbb343 100644
--- a/doc_src/cmds/fish_update_completions.rst
+++ b/doc_src/cmds/fish_update_completions.rst
@@ -6,7 +6,9 @@ fish_update_completions - update completions using manual pages
 Synopsis
 --------
 
-``fish_update_completions``
+.. synopsis::
+
+    fish_update_completions
 
 Description
 -----------
diff --git a/doc_src/cmds/fish_vcs_prompt.rst b/doc_src/cmds/fish_vcs_prompt.rst
index 9e5da1be0..15eb3997d 100644
--- a/doc_src/cmds/fish_vcs_prompt.rst
+++ b/doc_src/cmds/fish_vcs_prompt.rst
@@ -6,7 +6,10 @@ fish_vcs_prompt - output version control system information for use in a prompt
 Synopsis
 --------
 
-``fish_vcs_prompt``
+.. synopsis::
+
+    fish_vcs_prompt
+
 ::
 
      function fish_prompt
diff --git a/doc_src/cmds/for.rst b/doc_src/cmds/for.rst
index 36e15ddce..4d5064cc5 100644
--- a/doc_src/cmds/for.rst
+++ b/doc_src/cmds/for.rst
@@ -6,7 +6,9 @@ for - perform a set of commands multiple times
 Synopsis
 --------
 
-**for** *VARNAME* in [*VALUES* ...]; *COMMANDS* ...; **end**
+.. synopsis::
+
+    for VARNAME in [VALUES ...]; COMMANDS ...; end
 
 Description
 -----------
diff --git a/doc_src/cmds/funced.rst b/doc_src/cmds/funced.rst
index b78920b01..596baf4e8 100644
--- a/doc_src/cmds/funced.rst
+++ b/doc_src/cmds/funced.rst
@@ -6,7 +6,9 @@ funced - edit a function interactively
 Synopsis
 --------
 
-``funced`` [**OPTIONS**] *NAME*
+.. synopsis::
+
+    funced [OPTIONS] NAME
 
 Description
 -----------
diff --git a/doc_src/cmds/funcsave.rst b/doc_src/cmds/funcsave.rst
index 923530999..76b3a0dde 100644
--- a/doc_src/cmds/funcsave.rst
+++ b/doc_src/cmds/funcsave.rst
@@ -6,8 +6,10 @@ funcsave - save the definition of a function to the user's autoload directory
 Synopsis
 --------
 
-| ``funcsave`` *FUNCTION_NAME*
-| ``funcsave`` [**-q**] [(**-d** | **--directory**) *DIR*] *FUNCTION_NAME*
+.. synopsis::
+
+    funcsave FUNCTION_NAME
+    funcsave [-q] [(-d | --directory) DIR] FUNCTION_NAME
 
 
 Description
diff --git a/doc_src/cmds/function.rst b/doc_src/cmds/function.rst
index 2ec3d990a..abb3ba33c 100644
--- a/doc_src/cmds/function.rst
+++ b/doc_src/cmds/function.rst
@@ -6,7 +6,9 @@ function - create a function
 Synopsis
 --------
 
-**function** *NAME* [*OPTIONS*]; *BODY*; **end**
+.. synopsis::
+
+    function NAME [OPTIONS]; BODY; end
 
 
 Description
diff --git a/doc_src/cmds/functions.rst b/doc_src/cmds/functions.rst
index bb7b0e801..cdd0da710 100644
--- a/doc_src/cmds/functions.rst
+++ b/doc_src/cmds/functions.rst
@@ -6,11 +6,13 @@ functions - print or erase functions
 Synopsis
 --------
 
-| **functions** [**-a** | **--all**] [**-n** | **--names**]
-| **functions** [**-D** | **--details**] [**-v**] *FUNCTION*
-| **functions** **-c** *OLDNAME* *NEWNAME*
-| **functions** **-d** *DESCRIPTION* *FUNCTION*
-| **functions** [**-e** | **-q**] *FUNCTION* ...
+.. synopsis::
+
+    functions [-a | --all] [-n | --names]
+    functions [-D | --details] [-v] FUNCTION
+    functions -c OLDNAME NEWNAME
+    functions -d DESCRIPTION FUNCTION
+    functions [-e | -q] FUNCTION ...
 
 Description
 -----------
diff --git a/doc_src/cmds/help.rst b/doc_src/cmds/help.rst
index 1b6af322b..8a344338b 100644
--- a/doc_src/cmds/help.rst
+++ b/doc_src/cmds/help.rst
@@ -6,7 +6,9 @@ help - display fish documentation
 Synopsis
 --------
 
-``help`` [*SECTION*]
+.. synopsis::
+
+    help [SECTION]
 
 Description
 -----------
diff --git a/doc_src/cmds/history.rst b/doc_src/cmds/history.rst
index 46be50164..cb4b36cbb 100644
--- a/doc_src/cmds/history.rst
+++ b/doc_src/cmds/history.rst
@@ -6,15 +6,17 @@ history - show and manipulate command history
 Synopsis
 --------
 
-| ``history`` [**search**] [**--show-time**] [**--case-sensitive**]
-        \                  [**--exact** | **--prefix** | **--contains**] [**--max** *n*] [**--null**] [**--reverse**]
-        \                  [*SEARCH_STRING* ...]
-| ``history`` **delete** [**--case-sensitive**]
-        \                [**--exact** | **--prefix** | **--contains**] *SEARCH_STRING* ...
-| ``history`` **merge**
-| ``history`` **save**
-| ``history`` **clear**
-| ``history`` **clear-session**
+.. synopsis::
+
+    history [search] [--show-time] [--case-sensitive]
+                     [--exact | --prefix | --contains] [--max n] [--null] [--reverse]
+                     [SEARCH_STRING ...]
+    history delete [--case-sensitive]
+                   [--exact | --prefix | --contains] SEARCH_STRING ...
+    history merge
+    history save
+    history clear
+    history clear-session
 
 Description
 -----------
diff --git a/doc_src/cmds/if.rst b/doc_src/cmds/if.rst
index 2f6aa65ce..771fcdfe5 100644
--- a/doc_src/cmds/if.rst
+++ b/doc_src/cmds/if.rst
@@ -6,10 +6,12 @@ if - conditionally execute a command
 Synopsis
 --------
 
-| **if** *CONDITION*; *COMMANDS_TRUE* ...;
-| [**else** **if** *CONDITION2*; *COMMANDS_TRUE2* ...;]
-| [**else**; *COMMANDS_FALSE* ...;]
-| **end**
+.. synopsis::
+
+    if CONDITION; COMMANDS_TRUE ...;
+    [else if CONDITION2; COMMANDS_TRUE2 ...;]
+    [else; COMMANDS_FALSE ...;]
+    end
 
 Description
 -----------
diff --git a/doc_src/cmds/isatty.rst b/doc_src/cmds/isatty.rst
index cbd52bb2e..f3417aca2 100644
--- a/doc_src/cmds/isatty.rst
+++ b/doc_src/cmds/isatty.rst
@@ -6,7 +6,9 @@ isatty - test if a file descriptor is a terminal
 Synopsis
 --------
 
-``isatty`` [*FILE DESCRIPTOR*]
+.. synopsis::
+
+    isatty [FILE DESCRIPTOR]
 
 Description
 -----------
diff --git a/doc_src/cmds/jobs.rst b/doc_src/cmds/jobs.rst
index 0453247de..f84dd592c 100644
--- a/doc_src/cmds/jobs.rst
+++ b/doc_src/cmds/jobs.rst
@@ -6,7 +6,9 @@ jobs - print currently running jobs
 Synopsis
 --------
 
-``jobs`` [*OPTIONS*] [*PID* | %*JOBID*]
+.. synopsis::
+
+    jobs [OPTIONS] [PID | %JOBID]
 
 
 Description
diff --git a/doc_src/cmds/math.rst b/doc_src/cmds/math.rst
index 7f0b043f1..db203669e 100644
--- a/doc_src/cmds/math.rst
+++ b/doc_src/cmds/math.rst
@@ -6,7 +6,9 @@ math - perform mathematics calculations
 Synopsis
 --------
 
-``math`` [(**-s** | **--scale**) *N*] [(**-b** | **--base**) *BASE*] *EXPRESSION* ...
+.. synopsis::
+
+    math [(-s | --scale) N] [(-b | --base) BASE] EXPRESSION ...
 
 
 Description
diff --git a/doc_src/cmds/nextd.rst b/doc_src/cmds/nextd.rst
index 72f6d1b8b..6ea10f316 100644
--- a/doc_src/cmds/nextd.rst
+++ b/doc_src/cmds/nextd.rst
@@ -6,7 +6,9 @@ nextd - move forward through directory history
 Synopsis
 --------
 
-``nextd`` [**-l** | **--list**] [*POS*]
+.. synopsis::
+
+    nextd [-l | --list] [POS]
 
 Description
 -----------
diff --git a/doc_src/cmds/not.rst b/doc_src/cmds/not.rst
index 3168f1956..6e7a9c375 100644
--- a/doc_src/cmds/not.rst
+++ b/doc_src/cmds/not.rst
@@ -6,7 +6,9 @@ not - negate the exit status of a job
 Synopsis
 --------
 
-**not** *COMMAND* [*options* ...]
+.. synopsis::
+
+    not COMMAND [options ...]
 
 
 Description
diff --git a/doc_src/cmds/open.rst b/doc_src/cmds/open.rst
index 3bff34c4e..9f9875d27 100644
--- a/doc_src/cmds/open.rst
+++ b/doc_src/cmds/open.rst
@@ -6,7 +6,9 @@ open - open file in its default application
 Synopsis
 --------
 
-``open`` *FILES* ...
+.. synopsis::
+
+    open FILES ...
 
 
 Description
diff --git a/doc_src/cmds/or.rst b/doc_src/cmds/or.rst
index 8a932d802..52c547661 100644
--- a/doc_src/cmds/or.rst
+++ b/doc_src/cmds/or.rst
@@ -6,7 +6,9 @@ or - conditionally execute a command
 Synopsis
 --------
 
-*COMMAND1*; **or** *COMMAND2*
+.. synopsis::
+
+    COMMAND1; or COMMAND2
 
 Description
 -----------
diff --git a/doc_src/cmds/popd.rst b/doc_src/cmds/popd.rst
index 38567b5df..3eb6b8ad5 100644
--- a/doc_src/cmds/popd.rst
+++ b/doc_src/cmds/popd.rst
@@ -6,7 +6,9 @@ popd - move through directory stack
 Synopsis
 --------
 
-``popd``
+.. synopsis::
+
+    popd
 
 Description
 -----------
diff --git a/doc_src/cmds/prevd.rst b/doc_src/cmds/prevd.rst
index 2a1345b52..3d9a310ee 100644
--- a/doc_src/cmds/prevd.rst
+++ b/doc_src/cmds/prevd.rst
@@ -6,7 +6,9 @@ prevd - move backward through directory history
 Synopsis
 --------
 
-``prevd`` [**-l** | **--list**] [*POS*]
+.. synopsis::
+
+    prevd [-l | --list] [POS]
 
 Description
 -----------
diff --git a/doc_src/cmds/printf.rst b/doc_src/cmds/printf.rst
index 2febca422..be66487e8 100644
--- a/doc_src/cmds/printf.rst
+++ b/doc_src/cmds/printf.rst
@@ -6,7 +6,9 @@ printf - display text according to a format string
 Synopsis
 --------
 
-``printf`` *FORMAT* [*ARGUMENT* ...]
+.. synopsis::
+
+    printf FORMAT [ARGUMENT ...]
 
 Description
 -----------
diff --git a/doc_src/cmds/prompt_hostname.rst b/doc_src/cmds/prompt_hostname.rst
index 1751abaa2..386e62138 100644
--- a/doc_src/cmds/prompt_hostname.rst
+++ b/doc_src/cmds/prompt_hostname.rst
@@ -6,7 +6,9 @@ prompt_hostname - print the hostname, shortened for use in the prompt
 Synopsis
 --------
 
-``prompt_hostname``
+.. synopsis::
+
+    prompt_hostname
 
 Description
 -----------
diff --git a/doc_src/cmds/prompt_login.rst b/doc_src/cmds/prompt_login.rst
index 2741e4b6a..b69dbc5d4 100644
--- a/doc_src/cmds/prompt_login.rst
+++ b/doc_src/cmds/prompt_login.rst
@@ -6,7 +6,9 @@ prompt_login - describe the login suitable for prompt
 Synopsis
 --------
 
-``prompt_login``
+.. synopsis::
+
+    prompt_login
 
 Description
 -----------
diff --git a/doc_src/cmds/prompt_pwd.rst b/doc_src/cmds/prompt_pwd.rst
index 7437694f7..47a5a7fd9 100644
--- a/doc_src/cmds/prompt_pwd.rst
+++ b/doc_src/cmds/prompt_pwd.rst
@@ -6,7 +6,9 @@ prompt_pwd - print pwd suitable for prompt
 Synopsis
 --------
 
-``prompt_pwd``
+.. synopsis::
+
+    prompt_pwd
 
 Description
 -----------
diff --git a/doc_src/cmds/psub.rst b/doc_src/cmds/psub.rst
index f83e086cc..bf0be47d1 100644
--- a/doc_src/cmds/psub.rst
+++ b/doc_src/cmds/psub.rst
@@ -6,7 +6,9 @@ psub - perform process substitution
 Synopsis
 --------
 
-*COMMAND1* ( *COMMAND2* | ``psub`` [**-F** | -**-fifo**] [**-f** | **--file**] [(**-s** | **--suffix**) *SUFFIX*] )
+.. synopsis::
+
+    COMMAND1 ( COMMAND2 | psub [-F | --fifo] [-f | --file] [(-s | --suffix) SUFFIX] )
 
 Description
 -----------
diff --git a/doc_src/cmds/pushd.rst b/doc_src/cmds/pushd.rst
index 66fd57a33..95f256816 100644
--- a/doc_src/cmds/pushd.rst
+++ b/doc_src/cmds/pushd.rst
@@ -6,7 +6,9 @@ pushd - push directory to directory stack
 Synopsis
 --------
 
-``pushd`` *DIRECTORY*
+.. synopsis::
+
+    pushd DIRECTORY
 
 Description
 -----------
diff --git a/doc_src/cmds/pwd.rst b/doc_src/cmds/pwd.rst
index ce4244bdc..52fc3e107 100644
--- a/doc_src/cmds/pwd.rst
+++ b/doc_src/cmds/pwd.rst
@@ -6,8 +6,10 @@ pwd - output the current working directory
 Synopsis
 --------
 
-| ``pwd`` [**-P** | **--physical**]
-| ``pwd`` [**-L** | **--logical**]
+.. synopsis::
+
+    pwd [-P | --physical]
+    pwd [-L | --logical]
 
 
 Description
diff --git a/doc_src/cmds/random.rst b/doc_src/cmds/random.rst
index 6f77da8d1..f1a4ff8a4 100644
--- a/doc_src/cmds/random.rst
+++ b/doc_src/cmds/random.rst
@@ -6,11 +6,13 @@ random - generate random number
 Synopsis
 --------
 
-| ``random``
-| ``random`` *SEED*
-| ``random`` *START* *END*
-| ``random`` *START* *STEP* *END*
-| ``random`` choice [*ITEMS* ...]
+.. synopsis::
+
+    random
+    random SEED
+    random START END
+    random START STEP END
+    random choice [ITEMS ...]
 
 Description
 -----------
diff --git a/doc_src/cmds/read.rst b/doc_src/cmds/read.rst
index c52049b4b..1978ece47 100644
--- a/doc_src/cmds/read.rst
+++ b/doc_src/cmds/read.rst
@@ -6,7 +6,9 @@ read - read line of input into variables
 Synopsis
 --------
 
-``read`` [*options*] [*VARIABLE* ...]
+.. synopsis::
+
+    read [options] [VARIABLE ...]
 
 Description
 -----------
diff --git a/doc_src/cmds/realpath.rst b/doc_src/cmds/realpath.rst
index 2c8b0d9b4..3bf603246 100644
--- a/doc_src/cmds/realpath.rst
+++ b/doc_src/cmds/realpath.rst
@@ -7,7 +7,9 @@ realpath - convert a path to an absolute path without symlinks
 Synopsis
 --------
 
-**realpath** [*options*] *PATH*
+.. synopsis::
+
+    realpath [options] PATH
 
 Description
 -----------
diff --git a/doc_src/cmds/return.rst b/doc_src/cmds/return.rst
index 9bd84d001..405336f09 100644
--- a/doc_src/cmds/return.rst
+++ b/doc_src/cmds/return.rst
@@ -7,7 +7,9 @@ return - stop the current inner function
 Synopsis
 --------
 
-**return** [*n*]
+.. synopsis::
+
+    return [n]
 
 Description
 -----------
diff --git a/doc_src/cmds/set.rst b/doc_src/cmds/set.rst
index d0c36871e..b5363c2e1 100644
--- a/doc_src/cmds/set.rst
+++ b/doc_src/cmds/set.rst
@@ -6,13 +6,15 @@ set - display and change shell variables
 Synopsis
 --------
 
-| ``set`` [*scope options*]
-| ``set`` [*options*] *VARIABLE* *VALUES* ...
-| ``set`` [*options*] *VARIABLE*\[*INDICES*] *VALUES* ...
-| ``set`` (**-q** | **--query**) [*scope options*] *VARIABLE* ...
-| ``set`` (**-e** | **--erase**) [*scope options*] *VARIABLE* ...
-| ``set`` (**-e** | **--erase**) [*scope options*] *VARIABLE*\[*INDICES*] ...
-| ``set`` (**-S** | **--show**) *VARIABLE* ...
+.. synopsis::
+
+    set [scope options]
+    set [options] VARIABLE VALUES ...
+    set [options] VARIABLE[INDICES] VALUES ...
+    set (-q | --query) [scope options] VARIABLE ...
+    set (-e | --erase) [scope options] VARIABLE ...
+    set (-e | --erase) [scope options] VARIABLE[INDICES] ...
+    set (-S | --show) VARIABLE ...
 
 Description
 -----------
diff --git a/doc_src/cmds/set_color.rst b/doc_src/cmds/set_color.rst
index 15ba0f0fd..6c3bde437 100644
--- a/doc_src/cmds/set_color.rst
+++ b/doc_src/cmds/set_color.rst
@@ -6,7 +6,9 @@ set_color - set the terminal color
 Synopsis
 --------
 
-``set_color`` [*OPTIONS*] *VALUE*
+.. synopsis::
+
+    set_color [OPTIONS] VALUE
 
 Description
 -----------
diff --git a/doc_src/cmds/source.rst b/doc_src/cmds/source.rst
index 7baf42e15..25fe67f9f 100644
--- a/doc_src/cmds/source.rst
+++ b/doc_src/cmds/source.rst
@@ -6,8 +6,10 @@ source - evaluate contents of file
 Synopsis
 --------
 
-| **source** *FILE* [*arguments* ...]
-| ``somecommand`` | **source**
+.. synopsis::
+
+    source FILE [arguments ...]
+    somecommand | source
 
 
 Description
diff --git a/doc_src/cmds/status.rst b/doc_src/cmds/status.rst
index 076cfc612..670e2ba93 100644
--- a/doc_src/cmds/status.rst
+++ b/doc_src/cmds/status.rst
@@ -6,26 +6,28 @@ status - query fish runtime information
 Synopsis
 --------
 
-| **status**
-| **status** is-login
-| **status** is-interactive
-| **status** is-block
-| **status** is-breakpoint
-| **status** is-command-substitution
-| **status** is-no-job-control
-| **status** is-full-job-control
-| **status** is-interactive-job-control
-| **status** current-command
-| **status** filename
-| **status** basename
-| **status** dirname
-| **status** fish-path
-| **status** function
-| **status** line-number
-| **status** stack-trace
-| **status** job-control *CONTROL_TYPE*
-| **status** features
-| **status** test-feature *FEATURE*
+.. synopsis::
+
+    status
+    status is-login
+    status is-interactive
+    status is-block
+    status is-breakpoint
+    status is-command-substitution
+    status is-no-job-control
+    status is-full-job-control
+    status is-interactive-job-control
+    status current-command
+    status filename
+    status basename
+    status dirname
+    status fish-path
+    status function
+    status line-number
+    status stack-trace
+    status job-control CONTROL_TYPE
+    status features
+    status test-feature FEATURE
 
 Description
 -----------
diff --git a/doc_src/cmds/string-collect.rst b/doc_src/cmds/string-collect.rst
index 2851c09d2..fbacdd99b 100644
--- a/doc_src/cmds/string-collect.rst
+++ b/doc_src/cmds/string-collect.rst
@@ -6,7 +6,9 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-``string`` collect [**-N** | **--no-trim-newlines**] [*STRING* ...]
+.. synopsis::
+
+    string collect [-N | --no-trim-newlines] [STRING ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-escape.rst b/doc_src/cmds/string-escape.rst
index 4fffcae9b..cddc80184 100644
--- a/doc_src/cmds/string-escape.rst
+++ b/doc_src/cmds/string-escape.rst
@@ -6,8 +6,10 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-| ``string`` escape [**-n** | **--no-quoted**] [**--style=**] [*STRING* ...]
-| ``string`` unescape [**--style=**] [*STRING* ...]
+.. synopsis::
+
+    string escape [-n | --no-quoted] [--style=] [STRING ...]
+    string unescape [--style=] [STRING ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-join.rst b/doc_src/cmds/string-join.rst
index 658077b55..cf6a60c4a 100644
--- a/doc_src/cmds/string-join.rst
+++ b/doc_src/cmds/string-join.rst
@@ -6,8 +6,10 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-| ``string`` join [**-q** | **--quiet**] SEP [*STRING* ...]
-| ``string`` join0 [**-q** | **--quiet**] [*STRING* ...]
+.. synopsis::
+
+    string join [-q | --quiet] SEP [STRING ...]
+    string join0 [-q | --quiet] [STRING ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-length.rst b/doc_src/cmds/string-length.rst
index 03728116c..ec4fb9ed4 100644
--- a/doc_src/cmds/string-length.rst
+++ b/doc_src/cmds/string-length.rst
@@ -8,7 +8,9 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-``string`` length [**-q** | **--quiet**] [*STRING* ...]
+.. synopsis::
+
+    string length [-q | --quiet] [STRING ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-lower.rst b/doc_src/cmds/string-lower.rst
index a265bd049..08a36ca19 100644
--- a/doc_src/cmds/string-lower.rst
+++ b/doc_src/cmds/string-lower.rst
@@ -6,7 +6,9 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-``string`` lower [**-q** | **--quiet**] [*STRING* ...]
+.. synopsis::
+
+    string lower [-q | --quiet] [STRING ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-match.rst b/doc_src/cmds/string-match.rst
index 555ca6468..ceebaa0c4 100644
--- a/doc_src/cmds/string-match.rst
+++ b/doc_src/cmds/string-match.rst
@@ -6,9 +6,11 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-``string`` match [**-a** | **--all**] [**-e** | **--entire**] [**-i** | **--ignore-case**]
-         \       [**-r** | **--regex**] [**-n** | **--index**] [**-q** | **--quiet**] [**-v** | **--invert**]
-         \       *PATTERN* [*STRING* ...]
+.. synopsis::
+
+    string match [-a | --all] [-e | --entire] [-i | --ignore-case]
+                 [-r | --regex] [-n | --index] [-q | --quiet] [-v | --invert]
+                 PATTERN [STRING ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-pad.rst b/doc_src/cmds/string-pad.rst
index 4daaccbf6..c70ea6d5e 100644
--- a/doc_src/cmds/string-pad.rst
+++ b/doc_src/cmds/string-pad.rst
@@ -6,8 +6,10 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-``string`` pad [**-r** | **--right**] [(**-c** | **--char**) *CHAR*] [(**-w** | **--width**) *INTEGER*]
-         \     [*STRING* ...]
+.. synopsis::
+
+    string pad [-r | --right] [(-c | --char) CHAR] [(-w | --width) INTEGER]
+               [STRING ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-repeat.rst b/doc_src/cmds/string-repeat.rst
index dce27c6ba..53ada8f62 100644
--- a/doc_src/cmds/string-repeat.rst
+++ b/doc_src/cmds/string-repeat.rst
@@ -6,8 +6,10 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-``string`` repeat [(**-n** | **--count**) *COUNT*] [(**-m** | **--max**) *MAX*] [**-N** | **--no-newline**]
-         \        [**-q** | **--quiet**] [*STRING* ...]
+.. synopsis::
+
+    string repeat [(-n | --count) COUNT] [(-m | --max) MAX] [-N | --no-newline]
+                  [-q | --quiet] [STRING ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-replace.rst b/doc_src/cmds/string-replace.rst
index 0dcc6039e..2017f0c5b 100644
--- a/doc_src/cmds/string-replace.rst
+++ b/doc_src/cmds/string-replace.rst
@@ -6,8 +6,10 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-``string`` replace [**-a** | **--all**] [**-f** | **--filter**] [**-i** | **--ignore-case**]
-         \         [**-r** | **--regex**] [**-q** | **--quiet**] *PATTERN* *REPLACE* [*STRING* ...]
+.. synopsis::
+
+    string replace [-a | --all] [-f | --filter] [-i | --ignore-case]
+                   [-r | --regex] [-q | --quiet] PATTERN REPLACE [STRING ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-split.rst b/doc_src/cmds/string-split.rst
index 70e68b30b..480fb3336 100644
--- a/doc_src/cmds/string-split.rst
+++ b/doc_src/cmds/string-split.rst
@@ -6,10 +6,12 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-| ``string`` split [(**-m** | **--max**) *MAX*] [**-n** | **--no-empty**] [**-q** | **--quiet**]
-    \              [**-r** | **--right**] *SEP* [*STRING* ...]
-| ``string`` split0 [(**-m** | **--max**) *MAX*] [**-n** | **--no-empty**] [**-q** | **--quiet**]
-    \               [**-r** | **--right**] [*STRING* ...]
+.. synopsis::
+
+    string split [(-m | --max) MAX] [-n | --no-empty] [-q | --quiet]
+                 [-r | --right] SEP [STRING ...]
+    string split0 [(-m | --max) MAX] [-n | --no-empty] [-q | --quiet]
+                  [-r | --right] [STRING ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-sub.rst b/doc_src/cmds/string-sub.rst
index 368a0419a..784abe2e1 100644
--- a/doc_src/cmds/string-sub.rst
+++ b/doc_src/cmds/string-sub.rst
@@ -6,8 +6,10 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-``string`` sub [(**-s** | **--start**) *START*] [(**-l** | **--length**) *LENGTH*]
-         \     [**-q** | **--quiet**] [*STRING* ...]
+.. synopsis::
+
+    string sub [(-s | --start) START] [(-l | --length) LENGTH]
+               [-q | --quiet] [STRING ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-trim.rst b/doc_src/cmds/string-trim.rst
index 89832ac7a..16a67ab1a 100644
--- a/doc_src/cmds/string-trim.rst
+++ b/doc_src/cmds/string-trim.rst
@@ -6,8 +6,10 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-``string`` trim [**-l** | **--left**] [**-r** | **--right**] [(**-c** | **--chars**) *CHARS*]
-         \      [**-q** | **--quiet**] [*STRING* ...]
+.. synopsis::
+
+    string trim [-l | --left] [-r | --right] [(-c | --chars) CHARS]
+                [-q | --quiet] [STRING ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-upper.rst b/doc_src/cmds/string-upper.rst
index e8c7fe441..47f68fdf8 100644
--- a/doc_src/cmds/string-upper.rst
+++ b/doc_src/cmds/string-upper.rst
@@ -6,7 +6,9 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-``string`` upper [**-q** | **--quiet**] [*STRING* ...]
+.. synopsis::
+
+    string upper [-q | --quiet] [STRING ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string.rst b/doc_src/cmds/string.rst
index b101d6e7a..15a853945 100644
--- a/doc_src/cmds/string.rst
+++ b/doc_src/cmds/string.rst
@@ -6,31 +6,33 @@ string - manipulate strings
 Synopsis
 --------
 
-| ``string`` collect [**-N** | **--no-trim-newlines**] [*STRING* ...]
-| ``string`` escape [**-n** | **--no-quoted**] [**--style=**] [*STRING* ...]
-| ``string`` join [**-q** | **--quiet**] SEP [*STRING* ...]
-| ``string`` join0 [**-q** | **--quiet**] [*STRING* ...]
-| ``string`` length [**-q** | **--quiet**] [*STRING* ...]
-| ``string`` lower [**-q** | **--quiet**] [*STRING* ...]
-| ``string`` match [**-a** | **--all**] [**-e** | **--entire**] [**-i** | **--ignore-case**]
-    \              [**-r** | **--regex**] [**-n** | **--index**] [**-q** | **--quiet**] [**-v** | **--invert**]
-    \              *PATTERN* [*STRING* ...]
-| ``string`` pad [**-r** | **--right**] [**-c** | **--char** *CHAR*] [**-w** | **--width** *INTEGER*]
-    \            [*STRING* ...]
-| ``string`` repeat [(**-n** | **--count**) *COUNT*] [(**-m** | **--max**) *MAX*] [**-N** | **--no-newline**]
-    \               [**-q** | **--quiet**] [*STRING* ...]
-| ``string`` replace [**-a** | **--all**] [**-f** | **--filter**] [**-i** | **--ignore-case**]
-    \                [**-r** | **--regex**] [**-q** | **--quiet**] *PATTERN* *REPLACE* [*STRING* ...]
-| ``string`` split [(**-m** | **--max**) *MAX*] [**-n** | **--no-empty**] [**-q** | **--quiet**]
-    \              [**-r** | **--right**] *SEP* [*STRING* ...]
-| ``string`` split0 [(**-m** | **--max**) *MAX*] [**-n** | **--no-empty**] [**-q** | **--quiet**]
-    \               [**-r** | **--right**] [*STRING* ...]
-| ``string`` sub [(**-s** | **--start**) *START*] [(**-l** | **--length**) *LENGTH*]
-    \            [**-q** | **--quiet**] [*STRING* ...]
-| ``string`` trim [**-l** | **--left**] [**-r** | **--right**] [(**-c** | **--chars**) *CHARS*]
-    \             [**-q** | **--quiet**] [*STRING* ...]
-| ``string`` unescape [**--style=**] [*STRING* ...]
-| ``string`` upper [**-q** | **--quiet**] [*STRING* ...]
+.. synopsis::
+
+    string collect [-N | --no-trim-newlines] [STRING ...]
+    string escape [-n | --no-quoted] [--style=] [STRING ...]
+    string join [-q | --quiet] SEP [STRING ...]
+    string join0 [-q | --quiet] [STRING ...]
+    string length [-q | --quiet] [STRING ...]
+    string lower [-q | --quiet] [STRING ...]
+    string match [-a | --all] [-e | --entire] [-i | --ignore-case]
+                 [-r | --regex] [-n | --index] [-q | --quiet] [-v | --invert]
+                 PATTERN [STRING ...]
+    string pad [-r | --right] [-c | --char CHAR] [-w | --width INTEGER]
+               [STRING ...]
+    string repeat [(-n | --count) COUNT] [(-m | --max) MAX] [-N | --no-newline]
+                  [-q | --quiet] [STRING ...]
+    string replace [-a | --all] [-f | --filter] [-i | --ignore-case]
+                   [-r | --regex] [-q | --quiet] PATTERN REPLACE [STRING ...]
+    string split [(-m | --max) MAX] [-n | --no-empty] [-q | --quiet]
+                 [-r | --right] SEP [STRING ...]
+    string split0 [(-m | --max) MAX] [-n | --no-empty] [-q | --quiet]
+                  [-r | --right] [STRING ...]
+    string sub [(-s | --start) START] [(-l | --length) LENGTH]
+               [-q | --quiet] [STRING ...]
+    string trim [-l | --left] [-r | --right] [(-c | --chars) CHARS]
+                [-q | --quiet] [STRING ...]
+    string unescape [--style=] [STRING ...]
+    string upper [-q | --quiet] [STRING ...]
 
 Description
 -----------
diff --git a/doc_src/cmds/suspend.rst b/doc_src/cmds/suspend.rst
index 093490bd6..853044b87 100644
--- a/doc_src/cmds/suspend.rst
+++ b/doc_src/cmds/suspend.rst
@@ -6,7 +6,9 @@ suspend - suspend the current shell
 Synopsis
 --------
 
-``suspend`` [**--force**]
+.. synopsis::
+
+    suspend [--force]
 
 Description
 -----------
diff --git a/doc_src/cmds/switch.rst b/doc_src/cmds/switch.rst
index 735b6ba40..4079501a7 100644
--- a/doc_src/cmds/switch.rst
+++ b/doc_src/cmds/switch.rst
@@ -6,7 +6,9 @@ switch - conditionally execute a block of commands
 Synopsis
 --------
 
-**switch** *VALUE*; [**case** [*GLOB* ...]; [*COMMANDS* ...]; ...] **end**
+.. synopsis::
+
+    switch VALUE; [case [GLOB ...]; [COMMANDS ...]; ...] end
 
 Description
 -----------
diff --git a/doc_src/cmds/test.rst b/doc_src/cmds/test.rst
index a1b44921b..10ff53472 100644
--- a/doc_src/cmds/test.rst
+++ b/doc_src/cmds/test.rst
@@ -6,8 +6,10 @@ test - perform tests on files and text
 Synopsis
 --------
 
-| ``test`` [*EXPRESSION*]
-| ``[`` [*EXPRESSION*] ]
+.. synopsis::
+
+    test [EXPRESSION]
+    [ [EXPRESSION] ]
 
 
 Description
diff --git a/doc_src/cmds/time.rst b/doc_src/cmds/time.rst
index db2d73926..064f642fc 100644
--- a/doc_src/cmds/time.rst
+++ b/doc_src/cmds/time.rst
@@ -6,7 +6,9 @@ time - measure how long a command or block takes
 Synopsis
 --------
 
-**time** *COMMAND*
+.. synopsis::
+
+    time COMMAND
 
 Description
 -----------
diff --git a/doc_src/cmds/trap.rst b/doc_src/cmds/trap.rst
index 76603f8a9..117fb5974 100644
--- a/doc_src/cmds/trap.rst
+++ b/doc_src/cmds/trap.rst
@@ -6,7 +6,9 @@ trap - perform an action when the shell receives a signal
 Synopsis
 --------
 
-``trap`` [*options*] [[*ARG*] *REASON* ... ]
+.. synopsis::
+
+    trap [options] [[ARG] REASON ... ]
 
 Description
 -----------
diff --git a/doc_src/cmds/true.rst b/doc_src/cmds/true.rst
index 4010a9d73..9ffa1667f 100644
--- a/doc_src/cmds/true.rst
+++ b/doc_src/cmds/true.rst
@@ -6,7 +6,9 @@ true - return a successful result
 Synopsis
 --------
 
-``true``
+.. synopsis::
+
+    true
 
 Description
 -----------
diff --git a/doc_src/cmds/type.rst b/doc_src/cmds/type.rst
index 6d7b7d54a..45bc17bc0 100644
--- a/doc_src/cmds/type.rst
+++ b/doc_src/cmds/type.rst
@@ -6,7 +6,9 @@ type - locate a command and describe its type
 Synopsis
 --------
 
-``type`` [*options*] *NAME* [...]
+.. synopsis::
+
+    type [options] NAME [...]
 
 Description
 -----------
diff --git a/doc_src/cmds/ulimit.rst b/doc_src/cmds/ulimit.rst
index f34f644a8..7ad3cd00d 100644
--- a/doc_src/cmds/ulimit.rst
+++ b/doc_src/cmds/ulimit.rst
@@ -6,7 +6,9 @@ ulimit - set or get resource usage limits
 Synopsis
 --------
 
-``ulimit`` [**options**] [*limit*]
+.. synopsis::
+
+    ulimit [options] [limit]
 
 
 Description
diff --git a/doc_src/cmds/umask.rst b/doc_src/cmds/umask.rst
index 442394bb9..a455024e7 100644
--- a/doc_src/cmds/umask.rst
+++ b/doc_src/cmds/umask.rst
@@ -6,7 +6,9 @@ umask - set or get the file creation mode mask
 Synopsis
 --------
 
-``umask`` [**options**] [*MASK*]
+.. synopsis::
+
+    umask [options] [MASK]
 
 
 Description
diff --git a/doc_src/cmds/vared.rst b/doc_src/cmds/vared.rst
index 487ee7e56..0feda6108 100644
--- a/doc_src/cmds/vared.rst
+++ b/doc_src/cmds/vared.rst
@@ -6,7 +6,9 @@ vared - interactively edit the value of an environment variable
 Synopsis
 --------
 
-``vared`` *VARIABLE_NAME*
+.. synopsis::
+
+    vared VARIABLE_NAME
 
 Description
 -----------
diff --git a/doc_src/cmds/wait.rst b/doc_src/cmds/wait.rst
index 2bd1bf693..2144f5f58 100644
--- a/doc_src/cmds/wait.rst
+++ b/doc_src/cmds/wait.rst
@@ -6,7 +6,9 @@ wait - wait for jobs to complete
 Synopsis
 --------
 
-``wait`` [**-n** | **--any**] [*PID* | *PROCESS_NAME*] ...
+.. synopsis::
+
+    wait [-n | --any] [PID | PROCESS_NAME] ...
 
 Description
 -----------
diff --git a/doc_src/cmds/while.rst b/doc_src/cmds/while.rst
index eaa08ce11..7e0060536 100644
--- a/doc_src/cmds/while.rst
+++ b/doc_src/cmds/while.rst
@@ -6,7 +6,9 @@ while - perform a set of commands multiple times
 Synopsis
 --------
 
-**while** *CONDITION*; *COMMANDS*; **end**
+.. synopsis::
+
+    while CONDITION; COMMANDS; end
 
 Description
 -----------
diff --git a/doc_src/conf.py b/doc_src/conf.py
index 22708e950..fee3ace93 100644
--- a/doc_src/conf.py
+++ b/doc_src/conf.py
@@ -37,14 +37,17 @@ def issue_role(name, rawtext, text, lineno, inliner, options=None, content=None)
 
 # -- Load our extensions -------------------------------------------------
 def setup(app):
-    # Our own pygments lexer
+    # Our own pygments lexers
     from sphinx.highlighting import lexers
 
     this_dir = os.path.dirname(os.path.realpath(__file__))
     sys.path.insert(0, this_dir)
     from fish_indent_lexer import FishIndentLexer
+    from fish_synopsis import FishSynopsisDirective, FishSynopsisLexer
 
     lexers["fish-docs-samples"] = FishIndentLexer()
+    lexers["fish-synopsis"] = FishSynopsisLexer()
+    app.add_directive("synopsis", FishSynopsisDirective)
 
     app.add_config_value("issue_url", default=None, rebuild="html")
     app.add_role("issue", issue_role)
diff --git a/doc_src/fish_synopsis.py b/doc_src/fish_synopsis.py
new file mode 100644
index 000000000..51df271e1
--- /dev/null
+++ b/doc_src/fish_synopsis.py
@@ -0,0 +1,158 @@
+# Pygments lexer for a fish command synopsis.
+#
+# Example usage:
+# echo 'string match [OPTIONS] [STRING]' | pygmentize -f terminal256 -l doc_src/fish_synopsis.py:FishSynopsisLexer -x
+
+from docutils import nodes
+from pygments.lexer import Lexer
+from pygments.token import (
+    Generic,
+    Name,
+    Operator,
+    Punctuation,
+    Text,
+)
+import re
+from sphinx.directives.code import CodeBlock
+
+
+class FishSynopsisDirective(CodeBlock):
+    """A custom directive that describes a command's grammar."""
+
+    has_content = True
+    required_arguments = 0
+
+    def run(self):
+        if self.env.app.builder.name != "man":
+            self.arguments = ["fish-synopsis"]
+            return CodeBlock.run(self)
+        lexer = FishSynopsisLexer()
+        result = nodes.line_block()
+        for (start, tok, text) in lexer.get_tokens_unprocessed("\n".join(self.content)):
+            if (  # Literal text.
+                (tok in (Name.Function, Name.Constant) and not text.isupper())
+                or text.startswith("-")  # Literal option, even if it's uppercase.
+                or tok in (Operator, Punctuation)
+                or text
+                == " ]"  # Tiny hack: the closing bracket of the test(1) alias is a literal.
+            ):
+                node = nodes.strong(text=text)
+            elif (
+                tok in (Name.Constant, Name.Function) and text.isupper()
+            ):  # Placeholder parameter.
+                node = nodes.emphasis(text=text)
+            else:  # Grammar metacharacter or whitespace.
+                node = nodes.inline(text=text)
+            result.append(node)
+        return [result]
+
+
+lexer_rules = [
+    (re.compile(pattern), token)
+    for pattern, token in (
+        # Hack: treat the "[ expr ]" alias of builtin test as command token (not as grammar
+        # metacharacter).  This works because we write it without spaces in the grammar (like
+        # "[OPTIONS]").
+        (r"\[ | \]", Name.Constant),
+        # Statement separators.
+        (r"\n", Text.Whitespace),
+        (r";", Punctuation),
+        (r" +", Text.Whitespace),
+        # Operators have different highlighting than commands or parameters.
+        (r"\b(and|not|or|time)\b", Operator),
+        # Keywords that are not in command position.
+        (r"\b(if|in)\b", Name.Function),
+        # Grammar metacharacters.
+        (r"[()[\]|]", Generic.Other),
+        (r"\.\.\.", Generic.Other),
+        # Parameters.
+        (r"[\w-]+", Name.Constant),
+        (r"[=%]", Name.Constant),
+        (
+            r"[<>]",
+            Name.Constant,
+        ),  # Redirection are highlighted like parameters by default.
+    )
+]
+
+
+class FishSynopsisLexer(Lexer):
+    name = "FishSynopsisLexer"
+    aliases = ["fish-synopsis"]
+
+    is_before_command_token = None
+
+    def next_token(self, rule: str, offset: int, has_continuation_line: bool):
+        for pattern, token_kind in lexer_rules:
+            m = pattern.match(rule, pos=offset)
+            if m is None:
+                continue
+            if token_kind is Name.Constant and self.is_before_command_token:
+                token_kind = Name.Function
+
+            if has_continuation_line:
+                # Traditional case: rules with continuation lines only have a single command.
+                self.is_before_command_token = False
+            else:
+                if m.group() in ("\n", ";") or token_kind is Operator:
+                    self.is_before_command_token = True
+                elif token_kind in (Name.Constant, Name.Function):
+                    self.is_before_command_token = False
+
+            return m, token_kind, m.end()
+        return None, None, offset
+
+    def get_tokens_unprocessed(self, input_text):
+        """Return a list of (start, tok, value) tuples.
+
+        start is the index into the string
+        tok is the token type (as above)
+        value is the string contents of the token
+        """
+        """
+        A synopsis consists of multiple rules.  Each rule can have continuation lines, which
+        are expected to be indented:
+
+            cmd foo [--quux]
+                    [ARGUMENT] ...
+            cmd bar
+
+        We'll split the input into rules. This is easy for a traditional synopsis because each
+        non-indented line starts a new rule.  However, we also want to support code blocks:
+
+            switch VALUE
+               [case [GLOB ...]
+                   [COMMAND ...]]
+            end
+
+        which makes this format ambiguous. Hack around this by always adding "end" to the
+        current rule, which is enough in practice.
+        """
+        rules = []
+        rule = []
+        for line in list(input_text.splitlines()) + [""]:
+            if rule and not line.startswith(" "):
+                rules.append(rule)
+                rule = []
+                if line == "end":
+                    rules[-1].append(line)
+                    continue
+            rule.append(line)
+        result = []
+        for rule in rules:
+            offset = 0
+            self.is_before_command_token = True
+            has_continuation_line = rule[-1].startswith(" ")
+            rule = "\n".join(rule) + "\n"
+            while True:
+                match, token_kind, offset = self.next_token(
+                    rule, offset, has_continuation_line
+                )
+                if match is None:
+                    break
+                text = match.group()
+                result.append((match.start(), token_kind, text))
+            assert offset == len(rule), "cannot tokenize leftover text: '{}'".format(
+                rule[offset:]
+            )
+        return result

From 2a98b7a5939c636d0f78be03faa5ce05e7be50ba Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Mon, 17 Jan 2022 05:29:49 +0100
Subject: [PATCH 037/262] docs synopsis: make all placeholder arguments
 uppercase

man(1) uses lowercase placeholders but we usually don't.  Additionally,
the new synopsis autoformatting only recognizes placeholders if they
are uppercase. Use uppercase for all placeholders.
---
 doc_src/cmds/break.rst         |  2 +-
 doc_src/cmds/complete.rst      |  2 +-
 doc_src/cmds/contains.rst      |  2 +-
 doc_src/cmds/count.rst         |  4 ++--
 doc_src/cmds/echo.rst          |  2 +-
 doc_src/cmds/exit.rst          |  4 ++--
 doc_src/cmds/fish_add_path.rst |  2 +-
 doc_src/cmds/fish_opt.rst      |  2 +-
 doc_src/cmds/history.rst       |  2 +-
 doc_src/cmds/not.rst           |  2 +-
 doc_src/cmds/read.rst          |  2 +-
 doc_src/cmds/realpath.rst      |  2 +-
 doc_src/cmds/return.rst        |  4 ++--
 doc_src/cmds/set.rst           | 12 ++++++------
 doc_src/cmds/source.rst        |  4 ++--
 doc_src/cmds/trap.rst          |  2 +-
 doc_src/cmds/type.rst          |  2 +-
 doc_src/cmds/ulimit.rst        |  2 +-
 doc_src/cmds/umask.rst         |  2 +-
 19 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/doc_src/cmds/break.rst b/doc_src/cmds/break.rst
index b625caa76..e05a3341a 100644
--- a/doc_src/cmds/break.rst
+++ b/doc_src/cmds/break.rst
@@ -8,7 +8,7 @@ Synopsis
 
 .. synopsis::
 
-    loop_construct
+    LOOP_CONSTRUCT
        [COMMANDS ...]
        break
        [COMMANDS ...]
diff --git a/doc_src/cmds/complete.rst b/doc_src/cmds/complete.rst
index 501dbe1c0..8cd617ef3 100644
--- a/doc_src/cmds/complete.rst
+++ b/doc_src/cmds/complete.rst
@@ -8,7 +8,7 @@ Synopsis
 
 .. synopsis::
 
-    complete ((-c | --command) | (-p | --path)) COMMAND [options] 
+    complete ((-c | --command) | (-p | --path)) COMMAND [OPTIONS] 
     complete ((-C | --do-complete)) STRING
 
 Description
diff --git a/doc_src/cmds/contains.rst b/doc_src/cmds/contains.rst
index 7d79238c5..8a59ec982 100644
--- a/doc_src/cmds/contains.rst
+++ b/doc_src/cmds/contains.rst
@@ -8,7 +8,7 @@ Synopsis
 
 .. synopsis::
 
-    contains [options] KEY [VALUES ...]
+    contains [OPTIONS] KEY [VALUES ...]
 
 Description
 -----------
diff --git a/doc_src/cmds/count.rst b/doc_src/cmds/count.rst
index cda64bd3c..657dc8467 100644
--- a/doc_src/cmds/count.rst
+++ b/doc_src/cmds/count.rst
@@ -8,8 +8,8 @@ Synopsis
 
 .. synopsis::
 
-    count string1 string2 ...
-    command | count
+    count STRING1 STRING2 ...
+    COMMAND | count
     count [...] < FILE
 
 Description
diff --git a/doc_src/cmds/echo.rst b/doc_src/cmds/echo.rst
index 9fb0adb05..f8bf8bd24 100644
--- a/doc_src/cmds/echo.rst
+++ b/doc_src/cmds/echo.rst
@@ -8,7 +8,7 @@ Synopsis
 
 .. synopsis::
 
-    echo [options] [STRING]
+    echo [OPTIONS] [STRING]
 
 Description
 -----------
diff --git a/doc_src/cmds/exit.rst b/doc_src/cmds/exit.rst
index f3f481c9a..d830da1bd 100644
--- a/doc_src/cmds/exit.rst
+++ b/doc_src/cmds/exit.rst
@@ -9,12 +9,12 @@ Synopsis
 
 .. synopsis::
 
-    exit [code]
+    exit [CODE]
 
 Description
 -----------
 
-**exit** is a special builtin that causes the shell to exit. Either 255 or the *code* supplied is used, whichever is lesser.
+**exit** is a special builtin that causes the shell to exit. Either 255 or the *CODE* supplied is used, whichever is lesser.
 Otherwise, the exit status will be that of the last command executed.
 
 If exit is called while sourcing a file (using the :ref:`source <cmd-source>` builtin) the rest of the file will be skipped, but the shell itself will not exit.
diff --git a/doc_src/cmds/fish_add_path.rst b/doc_src/cmds/fish_add_path.rst
index 9fedec533..a8b19b18e 100644
--- a/doc_src/cmds/fish_add_path.rst
+++ b/doc_src/cmds/fish_add_path.rst
@@ -10,7 +10,7 @@ Synopsis
 .. synopsis::
 
     fish_add_path path ...
-    fish_add_path [(-g | --global) | (-U | --universal) | (-P | --path)] [(-m | --move)] [(-a | --append) | (-p | --prepend)] [(-v | --verbose) | (-n | --dry-run)] paths ...
+    fish_add_path [(-g | --global) | (-U | --universal) | (-P | --path)] [(-m | --move)] [(-a | --append) | (-p | --prepend)] [(-v | --verbose) | (-n | --dry-run)] PATHS ...
 
 
 Description
diff --git a/doc_src/cmds/fish_opt.rst b/doc_src/cmds/fish_opt.rst
index 140c5aaf2..80867648c 100644
--- a/doc_src/cmds/fish_opt.rst
+++ b/doc_src/cmds/fish_opt.rst
@@ -9,7 +9,7 @@ Synopsis
 .. synopsis::
 
     fish_opt [--help]
-    fish_opt [(-slor | --multiple-vals=) optname]
+    fish_opt [(-slor | --multiple-vals=) OPTNAME]
 
 Description
 -----------
diff --git a/doc_src/cmds/history.rst b/doc_src/cmds/history.rst
index cb4b36cbb..725d0e0ac 100644
--- a/doc_src/cmds/history.rst
+++ b/doc_src/cmds/history.rst
@@ -9,7 +9,7 @@ Synopsis
 .. synopsis::
 
     history [search] [--show-time] [--case-sensitive]
-                     [--exact | --prefix | --contains] [--max n] [--null] [--reverse]
+                     [--exact | --prefix | --contains] [--max N] [--null] [--reverse]
                      [SEARCH_STRING ...]
     history delete [--case-sensitive]
                    [--exact | --prefix | --contains] SEARCH_STRING ...
diff --git a/doc_src/cmds/not.rst b/doc_src/cmds/not.rst
index 6e7a9c375..b99c55a73 100644
--- a/doc_src/cmds/not.rst
+++ b/doc_src/cmds/not.rst
@@ -8,7 +8,7 @@ Synopsis
 
 .. synopsis::
 
-    not COMMAND [options ...]
+    not COMMAND [OPTIONS ...]
 
 
 Description
diff --git a/doc_src/cmds/read.rst b/doc_src/cmds/read.rst
index 1978ece47..3ac9c7298 100644
--- a/doc_src/cmds/read.rst
+++ b/doc_src/cmds/read.rst
@@ -8,7 +8,7 @@ Synopsis
 
 .. synopsis::
 
-    read [options] [VARIABLE ...]
+    read [OPTIONS] [VARIABLE ...]
 
 Description
 -----------
diff --git a/doc_src/cmds/realpath.rst b/doc_src/cmds/realpath.rst
index 3bf603246..92a624781 100644
--- a/doc_src/cmds/realpath.rst
+++ b/doc_src/cmds/realpath.rst
@@ -9,7 +9,7 @@ Synopsis
 
 .. synopsis::
 
-    realpath [options] PATH
+    realpath [OPTIONS] PATH
 
 Description
 -----------
diff --git a/doc_src/cmds/return.rst b/doc_src/cmds/return.rst
index 405336f09..307d5dafc 100644
--- a/doc_src/cmds/return.rst
+++ b/doc_src/cmds/return.rst
@@ -9,13 +9,13 @@ Synopsis
 
 .. synopsis::
 
-    return [n]
+    return [N]
 
 Description
 -----------
 
 :program:`return` halts a currently running function.
-The exit status is set to ``n`` if it is given.
+The exit status is set to ``N`` if it is given.
 If :program:`return` is invoked outside of a function or dot script it is equivalent to exit.
 
 It is often added inside of a conditional block such as an :ref:`if <cmd-if>` statement or a :ref:`switch <cmd-switch>` statement to conditionally stop the executing function and return to the caller; it can also be used to specify the exit status of a function.
diff --git a/doc_src/cmds/set.rst b/doc_src/cmds/set.rst
index b5363c2e1..256275a41 100644
--- a/doc_src/cmds/set.rst
+++ b/doc_src/cmds/set.rst
@@ -8,12 +8,12 @@ Synopsis
 
 .. synopsis::
 
-    set [scope options]
-    set [options] VARIABLE VALUES ...
-    set [options] VARIABLE[INDICES] VALUES ...
-    set (-q | --query) [scope options] VARIABLE ...
-    set (-e | --erase) [scope options] VARIABLE ...
-    set (-e | --erase) [scope options] VARIABLE[INDICES] ...
+    set [SCOPE_OPTIONS]
+    set [OPTIONS] VARIABLE VALUES ...
+    set [OPTIONS] VARIABLE[INDICES] VALUES ...
+    set (-q | --query) [SCOPE_OPTIONS] VARIABLE ...
+    set (-e | --erase) [SCOPE_OPTIONS] VARIABLE ...
+    set (-e | --erase) [SCOPE_OPTIONS] VARIABLE[INDICES] ...
     set (-S | --show) VARIABLE ...
 
 Description
diff --git a/doc_src/cmds/source.rst b/doc_src/cmds/source.rst
index 25fe67f9f..1a0092c3c 100644
--- a/doc_src/cmds/source.rst
+++ b/doc_src/cmds/source.rst
@@ -8,8 +8,8 @@ Synopsis
 
 .. synopsis::
 
-    source FILE [arguments ...]
-    somecommand | source
+    source FILE [ARGUMENTS ...]
+    SOMECOMMAND | source
 
 
 Description
diff --git a/doc_src/cmds/trap.rst b/doc_src/cmds/trap.rst
index 117fb5974..ae08e231a 100644
--- a/doc_src/cmds/trap.rst
+++ b/doc_src/cmds/trap.rst
@@ -8,7 +8,7 @@ Synopsis
 
 .. synopsis::
 
-    trap [options] [[ARG] REASON ... ]
+    trap [OPTIONS] [[ARG] REASON ... ]
 
 Description
 -----------
diff --git a/doc_src/cmds/type.rst b/doc_src/cmds/type.rst
index 45bc17bc0..9d971f274 100644
--- a/doc_src/cmds/type.rst
+++ b/doc_src/cmds/type.rst
@@ -8,7 +8,7 @@ Synopsis
 
 .. synopsis::
 
-    type [options] NAME [...]
+    type [OPTIONS] NAME [...]
 
 Description
 -----------
diff --git a/doc_src/cmds/ulimit.rst b/doc_src/cmds/ulimit.rst
index 7ad3cd00d..bce1c4731 100644
--- a/doc_src/cmds/ulimit.rst
+++ b/doc_src/cmds/ulimit.rst
@@ -8,7 +8,7 @@ Synopsis
 
 .. synopsis::
 
-    ulimit [options] [limit]
+    ulimit [OPTIONS] [LIMIT]
 
 
 Description
diff --git a/doc_src/cmds/umask.rst b/doc_src/cmds/umask.rst
index a455024e7..b6a1e9860 100644
--- a/doc_src/cmds/umask.rst
+++ b/doc_src/cmds/umask.rst
@@ -8,7 +8,7 @@ Synopsis
 
 .. synopsis::
 
-    umask [options] [MASK]
+    umask [OPTIONS] [MASK]
 
 
 Description

From 24f9fdd0a794aa86e81684cd53b1948ce311dd17 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 19 Jan 2022 17:23:23 +0100
Subject: [PATCH 038/262] themes/default: Set pager selection to reverse

This makes it look okay on both light and dark backgrounds.
---
 share/functions/__fish_config_interactive.fish   | 1 +
 share/tools/web_config/themes/fish default.theme | 1 +
 2 files changed, 2 insertions(+)

diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index 15da77741..d148dc280 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -66,6 +66,7 @@ function __fish_config_interactive -d "Initializations that should be performed
         __init_uvar fish_pager_color_completion
         __init_uvar fish_pager_color_description B3A06D yellow
         __init_uvar fish_pager_color_progress brwhite --background=cyan
+        __init_uvar fish_pager_color_selected_background -r
 
         #
         # Directory history colors
diff --git a/share/tools/web_config/themes/fish default.theme b/share/tools/web_config/themes/fish default.theme
index 075d9c308..c62480492 100644
--- a/share/tools/web_config/themes/fish default.theme	
+++ b/share/tools/web_config/themes/fish default.theme	
@@ -25,5 +25,6 @@ fish_pager_color_description B3A06D yellow
 fish_color_cancel -r
 fish_pager_color_prefix normal --bold --underline
 fish_pager_color_progress brwhite --background=cyan
+fish_pager_color_selected_background -r
 fish_color_option 00afff
 fish_color_keyword 005fd7

From 9d59254a720925ed3ea8036408da317c64c6e523 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 19 Jan 2022 17:54:59 +0100
Subject: [PATCH 039/262] themes: Resolve pager_selected_background

This sets the variable to the background value of
$fish_color_search_match, which fixes the case where you switch from a
theme with a set selected background (like our default, now) to one without.
---
 share/tools/web_config/themes/Base16 Default Dark.theme   | 1 +
 share/tools/web_config/themes/Base16 Default Light.theme  | 1 +
 share/tools/web_config/themes/Base16 Eighties.theme       | 1 +
 share/tools/web_config/themes/Bay Cruise.theme            | 1 +
 share/tools/web_config/themes/Dracula.theme               | 1 +
 share/tools/web_config/themes/Fairground.theme            | 1 +
 share/tools/web_config/themes/Just a Touch.theme          | 1 +
 share/tools/web_config/themes/Lava.theme                  | 1 +
 share/tools/web_config/themes/Mono Lace.theme             | 1 +
 share/tools/web_config/themes/Mono Smoke.theme            | 1 +
 share/tools/web_config/themes/Nord.theme                  | 1 +
 share/tools/web_config/themes/Old School.theme            | 1 +
 share/tools/web_config/themes/Seaweed.theme               | 1 +
 share/tools/web_config/themes/Snow Day.theme              | 1 +
 share/tools/web_config/themes/Solarized Dark.theme        | 1 +
 share/tools/web_config/themes/Solarized Light.theme       | 1 +
 share/tools/web_config/themes/Tomorrow Night Bright.theme | 1 +
 share/tools/web_config/themes/Tomorrow Night.theme        | 1 +
 share/tools/web_config/themes/Tomorrow.theme              | 1 +
 share/tools/web_config/themes/ayu Dark.theme              | 1 +
 share/tools/web_config/themes/ayu Light.theme             | 1 +
 share/tools/web_config/themes/ayu Mirage.theme            | 1 +
 22 files changed, 22 insertions(+)

diff --git a/share/tools/web_config/themes/Base16 Default Dark.theme b/share/tools/web_config/themes/Base16 Default Dark.theme
index f6c5e8e59..c4f64e583 100644
--- a/share/tools/web_config/themes/Base16 Default Dark.theme	
+++ b/share/tools/web_config/themes/Base16 Default Dark.theme	
@@ -27,5 +27,6 @@ fish_pager_color_completion normal
 fish_pager_color_description B3A06D yellow
 fish_pager_color_prefix normal --bold --underline
 fish_pager_color_progress brwhite --background=cyan
+fish_pager_color_selected_background --background=brblack
 fish_color_option d8d8d8
 fish_color_keyword a1b56c
diff --git a/share/tools/web_config/themes/Base16 Default Light.theme b/share/tools/web_config/themes/Base16 Default Light.theme
index cb19839b6..734d09b92 100644
--- a/share/tools/web_config/themes/Base16 Default Light.theme	
+++ b/share/tools/web_config/themes/Base16 Default Light.theme	
@@ -27,5 +27,6 @@ fish_pager_color_description B3A06D yellow
 fish_pager_color_completion normal
 fish_pager_color_prefix normal --bold --underline
 fish_pager_color_progress brwhite --background=cyan
+fish_pager_color_selected_background --background=brblack
 fish_color_option 383838
 fish_color_keyword a1b56c
diff --git a/share/tools/web_config/themes/Base16 Eighties.theme b/share/tools/web_config/themes/Base16 Eighties.theme
index 283b29866..a70c306f9 100644
--- a/share/tools/web_config/themes/Base16 Eighties.theme	
+++ b/share/tools/web_config/themes/Base16 Eighties.theme	
@@ -27,5 +27,6 @@ fish_pager_color_completion normal
 fish_pager_color_description B3A06D yellow
 fish_pager_color_prefix normal --bold --underline
 fish_pager_color_progress brwhite --background=cyan
+fish_pager_color_selected_background --background=brblack
 fish_color_option d3d0c8
 fish_color_keyword 99cc99
diff --git a/share/tools/web_config/themes/Bay Cruise.theme b/share/tools/web_config/themes/Bay Cruise.theme
index e4a742609..b2397b4d5 100644
--- a/share/tools/web_config/themes/Bay Cruise.theme	
+++ b/share/tools/web_config/themes/Bay Cruise.theme	
@@ -26,5 +26,6 @@ fish_pager_color_completion normal
 fish_pager_color_description B3A06D yellow
 fish_pager_color_prefix normal --bold --underline
 fish_pager_color_progress brwhite --background=cyan
+fish_pager_color_selected_background --background=brblack
 fish_color_option 33CCCC
 fish_color_keyword 009999
diff --git a/share/tools/web_config/themes/Dracula.theme b/share/tools/web_config/themes/Dracula.theme
index 45bcc0f48..e7cd77930 100644
--- a/share/tools/web_config/themes/Dracula.theme
+++ b/share/tools/web_config/themes/Dracula.theme
@@ -26,5 +26,6 @@ fish_pager_color_completion normal
 fish_pager_color_description B3A06D yellow
 fish_pager_color_prefix normal --bold --underline
 fish_pager_color_progress brwhite --background=cyan
+fish_pager_color_selected_background --background=brblack
 fish_color_option FF79C6
 fish_color_keyword F8F8F2
diff --git a/share/tools/web_config/themes/Fairground.theme b/share/tools/web_config/themes/Fairground.theme
index 0c0b10694..4d570d684 100644
--- a/share/tools/web_config/themes/Fairground.theme
+++ b/share/tools/web_config/themes/Fairground.theme
@@ -26,5 +26,6 @@ fish_pager_color_completion normal
 fish_pager_color_prefix normal --bold --underline
 fish_pager_color_description B3A06D yellow
 fish_pager_color_progress brwhite --background=cyan
+fish_pager_color_selected_background --background=brblack
 fish_color_option 225E79
 fish_color_keyword 0772A1
diff --git a/share/tools/web_config/themes/Just a Touch.theme b/share/tools/web_config/themes/Just a Touch.theme
index 3f3689de3..72f511f0a 100644
--- a/share/tools/web_config/themes/Just a Touch.theme	
+++ b/share/tools/web_config/themes/Just a Touch.theme	
@@ -26,5 +26,6 @@ fish_pager_color_completion normal
 fish_pager_color_description B3A06D yellow
 fish_pager_color_prefix normal --bold --underline
 fish_pager_color_progress brwhite --background=cyan
+fish_pager_color_selected_background --background=brblack
 fish_color_option A0A0F0
 fish_color_keyword F4F4F4
diff --git a/share/tools/web_config/themes/Lava.theme b/share/tools/web_config/themes/Lava.theme
index 9cf97843a..31bf8c730 100644
--- a/share/tools/web_config/themes/Lava.theme
+++ b/share/tools/web_config/themes/Lava.theme
@@ -26,5 +26,6 @@ fish_pager_color_completion normal
 fish_pager_color_description B3A06D yellow
 fish_pager_color_prefix normal --bold --underline
 fish_pager_color_progress brwhite --background=cyan
+fish_pager_color_selected_background --background=brblack
 fish_color_option FFC000
 fish_color_keyword FF9400
diff --git a/share/tools/web_config/themes/Mono Lace.theme b/share/tools/web_config/themes/Mono Lace.theme
index 6e4b2466b..2155fc7b0 100644
--- a/share/tools/web_config/themes/Mono Lace.theme	
+++ b/share/tools/web_config/themes/Mono Lace.theme	
@@ -26,5 +26,6 @@ fish_color_cancel -r
 fish_pager_color_completion normal
 fish_pager_color_progress brwhite --background=cyan
 fish_pager_color_description B3A06D yellow
+fish_pager_color_selected_background --background=brblack
 fish_color_option 303030
 fish_color_keyword 000000
diff --git a/share/tools/web_config/themes/Mono Smoke.theme b/share/tools/web_config/themes/Mono Smoke.theme
index fd43489a6..72052d7a4 100644
--- a/share/tools/web_config/themes/Mono Smoke.theme	
+++ b/share/tools/web_config/themes/Mono Smoke.theme	
@@ -26,5 +26,6 @@ fish_pager_color_completion normal
 fish_pager_color_description B3A06D yellow
 fish_pager_color_prefix normal --bold --underline
 fish_pager_color_progress brwhite --background=cyan
+fish_pager_color_selected_background --background=brblack
 fish_color_option d7d7d7
 fish_color_keyword ffffff
diff --git a/share/tools/web_config/themes/Nord.theme b/share/tools/web_config/themes/Nord.theme
index 797927abe..6daf1d9ec 100644
--- a/share/tools/web_config/themes/Nord.theme
+++ b/share/tools/web_config/themes/Nord.theme
@@ -27,5 +27,6 @@ fish_pager_color_completion normal
 fish_pager_color_prefix normal --bold --underline
 fish_pager_color_description B3A06D yellow
 fish_pager_color_progress brwhite --background=cyan
+fish_pager_color_selected_background --background=brblack
 fish_color_option eceff4
 fish_color_keyword 81a1c1
diff --git a/share/tools/web_config/themes/Old School.theme b/share/tools/web_config/themes/Old School.theme
index f2b2a1b78..06acb565f 100644
--- a/share/tools/web_config/themes/Old School.theme	
+++ b/share/tools/web_config/themes/Old School.theme	
@@ -26,5 +26,6 @@ fish_pager_color_completion normal
 fish_pager_color_description B3A06D yellow
 fish_pager_color_prefix normal --bold --underline
 fish_pager_color_progress brwhite --background=cyan
+fish_pager_color_selected_background --background=brblack
 fish_color_option 30BE30
 fish_color_keyword 00FF00
diff --git a/share/tools/web_config/themes/Seaweed.theme b/share/tools/web_config/themes/Seaweed.theme
index 42976649d..ca7d294cf 100644
--- a/share/tools/web_config/themes/Seaweed.theme
+++ b/share/tools/web_config/themes/Seaweed.theme
@@ -26,5 +26,6 @@ fish_pager_color_description B3A06D yellow
 fish_pager_color_prefix normal --bold --underline
 fish_pager_color_completion normal
 fish_pager_color_progress brwhite --background=cyan
+fish_pager_color_selected_background --background=brblack
 fish_color_option 04819E
 fish_color_keyword 00BF32
diff --git a/share/tools/web_config/themes/Snow Day.theme b/share/tools/web_config/themes/Snow Day.theme
index b2b5889d9..289632ee4 100644
--- a/share/tools/web_config/themes/Snow Day.theme	
+++ b/share/tools/web_config/themes/Snow Day.theme	
@@ -26,5 +26,6 @@ fish_pager_color_completion normal
 fish_pager_color_description B3A06D yellow
 fish_pager_color_prefix normal --bold --underline
 fish_pager_color_progress brwhite --background=cyan
+fish_pager_color_selected_background --background=brblack
 fish_color_option 4319CC
 fish_color_keyword 164CC9
diff --git a/share/tools/web_config/themes/Solarized Dark.theme b/share/tools/web_config/themes/Solarized Dark.theme
index 263b3389a..f05744d93 100644
--- a/share/tools/web_config/themes/Solarized Dark.theme	
+++ b/share/tools/web_config/themes/Solarized Dark.theme	
@@ -27,5 +27,6 @@ fish_pager_color_completion B3A06D
 fish_pager_color_description B3A06D
 fish_pager_color_prefix cyan --underline
 fish_pager_color_progress brwhite --background=cyan
+fish_pager_color_selected_background --background=brblack
 fish_color_option 839496
 fish_color_keyword 93a1a1
diff --git a/share/tools/web_config/themes/Solarized Light.theme b/share/tools/web_config/themes/Solarized Light.theme
index abbef71f9..aa7cc0417 100644
--- a/share/tools/web_config/themes/Solarized Light.theme	
+++ b/share/tools/web_config/themes/Solarized Light.theme	
@@ -27,5 +27,6 @@ fish_pager_color_completion green
 fish_pager_color_description B3A06D
 fish_pager_color_prefix cyan --underline
 fish_pager_color_progress brwhite --background=cyan
+fish_pager_color_selected_background --background=white
 fish_color_option 657b83
 fish_color_keyword 586e75
diff --git a/share/tools/web_config/themes/Tomorrow Night Bright.theme b/share/tools/web_config/themes/Tomorrow Night Bright.theme
index 4ddb2bef8..fbe1d056c 100644
--- a/share/tools/web_config/themes/Tomorrow Night Bright.theme	
+++ b/share/tools/web_config/themes/Tomorrow Night Bright.theme	
@@ -27,5 +27,6 @@ fish_pager_color_completion normal
 fish_pager_color_description B3A06D yellow
 fish_pager_color_prefix normal --bold --underline
 fish_pager_color_progress brwhite --background=cyan
+fish_pager_color_selected_background --background=brblack
 fish_color_option 7aa6da
 fish_color_keyword c397d8
diff --git a/share/tools/web_config/themes/Tomorrow Night.theme b/share/tools/web_config/themes/Tomorrow Night.theme
index 17ef24a88..a52da6313 100644
--- a/share/tools/web_config/themes/Tomorrow Night.theme	
+++ b/share/tools/web_config/themes/Tomorrow Night.theme	
@@ -27,5 +27,6 @@ fish_pager_color_completion normal
 fish_pager_color_description B3A06D yellow
 fish_pager_color_prefix normal --bold --underline
 fish_pager_color_progress brwhite --background=cyan
+fish_pager_color_selected_background --background=brblack
 fish_color_option 81a2be
 fish_color_keyword b294bb
diff --git a/share/tools/web_config/themes/Tomorrow.theme b/share/tools/web_config/themes/Tomorrow.theme
index 494426ea3..27353fd83 100644
--- a/share/tools/web_config/themes/Tomorrow.theme
+++ b/share/tools/web_config/themes/Tomorrow.theme
@@ -27,5 +27,6 @@ fish_pager_color_completion normal
 fish_color_cancel -r
 fish_pager_color_prefix normal --bold --underline
 fish_pager_color_progress brwhite --background=cyan
+fish_pager_color_selected_background --background=brblack
 fish_color_option 4271ae
 fish_color_keyword 8959a8
diff --git a/share/tools/web_config/themes/ayu Dark.theme b/share/tools/web_config/themes/ayu Dark.theme
index fe1b93bc1..9cd7eeb33 100644
--- a/share/tools/web_config/themes/ayu Dark.theme	
+++ b/share/tools/web_config/themes/ayu Dark.theme	
@@ -27,5 +27,6 @@ fish_pager_color_completion normal
 fish_pager_color_description B3A06D yellow
 fish_pager_color_prefix normal --bold --underline
 fish_pager_color_progress brwhite --background=cyan
+fish_pager_color_selected_background --background=E6B450
 fish_color_option B3B1AD
 fish_color_keyword 39BAE6
diff --git a/share/tools/web_config/themes/ayu Light.theme b/share/tools/web_config/themes/ayu Light.theme
index 52457b88c..1c4448d0b 100644
--- a/share/tools/web_config/themes/ayu Light.theme	
+++ b/share/tools/web_config/themes/ayu Light.theme	
@@ -27,5 +27,6 @@ fish_pager_color_description B3A06D yellow
 fish_pager_color_completion normal
 fish_pager_color_prefix normal --bold --underline
 fish_pager_color_progress brwhite --background=cyan
+fish_pager_color_selected_background --background=FF9940
 fish_color_option 575F66
 fish_color_keyword 55B4D4
diff --git a/share/tools/web_config/themes/ayu Mirage.theme b/share/tools/web_config/themes/ayu Mirage.theme
index bbeb79da2..2b891f0da 100644
--- a/share/tools/web_config/themes/ayu Mirage.theme	
+++ b/share/tools/web_config/themes/ayu Mirage.theme	
@@ -27,5 +27,6 @@ fish_pager_color_completion normal
 fish_pager_color_description B3A06D yellow
 fish_pager_color_prefix normal --bold --underline
 fish_pager_color_progress brwhite --background=cyan
+fish_pager_color_selected_background --background=FFCC66
 fish_color_option CBCCC6
 fish_color_keyword 5CCFE6

From 398f3213d2dc92b3ed27275b36b01fcfba2017ac Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Wed, 19 Jan 2022 11:38:30 -0800
Subject: [PATCH 040/262] Remove CheckIncludeFiles.cmake

We apparently vendored it for the sake of attempting to support
old cmake versions:
7aefaff2980ccebb6dcab895d23a87f2d13f086b.
"This file can be dropped once the minimum version of CMake for fish is 3.11.0"

So, drop it like it's hot.
---
 cmake/CheckIncludeFiles.cmake | 123 ----------------------------------
 1 file changed, 123 deletions(-)
 delete mode 100644 cmake/CheckIncludeFiles.cmake

diff --git a/cmake/CheckIncludeFiles.cmake b/cmake/CheckIncludeFiles.cmake
deleted file mode 100644
index c7fc2b5de..000000000
--- a/cmake/CheckIncludeFiles.cmake
+++ /dev/null
@@ -1,123 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See full license information in
-# doc_src/license.hdr or https://cmake.org/licensing for details.
-
-#.rst:
-# CheckIncludeFiles
-# -----------------
-#
-# Provides a macro to check if a list of one or more header files can
-# be included together in ``C``.
-#
-# .. command:: CHECK_INCLUDE_FILES
-#
-#   ::
-#
-#     CHECK_INCLUDE_FILES("<includes>" <variable> [LANGUAGE <language>])
-#
-#   Check if the given ``<includes>`` list may be included together
-#   in a ``C`` source file and store the result in an internal cache
-#   entry named ``<variable>``.  Specify the ``<includes>`` argument
-#   as a :ref:`;-list <CMake Language Lists>` of header file names.
-#
-# If LANGUAGE is set, the specified compiler will be used to perform the
-# check. Acceptable values are C and CXX.
-#
-# The following variables may be set before calling this macro to modify
-# the way the check is run:
-#
-# ``CMAKE_REQUIRED_FLAGS``
-#   string of compile command line flags
-# ``CMAKE_REQUIRED_DEFINITIONS``
-#   list of macros to define (-DFOO=bar)
-# ``CMAKE_REQUIRED_INCLUDES``
-#   list of include directories
-# ``CMAKE_REQUIRED_QUIET``
-#   execute quietly without messages
-#
-# See modules :module:`CheckIncludeFile` and :module:`CheckIncludeFileCXX`
-# to check for a single header file in ``C`` or ``CXX`` languages.
-
-macro(CHECK_INCLUDE_FILES INCLUDE VARIABLE)
-  if(NOT DEFINED "${VARIABLE}")
-    set(CMAKE_CONFIGURABLE_FILE_CONTENT "/* */\n")
-
-    if("x${ARGN}" STREQUAL "x")
-       if(CMAKE_C_COMPILER_LOADED)
-         set(_lang C)
-       elseif(CMAKE_CXX_COMPILER_LOADED)
-         set(_lang CXX)
-       else()
-         message(FATAL_ERROR "CHECK_INCLUDE_FILES needs either C or CXX language enabled")
-       endif()
-    elseif("x${ARGN}" MATCHES "^xLANGUAGE;([a-zA-Z]+)$")
-       set(_lang "${CMAKE_MATCH_1}")
-    else()
-       message(FATAL_ERROR "Unknown arguments:\n  ${ARGN}\n")
-    endif()
-
-    if(_lang STREQUAL "C")
-      set(src ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckIncludeFiles/${VARIABLE}.c)
-    elseif(_lang STREQUAL "CXX")
-      set(src ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckIncludeFiles/${VARIABLE}.cpp)
-    else()
-      message(FATAL_ERROR "Unknown language:\n  ${_lang}\nSupported languages: C, CXX.\n")
-    endif()
-
-    if(CMAKE_REQUIRED_INCLUDES)
-      set(CHECK_INCLUDE_FILES_INCLUDE_DIRS "-DINCLUDE_DIRECTORIES=${CMAKE_REQUIRED_INCLUDES}")
-    else()
-      set(CHECK_INCLUDE_FILES_INCLUDE_DIRS)
-    endif()
-    set(CHECK_INCLUDE_FILES_CONTENT "/* */\n")
-    set(MACRO_CHECK_INCLUDE_FILES_FLAGS ${CMAKE_REQUIRED_FLAGS})
-    foreach(FILE ${INCLUDE})
-      string(APPEND CMAKE_CONFIGURABLE_FILE_CONTENT
-        "#include <${FILE}>\n")
-    endforeach()
-    string(APPEND CMAKE_CONFIGURABLE_FILE_CONTENT
-      "\n\nint main(void){return 0;}\n")
-    configure_file("${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in"
-      "${src}" @ONLY)
-
-    set(_INCLUDE ${INCLUDE}) # remove empty elements
-    if("${_INCLUDE}" MATCHES "^([^;]+);.+;([^;]+)$")
-      list(LENGTH _INCLUDE _INCLUDE_LEN)
-      set(_description "${_INCLUDE_LEN} include files ${CMAKE_MATCH_1}, ..., ${CMAKE_MATCH_2}")
-    elseif("${_INCLUDE}" MATCHES "^([^;]+);([^;]+)$")
-      set(_description "include files ${CMAKE_MATCH_1}, ${CMAKE_MATCH_2}")
-    else()
-      set(_description "include file ${_INCLUDE}")
-    endif()
-
-    if(NOT CMAKE_REQUIRED_QUIET)
-      message(STATUS "Looking for ${_description}")
-    endif()
-    try_compile(${VARIABLE}
-      ${CMAKE_BINARY_DIR}
-      ${src}
-      COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
-      CMAKE_FLAGS
-      -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_INCLUDE_FILES_FLAGS}
-      "${CHECK_INCLUDE_FILES_INCLUDE_DIRS}"
-      OUTPUT_VARIABLE OUTPUT)
-    if(${VARIABLE})
-      if(NOT CMAKE_REQUIRED_QUIET)
-        message(STATUS "Looking for ${_description} - found")
-      endif()
-      set(${VARIABLE} 1 CACHE INTERNAL "Have include ${INCLUDE}")
-      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
-        "Determining if files ${INCLUDE} "
-        "exist passed with the following output:\n"
-        "${OUTPUT}\n\n")
-    else()
-      if(NOT CMAKE_REQUIRED_QUIET)
-        message(STATUS "Looking for ${_description} - not found")
-      endif()
-      set(${VARIABLE} "" CACHE INTERNAL "Have includes ${INCLUDE}")
-      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
-        "Determining if files ${INCLUDE} "
-        "exist failed with the following output:\n"
-        "${OUTPUT}\nSource:\n${CMAKE_CONFIGURABLE_FILE_CONTENT}\n")
-    endif()
-  endif()
-endmacro()

From 401d302179df648a837ec24d7734ef2db5a9c744 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Wed, 19 Jan 2022 11:41:16 -0800
Subject: [PATCH 041/262] :Revert "Remove CheckIncludeFiles.cmake"

This reverts commit 398f3213d2dc92b3ed27275b36b01fcfba2017ac.
---
 cmake/CheckIncludeFiles.cmake | 123 ++++++++++++++++++++++++++++++++++
 1 file changed, 123 insertions(+)
 create mode 100644 cmake/CheckIncludeFiles.cmake

diff --git a/cmake/CheckIncludeFiles.cmake b/cmake/CheckIncludeFiles.cmake
new file mode 100644
index 000000000..c7fc2b5de
--- /dev/null
+++ b/cmake/CheckIncludeFiles.cmake
@@ -0,0 +1,123 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See full license information in
+# doc_src/license.hdr or https://cmake.org/licensing for details.
+
+#.rst:
+# CheckIncludeFiles
+# -----------------
+#
+# Provides a macro to check if a list of one or more header files can
+# be included together in ``C``.
+#
+# .. command:: CHECK_INCLUDE_FILES
+#
+#   ::
+#
+#     CHECK_INCLUDE_FILES("<includes>" <variable> [LANGUAGE <language>])
+#
+#   Check if the given ``<includes>`` list may be included together
+#   in a ``C`` source file and store the result in an internal cache
+#   entry named ``<variable>``.  Specify the ``<includes>`` argument
+#   as a :ref:`;-list <CMake Language Lists>` of header file names.
+#
+# If LANGUAGE is set, the specified compiler will be used to perform the
+# check. Acceptable values are C and CXX.
+#
+# The following variables may be set before calling this macro to modify
+# the way the check is run:
+#
+# ``CMAKE_REQUIRED_FLAGS``
+#   string of compile command line flags
+# ``CMAKE_REQUIRED_DEFINITIONS``
+#   list of macros to define (-DFOO=bar)
+# ``CMAKE_REQUIRED_INCLUDES``
+#   list of include directories
+# ``CMAKE_REQUIRED_QUIET``
+#   execute quietly without messages
+#
+# See modules :module:`CheckIncludeFile` and :module:`CheckIncludeFileCXX`
+# to check for a single header file in ``C`` or ``CXX`` languages.
+
+macro(CHECK_INCLUDE_FILES INCLUDE VARIABLE)
+  if(NOT DEFINED "${VARIABLE}")
+    set(CMAKE_CONFIGURABLE_FILE_CONTENT "/* */\n")
+
+    if("x${ARGN}" STREQUAL "x")
+       if(CMAKE_C_COMPILER_LOADED)
+         set(_lang C)
+       elseif(CMAKE_CXX_COMPILER_LOADED)
+         set(_lang CXX)
+       else()
+         message(FATAL_ERROR "CHECK_INCLUDE_FILES needs either C or CXX language enabled")
+       endif()
+    elseif("x${ARGN}" MATCHES "^xLANGUAGE;([a-zA-Z]+)$")
+       set(_lang "${CMAKE_MATCH_1}")
+    else()
+       message(FATAL_ERROR "Unknown arguments:\n  ${ARGN}\n")
+    endif()
+
+    if(_lang STREQUAL "C")
+      set(src ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckIncludeFiles/${VARIABLE}.c)
+    elseif(_lang STREQUAL "CXX")
+      set(src ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckIncludeFiles/${VARIABLE}.cpp)
+    else()
+      message(FATAL_ERROR "Unknown language:\n  ${_lang}\nSupported languages: C, CXX.\n")
+    endif()
+
+    if(CMAKE_REQUIRED_INCLUDES)
+      set(CHECK_INCLUDE_FILES_INCLUDE_DIRS "-DINCLUDE_DIRECTORIES=${CMAKE_REQUIRED_INCLUDES}")
+    else()
+      set(CHECK_INCLUDE_FILES_INCLUDE_DIRS)
+    endif()
+    set(CHECK_INCLUDE_FILES_CONTENT "/* */\n")
+    set(MACRO_CHECK_INCLUDE_FILES_FLAGS ${CMAKE_REQUIRED_FLAGS})
+    foreach(FILE ${INCLUDE})
+      string(APPEND CMAKE_CONFIGURABLE_FILE_CONTENT
+        "#include <${FILE}>\n")
+    endforeach()
+    string(APPEND CMAKE_CONFIGURABLE_FILE_CONTENT
+      "\n\nint main(void){return 0;}\n")
+    configure_file("${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in"
+      "${src}" @ONLY)
+
+    set(_INCLUDE ${INCLUDE}) # remove empty elements
+    if("${_INCLUDE}" MATCHES "^([^;]+);.+;([^;]+)$")
+      list(LENGTH _INCLUDE _INCLUDE_LEN)
+      set(_description "${_INCLUDE_LEN} include files ${CMAKE_MATCH_1}, ..., ${CMAKE_MATCH_2}")
+    elseif("${_INCLUDE}" MATCHES "^([^;]+);([^;]+)$")
+      set(_description "include files ${CMAKE_MATCH_1}, ${CMAKE_MATCH_2}")
+    else()
+      set(_description "include file ${_INCLUDE}")
+    endif()
+
+    if(NOT CMAKE_REQUIRED_QUIET)
+      message(STATUS "Looking for ${_description}")
+    endif()
+    try_compile(${VARIABLE}
+      ${CMAKE_BINARY_DIR}
+      ${src}
+      COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
+      CMAKE_FLAGS
+      -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_INCLUDE_FILES_FLAGS}
+      "${CHECK_INCLUDE_FILES_INCLUDE_DIRS}"
+      OUTPUT_VARIABLE OUTPUT)
+    if(${VARIABLE})
+      if(NOT CMAKE_REQUIRED_QUIET)
+        message(STATUS "Looking for ${_description} - found")
+      endif()
+      set(${VARIABLE} 1 CACHE INTERNAL "Have include ${INCLUDE}")
+      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+        "Determining if files ${INCLUDE} "
+        "exist passed with the following output:\n"
+        "${OUTPUT}\n\n")
+    else()
+      if(NOT CMAKE_REQUIRED_QUIET)
+        message(STATUS "Looking for ${_description} - not found")
+      endif()
+      set(${VARIABLE} "" CACHE INTERNAL "Have includes ${INCLUDE}")
+      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+        "Determining if files ${INCLUDE} "
+        "exist failed with the following output:\n"
+        "${OUTPUT}\nSource:\n${CMAKE_CONFIGURABLE_FILE_CONTENT}\n")
+    endif()
+  endif()
+endmacro()

From 87ce31771665d44238a542e586cc85d0a20eb09c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dundar=20G=C3=B6c?= <gocdundar@gmail.com>
Date: Wed, 19 Jan 2022 21:51:51 +0100
Subject: [PATCH 042/262] completion(animate): shorten descriptions

---
 share/completions/animate.fish | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/share/completions/animate.fish b/share/completions/animate.fish
index fadc47945..2aa4303ef 100644
--- a/share/completions/animate.fish
+++ b/share/completions/animate.fish
@@ -1,4 +1,4 @@
-complete -c animate -o alpha -d 'On, activate, off, deactivate, set, opaque, copy transparent, extract, background, or shape [option]' -xa '(animate -list alpha)'
+complete -c animate -o alpha -d 'Control alpha/matte channel of an image [option]' -xa '(animate -list alpha)'
 complete -c animate -o authenticate -d 'Decipher image with this password [password]'
 complete -c animate -o backdrop -d 'Display image centered on a backdrop'
 complete -c animate -o channel -d 'Apply option to select image channels [type]' -xa '(animate -list channel)'
@@ -12,7 +12,7 @@ complete -c animate -o depth -d 'Image depth [value]'
 complete -c animate -o display -d 'Display image to this X server [server]'
 complete -c animate -o dispose -d 'Layer disposal method [method]' -xa '(animate -list dispose)'
 complete -c animate -o dither -d 'Apply error diffusion to image [method]' -xa '(animate -list dither)'
-complete -c animate -o filter -d 'Use this filter when resizing an image [type]' -xa '(animate -list filter)'
+complete -c animate -o filter -d 'Choose filter when resizing an image [type]' -xa '(animate -list filter)'
 complete -c animate -o format -d 'Output formatted image characteristics ["string"]'
 complete -c animate -o gamma -d 'Level of gamma correction [value]'
 complete -c animate -o geometry -d 'Preferred size and location of the Image window [geometry]'
@@ -24,7 +24,7 @@ complete -c animate -o interpolate -d 'Pixel color interpolation method [method]
 complete -c animate -o limit -d 'Pixel cache resource limit [type value]' -x
 complete -c animate -o loop -d 'Loop images then exit [iterations]'
 complete -c animate -o map -d 'Display image using this Standard Colormap [type]' -x
-complete -c animate -o monitor -d 'Monitor progress '
+complete -c animate -o monitor -d 'Monitor progress'
 complete -c animate -o pause -d 'Seconds to pause before reanimating'
 complete -c animate -o page -d 'Size and location of an image canvas (setting) [geometry]'
 complete -c animate -o quantize -d 'Reduce colors in this colorspace [colorspace]' -xa '(animate -list colorspace)'
@@ -34,7 +34,7 @@ complete -c animate -o remote -d 'Command execute a command in an remote display
 complete -c animate -o respect-parentheses -d 'Settings remain in effect until parenthesis boundary'
 complete -c animate -o sampling-factor -d 'Horizontal and vertical sampling factor [geometry]'
 complete -c animate -o seed -d 'Seed a new sequence of pseudo-random numbers [value]'
-complete -c animate -o set -d 'Attribute set an image attribute [ value]'
+complete -c animate -o set -d 'Attribute set an image attribute [value]'
 complete -c animate -o size -d 'Width and height of image [geometry]'
 complete -c animate -o transparent-color -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
 complete -c animate -o treedepth -d 'Color tree depth [value]'
@@ -59,7 +59,7 @@ complete -c animate -o debug -d 'Display copious debugging information [events]'
 complete -c animate -o help -d 'Print program options'
 complete -c animate -o list -d 'Print a list of supported option arguments [type]' -xa '(animate -list list)'
 complete -c animate -o log -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
-complete -c animate -o version -d 'Print version information Press any button to map or unmap the Command widget'
+complete -c animate -o version -d 'Print version information'
 complete -c animate -o matte -d 'Store matte channel if the image has one'
 complete -c animate -o scenes -d 'Range image scene range'
 complete -c animate -o support -d 'Resize support: > 1.0 is blurry, < 1.0 is sharp [factor]'

From 8878e990a4436fec486b1eed6cf1d2a29c3cd72b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dundar=20G=C3=B6c?= <gocdundar@gmail.com>
Date: Wed, 19 Jan 2022 22:42:19 +0100
Subject: [PATCH 043/262] completion(ansible-playbook, ansible): shorten
 descriptions

---
 share/completions/ansible-playbook.fish | 10 +++++-----
 share/completions/ansible.fish          |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/share/completions/ansible-playbook.fish b/share/completions/ansible-playbook.fish
index a77ecc5d0..375fcfa7c 100644
--- a/share/completions/ansible-playbook.fish
+++ b/share/completions/ansible-playbook.fish
@@ -1,12 +1,12 @@
 complete -c ansible-playbook -l ask-vault-pass -f -d "Ask for vault password"
 complete -c ansible-playbook -s C -l check -f -d "Just check, don't make any changes"
-complete -c ansible-playbook -s D -l diff -f -d "Show the differences in files and templates; works great with --check"
+complete -c ansible-playbook -s D -l diff -f -d "Show the differences in files and templates"
 complete -c ansible-playbook -s e -l extra-vars -r -d "Set additional variables as key=value or YAML/JSON"
 complete -c ansible-playbook -l flush-cache -d "Clear the fact cache"
 complete -c ansible-playbook -l force-handlers -d "Run handlers even if a task fails"
 complete -c ansible-playbook -s f -l forks -a "(seq 0 100)" -d "Number of parallel processes to use (default=5)"
 complete -c ansible-playbook -s h -l help -d "Shows a help message"
-complete -c ansible-playbook -s i -l inventory -r -d "Specify inventory host path (default=/etc/ansible/hosts) or comma separated host list."
+complete -c ansible-playbook -s i -l inventory -r -d "Specify inventory host path or comma separated host list"
 complete -c ansible-playbook -s l -l limit -r -d "Further limit selected hosts to an additional pattern"
 complete -c ansible-playbook -l list-hosts -d "List all matching hosts"
 complete -c ansible-playbook -l list-tags -d "List all available tags"
@@ -14,13 +14,13 @@ complete -c ansible-playbook -l list-tasks -d "List all tasks that would be exec
 complete -c ansible-playbook -s M -l module-path -r -d "Specify path(s) to module library (default=None)"
 complete -c ansible-playbook -l new-vault-password-file -f -d "New vault password file for rekey"
 complete -c ansible-playbook -l output -f -d "Output file name for encrypt or decrypt; use - for stdout"
-complete -c ansible-playbook -l skip-tags -r -d "Only run plays and tasks whose tags do not match these values"
+complete -c ansible-playbook -l skip-tags -r -d "Don't run plays and tasks whose tags match these values"
 complete -c ansible-playbook -l start-at-task -r -d "Start the playbook at the task matching this name"
 complete -c ansible-playbook -l step -d "Confirm each task before running"
 complete -c ansible-playbook -l syntax-check -f -d "Perform a syntax check on the playbook"
 complete -c ansible-playbook -s t -l tags -r -f -d "Only run plays and tasks tagged with these values"
 complete -c ansible-playbook -l vault-password-file -d "Vault password file"
-complete -c ansible-playbook -s v -l verbose -f -d "Verbose mode (-vvv for more, -vvvv to enable connection debugging)"
+complete -c ansible-playbook -s v -l verbose -f -d "Verbose mode (-vv/-vvv/-vvvv for more)"
 complete -c ansible-playbook -l version -f -d "Display version and exit"
 complete -c ansible-playbook -s k -l ask-pass -f -d "Ask for connection password"
 complete -c ansible-playbook -l private-key -r -d "Use this file to authenticate the connection"
@@ -31,7 +31,7 @@ complete -c ansible-playbook -l ssh-common-args -f -d "Specify common arguments
 complete -c ansible-playbook -l sftp-extra-args -f -d "Specify extra arguments to pass to sftp only"
 complete -c ansible-playbook -l scp-extra-args -f -d "Specify extra arguments to pass to scp only"
 complete -c ansible-playbook -l ssh-extra-args -f -d "Specify extra arguments to pass to ssh only"
-complete -c ansible-playbook -s b -l become -f -d "Run operations with become (does not imply password prompting)"
+complete -c ansible-playbook -s b -l become -f -d "Run operations with become"
 complete -c ansible-playbook -l become-method -r -f -a "sudo su pbrun pfexec runas doas dzdo" -d "Privilege escalation method to use (default=sudo)"
 complete -c ansible-playbook -l become-user -r -f -a "(__fish_complete_users)" -d "Run operations as this user (default=root)"
 complete -c ansible-playbook -s K -l ask-become-pass -f -d "Ask for privilege escalation password"
diff --git a/share/completions/ansible.fish b/share/completions/ansible.fish
index d61b0f921..d34a09b38 100644
--- a/share/completions/ansible.fish
+++ b/share/completions/ansible.fish
@@ -2,7 +2,7 @@ complete -c ansible -s a -l args -r -f -d "Module arguments"
 complete -c ansible -l ask-vault-pass -f -d "Ask for vault password"
 complete -c ansible -s B -l background -r -f -d "Run asynchronously, failing after X seconds"
 complete -c ansible -s C -l check -f -d "Just check, don't make any changes"
-complete -c ansible -s D -l diff -f -d "Show the differences in files and templates; works great with --check"
+complete -c ansible -s D -l diff -f -d "Show the differences in files and templates"
 complete -c ansible -s e -l extra-vars -r -d "Set additional variables as key=value or YAML/JSON"
 complete -c ansible -s f -l forks -a "(seq 0 100)" -d "Number of parallel processes to use (default=5)"
 complete -c ansible -s h -l help -d "Shows a help message"
@@ -18,7 +18,7 @@ complete -c ansible -s P --l poll -r -d "Set the poll interval if using -B (defa
 complete -c ansible -l syntax-check -f -d "Perform a syntax check on the playbook"
 complete -c ansible -s t -l tree -f -a "(__fish_complete_directories)" -d "Log output to this directory"
 complete -c ansible -l vault-password-file -d "Vault password file"
-complete -c ansible -s v -l verbose -f -d "Verbose mode (-vvv for more, -vvvv to enable connection debugging)"
+complete -c ansible -s v -l verbose -f -d "Verbose mode (-vv/-vvv/-vvvv for more)"
 complete -c ansible -l version -f -d "Display version and exit"
 complete -c ansible -s k -l ask-pass -f -d "Ask for connection password"
 complete -c ansible -l private-key -r -d "Use this file to authenticate the connection"
@@ -30,7 +30,7 @@ complete -c ansible -l ssh-common-args -f -d "Specify common arguments to pass t
 complete -c ansible -l sftp-extra-args -f -d "Specify extra arguments to pass to sftp only"
 complete -c ansible -l scp-extra-args -f -d "Specify extra arguments to pass to scp only"
 complete -c ansible -l ssh-extra-args -f -d "Specify extra arguments to pass to ssh only"
-complete -c ansible -s b -l become -f -d "Run operations with become (does not imply password prompting)"
+complete -c ansible -s b -l become -f -d "Run operations with become"
 complete -c ansible -l become-method -r -f -a "sudo su pbrun pfexec runas doas dzdo" -d "Privilege escalation method to use (default=sudo)"
 complete -c ansible -l become-user -r -f -a "(__fish_complete_users)" -d "Run operations as this user (default=root)"
 complete -c ansible -s K -l ask-become-pass -f -d "Ask for privilege escalation password"

From 157d8cfd747292b4071fefb5bf80806c7386b4e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dundar=20G=C3=B6c?= <gocdundar@gmail.com>
Date: Thu, 20 Jan 2022 00:06:13 +0100
Subject: [PATCH 044/262] completions(ant): shorten descriptions

---
 share/completions/ant.fish | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/share/completions/ant.fish b/share/completions/ant.fish
index d1977609a..2d7837fc8 100644
--- a/share/completions/ant.fish
+++ b/share/completions/ant.fish
@@ -62,14 +62,14 @@ complete -x -c ant -a "(__fish_complete_ant_targets (commandline -co))"
 
 # Script Options:
 complete -f -c ant -l help -l h -d 'print help message and ant help'
-complete -f -c ant -l noconfig -d 'suppress sourcing of /etc/ant.conf, $HOME/.ant/ant.conf, and $HOME/.antrc configuration files'
-complete -f -c ant -l usejikes -d 'enable use of jikes by default, unless set explicitly in configuration files'
+complete -f -c ant -l noconfig -d 'suppress sourcing of configuration files'
+complete -f -c ant -l usejikes -d 'enable use of jikes by default'
 complete -f -c ant -l execdebug -d 'print ant exec line generated by this launch script'
 # Options:
-complete -f -c ant -o help -s h -d 'print help message and exit'
-complete -f -c ant -o projecthelp -s p -d 'print project help information and exit'
-complete -f -c ant -o version -d 'print the version information and exit'
-complete -f -c ant -o diagnostics -d 'print information that might be helpful to diagnose or report problems and exit'
+complete -f -c ant -o help -s h -d 'print help message'
+complete -f -c ant -o projecthelp -s p -d 'print project help information'
+complete -f -c ant -o version -d 'print the version information'
+complete -f -c ant -o diagnostics -d 'print diagnostic information'
 complete -f -c ant -o quiet -s q -d 'be extra quiet'
 complete -f -c ant -o silent -s S -d 'print nothing but task outputs and build failures'
 complete -f -c ant -o verbose -s v -d 'be extra verbose'
@@ -78,7 +78,7 @@ complete -f -c ant -o emacs -s e -d 'produce logging information without adornme
 complete -f -c ant -o noinput -d 'do not allow interactive input'
 complete -f -c ant -s D -d 'use value for given property like -D<property>=<value>'
 complete -f -c ant -o keep-going -s k -d 'execute all targets that do not depend on failed target(s)'
-complete -f -c ant -o nouserlib -d 'Run ant without using the jar files from ${user.home}/.ant/lib'
+complete -f -c ant -o nouserlib -d 'Run ant without using jar files from ${user.home}/.ant/lib'
 complete -f -c ant -o noclasspath -d 'Run ant without using CLASSPATH'
 complete -f -c ant -o autoproxy -d 'Java1.5+: use the OS proxy settings'
 complete -r -c ant -o lib -d 'specifies a path to search for jars and classes'
@@ -86,8 +86,8 @@ complete -r -c ant -o logfile -s l -d 'use given file for log'
 complete -r -c ant -o logger -d 'the class which is to perform logging'
 complete -r -c ant -o listener -d 'add an instance of class as a project listener'
 complete -r -c ant -o buildfile -o file -s f -d 'use given buildfile'
-complete -r -c ant -o propertyfile -d 'load all properties from file with -D properties taking precedence'
+complete -r -c ant -o propertyfile -d 'load properties from file, -D properties takes precedence'
 complete -r -c ant -o inputhandler -d 'the class which will handle input requests'
-complete -r -c ant -o find -s s -d '(s)earch for buildfile towards the root of the filesystem and use it'
-complete -r -c ant -o nice -d 'A niceness value for the main thread: 1 (lowest) to 10 (highest); 5 is the default'
+complete -r -c ant -o find -s s -d 'search for buildfile towards the root and use it'
+complete -r -c ant -o nice -d 'A niceness value for the main thread'
 complete -r -c ant -o main -d 'override Ant\'s normal entry point'

From b74f610a470712f4760e0f4abb0df8e8c49c9bd1 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 19 Jan 2022 22:18:36 +0100
Subject: [PATCH 045/262] completions/gcc: Some small fixes

Remove some nonexistent options (my gcc does not know "-mdata"), fix
the longest description in all of fish and remove some argument
markers from the option.
---
 share/completions/gcc.fish | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/share/completions/gcc.fish b/share/completions/gcc.fish
index f7e2e9ee7..414b27c2b 100644
--- a/share/completions/gcc.fish
+++ b/share/completions/gcc.fish
@@ -502,8 +502,8 @@ complete -c gcc -o Xlinker -d 'Pass option as an option to the linker'
 complete -c gcc -s u -d 'Pretend the symbol symbol is undefined, to force linking of library modules to define it'
 complete -c gcc -o Idir -d 'Add the directory dir to the head of the list of directories to be searched for header files'
 complete -c gcc -o iquotedir -d 'Add the directory dir to the head of the list of directories to be searched for header files only for the case of #include "file"; they are not searched for #include <file>, otherwise just like -I'
-complete -c gcc -o Ldir -d 'Add directory dir to the list of directories to be searched for -l'
-complete -c gcc -o Bprefix -d 'This option specifies where to find the executables, libraries, include files, and data files of the compiler itself'
+complete -c gcc -o L -d 'Add directory dir to the list of directories to be searched for -l'
+complete -c gcc -o B -d 'This option specifies where to find the executables, libraries, include files, and data files of the compiler itself'
 complete -c gcc -o specs -r -d 'Process file after the compiler reads in the standard specs file, in order to override the defaults that the gcc driver program uses when determining what switches to pass to cc1, cc1plus, as, ld, etc'
 complete -c gcc -l sysroot -x -a '(__fish_complete_directories)' -d 'Use dir as the logical root directory for headers and libraries'
 complete -c gcc -o I- -d 'This option has been deprecated'
@@ -513,10 +513,6 @@ complete -c gcc -o EL -d 'Compile code for little endian mode'
 complete -c gcc -o EB -d 'Compile code for big endian mode'
 complete -c gcc -o mmangle-cpu -d 'Prepend the name of the cpu to all public symbol names'
 complete -c gcc -o mcpu -d 'Compile code for ARC variant cpu' -x
-complete -c gcc -o mtext -d 'Put functions, data, and readonly data in text-section, data-section, and readonly-data-section respectively by default'
-complete -c gcc -o mdata -d 'Put functions, data, and readonly data in text-section, data-section, and readonly-data-section respectively by default'
-complete -c gcc -o mrodata -d 'Put functions, data, and readonly data in text-section, data-section, and readonly-data-section respectively by default'
-complete -c gcc -o section -d 'Put functions, data, and readonly data in text-section, data-section, and readonly-data-section respectively by default'
 complete -c gcc -o mabi -d 'Generate code for the specified ABI' -x
 complete -c gcc -o mapcs-frame -d 'Generate a stack frame that is compliant with the ARM Procedure Call Standard for all functions, even if this is not strictly necessary for correct execution of the code'
 complete -c gcc -o mapcs -d 'This is a synonym for -mapcs-frame'
@@ -529,7 +525,7 @@ complete -c gcc -o mlittle-endian -d 'Generate code for a processor running in l
 complete -c gcc -o mbig-endian -d 'Generate code for a processor running in big-endian mode; the default is to compile code for a little-endian processor'
 complete -c gcc -o mwords-little-endian -d 'This option only applies when generating code for big-endian processors'
 complete -c gcc -o mcpu -d 'This specifies the name of the target ARM processor' -x
-complete -c gcc -o mtune -d 'This option is very similar to the -mcpu= option, except that instead of specifying the actual target processor type, and hence restricting which instructions can be used, it specifies that GCC should tune the performance of the code as if the target were of the type specified in this option, but still choosing the instructions that it will generate based on the cpu specified by a -mcpu= option' -x
+complete -c gcc -o mtune -d 'Tune output for this cpu without restricting the instructions to it'
 complete -c gcc -o march -d 'This specifies the name of the target ARM architecture' -x
 complete -c gcc -o mfpu -x -d 'This specifies what floating point hardware (or hardware emulation) is available on the target'
 complete -c gcc -o mfpe -x -d 'This specifies what floating point hardware (or hardware emulation) is available on the target'

From 02241d19be014df7247912f11316dda37255ebfa Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 20 Jan 2022 17:15:34 +0100
Subject: [PATCH 046/262] CHANGELOG More ignores

---
 CHANGELOG.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ce428d51a..71bbf69b7 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,7 +2,7 @@ fish 3.4.0 (released ???)
 =========================
 
 ..
-   Ignore for 3.4.0 changelog: 1363 3625 3954 6477 7602 8059 8077 8079 8084 8096 8118 8127 8128 8130 8137 8139 8146 8151 8153 8161 8170 8176 8183 8184 8191 8192 8195 8202 8204 8205 8206 8219 8221 8222 8224 8227 8228 8229 8230 8231 8235 8236 8237 8238 8239 8241 8243 8249 8252 8253 8256 8257 8260 8268 8270 8271 8277 8280 8285 8287 8289 8295 8299 8305 8306 8308 8310 8311 8314 8321 8323 8326 8327 8334 8335 8337 8338 8344 8353 8358 8365 8367 8368 8380 8381 8385 8391 8394 8403 8406 8409 8410 8419 8429 8430 8433 8438 8439 8441 8444 8446 8449 8456 8457 8471 8472 8476 8477 8478 8479 8480 8487 8492 8495 8497 8500 8511 8518 8521 8522 8526 8527 8528 8548 8549 8559 8575 8584 8587 8588 8570 8591 8596 8597 8601 8608 8612 8613 8614 8615 8621 8623 8626 8630 8633 8636 8639 8647 8650 8643
+   Ignore for 3.4.0 changelog: 1363 3625 3954 6477 7602 8059 8077 8079 8084 8096 8118 8127 8128 8130 8137 8139 8146 8151 8153 8161 8170 8176 8183 8184 8191 8192 8195 8202 8204 8205 8206 8219 8221 8222 8224 8227 8228 8229 8230 8231 8235 8236 8237 8238 8239 8241 8243 8249 8252 8253 8256 8257 8260 8268 8270 8271 8277 8280 8285 8287 8289 8295 8299 8305 8306 8308 8310 8311 8314 8321 8323 8326 8327 8334 8335 8337 8338 8344 8353 8358 8365 8367 8368 8380 8381 8385 8391 8394 8403 8406 8409 8410 8419 8429 8430 8433 8438 8439 8441 8444 8446 8449 8456 8457 8471 8472 8476 8477 8478 8479 8480 8487 8492 8495 8497 8500 8511 8518 8521 8522 8526 8527 8528 8548 8549 8559 8575 8584 8587 8588 8570 8591 8596 8597 8601 8608 8612 8613 8614 8615 8621 8623 8626 8630 8633 8636 8639 8647 8650 8643 8647 8651 8654 8655 8656
 
 
 Notable improvements and fixes

From 372f03ba20a62eab9f2c35e076732ec7bffcce98 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Thu, 20 Jan 2022 11:04:40 -0600
Subject: [PATCH 047/262] Fix sys/sysctl.h depreciation error under glibc 2.30+

glibc 2.30 and up emit an ugly depreciation warning on
`#include <sys/sysctl.h>` - this patch makes the build system fail the
include test for `sys/sysctl.h` by forcibly setting `-Werror` before the
call to `check_include_files` (which internally uses `try_compile`) to
get `HAVE_SYS_SYSCTL` to not be defined (even if it's there) if it would
cause such a depreciation message to be emitted.

Ideally, we would not have to manually massage `CMAKE_C_FLAGS` before
calling `check_include_files` and could just tweak that to either always
or conditionally try compilation with `-Werror`, but try_compile doesn't
actually use any overridden `CMAKE_C_FLAGS` values [0] (dating back to
2006).

[0]: https://cmake.org/pipermail/cmake/2006-October/011649.html
---
 cmake/ConfigureChecks.cmake | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index 9c75ae668..2e2d5e567 100644
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -115,7 +115,14 @@ check_struct_has_member("struct stat" st_mtim.tv_nsec "sys/stat.h" HAVE_STRUCT_S
     LANGUAGE CXX)
 check_include_file_cxx(sys/ioctl.h HAVE_SYS_IOCTL_H)
 check_include_file_cxx(sys/select.h HAVE_SYS_SELECT_H)
+
+# glibc 2.30 deprecated <sys/sysctl.h> because that's what glibc does.
+# Checking for that here rather than hardcoding a check on the glibc
+# version in the C++ sources at point of use makes more sense.
+SET(OLD_CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
 check_include_files("sys/types.h;sys/sysctl.h" HAVE_SYS_SYSCTL_H)
+SET(CMAKE_C_FLAGS "${OLD_CMAKE_C_FLAGS}")
 
 check_cxx_symbol_exists(eventfd sys/eventfd.h HAVE_EVENTFD)
 check_cxx_symbol_exists(pipe2 unistd.h HAVE_PIPE2)

From f40c054a6a0f1b4c0cb13b686ac49a1bcb4c2151 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 21 Jan 2022 17:10:52 +0100
Subject: [PATCH 048/262] Replace hangul hack with widecharwidth version

This updates widecharwidth to
6d3d55b419db93934517cb568d1a3d95909b4c7b, which includes the same
Hangul Jamo check in a separate table.

This should slightly speed up most width calculation because we no
longer need to do it for most chars, including the overwhelmingly
common ascii ones.

Also the range is increased and should better match reality.
---
 src/fallback.cpp                   |  6 ------
 src/widecharwidth/widechar_width.h | 10 +++++++++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/fallback.cpp b/src/fallback.cpp
index c93d685be..d5104daab 100644
--- a/src/fallback.cpp
+++ b/src/fallback.cpp
@@ -243,12 +243,6 @@ int fish_wcwidth(wchar_t wc) {
     else if (wc == variation_selector_15)
         return 0;
 
-    // Korean Hangul Jamo median vowels and final consonants.
-    // These can either appear in combined form, taking 0 width themselves,
-    // or standalone with a 1 width. Since that's literally not expressible with wcwidth(),
-    // we take the position that the typical way for them to show up is composed.
-    if (wc >= L'\u1160' && wc <= L'\u11FF') return 0;
-
     // Check for Emoji_Modifier property. Only the Fitzpatrick modifiers have this, in range
     // 1F3FB..1F3FF. This is a hack because such an emoji appearing on its own would be drawn as
     // width 2, but that's unlikely to be useful. See #8275.
diff --git a/src/widecharwidth/widechar_width.h b/src/widecharwidth/widechar_width.h
index 0843f7b6c..cc849745a 100644
--- a/src/widecharwidth/widechar_width.h
+++ b/src/widecharwidth/widechar_width.h
@@ -1,5 +1,5 @@
 /**
- * widechar_width.h, generated on 2021-10-26.
+ * widechar_width.h, generated on 2022-01-01.
  * See https://github.com/ridiculousfish/widecharwidth/
  *
  * SHA1 file hashes:
@@ -378,6 +378,12 @@ static const struct widechar_range widechar_combining_table[] = {
     {0xE0100, 0xE01EF}
 };
 
+/* Width 0 combining letters. */
+static const struct widechar_range widechar_combiningletters_table[] = {
+    {0x01160, 0x011FF},
+    {0x0D7B0, 0x0D7FF}
+};
+
 /* Width 2 characters. */
 static const struct widechar_range widechar_doublewide_table[] = {
     {0x01100, 0x0115F},
@@ -1463,6 +1469,8 @@ int widechar_wcwidth(uint32_t c) {
         return widechar_non_character;
     if (widechar_in_table(widechar_combining_table, c))
         return widechar_combining;
+    if (widechar_in_table(widechar_combiningletters_table, c))
+        return widechar_combining;
     if (widechar_in_table(widechar_doublewide_table, c))
         return 2;
     if (widechar_in_table(widechar_ambiguous_table, c))

From 0d5651b0ab83c05e88d38245ace51581df6cda27 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Fri, 21 Jan 2022 13:03:35 -0800
Subject: [PATCH 049/262] .pkg scripts: remove old installs, fix install
 volume, logging

 + Adds a preinstall script to wipe out whatever the last .pkg
   installed. This should avoid systems that have mad many updates
   getting into strange states autoloading things that no longer
   exist. Fixes #2963

 + Run add-shell with ${DSTVOLUME} prepended to the path - the
   installer lets users intall onto any volume, so it's plausible
   not installed onto /

 + Use `logger` instead of rando /tmp files for logging - stuff
   should show up in Console.

 + make_pkg makes the pkg and also fish.app - the former was being
   built with -j12 already, make the latter do so as well.
---
 build_tools/make_pkg.sh                     | 2 +-
 build_tools/osx_package_scripts/postinstall | 2 +-
 build_tools/osx_package_scripts/preinstall  | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100755 build_tools/osx_package_scripts/preinstall

diff --git a/build_tools/make_pkg.sh b/build_tools/make_pkg.sh
index 25a3de109..d4fcd9934 100755
--- a/build_tools/make_pkg.sh
+++ b/build_tools/make_pkg.sh
@@ -35,6 +35,6 @@ MAC_PRODUCTSIGN_ID=${MAC_PRODUCTSIGN_ID:--}
 productsign --sign "${MAC_PRODUCTSIGN_ID}" "$OUTPUT_PATH/fish-$VERSION.pkg" "$OUTPUT_PATH/fish-$VERSION-signed.pkg" && mv "$OUTPUT_PATH/fish-$VERSION-signed.pkg" "$OUTPUT_PATH/fish-$VERSION.pkg"
 
 # Make the app
-{ cd "$PKGDIR/build" && make signed_fish_macapp && zip -r "$OUTPUT_PATH/fish-$VERSION.app.zip" fish.app; }
+{ cd "$PKGDIR/build" && make -j 12 signed_fish_macapp && zip -r "$OUTPUT_PATH/fish-$VERSION.app.zip" fish.app; }
 
 rm -r "$PKGDIR"
diff --git a/build_tools/osx_package_scripts/postinstall b/build_tools/osx_package_scripts/postinstall
index 544fd1de1..e9a6a0517 100755
--- a/build_tools/osx_package_scripts/postinstall
+++ b/build_tools/osx_package_scripts/postinstall
@@ -1,3 +1,3 @@
 #!/bin/sh -x
 
-./add-shell /usr/local/bin/fish > /tmp/fish_postinstall_output.log
+./add-shell ${DSTVOLUME}usr/local/bin/fish | logger -s -t "${INSTALL_PKG_SESSION_ID}"
diff --git a/build_tools/osx_package_scripts/preinstall b/build_tools/osx_package_scripts/preinstall
new file mode 100755
index 000000000..2f2cffb3b
--- /dev/null
+++ b/build_tools/osx_package_scripts/preinstall
@@ -0,0 +1,7 @@
+#!/bin/sh -x
+
+logger -s -t "${INSTALL_PKG_SESSION_ID}" "Removing any previous installation"
+pkgutil --pkg-info ${INSTALL_PKG_SESSION_ID} && pkgutil pkgutil --only-files --files ${INSTALL_PKG_SESSION_ID} | while read installed
+     do rm -v ${DSTVOLUME}${installed}
+done | logger -s -t "${INSTALL_PKG_SESSION_ID}"
+logger -s -t "${INSTALL_PKG_SESSION_ID}" "... removed"

From 9c1723863dd85b5668d82b42a37772ad5343dd18 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Fri, 21 Jan 2022 14:28:49 -0800
Subject: [PATCH 050/262] Update CHANGELOG.rst

---
 CHANGELOG.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 71bbf69b7..b562d6b0f 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -192,7 +192,8 @@ Other improvements
 - The HTML version of the documentation now includes copy buttons for code examples (:issue:`8218`).
 - The HTML version of the documentation and the web-based configuration tool now pick more modern system fonts instead of falling back to Arial and something like Courier New most of the time (:issue:`8632`).
 - The Debian & Ubuntu package linked from fishshell.com is now a single package, rather than split into ``fish`` and ``fish-common`` (:issue:`7845`).
-- The macOS installer does not assert that Rosetta is required to install fish (:issue:`8566`).
+- The macOS installer does not assert that Rosetta is required to install fish on machines with Apple Silicon (:issue:`8566`).
+- The macOS installer now cleans up previous .pkg installations when upgrading. (:issue:`2963`).
 
 For distributors
 ----------------

From 3bad45a933c9be015b610fe8b8779469054dab9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dundar=20G=C3=B6c?= <gocdundar@gmail.com>
Date: Thu, 20 Jan 2022 10:20:27 +0100
Subject: [PATCH 051/262] completions(bison): shorten descriptions

Work on https://github.com/fish-shell/fish-shell/issues/6981
---
 share/completions/bison.fish | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/share/completions/bison.fish b/share/completions/bison.fish
index d7b50f891..ef2dc275d 100644
--- a/share/completions/bison.fish
+++ b/share/completions/bison.fish
@@ -5,19 +5,16 @@
 # have been hand edited since.
 #
 
-complete -c bison -s b -l file-prefix -d 'Specify a prefix to use for all bison output file names' -r
-
-complete -c bison -s d -d 'Write an extra output file containing macro definitions for the token type names defined in the grammar and the semantic value type YYSTYPE, as well as a few extern variable declarations'
-complete -c bison -l defines -d 'The behavior of --defines is the same than -d option'
-complete -c bison -s g -d 'Output a VCG definition of the LALR(1) grammar automaton com puted by Bison'
-complete -c bison -l graph -d 'The behavior of --graph is the same than -g option'
+complete -c bison -s b -l file-prefix -d 'Specify a prefix to use for all output file names' -r
+complete -c bison -s d -l defines -d 'Generate file with macro definitions for token type names'
+complete -c bison -s g -l graph -d 'Output a VCG definition of the LALR(1) grammar automaton'
 complete -c bison -s k -l token-table -d 'This switch causes the name'
 complete -c bison -s l -l no-lines -d 'Dont put any #line preprocessor commands in the parser file'
-complete -c bison -s n -l no-parser -d 'Do not generate the parser code into the output; generate only declarations'
+complete -c bison -s n -l no-parser -d "Generate only declarations, not parser code"
 complete -c bison -s o -l output -d 'Specify the name outfile for the parser file'
-complete -c bison -s p -l name-prefix -d 'Rename the external symbols used in the parser so that they start with prefix instead of yy'
-complete -c bison -s t -l debug -d 'In the parser file, define the macro YYDEBUG to 1 if it is not already defined, so that the debugging facilities are compiled'
-complete -c bison -s v -l verbose -d 'Write an extra output file containing verbose descriptions of the parser states and what is done for each type of look-ahead token in that state'
-complete -c bison -s V -l version -d 'Print the version number of bison and exit'
-complete -c bison -s h -l help -d 'Print a summary of the options to bison and exit'
+complete -c bison -s p -l name-prefix -d 'External symbols start with prefix instead of yy'
+complete -c bison -s t -l debug -d 'Enable debugging facilities on compilation'
+complete -c bison -s v -l verbose -d 'Generate file with descriptions of the parser states'
+complete -c bison -s V -l version -d 'Print version number'
+complete -c bison -s h -l help -d 'Print summary of the options'
 complete -c bison -s y -l yacc -l fixed-output-files -d 'Equivalent to -o y.tab.c'

From 7667a51d93c4c0c47741c287b8b1948eb8937716 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dundar=20G=C3=B6c?= <gocdundar@gmail.com>
Date: Thu, 20 Jan 2022 10:55:01 +0100
Subject: [PATCH 052/262] completions(cdrecord): shorten descriptions

---
 share/completions/cdrecord.fish | 72 ++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/share/completions/cdrecord.fish b/share/completions/cdrecord.fish
index 01cd0eb85..3f7b6805e 100644
--- a/share/completions/cdrecord.fish
+++ b/share/completions/cdrecord.fish
@@ -2,33 +2,33 @@
 # Completions for Cdrecord
 #
 
-complete -c cdrecord -o version -d "Display version and exit"
+complete -c cdrecord -o version -d "Display version"
 complete -c cdrecord -s v -d "Increment the level of general verbosity by one"
 complete -c cdrecord -s V -d "Increment the verbose level in respect of SCSI command transport by one"
 complete -c cdrecord -a "debug={1,2,3,4,5}" -d "Set the misc debug value to #"
 complete -c cdrecord -s d -d "Increment the misc debug level by one" -a "1 2 3 4 5"
 complete -c cdrecord -s s -o silent -d "Do not print out a status report for failed SCSI commands"
 complete -c cdrecord -o force -d "Force to continue on some errors"
-complete -c cdrecord -o immed -d "Tell cdrecord to set the SCSI IMMED flag in certain commands"
-complete -c cdrecord -a "minbuf={25,35,45,55,65,75,85,95}" -d "Defines the minimum drive buffer fill ratio for the experimental ATAPI wait mode intended to free the IDE bus to allow hard disk and CD/DVD writer on the same IDE cable"
+complete -c cdrecord -o immed -d "Set the SCSI IMMED flag in certain commands"
+complete -c cdrecord -a "minbuf={25,35,45,55,65,75,85,95}" -d "Minimum drive buffer fill ratio for the ATAPI wait mode"
 complete -c cdrecord -o dummy -d "Complete CD/DVD-Recorder recording process with the laser turned off"
-complete -c cdrecord -o clone -d "Tells cdrecord to handle images created by readcd -clone"
+complete -c cdrecord -o clone -d "Handle images created by readcd -clone"
 complete -c cdrecord -o dao
 complete -c cdrecord -o sao -d "Set SAO (Session At Once) mode, usually called Disk At Once mode"
 complete -c cdrecord -o tao -d "Set TAO (Track At Once) writing mode"
 complete -c cdrecord -o raw -d "Set RAW writing mode"
 complete -c cdrecord -o raw96r -d "Select Set RAW writing, the preferred raw writing mode"
 complete -c cdrecord -o raw96p -d "Select Set RAW writing, the less preferred raw writing mode"
-complete -c cdrecord -o raw16 -d "Select Set RAW writing, the preferred raw writing mode if raw96r is not supported"
+complete -c cdrecord -o raw16 -d "Select Set RAW writing, the preferred raw writing mode after raw96r"
 complete -c cdrecord -o multi -d "Allow multi session CDs to be made"
 complete -c cdrecord -o msinfo -d "Retrieve multi session info in a form suitable for mkisofs-1.10 or later"
 complete -c cdrecord -o toc -d "Retrieve and print out the table of content or PMA of a CD"
 complete -c cdrecord -o atip -d "Retrieve and print out the ATIP (absolute Time in Pre-groove) info"
-complete -c cdrecord -o fix -d "The disk will only be fixated"
+complete -c cdrecord -o fix -d "Only fixate disk "
 complete -c cdrecord -o nofix -d "Do not fixate the disk after writing the tracks"
-complete -c cdrecord -o waiti -d "Wait for input to become available on standard input before trying to open the SCSI driver"
-complete -c cdrecord -o load -d "Load the media and exit"
-complete -c cdrecord -o lock -d "Load the media, lock the door and exit"
+complete -c cdrecord -o waiti -d "Wait for standard input to become available before opening the SCSI driver"
+complete -c cdrecord -o load -d "Load the media"
+complete -c cdrecord -o lock -d "Load the media, lock the door"
 complete -c cdrecord -o eject -d "Eject disk after doing the work"
 complete -c cdrecord -a "speed={0,150,172,1385}" -d "Set the speed factor of the writing process to #"
 complete -c cdrecord -a "blank={help,all,fast,track,unreserve,trtail,unclose,session}" -d "Blank a CD-RW and exit or blank a CD-RW before writing"
@@ -43,22 +43,22 @@ complete -c cdrecord -a "driver={help,mmc_cd,mmc_cd_dvd,mmc_cdr,mmc_cdr_sony,mmc
 # TODO: This argument accepts a comma separated list of arguments
 
 complete -c cdrecord -a "driveropts=" -d "Set driver specific options"
-complete -c cdrecord -o setdropts -d "Set the driveropts specified by driveropts=option list, the speed of the drive and the dummy flag and exit"
-complete -c cdrecord -o checkdrive -d "Checks if a driver for the current drive is present and exit"
-complete -c cdrecord -o prcap -d "Print the drive capabilities for SCSI-3/mmc compliant drives as obtained from mode page 0x2A"
-complete -c cdrecord -o inq -d "Do an inquiry for the drive, print the inquiry info and exit"
+complete -c cdrecord -o setdropts -d "Set driver specific options"
+complete -c cdrecord -o checkdrive -d "Checks if a driver for the current drive is present"
+complete -c cdrecord -o prcap -d "Print the drive capabilities for SCSI-3/mmc compliant drives"
+complete -c cdrecord -o inq -d "Do an inquiry for the drive, print the inquiry info"
 complete -c cdrecord -o scanbus -d "Scan all SCSI devices on all SCSI busses and print the inquiry strings"
 complete -c cdrecord -o reset -d "Try to reset the SCSI bus where the CD recorder is located"
 complete -c cdrecord -o abort -d "Try to send an abort sequence to the drive"
-complete -c cdrecord -o overburn -d "Allow cdrecord to write more than the official size of a medium"
+complete -c cdrecord -o overburn -d "Allow writing more than the official size of a medium"
 complete -c cdrecord -o ignsize -d "Ignore the known size of the medium, use for debugging only"
 complete -c cdrecord -o useinfo -d "Use *.inf files to overwrite audio options"
-complete -c cdrecord -a "defpregap=" -d "Set the default pre-gap size for all tracks except track nr 1"
-complete -c cdrecord -o packet -d "Set Packet writing mode (experimental interface)"
-complete -c cdrecord -a "pktsize=" -d "Set the packet size to #, forces fixed packet mode (experimental)"
-complete -c cdrecord -o noclose -d "Do not close the current track, only when in packet writing mode (experimental)"
+complete -c cdrecord -a "defpregap=" -d "Set default pre-gap size for all tracks except track nr 1"
+complete -c cdrecord -o packet -d "Set Packet writing mode"
+complete -c cdrecord -a "pktsize=" -d "Set the packet size to #, forces fixed packet mode"
+complete -c cdrecord -o noclose -d "Don't close the current track, only when in packet writing mode"
 complete -c cdrecord -a "mcn=" -d "Set the Media Catalog Number of the CD"
-complete -c cdrecord -o text -d "Write CD-Text info based on info taken from a file that contains ascii info for the text strings"
+complete -c cdrecord -o text -d "Write CD-Text info based on file containing ascii info"
 complete -c cdrecord -a "textfile=" -d "Write CD-Text based on info found in the binary file filename"
 complete -c cdrecord -a "cuefile=" -d "Take all recording related info from a CDRWIN compliant CUE sheet file"
 
@@ -66,25 +66,25 @@ complete -c cdrecord -a "cuefile=" -d "Take all recording related info from a CD
 
 complete -c cdrecord -a "isrc=" -d "Set the International Standard Recording Number for the next track"
 complete -c cdrecord -a "index=" -d "Sets an index list for the next track"
-complete -c cdrecord -o audio -d "All subsequent tracks are written in CD-DA audio format"
-complete -c cdrecord -o swab -d "Audio data is assumed to be in byte-swapped (little-endian) order"
-complete -c cdrecord -o data -d "All subsequent tracks are written in CD-ROM mode 1 (Yellow Book) format"
-complete -c cdrecord -o mode2 -d "All subsequent tracks are written in CD-ROM mode 2 format"
-complete -c cdrecord -o xa -d "All subsequent tracks are written in CD-ROM XA mode 2 form 1 format"
-complete -c cdrecord -o xa1 -d "All subsequent tracks are written in CD-ROM XA mode 2 form 1 format"
-complete -c cdrecord -o xa2 -d "All subsequent tracks are written in CD-ROM XA mode 2 form 2 format"
-complete -c cdrecord -o xamix -d "All subsequent tracks are written in a way that allows a mix of CD-ROM XA mode 2 form 1/2 format"
+complete -c cdrecord -o audio -d "Subsequent tracks are written in CD-DA format"
+complete -c cdrecord -o swab -d "Audio data is assumed to be in byte-swapped order"
+complete -c cdrecord -o data -d "Subsequent tracks are written in CD-ROM mode 1 format"
+complete -c cdrecord -o mode2 -d "Subsequent tracks are written in CD-ROM mode 2 format"
+complete -c cdrecord -o xa -d "Subsequent tracks are written in CD-ROM XA mode 2 form 1 format"
+complete -c cdrecord -o xa1 -d "Subsequent tracks are written in CD-ROM XA mode 2 form 1 format"
+complete -c cdrecord -o xa2 -d "Subsequent tracks are written in CD-ROM XA mode 2 form 2 format"
+complete -c cdrecord -o xamix -d "Subsequent tracks allows a mix of CD-ROM XA mode 2 form 1/2 format"
 complete -c cdrecord -o cdi -d "The TOC type for the disk is set to CDI, with XA only"
 complete -c cdrecord -o isosize -d "Use the ISO-9660 file system size as the size of the next track"
-complete -c cdrecord -o pad -d "15 sectors of zeroed data will be added to the end of this and each subsequent data track"
+complete -c cdrecord -o pad -d "Add 15 sectors of zeroed data to the end of this and subsequent tracks"
 complete -c cdrecord -a "padsize=" -d "Set the amount of data to be appended as padding to the next track"
 complete -c cdrecord -o nopad -d "Do not pad the following tracks - the default"
-complete -c cdrecord -o shorttrack -d "Allow all subsequent tracks to violate the Red Book track length standard (min 4 s)"
-complete -c cdrecord -o noshorttrack -d "Re-enforce the Red Book track length standard (min 4 s)"
+complete -c cdrecord -o shorttrack -d "Allow all subsequent tracks to violate the Red Book track length standard"
+complete -c cdrecord -o noshorttrack -d "Re-enforce the Red Book track length standard"
 complete -c cdrecord -a "pregap=" -d "Set the pre-gap size for the next track"
-complete -c cdrecord -o preemp -d "All TOC entries for subsequent audio tracks will indicate that the audio data has been sampled with 50/15 microsec pre-emphasis"
-complete -c cdrecord -o nopreemp -d "All TOC entries for subsequent audio tracks will indicate that the audio data has been mastered with linear data"
-complete -c cdrecord -o copy -d "All TOC entries for subsequent audio tracks of the resulting CD will indicate that the audio data has permission to be copied without limit"
-complete -c cdrecord -o nocopy -d "All TOC entries for subsequent audio tracks of the resulting CD will indicate that the audio data has permission to be copied only once for personal use"
-complete -c cdrecord -o scms -d "All TOC entries for subsequent audio tracks of the resulting CD will indicate that the audio data has no permission to be copied"
-complete -c cdrecord -a "tsize=" -d "If the master image for the next track has been stored on a raw disk, use this option to specify the valid amount of data on this disk"
+complete -c cdrecord -o preemp -d "TOC indicates that data has been sampled with 50/15 microsec pre-emphasis"
+complete -c cdrecord -o nopreemp -d "TOC indicates that data has been mastered with linear data"
+complete -c cdrecord -o copy -d "TOC indicates that data has permission to be copied without limit"
+complete -c cdrecord -o nocopy -d "TOC indicates that data has permission to be copied only once"
+complete -c cdrecord -o scms -d "TOC indicates that data has no permission to be copied"
+complete -c cdrecord -a "tsize=" -d "Specify valid amount of data on raw disk for next track's master image"

From 095aed64e0734bd6d833cea12d3abb9d01f7ccd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dundar=20G=C3=B6c?= <gocdundar@gmail.com>
Date: Thu, 20 Jan 2022 11:39:17 +0100
Subject: [PATCH 053/262] completions(imagemagick): shorten descriptions

---
 share/completions/compare.fish   |  6 +++---
 share/completions/composite.fish |  8 ++++----
 share/completions/conjure.fish   |  2 +-
 share/completions/convert.fish   | 18 +++++++++---------
 share/completions/display.fish   | 10 +++++-----
 share/completions/identify.fish  | 10 +++++-----
 share/completions/import.fish    |  2 +-
 share/completions/mogrify.fish   | 18 +++++++++---------
 share/completions/montage.fish   | 14 +++++++-------
 share/completions/stream.fish    |  4 ++--
 10 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/share/completions/compare.fish b/share/completions/compare.fish
index 4b87f43bd..2e702d3a9 100644
--- a/share/completions/compare.fish
+++ b/share/completions/compare.fish
@@ -1,4 +1,4 @@
-complete -c compare -o alpha -d 'On, activate, off, deactivate, set, opaque, copy transparent, extract, background, or shape [option]' -xa '(compare -list alpha)'
+complete -c compare -o alpha -d 'Control alpha/matte channel of an image [option]' -xa '(compare -list alpha)'
 complete -c compare -o authenticate -d 'Decipher image with this password [password]'
 complete -c compare -o channel -d 'Apply option to select image channels [type]' -xa '(compare -list channel)'
 complete -c compare -o colorspace -d 'Alternate image colorspace [type]' -xa '(compare -list colorspace)'
@@ -19,7 +19,7 @@ complete -c compare -o interlace -d 'Type of image interlacing scheme [type]' -x
 complete -c compare -o limit -d 'Pixel cache resource limit [type value]' -x
 complete -c compare -o lowlight-color -d 'De-emphasize pixel differences with this color [color]' -xa '(__fish_complete_convert_options color)'
 complete -c compare -o metric -d 'Measure differences between images with this metric [type]' -xa '(compare -list metric)'
-complete -c compare -o monitor -d 'Monitor progress '
+complete -c compare -o monitor -d 'Monitor progress'
 complete -c compare -o passphrase -d 'Get the passphrase from this file [filename]' -r
 complete -c compare -o profile -d 'Add, delete, or apply an image profile [filename]' -r
 complete -c compare -o quality -d 'JPEG/MIFF/PNG compression level [value]'
@@ -29,7 +29,7 @@ complete -c compare -o regard-warnings -d 'Pay attention to warning messages'
 complete -c compare -o respect-parentheses -d 'Settings remain in effect until parenthesis boundary'
 complete -c compare -o sampling-factor -d 'Horizontal and vertical sampling factor [geometry]'
 complete -c compare -o seed -d 'Seed a new sequence of pseudo-random numbers [value]'
-complete -c compare -o set -d 'Attribute set an image attribute [ value]'
+complete -c compare -o set -d 'Attribute set an image attribute [value]'
 complete -c compare -o size -d 'Width and height of image [geometry]'
 complete -c compare -o subimage-search -d 'Search for subimage'
 complete -c compare -o transparent-color -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
diff --git a/share/completions/composite.fish b/share/completions/composite.fish
index ce972cbae..b4fede6d1 100644
--- a/share/completions/composite.fish
+++ b/share/completions/composite.fish
@@ -1,5 +1,5 @@
 complete -c composite -o affine -d 'Affine transform matrix [matrix]'
-complete -c composite -o alpha -d 'On, activate, off, deactivate, set, opaque, copy transparent, extract, background, or shape [option]' -xa '(convert -list alpha)'
+complete -c composite -o alpha -d 'Control alpha/matte channel of an image [option]' -xa '(convert -list alpha)'
 complete -c composite -o authenticate -d 'Decipher image with this password [password]'
 complete -c composite -o blue-primary -d 'Chromaticity blue primary point [point]'
 complete -c composite -o channel -d 'Apply option to select image channels [type]' -xa '(convert -list channel)'
@@ -24,7 +24,7 @@ complete -c composite -o interlace -d 'Type of image interlacing scheme [type]'
 complete -c composite -o interpolate -d 'Pixel color interpolation method [method]' -xa '(convert -list interpolate)'
 complete -c composite -o label -d 'Assign a label to an image [string]'
 complete -c composite -o limit -d 'Pixel cache resource limit [type value]' -x
-complete -c composite -o monitor -d 'Monitor progress '
+complete -c composite -o monitor -d 'Monitor progress'
 complete -c composite -o page -d 'Size and location of an image canvas (setting) [geometry]'
 complete -c composite -o pointsize -d 'Font point size [value]'
 complete -c composite -o quality -d 'JPEG/MIFF/PNG compression level [value]'
@@ -50,9 +50,9 @@ complete -c composite -o border -d 'Surround image with a border of color [geome
 complete -c composite -o bordercolor -d 'Border color [color]' -xa '(__fish_complete_convert_options color)'
 complete -c composite -o colors -d 'Preferred number of colors in the image [value]'
 complete -c composite -o decipher -d 'Convert cipher pixels to plain pixels [filename]' -r
-complete -c composite -o displace -d 'Shift lookup according to a relative displacement map [geometry]'
+complete -c composite -o displace -d 'Shift image pixels defined by a displacement map [geometry]'
 complete -c composite -o dissolve -d 'Dissolve the two images a given percent [value]'
-complete -c composite -o distort -d 'Shift lookup according to a absolute distortion map [geometry]'
+complete -c composite -o distort -d 'Shift lookup based on a absolute distortion map [geometry]'
 complete -c composite -o encipher -d 'Convert plain pixels to cipher pixels [filename]' -r
 complete -c composite -o extract -d 'Extract area from image [geometry]'
 complete -c composite -o geometry -d 'Location of the composite image [geometry]'
diff --git a/share/completions/conjure.fish b/share/completions/conjure.fish
index 46954e08c..a78657d83 100644
--- a/share/completions/conjure.fish
+++ b/share/completions/conjure.fish
@@ -1,4 +1,4 @@
-complete -c conjure -o monitor -d 'Monitor progress '
+complete -c conjure -o monitor -d 'Monitor progress'
 complete -c conjure -o quiet -d 'Suppress all warning messages'
 complete -c conjure -o regard-warnings -d 'Pay attention to warning messages'
 complete -c conjure -o seed -d 'Seed a new sequence of pseudo-random numbers [value]'
diff --git a/share/completions/convert.fish b/share/completions/convert.fish
index 5e19772af..fe7873159 100644
--- a/share/completions/convert.fish
+++ b/share/completions/convert.fish
@@ -1,7 +1,7 @@
 complete -c convert -o adjoin -d 'Join images into a single multi-image file'
 complete -c convert -o affine -d 'Affine transform matrix [matrix]'
-complete -c convert -o alpha -d 'Activate, deactivate, reset, or set the alpha channel [option]' -xa '(convert -list alpha)'
-complete -c convert -o antialias -d 'Remove pixel-aliasing '
+complete -c convert -o alpha -d 'Control alpha/matte channel of an image [option]' -xa '(convert -list alpha)'
+complete -c convert -o antialias -d 'Remove pixel-aliasing'
 complete -c convert -o authenticate -d 'Decipher image with this password [password]'
 complete -c convert -o attenuate -d 'Lessen (or intensify) when adding noise to an image [value]'
 complete -c convert -o background -d 'Background color [color]' -xa '(__fish_complete_convert_options color)'
@@ -45,7 +45,7 @@ complete -c convert -o limit -d 'Pixel cache resource limit [type value]' -x
 complete -c convert -o loop -d 'Add Netscape loop extension to your GIF animation [iterations]'
 complete -c convert -o mask -d 'Associate a mask with the image [filename]' -r
 complete -c convert -o mattecolor -d 'Frame color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c convert -o monitor -d 'Monitor progress '
+complete -c convert -o monitor -d 'Monitor progress'
 complete -c convert -o orient -d 'Image orientation [type]' -xa '(convert -list orientation)'
 complete -c convert -o page -d 'Size and location of an image canvas (setting) [geometry]'
 complete -c convert -o ping -d 'Efficiently determine image attributes'
@@ -80,7 +80,7 @@ complete -c convert -o virtual-pixel -d 'Virtual pixel access method [method]' -
 complete -c convert -o weight -d 'Render text with this font weight [type]' -x
 complete -c convert -o white-point -d 'Chromaticity white point [point]'
 complete -c convert -o adaptive-blur -d 'Adaptively blur pixels; decrease effect near edges [geometry]'
-complete -c convert -o adaptive-resize -d 'Adaptively resize image using \'mesh\' interpolation [geometry]'
+complete -c convert -o adaptive-resize -d "Adaptively resize image using 'mesh' interpolation [geometry]"
 complete -c convert -o adaptive-sharpen -d 'Adaptively sharpen pixels; increase effect near edges [geometry]'
 complete -c convert -o annotate -d 'Annotate the image with text [geometry text]'
 complete -c convert -o auto-gamma -d 'Automagically adjust gamma level of image'
@@ -115,7 +115,7 @@ complete -c convert -o encipher -d 'Convert plain pixels to cipher pixels [filen
 complete -c convert -o emboss -d 'Emboss an image [radius]'
 complete -c convert -o enhance -d 'Apply a digital filter to enhance a noisy image'
 complete -c convert -o equalize -d 'Perform histogram equalization to an image'
-complete -c convert -o evaluate -d 'Evaluate an arithmetic, relational, or logical expression [operator value]'
+complete -c convert -o evaluate -d 'Alter channel pixels based on expression [operator]'
 complete -c convert -o extent -d 'Set the image size [geometry]'
 complete -c convert -o extract -d 'Extract area from image [geometry]'
 complete -c convert -o fft -d 'Implements the discrete Fourier transform (DFT)'
@@ -173,13 +173,13 @@ complete -c convert -o shadow -d 'Simulate an image shadow [geometry]'
 complete -c convert -o sharpen -d 'Sharpen the image [geometry]'
 complete -c convert -o shave -d 'Shave pixels from the image edges [geometry]'
 complete -c convert -o shear -d 'Slide one edge of the image along the X or Y axis [geometry]'
-complete -c convert -o sigmoidal-contrast -d 'Increase the contrast without saturating highlights or shadows [geometry]'
+complete -c convert -o sigmoidal-contrast -d 'Lightness rescaling using sigmoidal contrast enhancement [geometry]'
 complete -c convert -o sketch -d 'Simulate a pencil sketch [geometry]'
 complete -c convert -o solarize -d 'Negate all pixels above the threshold level [threshold]'
 complete -c convert -o sparse-color -d 'Args fill in a image based on a few color points [method]' -xa '(convert -list sparse-color)'
 complete -c convert -o splice -d 'Splice the background color into the image [geometry]'
 complete -c convert -o spread -d 'Displace image pixels by a random amount [radius]'
-complete -c convert -o statistic -d 'Replace each pixel with corresponding statistic from the neighborhood [type geometry]' -xa '(convert -list statistic)'
+complete -c convert -o statistic -d 'Replace pixels with statistic from the neighborhood [type geometry]' -xa '(convert -list statistic)'
 complete -c convert -o strip -d 'Strip image of all profiles and comments'
 complete -c convert -o swirl -d 'Swirl image pixels about the center [degrees]'
 complete -c convert -o threshold -d 'Threshold the image [value]'
@@ -201,10 +201,10 @@ complete -c convert -o append -d 'Append an image sequence'
 complete -c convert -o clut -d 'Apply a color lookup table to the image'
 complete -c convert -o coalesce -d 'Merge a sequence of images'
 complete -c convert -o combine -d 'Combine a sequence of images'
-complete -c convert -o composite -d 'Composite image '
+complete -c convert -o composite -d 'Composite image'
 complete -c convert -o crop -d 'Cut out a rectangular region of the image [geometry]'
 complete -c convert -o deconstruct -d 'Break down an image sequence into constituent parts'
-complete -c convert -o evaluate-sequence -d 'Evaluate an arithmetic, relational, or logical expression [operator]'
+complete -c convert -o evaluate-sequence -d 'Alter channel pixels based on expression [operator]'
 complete -c convert -o flatten -d 'Flatten a sequence of images'
 complete -c convert -o fx -d 'Apply mathematical expression to an image channel(s) [expression]'
 complete -c convert -o hald-clut -d 'Apply a Hald color lookup table to the image'
diff --git a/share/completions/display.fish b/share/completions/display.fish
index 8a764dd2b..7b182ac25 100644
--- a/share/completions/display.fish
+++ b/share/completions/display.fish
@@ -1,5 +1,5 @@
-complete -c display -o alpha -d 'On, activate, off, deactivate, set, opaque, copy transparent, extract, background, or shape [option]' -xa '(display -list alpha)'
-complete -c display -o antialias -d 'Remove pixel-aliasing '
+complete -c display -o alpha -d 'Control alpha/matte channel of an image [option]' -xa '(display -list alpha)'
+complete -c display -o antialias -d 'Remove pixel-aliasing'
 complete -c display -o authenticate -d 'Decipher image with this password [password]'
 complete -c display -o backdrop -d 'Display image centered on a backdrop'
 complete -c display -o channel -d 'Apply option to select image channels [type]' -xa '(display -list channel)'
@@ -27,7 +27,7 @@ complete -c display -o label -d 'Assign a label to an image [string]'
 complete -c display -o limit -d 'Pixel cache resource limit [type value]' -x
 complete -c display -o loop -d 'Loop images then exit [iterations]'
 complete -c display -o map -d 'Display image using this Standard Colormap [type]' -x
-complete -c display -o monitor -d 'Monitor progress '
+complete -c display -o monitor -d 'Monitor progress'
 complete -c display -o page -d 'Size and location of an image canvas [geometry]'
 complete -c display -o profile -d 'Add, delete, or apply an image profile [filename]' -r
 complete -c display -o quality -d 'JPEG/MIFF/PNG compression level [value]'
@@ -41,7 +41,7 @@ complete -c display -o sampling-factor -d 'Horizontal and vertical sampling fact
 complete -c display -o seed -d 'Seed a new sequence of pseudo-random numbers [value]'
 complete -c display -o set -d 'Set an image property [property value]'
 complete -c display -o size -d 'Width and height of image [geometry]'
-complete -c display -o texture -d 'Name of texture to tile onto the image background [filename]' -r
+complete -c display -o texture -d 'Texture name to tile onto the image background [filename]' -r
 complete -c display -o transparent-color -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
 complete -c display -o treedepth -d 'Color tree depth [value]'
 complete -c display -o update -d 'Seconds detect when image file is modified and redisplay'
@@ -51,7 +51,7 @@ complete -c display -o virtual-pixel -d 'Virtual pixel access method [method]' -
 complete -c display -o window -d 'Display image to background of this window [id]' -xa 'root (__fish_print_xwindows)'
 complete -c display -o window-group -d 'Exit program when this window id is destroyed [id]'
 complete -c display -o write -d 'Write image to a file [filename]' -r
-complete -c display -o auto-orient -d 'Automagically orient image'
+complete -c display -o auto-orient -d 'Automagically orient (rotate) image'
 complete -c display -o border -d 'Surround image with a border of color [geometry]'
 complete -c display -o clip -d 'Clip along the first path from the 8BIM profile'
 complete -c display -o clip-path -d 'Clip along a named path from the 8BIM profile [id]'
diff --git a/share/completions/identify.fish b/share/completions/identify.fish
index f4ae7c5e7..c3806d871 100644
--- a/share/completions/identify.fish
+++ b/share/completions/identify.fish
@@ -1,4 +1,4 @@
-complete -c identify -o antialias -d 'Remove pixel-aliasing '
+complete -c identify -o antialias -d 'Remove pixel-aliasing'
 complete -c identify -o authenticate -d 'Decrypt image with this password [value]'
 complete -c identify -o channel -d 'Apply option to select image channels [type]' -xa '(identify -list channel)'
 complete -c identify -o crop -d 'Cut out a rectangular region of the image [geometry]'
@@ -6,21 +6,21 @@ complete -c identify -o define -d 'Define one or more image format options [form
 complete -c identify -o density -d 'Horizontal and vertical density of the image [geometry]'
 complete -c identify -o depth -d 'Image depth [value]'
 complete -c identify -o extract -d 'Extract area from image [geometry]'
-complete -c identify -o features -d 'Display image features (e.g. contrast, correlation) [distance]'
+complete -c identify -o features -d 'Display image features [distance]'
 complete -c identify -o format -d 'Output formatted image characteristics ["string"]'
 complete -c identify -o fuzz -d 'Colors within this distance are considered equal [distance]'
 complete -c identify -o interlace -d 'Type of image interlacing scheme [type]' -xa '(identify -list interlace)'
 complete -c identify -o interpolate -d 'Pixel color interpolation method [method]' -xa '(identify -list interpolate)'
 complete -c identify -o limit -d 'Pixel cache resource limit [type value]' -x
-complete -c identify -o list -d 'Color, Configure, Delegate, Format, Magic, Module, Resource, or Type [type]' -xa '(identify -list list)'
+complete -c identify -o list -d 'Print a list of supported option arguments [type]' -xa '(identify -list list)'
 complete -c identify -o matte -d 'Store matte channel if the image has one'
-complete -c identify -o monitor -d 'Monitor progress '
+complete -c identify -o monitor -d 'Monitor progress'
 complete -c identify -o ping -d 'Efficiently determine image attributes'
 complete -c identify -o quiet -d 'Suppress all warning messages'
 complete -c identify -o regard-warnings -d 'Pay attention to warning messages'
 complete -c identify -o sampling-factor -d 'Horizontal and vertical sampling factor [geometry]'
 complete -c identify -o seed -d 'Seed a new sequence of pseudo-random numbers [value]'
-complete -c identify -o set -d 'Attribute set an image attribute [ value]'
+complete -c identify -o set -d 'Attribute set an image attribute [value]'
 complete -c identify -o size -d 'Width and height of image [geometry]'
 complete -c identify -o strip -d 'Strip image of all profiles and comments'
 complete -c identify -o unique -d 'Display the number of unique colors in the image'
diff --git a/share/completions/import.fish b/share/completions/import.fish
index bb12ab76c..d34398631 100644
--- a/share/completions/import.fish
+++ b/share/completions/import.fish
@@ -24,7 +24,7 @@ complete -c import -o interlace -d 'None, Line, Plane, or Partition [type]' -xa
 complete -c import -o interpolate -d 'Pixel color interpolation method [method]' -xa '(import -list interpolate)'
 complete -c import -o label -d 'Assign a label to an image [string]'
 complete -c import -o limit -d 'Area, Disk, Map, or Memory resource limit [type value]' -x
-complete -c import -o monitor -d 'Monitor progress '
+complete -c import -o monitor -d 'Monitor progress'
 complete -c import -o page -d 'Size and location of an image canvas [geometry]'
 complete -c import -o pause -d 'Seconds delay between snapshots [value]'
 complete -c import -o pointsize -d 'Font point size [value]'
diff --git a/share/completions/mogrify.fish b/share/completions/mogrify.fish
index aec69c942..458c76f43 100644
--- a/share/completions/mogrify.fish
+++ b/share/completions/mogrify.fish
@@ -1,6 +1,6 @@
 complete -c mogrify -o adjoin -d 'Join images into a single multi-image file'
 complete -c mogrify -o affine -d 'Affine transform matrix [matrix]'
-complete -c mogrify -o antialias -d 'Remove pixel-aliasing '
+complete -c mogrify -o antialias -d 'Remove pixel-aliasing'
 complete -c mogrify -o authenticate -d 'Decrypt image with this password [value]'
 complete -c mogrify -o background -d 'Background color [color]' -xa '(__fish_complete_convert_options color)'
 complete -c mogrify -o bias -d 'Add bias when convolving an image [value]'
@@ -47,7 +47,7 @@ complete -c mogrify -o loop -d 'Add Netscape loop extension to your GIF animatio
 complete -c mogrify -o mask -d 'Associate a mask with the image [filename]' -r
 complete -c mogrify -o matte -d 'Store matte channel if the image has one'
 complete -c mogrify -o mattecolor -d 'Frame color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c mogrify -o monitor -d 'Monitor progress '
+complete -c mogrify -o monitor -d 'Monitor progress'
 complete -c mogrify -o morphology -d 'Apply a morphology method to the image [method kernel]' -xa '(mogrify -list morphology)'
 complete -c mogrify -o orient -d 'Image orientation [type]' -xa '(mogrify -list orientation)'
 complete -c mogrify -o origin -d 'Image origin [geometry]'
@@ -83,10 +83,10 @@ complete -c mogrify -o virtual-pixel -d 'Virtual pixel access method [method]' -
 complete -c mogrify -o weight -d 'Render text with this font weight [type]' -x
 complete -c mogrify -o white-point -d 'Chromaticity white point [point]'
 complete -c mogrify -o adaptive-blur -d 'Adaptively blur pixels; decrease effect near edges [geometry]'
-complete -c mogrify -o adaptive-resize -d 'Adaptively resize image with data dependent triangulation [geometry]'
+complete -c mogrify -o adaptive-resize -d "Adaptively resize image using 'mesh' interpolation [geometry]"
 complete -c mogrify -o adaptive-sharpen -d 'Adaptively sharpen pixels; increase effect near edges [geometry]'
 complete -c mogrify -o annotate -d 'Annotate the image with text [geometry text]'
-complete -c mogrify -o auto-orient -d 'Automatically orient image'
+complete -c mogrify -o auto-orient -d 'Automatically orient (rotate) image'
 complete -c mogrify -o black-threshold -d 'Force all pixels below the threshold into black [value]'
 complete -c mogrify -o blur -d 'Reduce image noise and reduce detail levels [geometry]'
 complete -c mogrify -o border -d 'Surround image with a border of color [geometry]'
@@ -107,7 +107,7 @@ complete -c mogrify -o edge -d 'Apply a filter to detect edges in the image [rad
 complete -c mogrify -o emboss -d 'Emboss an image [radius]'
 complete -c mogrify -o enhance -d 'Apply a digital filter to enhance a noisy image'
 complete -c mogrify -o equalize -d 'Perform histogram equalization to an image'
-complete -c mogrify -o evaluate -d 'Evaluate an arithmetic, relational, or logical expression [operator value]'
+complete -c mogrify -o evaluate -d 'Alter channel pixels based on expression [operator]'
 complete -c mogrify -o extent -d 'Set the image size [geometry]'
 complete -c mogrify -o extract -d 'Extract area from image [geometry]'
 complete -c mogrify -o fft -d 'Implements the discrete Fourier transform (DFT)'
@@ -168,7 +168,7 @@ complete -c mogrify -o sketch -d 'Simulate a pencil sketch [geometry]'
 complete -c mogrify -o solarize -d 'Negate all pixels above the threshold level [threshold]'
 complete -c mogrify -o splice -d 'Splice the background color into the image [geometry]'
 complete -c mogrify -o spread -d 'Displace image pixels by a random amount [amount]'
-complete -c mogrify -o statistic -d 'Replace each pixel with corresponding statistic from the neighborhood [type geometry]' -xa '(mogrify -list statistic)'
+complete -c mogrify -o statistic -d 'Replace pixels with statistic from the neighborhood [type geometry]' -xa '(mogrify -list statistic)'
 complete -c mogrify -o strip -d 'Strip image of all profiles and comments'
 complete -c mogrify -o swirl -d 'Swirl image pixels about the center [degrees]'
 complete -c mogrify -o threshold -d 'Threshold the image [value]'
@@ -187,14 +187,14 @@ complete -c mogrify -o vignette -d 'Soften the edges of the image in vignette st
 complete -c mogrify -o wave -d 'Alter an image along a sine wave [geometry]'
 complete -c mogrify -o white-threshold -d 'Force all pixels above the threshold into white [value]'
 complete -c mogrify -o affinity -d 'Transform image colors to match this set of colors [filename]' -r
-complete -c mogrify -o append -d 'Append an image sequence top to botto (use +append for left to right)'
+complete -c mogrify -o append -d 'Append an image sequence'
 complete -c mogrify -o clut -d 'Apply a color lookup table to the image'
 complete -c mogrify -o coalesce -d 'Merge a sequence of images'
 complete -c mogrify -o combine -d 'Combine a sequence of images'
-complete -c mogrify -o composite -d 'Composite image '
+complete -c mogrify -o composite -d 'Composite image'
 complete -c mogrify -o crop -d 'Cut out a rectangular region of the image [geometry]'
 complete -c mogrify -o deconstruct -d 'Break down an image sequence into constituent parts'
-complete -c mogrify -o evaluate-sequence -d 'Evaluate an arithmetic, relational, or logical expression [operator]'
+complete -c mogrify -o evaluate-sequence -d 'Alter channel pixels based on expression [operator]'
 complete -c mogrify -o fx -d 'Apply mathematical expression to an image channel(s) [expression]'
 complete -c mogrify -o hald-clut -d 'Apply a Hald color lookup table to the image'
 complete -c mogrify -o morph -d 'Morph an image sequence [value]'
diff --git a/share/completions/montage.fish b/share/completions/montage.fish
index 7c4b59334..64a4010ff 100644
--- a/share/completions/montage.fish
+++ b/share/completions/montage.fish
@@ -1,6 +1,6 @@
 complete -c montage -o adjoin -d 'Join images into a single multi-image file'
 complete -c montage -o affine -d 'Affine transform matrix [matrix]'
-complete -c montage -o alpha -d 'On, activate, off, deactivate, set, opaque, copy transparent, extract, background, or shape [option]' -xa '(montage -list alpha)'
+complete -c montage -o alpha -d 'Control alpha/matte channel of an image [option]' -xa '(montage -list alpha)'
 complete -c montage -o authenticate -d 'Decipher image with this password [password]'
 complete -c montage -o blue-primary -d 'Chromaticity blue primary point [point]'
 complete -c montage -o bordercolor -d 'Border color [color]' -xa '(__fish_complete_convert_options color)'
@@ -37,7 +37,7 @@ complete -c montage -o label -d 'Assign a label to an image [string]'
 complete -c montage -o limit -d 'Pixel cache resource limit [type value]' -x
 complete -c montage -o mattecolor -d 'Frame color [color]' -xa '(__fish_complete_convert_options color)'
 complete -c montage -o mode -d 'Framing style [type]' -xa '(montage -list mode)'
-complete -c montage -o monitor -d 'Monitor progress '
+complete -c montage -o monitor -d 'Monitor progress'
 complete -c montage -o origin -d 'Image origin [geometry]'
 complete -c montage -o page -d 'Size and location of an image canvas (setting) [geometry]'
 complete -c montage -o pointsize -d 'Font point size [value]'
@@ -51,13 +51,13 @@ complete -c montage -o respect-parentheses -d 'Settings remain in effect until p
 complete -c montage -o sampling-factor -d 'Horizontal and vertical sampling factor [geometry]'
 complete -c montage -o scenes -d 'Range image scene range'
 complete -c montage -o seed -d 'Seed a new sequence of pseudo-random numbers [value]'
-complete -c montage -o set -d 'Attribute set an image attribute [ value]'
+complete -c montage -o set -d 'Attribute set an image attribute [value]'
 complete -c montage -o shadow -d 'Add a shadow beneath a tile to simulate depth'
 complete -c montage -o size -d 'Width and height of image [geometry]'
 complete -c montage -o stroke -d 'Color to use when stroking a graphic primitive [color]' -xa '(__fish_complete_convert_options color)'
 complete -c montage -o synchronize -d 'Synchronize image to storage device'
 complete -c montage -o taint -d 'Declare the image as modified'
-complete -c montage -o texture -d 'Name of texture to tile onto the image background [filename]' -r
+complete -c montage -o texture -d 'Texture name to tile onto the image background [filename]' -r
 complete -c montage -o thumbnail -d 'Create a thumbnail of the image [geometry]'
 complete -c montage -o tile -d 'Number of tiles per row and column [geometry]'
 complete -c montage -o title -d 'Decorate the montage image with a title [string]'
@@ -68,8 +68,8 @@ complete -c montage -o units -d 'The units of image resolution [type]' -xa '(mon
 complete -c montage -o verbose -d 'Print detailed information about the image'
 complete -c montage -o virtual-pixel -d 'Virtual pixel access method [method]' -xa '(montage -list virtual-pixel)'
 complete -c montage -o white-point -d 'Chromaticity white point [point]'
-complete -c montage -o adaptive-sharpen -d 'Adaptively sharpen pixels; increase effect near edges annotate geometry text annotate the image with text [geometry]'
-complete -c montage -o auto-orient -d 'Automagically orient image'
+complete -c montage -o adaptive-sharpen -d 'Adaptively sharpen pixels; increase effect near edges [geometry]'
+complete -c montage -o auto-orient -d 'Automagically orient (rotate) image'
 complete -c montage -o blur -d 'Reduce image noise and reduce detail levels [geometry]'
 complete -c montage -o border -d 'Surround image with a border of color [geometry]'
 complete -c montage -o crop -d 'Preferred size and location of the cropped image [geometry]'
@@ -90,7 +90,7 @@ complete -c montage -o transparent -d 'Make this color transparent within the im
 complete -c montage -o type -d 'Image type [type]' -xa '(montage -list type)'
 complete -c montage -o unsharp -d 'Sharpen the image [geometry]'
 complete -c montage -o coalesce -d 'Merge a sequence of images'
-complete -c montage -o composite -d 'Composite image '
+complete -c montage -o composite -d 'Composite image'
 complete -c montage -o clone -d 'Clone an image [indexes]'
 complete -c montage -o delete -d 'Delete the image from the image sequence [indexes]'
 complete -c montage -o duplicate -d 'Duplicate an image one or more times [count,indexes]'
diff --git a/share/completions/stream.fish b/share/completions/stream.fish
index b50979943..cf5843110 100644
--- a/share/completions/stream.fish
+++ b/share/completions/stream.fish
@@ -11,14 +11,14 @@ complete -c stream -o interlace -d 'Type of image interlacing scheme [type]' -xa
 complete -c stream -o interpolate -d 'Pixel color interpolation method [method]' -xa '(stream -list interpolate)'
 complete -c stream -o limit -d 'Pixel cache resource limit [type value]' -x
 complete -c stream -o map -d 'Components one or more pixel components'
-complete -c stream -o monitor -d 'Monitor progress '
+complete -c stream -o monitor -d 'Monitor progress'
 complete -c stream -o quantize -d 'Reduce colors in this colorspace [colorspace]' -xa '(stream -list colorspace)'
 complete -c stream -o quiet -d 'Suppress all warning messages'
 complete -c stream -o regard-warnings -d 'Pay attention to warning messages'
 complete -c stream -o respect-parentheses -d 'Settings remain in effect until parenthesis boundary'
 complete -c stream -o sampling-factor -d 'Horizontal and vertical sampling factor [geometry]'
 complete -c stream -o seed -d 'Seed a new sequence of pseudo-random numbers [value]'
-complete -c stream -o set -d 'Attribute set an image attribute [ value]'
+complete -c stream -o set -d 'Attribute set an image attribute [value]'
 complete -c stream -o size -d 'Width and height of image [geometry]'
 complete -c stream -o storage-type -d 'Pixel storage type [type]' -xa '(stream -list storage)'
 complete -c stream -o synchronize -d 'Synchronize image to storage device'

From 48e686dae21a4b769e08b430143e5da1fc50f348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dundar=20G=C3=B6c?= <gocdundar@gmail.com>
Date: Thu, 20 Jan 2022 20:27:04 +0100
Subject: [PATCH 054/262] completions(latexmk): shorten descriptions

---
 share/completions/latexmk.fish | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/share/completions/latexmk.fish b/share/completions/latexmk.fish
index ac1dc5eeb..d8b4b7874 100644
--- a/share/completions/latexmk.fish
+++ b/share/completions/latexmk.fish
@@ -6,25 +6,25 @@ complete -c latexmk -o bm -x -d 'Print message across the page when converting t
 complete -c latexmk -o bi -x -d 'Set contrast or intensity of banner'
 complete -c latexmk -o bs -x -d 'Set scale for banner'
 complete -c latexmk -o commands -d 'list commands used by latexmk for processing files'
-complete -c latexmk -o c -d 'clean up (remove) all nonessential files, except dvi, ps and pdf files'
-complete -c latexmk -o C -o CA -d 'clean up (remove) all nonessential files'
-complete -c latexmk -o CF -d 'Remove file of database of file information before doing other actions'
+complete -c latexmk -o c -d 'Delete all nonessential files, except dvi, ps and pdf files'
+complete -c latexmk -o C -o CA -d 'Delete all nonessential files'
+complete -c latexmk -o CF -d 'Delete database file information file before other actions'
 complete -c latexmk -o cd -d 'Change to directory of source file when processing it'
-complete -c latexmk -o cd- -d 'Do NOT change to directory of source file when processing it'
+complete -c latexmk -o cd- -d "Don't change to directory of source file when processing it"
 complete -c latexmk -o dependents -o -deps -d 'Show list of dependent files after processing'
 complete -c latexmk -o dependents- -o -deps- -d 'Do not show list of dependent files'
-complete -c latexmk -o deps-out= -r -d 'Set name of output file for dependency list, and turn on showing of dependency list'
+complete -c latexmk -o deps-out= -r -d 'Set dependency list file name, show dependency list'
 complete -c latexmk -o dF -x -d 'Filter to apply to dvi file'
 complete -c latexmk -o dvi -d 'generate dvi'
 complete -c latexmk -o dvi- -d 'turn off required dvi'
-complete -c latexmk -o e -x -d 'Execute specified Perl code (as part of latexmk start-up code)'
+complete -c latexmk -o e -x -d 'Execute specified Perl code on start-up'
 complete -c latexmk -o f -d 'force continued processing past errors'
 complete -c latexmk -o f- -d 'turn off forced continuing processing past errors'
 complete -c latexmk -o gg -d 'Super go mode: clean out generated files before processing'
 complete -c latexmk -o g -d 'process regardless of file timestamps'
 complete -c latexmk -o g- -d 'Turn off -g'
 complete -c latexmk -o h -o help -d 'print help'
-complete -c latexmk -o jobname= -x -d 'set basename of output file(s) to STRING'
+complete -c latexmk -o jobname= -x -d 'set basename of output files to STRING'
 complete -c latexmk -o l -d 'force landscape mode'
 complete -c latexmk -o l- -d 'turn off -l'
 complete -c latexmk -o latex= -d 'set program used for latex' -xa '(__fish_complete_command)'

From cd529377710a07a9d656d9fc35b99363763e976b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dundar=20G=C3=B6c?= <gocdundar@gmail.com>
Date: Thu, 20 Jan 2022 20:48:12 +0100
Subject: [PATCH 055/262] completions(sass): shorten descriptions

---
 share/completions/sass-convert.fish | 30 ++++++++---------
 share/completions/sass.fish         | 48 +++++++++++++--------------
 share/completions/scss.fish         | 50 ++++++++++++++---------------
 3 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/share/completions/sass-convert.fish b/share/completions/sass-convert.fish
index 6f45e7154..bdda9be76 100644
--- a/share/completions/sass-convert.fish
+++ b/share/completions/sass-convert.fish
@@ -9,45 +9,45 @@
 #     -F, --from FORMAT                The format to convert from. Can be css, scss, sass.
 #                                      By default, this is inferred from the input filename.
 #                                      If there is none, defaults to css.
-complete -c sass-convert -s F -l from -x -a "css scss sass" -d "The format to convert from. Can be css, scss, sass. By default, this is inferred from the input filename. If there is none, defaults to css."
+complete -c sass-convert -s F -l from -x -a "css scss sass" -d "The format to convert from"
 #     -T, --to FORMAT                  The format to convert to. Can be scss or sass.
 #                                      By default, this is inferred from the output filename.
 #                                      If there is none, defaults to sass.
-complete -c sass-convert -s T -l to -x -a "scss sass" -d "The format to convert to. Can be scss or sass. By default, this is inferred from the output filename. If there is none, defaults to sass."
+complete -c sass-convert -s T -l to -x -a "scss sass" -d "The format to convert to"
 #     -i, --in-place                   Convert a file to its own syntax.
 #                                      This can be used to update some deprecated syntax.
-complete -c sass-convert -s i -l in-place -d "Convert a file to its own syntax. This can be used to update some deprecated syntax."
+complete -c sass-convert -s i -l in-place -d "Convert a file to its own syntax"
 #     -R, --recursive                  Convert all the files in a directory. Requires --from and --to.
-complete -c sass-convert -s R -l recursive -d "Convert all the files in a directory. Requires --from and --to."
+complete -c sass-convert -s R -l recursive -d "Convert all the files in a directory"
 #     -?, -h, --help                   Show this help message.
-complete -c sass-convert -s '?' -s h -l help -f -d "Show help message."
+complete -c sass-convert -s '?' -s h -l help -f -d "Show help message"
 #     -v, --version                    Print the Sass version.
-complete -c sass-convert -s v -l version -f -d "Print the Sass version."
+complete -c sass-convert -s v -l version -f -d "Print the Sass version"
 
 # Style:
 #         --dasherize                  Convert underscores to dashes.
-complete -c sass-convert -l dasherize -d "Convert underscores to dashes."
+complete -c sass-convert -l dasherize -d "Convert underscores to dashes"
 #         --indent NUM                 How many spaces to use for each level of indentation. Defaults to 2.
 #                                      "t" means use hard tabs.
-complete -c sass-convert -l indent -x -d "How many spaces to use for each level of indentation. Defaults to 2. 't' means use hard tabs."
+complete -c sass-convert -l indent -x -d "How many spaces to use for each level of indentation"
 #         --old                        Output the old-style ":prop val" property syntax.
 #                                      Only meaningful when generating Sass.
-complete -c sass-convert -l old -d "Output the old-style ':prop val' property syntax. Only meaningful when generating Sass."
+complete -c sass-convert -l old -d "Output the old-style ':prop val' property syntax"
 
 # Input and Output:
 #     -s, --stdin                      Read input from standard input instead of an input file.
 #                                      This is the default if no input file is specified. Requires --from.
-complete -c sass-convert -s s -l stdin -d "Read input from standard input instead of an input file. This is the default if no input file is specified. Requires --from."
+complete -c sass-convert -s s -l stdin -d "Read input from standard input instead of an input file"
 #     -E, --default-encoding ENCODING  Specify the default encoding for input files.
-complete -c sass-convert -s E -l default-encoding -x -d "Specify the default encoding for input files."
+complete -c sass-convert -s E -l default-encoding -x -d "Specify the default encoding for input files"
 #         --unix-newlines              Use Unix-style newlines in written files.
 #                                      Always true on Unix.
-complete -c sass-convert -l unix-newlines -d "Use Unix-style newlines in written files. Always true on Unix."
+complete -c sass-convert -l unix-newlines -d "Use Unix-style newlines in written files"
 
 # Miscellaneous:
 #         --cache-location PATH        The path to save parsed Sass files. Defaults to .sass-cache.
-complete -c sass-convert -l cache-location -r -d "The path to save parsed Sass files. Defaults to .sass-cache."
+complete -c sass-convert -l cache-location -r -d "The path to save parsed Sass files"
 #     -C, --no-cache                   Don't cache to sassc files.
-complete -c sass-convert -s C -l no-cache -d "Don't cache to sassc files."
+complete -c sass-convert -s C -l no-cache -d "Don't cache to sassc files"
 #         --trace                      Show a full Ruby stack trace on error
-complete -c sass-convert -l trace -d "Show a full Ruby stack trace on error."
+complete -c sass-convert -l trace -d "Show a full Ruby stack trace on error"
diff --git a/share/completions/sass.fish b/share/completions/sass.fish
index 95a2c1441..1c7421ff7 100644
--- a/share/completions/sass.fish
+++ b/share/completions/sass.fish
@@ -5,36 +5,36 @@
 
 # Common Options:
 #     -I, --load-path PATH             Specify a Sass import path.
-complete -c sass -s I -l load-path -r -d "Specify a Sass import path."
+complete -c sass -s I -l load-path -r -d "Specify a import path"
 #     -r, --require LIB                Require a Ruby library before running Sass.
-complete -c sass -s r -l require -x -d "Require a Ruby library before running Sass."
+complete -c sass -s r -l require -x -d "Require a Ruby library before running"
 #         --compass                    Make Compass imports available and load project configuration.
-complete -c sass -l compass -d "Make Compass imports available and load project configuration."
+complete -c sass -l compass -d "Enable Compass imports and load project configuration"
 #     -t, --style NAME                 Output style. Can be nested (default), compact, compressed, or expanded.
-complete -c sass -s t -l style -x -a "nested compact compressed expanded" -d "Output style. Can be nested (default), compact, compressed, or expanded."
+complete -c sass -s t -l style -x -a "nested compact compressed expanded" -d "Output style"
 #     -?, -h, --help                   Show this help message.
-complete -c sass -s '?' -s h -l help -f -d "Show help message."
+complete -c sass -s '?' -s h -l help -f -d "Show help message"
 #     -v, --version                    Print the Sass version.
-complete -c sass -s v -l version -f -d "Print the Sass version."
+complete -c sass -s v -l version -f -d "Print the version"
 
 # Watching and Updating:
 #         --watch                      Watch files or directories for changes.
 #                                      The location of the generated CSS can be set using a colon:
 #                                        sass --watch input.sass:output.css
 #                                        sass --watch input-dir:output-dir
-complete -c sass -l watch -d "Watch files or directories for changes. The location of the generated CSS can be set using a colon: input.sass:output.css input-dir:output-dir"
+complete -c sass -l watch -d "Watch files or directories for changes"
 #         --poll                       Check for file changes manually, rather than relying on the OS.
 #                                      Only meaningful for --watch.
-complete -c sass -l poll -d "Check for file changes manually, rather than relying on the OS. Only meaningful for --watch."
+complete -c sass -l poll -d "Check for file changes manually, don't rely on OS"
 #         --update                     Compile files or directories to CSS.
 #                                      Locations are set like --watch.
-complete -c sass -l update -d "Compile files or directories to CSS. The location of the generated CSS can be set using a colon: input.sass:output.css input-dir:output-dir"
+complete -c sass -l update -d "Compile files or directories to CSS"
 #     -f, --force                      Recompile every Sass file, even if the CSS file is newer.
 #                                      Only meaningful for --update.
-complete -c sass -s f -l force -d "Recompile every Sass file, even if the CSS file is newer. Only meaningful for --update."
+complete -c sass -s f -l force -d "Recompile every Sass file, even if the CSS file is newer"
 #         --stop-on-error              If a file fails to compile, exit immediately.
 #                                      Only meaningful for --watch and --update.
-complete -c sass -l stop-on-error -d "If a file fails to compile, exit immediately. Only meaningful for --watch and --update."
+complete -c sass -l stop-on-error -d "If a file fails to compile, exit immediately"
 
 # Input and Output:
 #         --scss                       Use the CSS-superset SCSS syntax.
@@ -47,34 +47,34 @@ complete -c sass -l scss -d "Use the CSS-superset SCSS syntax."
 complete -c sass -l sourcemap -x -a "auto\t'(default) relative paths where possible, file URIs elsewhere'
 sfile\t'always absolute file URIs'
 inline\t'include the source text in the sourcemap'
-none\t'no sourcemaps'" -d "How to link generated output to the source files."
+none\t'no sourcemaps'" -d "How to link generated output to the source files"
 #     -s, --stdin                      Read input from standard input instead of an input file.
 #                                      This is the default if no input file is specified.
-complete -c sass -s s -l stdin -d "Read input from standard input instead of an input file. This is the default if no input file is specified."
+complete -c sass -s s -l stdin -d "Read input from standard input instead of an input file"
 #     -E, --default-encoding ENCODING  Specify the default encoding for input files.
-complete -c sass -s E -l default-encoding -x -d "Specify the default encoding for input files."
+complete -c sass -s E -l default-encoding -x -d "Specify the default encoding for input files"
 #         --unix-newlines              Use Unix-style newlines in written files.
 #                                      Always true on Unix.
-complete -c sass -l unix-newlines -d "Use Unix-style newlines in written files. Always true on Unix."
+complete -c sass -l unix-newlines -d "Use Unix-style newlines in written files"
 #     -g, --debug-info                 Emit output that can be used by the FireSass Firebug plugin.
-complete -c sass -s g -l debug-info -d "Emit output that can be used by the FireSass Firebug plugin."
+complete -c sass -s g -l debug-info -d "Emit output that can be used by the FireSass Firebug plugin"
 #     -l, --line-numbers               Emit comments in the generated CSS indicating the corresponding source line.
 #         --line-comments
-complete -c sass -s l -l line-numbers -l line-comments -d "Emit comments in the generated CSS indicating the corresponding source line."
+complete -c sass -s l -l line-numbers -l line-comments -d "Indicate corresponding source line with comments"
 
 # Miscellaneous:
 #     -i, --interactive                Run an interactive SassScript shell.
-complete -c sass -s i -l interactive -d "Run an interactive SassScript shell."
+complete -c sass -s i -l interactive -d "Run an interactive SassScript shell"
 #     -c, --check                      Just check syntax, don't evaluate.
-complete -c sass -s c -l check -d "Just check syntax, don't evaluate."
+complete -c sass -s c -l check -d "Just check syntax, don't evaluate"
 #         --precision NUMBER_OF_DIGITS How many digits of precision to use when outputting decimal numbers.
 #                                      Defaults to 5.
-complete -c sass -l precision -x -d "How many digits of precision to use when outputting decimal numbers. Defaults to 5."
+complete -c sass -l precision -x -d "Set precision when outputting decimal numbers"
 #         --cache-location PATH        The path to save parsed Sass files. Defaults to .sass-cache.
-complete -c sass -l cache-location -r -d "The path to save parsed Sass files. Defaults to .sass-cache."
+complete -c sass -l cache-location -r -d "The path to save parsed Sass files"
 #     -C, --no-cache                   Don't cache parsed Sass files.
-complete -c sass -s C -l no-cache -d "Don't cache parsed Sass files."
+complete -c sass -s C -l no-cache -d "Don't cache parsed Sass files"
 #         --trace                      Show a full Ruby stack trace on error.
-complete -c sass -l trace -d "Show a full Ruby stack trace on error."
+complete -c sass -l trace -d "Show a full Ruby stack trace on error"
 #     -q, --quiet                      Silence warnings and status messages during compilation.
-complete -c sass -s q -l quiet -d "Silence warnings and status messages during compilation."
+complete -c sass -s q -l quiet -d "Silence warnings and status messages during compilation"
diff --git a/share/completions/scss.fish b/share/completions/scss.fish
index 0b8765693..23e8f7e7a 100644
--- a/share/completions/scss.fish
+++ b/share/completions/scss.fish
@@ -5,77 +5,77 @@
 
 # Common Options:
 #     -I, --load-path PATH             Specify a Sass import path.
-complete -c scss -s I -l load-path -r -d "Specify a Sass import path."
+complete -c scss -s I -l load-path -r -d "Specify a Sass import path"
 #     -r, --require LIB                Require a Ruby library before running Sass.
-complete -c scss -s r -l require -r -d "Require a Ruby library before running Sass."
+complete -c scss -s r -l require -r -d "Require a Ruby library before running Sass"
 #         --compass                    Make Compass imports available and load project configuration.
-complete -c scss -l compass -d "Make Compass imports available and load project configuration."
+complete -c scss -l compass -d "Enable Compass imports and load project configuration"
 #     -t, --style NAME                 Output style. Can be nested (default), compact, compressed, or expanded.
-complete -c scss -s t -l style -x -a "nested compact compressed expanded" -d "Output style. Can be nested (default), compact, compressed, or expanded."
+complete -c scss -s t -l style -x -a "nested compact compressed expanded" -d "Output style"
 #     -?, -h, --help                   Show this help message.
-complete -c scss -s '?' -s h -l help -f -d "Show help message."
+complete -c scss -s '?' -s h -l help -f -d "Show help message"
 #     -v, --version                    Print the Sass version.
-complete -c scss -s v -l version -f -d "Print the Sass version."
+complete -c scss -s v -l version -f -d "Print the Sass version"
 
 # Watching and Updating:
 #         --watch                      Watch files or directories for changes.
 #                                      The location of the generated CSS can be set using a colon:
 #                                        scss --watch input.scss:output.css
 #                                        scss --watch input-dir:output-dir
-complete -c scss -l watch -d "Watch files or directories for changes. The location of the generated CSS can be set using a colon: input.scss:output.css input-dir:output-dir"
+complete -c scss -l watch -d "Watch files or directories for changes"
 #         --poll                       Check for file changes manually, rather than relying on the OS.
 #                                      Only meaningful for --watch.
-complete -c scss -l poll -d "Check for file changes manually, rather than relying on the OS. Only meaningful for --watch."
+complete -c scss -l poll -d "Check for file changes manually, don't rely on OS"
 #         --update                     Compile files or directories to CSS.
 #                                      Locations are set like --watch.
-complete -c scss -l update -d "Compile files or directories to CSS. The location of the generated CSS can be set using a colon: input.scss:output.css input-dir:output-dir"
+complete -c scss -l update -d "Compile files or directories to CSS"
 #     -f, --force                      Recompile every Sass file, even if the CSS file is newer.
 #                                      Only meaningful for --update.
-complete -c scss -s f -l force -d "Recompile every Sass file, even if the CSS file is newer. Only meaningful for --update."
+complete -c scss -s f -l force -d "Recompile every Sass file, even if the CSS file is newer"
 #         --stop-on-error              If a file fails to compile, exit immediately.
 #                                      Only meaningful for --watch and --update.
-complete -c scss -l stop-on-error -d "If a file fails to compile, exit immediately. Only meaningful for --watch and --update."
+complete -c scss -l stop-on-error -d "If a file fails to compile, exit immediately"
 
 # Input and Output:
 #         --sass                       Use the indented Sass syntax.
-complete -c scss -l sass -d "Use the indented Sass syntax."
+complete -c scss -l sass -d "Use the indented Sass syntax"
 #         --sourcemap=TYPE             How to link generated output to the source files.
 #                                        auto (default): relative paths where possible, file URIs elsewhere
 #                                        file: always absolute file URIs
 #                                        inline: include the source text in the sourcemap
 #                                        none: no sourcemaps
-complete -c scss -l sourcemap -x -d "How to link generated output to the source files." -a \
+complete -c scss -l sourcemap -x -d "How to link generated output to the source files" -a \
     "auto\t'(default) relative paths where possible, file URIs elsewhere'
 file\t'always absolute file URIs'
 inline\t'include the source text in the sourcemap'
 none\t'no sourcemaps'"
 #     -s, --stdin                      Read input from standard input instead of an input file.
 #                                      This is the default if no input file is specified.
-complete -c scss -s s -l stdin -d "Read input from standard input instead of an input file. This is the default if no input file is specified."
+complete -c scss -s s -l stdin -d "Read input from standard input instead of an input file"
 #     -E, --default-encoding ENCODING  Specify the default encoding for input files.
-complete -c scss -s E -l default-encoding -x -d "Specify the default encoding for input files."
+complete -c scss -s E -l default-encoding -x -d "Specify the default encoding for input files"
 #         --unix-newlines              Use Unix-style newlines in written files.
 #                                      Always true on Unix.
-complete -c scss -l unix-newlines -d "Use Unix-style newlines in written files. Always true on Unix."
+complete -c scss -l unix-newlines -d "Use Unix-style newlines in written files"
 #     -g, --debug-info                 Emit output that can be used by the FireSass Firebug plugin.
-complete -c scss -s g -l debug-info -d "Emit output that can be used by the FireSass Firebug plugin."
+complete -c scss -s g -l debug-info -d "Emit output that can be used by the FireSass Firebug plugin"
 #     -l, --line-numbers               Emit comments in the generated CSS indicating the corresponding source line.
 #         --line-comments
-complete -c scss -s l -l line-numbers -l line-comments -d "Emit comments in the generated CSS indicating the corresponding source line."
+complete -c scss -s l -l line-numbers -l line-comments -d "Indicate corresponding source line with comments"
 
 # Miscellaneous:
 #     -i, --interactive                Run an interactive SassScript shell.
-complete -c scss -s i -l interactive -d "Run an interactive SassScript shell."
+complete -c scss -s i -l interactive -d "Run an interactive SassScript shell"
 #     -c, --check                      Just check syntax, don't evaluate.
-complete -c scss -s c -l check -d "Just check syntax, don't evaluate."
+complete -c scss -s c -l check -d "Just check syntax, don't evaluate"
 #         --precision NUMBER_OF_DIGITS How many digits of precision to use when outputting decimal numbers.
 #                                      Defaults to 5.
-complete -c scss -l precision -x -d "How many digits of precision to use when outputting decimal numbers. Defaults to 5."
+complete -c scss -l precision -x -d "Set precision when outputting decimal numbers"
 #         --cache-location PATH        The path to save parsed Sass files. Defaults to .sass-cache.
-complete -c scss -l cache-location -r -d "The path to save parsed Sass files. Defaults to .sass-cache."
+complete -c scss -l cache-location -r -d "The path to save parsed Sass files"
 #     -C, --no-cache                   Don't cache parsed Sass files.
-complete -c scss -s C -l no-cache -d "Don't cache parsed Sass files."
+complete -c scss -s C -l no-cache -d "Don't cache parsed Sass files"
 #         --trace                      Show a full Ruby stack trace on error.
-complete -c scss -l trace -d "Show a full Ruby stack trace on error."
+complete -c scss -l trace -d "Show a full Ruby stack trace on error"
 #     -q, --quiet                      Silence warnings and status messages during compilation.
-complete -c scss -s q -l quiet -d "Silence warnings and status messages during compilation."
+complete -c scss -s q -l quiet -d "Silence warnings and status messages during compilation"

From f45ca4aca4909e6cea1a3ab9ab88fc8862b1e4fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dundar=20G=C3=B6c?= <gocdundar@gmail.com>
Date: Fri, 21 Jan 2022 17:28:19 +0100
Subject: [PATCH 056/262] completions(postgresql): shorten descriptions

---
 share/completions/pg_dump.fish    | 10 +++++-----
 share/completions/pg_dumpall.fish |  6 +++---
 share/completions/pg_restore.fish | 14 +++++++-------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/share/completions/pg_dump.fish b/share/completions/pg_dump.fish
index d35943560..688060590 100644
--- a/share/completions/pg_dump.fish
+++ b/share/completions/pg_dump.fish
@@ -3,13 +3,13 @@ complete -c pg_dump --no-files -a '(__fish_complete_pg_database)'
 # General options:
 complete -c pg_dump -s f -l file -r -d "Output file or directory name"
 complete -c pg_dump -s F -l format -x -a "p\t'Plain text' c\t'Custom format' d\t'Directory archive' t\t'Tar archive'" -d "Output file format"
-complete -c pg_dump -s j -l jobs -x -d "Use this many parallel jobs to dump"
+complete -c pg_dump -s j -l jobs -x -d "Number of parallel jobs to dump"
 complete -c pg_dump -s v -l verbose -d "Verbose mode"
-complete -c pg_dump -s V -l version -d "Output version information, then exit"
+complete -c pg_dump -s V -l version -d "Output version information"
 complete -c pg_dump -s Z -l compress -x -d "Compression level for compressed formats"
 complete -c pg_dump -l lock-wait-timeout -x -d "Fail after waiting TIMEOUT for a table lock"
 complete -c pg_dump -l no-sync -d "Do not wait for changes to be written safely to disk"
-complete -c pg_dump -s '?' -l help -d "Show this help, then exit"
+complete -c pg_dump -s '?' -l help -d "Show this help"
 
 # Options controlling the output content:
 complete -c pg_dump -s a -l data-only -d "Dump only the data, not the schema"
@@ -47,8 +47,8 @@ complete -c pg_dump -l quote-all-identifiers -d "Quote all identifiers, even if
 complete -c pg_dump -l section -x -a "pre-data data post-data" -d "Dump named section (pre-data, data, or post-data)"
 complete -c pg_dump -l serializable-deferrable -d "Wait until the dump can run without anomalies"
 complete -c pg_dump -l snapshot -x -d "Use given snapshot for the dump"
-complete -c pg_dump -l strict-names -d "Require table and/or schema include patterns to match at least one entity each"
-complete -c pg_dump -l use-set-session-authorization -d "Use SET SESSION AUTHORIZATION commands instead of ALTER OWNER commands to set ownership"
+complete -c pg_dump -l strict-names -d "Require table/schema include patterns to match entities"
+complete -c pg_dump -l use-set-session-authorization -d "Use SET SESSION AUTHORIZATION instead of ALTER OWNER"
 
 # Connection options:
 complete -c pg_dump -s d -l dbname -x -a '(__fish_complete_pg_database)' -d "Database to dump"
diff --git a/share/completions/pg_dumpall.fish b/share/completions/pg_dumpall.fish
index 347474d2c..7ee3b54e2 100644
--- a/share/completions/pg_dumpall.fish
+++ b/share/completions/pg_dumpall.fish
@@ -3,9 +3,9 @@ complete -c pg_dumpall --no-files
 # General options:
 complete -c pg_dumpall -s f -l file -r -d "Output file name"
 complete -c pg_dumpall -s v -l verbose -d "Verbose mode"
-complete -c pg_dumpall -s V -l version -d "Output version information, then exit"
+complete -c pg_dumpall -s V -l version -d "Output version information"
 complete -c pg_dumpall -l lock-wait-timeout -x -d "Fail after waiting TIMEOUT for a table lock"
-complete -c pg_dumpall -s '?' -l help -d "Show this help, then exit"
+complete -c pg_dumpall -s '?' -l help -d "Show this help"
 
 # Options controlling the output content:
 complete -c pg_dumpall -s a -l data-only -d "Dump only the data, not the schema"
@@ -35,7 +35,7 @@ complete -c pg_dumpall -l no-sync -d "Do not wait for changes to be written safe
 complete -c pg_dumpall -l no-tablespaces -d "Do not dump tablespace assignments"
 complete -c pg_dumpall -l no-unlogged-table-data -d "Do not dump unlogged table data"
 complete -c pg_dumpall -l quote-all-identifiers -d "Quote all identifiers, even if not key words"
-complete -c pg_dumpall -l use-set-session-authorization -d "Use SET SESSION AUTHORIZATION commands instead of ALTER OWNER commands to set ownership"
+complete -c pg_dumpall -l use-set-session-authorization -d "Use SET SESSION AUTHORIZATION instead of ALTER OWNER"
 
 # Connection options:
 complete -c pg_dumpall -s d -l dbname -x -a '(__fish_complete_pg_database)' -d "Database to dump"
diff --git a/share/completions/pg_restore.fish b/share/completions/pg_restore.fish
index 18abf654e..df8cdea85 100644
--- a/share/completions/pg_restore.fish
+++ b/share/completions/pg_restore.fish
@@ -4,8 +4,8 @@ complete -c pg_restore -s f -l file -a - -r -d "Output file name (- for stdout)"
 complete -c pg_restore -s F -l format -x -a "c\t'Custom format (pg_dump)' d\t'Directory archive' t\t'Tar archive'" -d "Backup file format (should be automatic)"
 complete -c pg_restore -s l -l list -d "Print summarized TOC of the archive"
 complete -c pg_restore -s v -l verbose -d "Verbose mode"
-complete -c pg_restore -s V -l version -d "Output version information, then exit"
-complete -c pg_restore -s '?' -l help -d "Show help, then exit"
+complete -c pg_restore -s V -l version -d "Output version information"
+complete -c pg_restore -s '?' -l help -d "Show help"
 
 # Options controlling the restore:
 complete -c pg_restore -s a -l data-only -d "Restore only the data, no schema"
@@ -13,8 +13,8 @@ complete -c pg_restore -s c -l clean -d "Clean (drop) database objects before re
 complete -c pg_restore -s C -l create -d "Create the target database"
 complete -c pg_restore -s e -l exit-on-error -d "Exit on error, default is to continue"
 complete -c pg_restore -s I -l index -x -d "Restore named index"
-complete -c pg_restore -s j -l jobs -x -d "Use this many parallel jobs to restore"
-complete -c pg_restore -s L -l use-list -r -d "Use table of contents from this file for selecting/ordering output"
+complete -c pg_restore -s j -l jobs -x -d "Number of parallel jobs to restore"
+complete -c pg_restore -s L -l use-list -r -d "Use table of contents from this file"
 complete -c pg_restore -s n -l schema -x -d "Restore only objects in this schema"
 complete -c pg_restore -s N -l exclude-schema -x -d "Do not restore objects in this schema"
 complete -c pg_restore -s O -l no-owner -d "Skip restoration of object ownership"
@@ -29,14 +29,14 @@ complete -c pg_restore -l disable-triggers -d "Disable triggers during data-only
 complete -c pg_restore -l enable-row-security -d "Enable row security"
 complete -c pg_restore -l if-exists -d "Use IF EXISTS when dropping objects"
 complete -c pg_restore -l no-comments -d "Do not restore comments"
-complete -c pg_restore -l no-data-for-failed-tables -d "Do not restore data of tables that could not be created"
+complete -c pg_restore -l no-data-for-failed-tables -d "Don't restore data of tables that could not be created"
 complete -c pg_restore -l no-publications -d "Do not restore publications"
 complete -c pg_restore -l no-security-labels -d "Do not restore security labels"
 complete -c pg_restore -l no-subscriptions -d "Do not restore subscriptions"
 complete -c pg_restore -l no-tablespaces -d "Do not restore tablespace assignments"
 complete -c pg_restore -l section -x -d "Restore named section (pre-data, data, or post-data)"
-complete -c pg_restore -l strict-names -d "Require table and/or schema include patterns to match at least one entity each"
-complete -c pg_restore -l use-set-session-authorization -d "Use SET SESSION AUTHORIZATION commands instead of ALTER OWNER commands to set ownership"
+complete -c pg_restore -l strict-names -d "Require table/schema include patterns to match entities"
+complete -c pg_restore -l use-set-session-authorization -d "Use SET SESSION AUTHORIZATION instead of ALTER OWNER"
 
 # Connection options:
 complete -c pg_restore -s h -l host -x -a '(__fish_print_hostnames)' -d "Database server host or socket directory"

From 954de4441492bbea15af125e52ef4c29301a97b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dundar=20G=C3=B6c?= <gocdundar@gmail.com>
Date: Fri, 21 Jan 2022 22:49:19 +0100
Subject: [PATCH 057/262] mocp

---
 share/completions/mocp.fish | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/share/completions/mocp.fish b/share/completions/mocp.fish
index ef1493563..321a9bf01 100644
--- a/share/completions/mocp.fish
+++ b/share/completions/mocp.fish
@@ -1,32 +1,32 @@
-complete -c mocp -s V -l version -d "Print program version and exit"
-complete -c mocp -s h -l help -d "Print usage and exit"
+complete -c mocp -s V -l version -d "Print program version"
+complete -c mocp -s h -l help -d "Print usage"
 complete -c mocp -s D -l debug -d "Turn on logging to a file"
 complete -c mocp -s S -l server -d "Run only the server"
 complete -c mocp -s F -l foreground -d "Run server in foreground, log to stdout"
 complete -c mocp -s R -l sound-driver -d "Use the specified sound driver" -xa 'oss alsa jack null'
 complete -c mocp -s m -l music-dir -r -d "Start in MusicDir"
-complete -c mocp -s a -l append -r -d "Append the files/directories/playlists passed in the command line to playlist and exit"
-complete -c mocp -s q -l enqueue -r -d "Add the files given on command line to the queue"
-complete -c mocp -s c -l clear -d "Clear the playlist and exit"
+complete -c mocp -s a -l append -r -d "Append the files/directories/playlists to playlist"
+complete -c mocp -s q -l enqueue -r -d "Add files to the queue"
+complete -c mocp -s c -l clear -d "Clear the playlist"
 complete -c mocp -s p -l play -r -d "Start playing from the first item on the playlist"
-complete -c mocp -s l -l playit -r -d "Play files given on command line without modifying the playlist"
+complete -c mocp -s l -l playit -r -d "Play files without modifying the playlist"
 complete -c mocp -s s -l stop -d "Stop playing"
 complete -c mocp -s f -l next -d "Play next song"
 complete -c mocp -s r -l previous -d "Play previous song"
 complete -c mocp -s x -l exit -d "Shutdown the server"
-complete -c mocp -s T -l theme -r -d "Use selected theme file (read from ~/.moc/themes if the path is not absolute"
-complete -c mocp -s C -l config -r -d "Use the specified config file instead of the default"
+complete -c mocp -s T -l theme -r -d "Use selected theme file"
+complete -c mocp -s C -l config -r -d "Use config file instead of the default"
 complete -c mocp -s O -l set-option -r -d "NAME=VALUE Override configuration option NAME with VALUE"
-complete -c mocp -s M -l moc-dir -r -d "Use the specified MOC directory instead of the default"
+complete -c mocp -s M -l moc-dir -r -d "Use MOC directory instead of the default"
 complete -c mocp -s P -l pause -d Pause
 complete -c mocp -s U -l unpause -d Unpause
 complete -c mocp -s G -l toggle-pause -d "Toggle between play/pause"
 complete -c mocp -s v -l volume -d "(+/-)LEVEL Adjust PCM volume" -xa '+ -'
 complete -c mocp -s y -l sync -d "Synchronize the playlist with other clients"
-complete -c mocp -s n -l nosync -d "Don't synchronize the playlist with other client's"
+complete -c mocp -s n -l nosync -d "Don't synchronize the playlist with other clients"
 complete -c mocp -s A -l ascii -d "Use ASCII characters to draw lines"
-complete -c mocp -s i -l info -d "Print the information about the currently played file"
-complete -c mocp -s Q -l format -rf -d "Print the formatted information about the currently played file"
+complete -c mocp -s i -l info -d "Print information about the currently played file"
+complete -c mocp -s Q -l format -rf -d "Print formatted information about currently played file"
 complete -c mocp -s e -l recursively -d "Alias for -a"
 complete -c mocp -s k -l seek -rf -d "Seek by N seconds (can be negative)"
 complete -c mocp -s j -l jump -rf -d "N{%,s} Jump to some position of the current track"

From 864f5ca254c4bf6c543608d05398076a0fa4ee8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dundar=20G=C3=B6c?= <gocdundar@gmail.com>
Date: Fri, 21 Jan 2022 22:53:57 +0100
Subject: [PATCH 058/262] lpstat

---
 share/completions/lpstat.fish | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/share/completions/lpstat.fish b/share/completions/lpstat.fish
index 3a1effd2a..54b8479c2 100644
--- a/share/completions/lpstat.fish
+++ b/share/completions/lpstat.fish
@@ -1,15 +1,15 @@
 __fish_complete_lpr lpstat
-complete -c lpstat -s H -d 'Show the server hostname and port'
-complete -c lpstat -s R -d 'Shows the ranking of print jobs'
-complete -c lpstat -s W -d 'Specifies which jobs to show' -xa 'completed not-completed'
-complete -c lpstat -s a -d 'Shows the accepting state of selected printer queues' -xa '(__fish_print_lpr_printers)'
-complete -c lpstat -s c -x -d 'Shows the printer classes and the printers that belong to them.  If no classes are specified then all classes are listed'
+complete -c lpstat -s H -d 'Show server hostname and port'
+complete -c lpstat -s R -d 'Shows ranking of print jobs'
+complete -c lpstat -s W -d 'Specify which jobs to show' -xa 'completed not-completed'
+complete -c lpstat -s a -d 'Shows accepting state of selected printer queues' -xa '(__fish_print_lpr_printers)'
+complete -c lpstat -s c -x -d 'Shows printer classes and the printers that belong to them'
 complete -c lpstat -s d -d 'Shows the current default destination'
-complete -c lpstat -s l -d 'Shows a long listing of printers, classes, or jobs'
-complete -c lpstat -s o -d 'Shows the jobs queue on the specified destinations' -xa '(__fish_print_lpr_printers)'
-complete -c lpstat -s p -d 'Shows the printers and whether or not they are enabled for printing' -xa '(__fish_print_lpr_printers)'
+complete -c lpstat -s l -d 'Shows list of printers, classes, or jobs'
+complete -c lpstat -s o -d 'Shows jobs queue on the specified destinations' -xa '(__fish_print_lpr_printers)'
+complete -c lpstat -s p -d 'Shows printers and if they are enabled for printing' -xa '(__fish_print_lpr_printers)'
 complete -c lpstat -s r -d 'Shows whether the CUPS server is running'
-complete -c lpstat -s s -d 'Shows a status summary, including the default destination'
+complete -c lpstat -s s -d 'Shows a status summary, including default destination'
 complete -c lpstat -s t -d 'Shows all status information'
 complete -c lpstat -s u -d 'Shows a list of print jobs queued by the specified users' -xa '(__fish_complete_users)'
-complete -c lpstat -s v -d 'Shows the printers and what device they are attached to' -xa '(__fish_print_lpr_printers)'
+complete -c lpstat -s v -d 'Shows printers and what device they are attached to' -xa '(__fish_print_lpr_printers)'

From e8af17c191a754c4d866746382e468996bbca8a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dundar=20G=C3=B6c?= <gocdundar@gmail.com>
Date: Fri, 21 Jan 2022 23:00:32 +0100
Subject: [PATCH 059/262] lpadmin

---
 share/completions/lpadmin.fish | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/share/completions/lpadmin.fish b/share/completions/lpadmin.fish
index 6e9d83c52..c70ba55ce 100644
--- a/share/completions/lpadmin.fish
+++ b/share/completions/lpadmin.fish
@@ -2,30 +2,30 @@ complete -c lpadmin -s c -d 'Adds the named printer to class' -x
 complete -c lpadmin -s i -d 'Sets a  System V style interface script for the printer' -x
 complete -c lpadmin -s m -d 'Sets a standard System V interface script or PPD file ' -x
 complete -c lpadmin -s R -d 'Deletes the named option from printer' -xa '(__fish_print_lpr_options)'
-complete -c lpadmin -s r -d 'Removes the named printer from class. If the resulting class becomes empty it is removed' -x
+complete -c lpadmin -s r -d 'Removes the named printer from class' -x
 
 complete -c lpadmin -s v -d 'Sets the device-uri attribute of the printer queue' -r
 complete -c lpadmin -s D -d 'Provides a textual description of the destination' -x
 complete -c lpadmin -s E -d 'Enables the destination and accepts jobs'
 complete -c lpadmin -s L -d 'Provides a textual location of the destination' -x
-complete -c lpadmin -s P -d 'Specifies a PostScript Printer Description file to use with the printer' -k -xa "(__fish_complete_suffix .ppd; __fish_complete_suffix .ppd.gz)"
-complete -c lpadmin -s o -xa cupsIPPSupplies=true -d 'Specifies whether IPP supply level values should be reported'
-complete -c lpadmin -s o -xa cupsIPPSupplies=false -d 'Specifies whether IPP supply level values should be reported'
-complete -c lpadmin -s o -xa cupsSNMPSupplies=true -d 'Specifies whether SNMP supply level (RFC 3805) values should be reported'
-complete -c lpadmin -s o -xa cupsSNMPSupplies=false -d 'Specifies whether SNMP supply level (RFC 3805) values should be reported'
-complete -c lpadmin -s o -xa job-k-limit= -d 'Sets the kilobyte limit for per-user quotas. The value is an integer number of kilobytes (1024)'
+complete -c lpadmin -s P -d 'Specify a PDD file to use with the printer' -k -xa "(__fish_complete_suffix .ppd; __fish_complete_suffix .ppd.gz)"
+complete -c lpadmin -s o -xa cupsIPPSupplies=true -d 'Specify if IPP supply level values should be reported'
+complete -c lpadmin -s o -xa cupsIPPSupplies=false -d 'Specify if IPP supply level values should be reported'
+complete -c lpadmin -s o -xa cupsSNMPSupplies=true -d 'Specify if SNMP supply level values should be reported'
+complete -c lpadmin -s o -xa cupsSNMPSupplies=false -d 'Specify if SNMP supply level values should be reported'
+complete -c lpadmin -s o -xa job-k-limit= -d 'Sets the kilobyte limit for per-user quotas'
 complete -c lpadmin -s o -xa job-page-limit= -d 'Sets the page limit for per-user quotas (int) '
 complete -c lpadmin -s o -xa job-quota-period= -d 'Sets the accounting period for per-user quotas (sec)'
 complete -c lpadmin -s o -xa job-sheets-default= -d 'Sets the default banner page(s) to use for print jobs'
 complete -c lpadmin -s o -d 'Sets a  PPD option for the printer' -xa '(__fish_complete_lpr_option)'
 #complete -c lpadmin -s o -d 'Sets a default server-side option for the destination' -xa '(__fish_complete_lpr_option | sed "s/=/-default=/")'
 complete -c lpadmin -s o -d 'Sets the binary communications program to use when printing' -xa 'port-monitor=none port-monitor=bcp port-monitor=tbcp'
-complete -c lpadmin -s o -d 'Sets the error policy to be used when the printer backend is unable to send the job to the printer. ' -xa 'printer-error-policy=abort-job printer-error-policy=retry-job printer-error-policy=retry-current-job printer-error-policy=stop-printer'
-complete -c lpadmin -s o -xa printer-is-shared=true -d 'Sets the destination to shared/published or unshared/unpublished'
-complete -c lpadmin -s o -xa printer-is-shared=false -d 'Sets the destination to shared/published or unshared/unpublished'
-complete -c lpadmin -s o -d 'Sets the IPP operation policy associated with the destination' -xa "printer-policy=(test -r /etc/cups/cupsd.conf; and string replace -r --filter '<Policy (.*)>' '$1' < /etc/cups/cupsd.conf)"
+complete -c lpadmin -s o -d "Set error policy if printer backend can't send job" -xa 'printer-error-policy=abort-job printer-error-policy=retry-job printer-error-policy=retry-current-job printer-error-policy=stop-printer'
+complete -c lpadmin -s o -xa printer-is-shared=true -d 'Sets destination to shared/published or unshared/unpublished'
+complete -c lpadmin -s o -xa printer-is-shared=false -d 'Sets destination to shared/published or unshared/unpublished'
+complete -c lpadmin -s o -d 'Set IPP operation policy associated with destination' -xa "printer-policy=(test -r /etc/cups/cupsd.conf; and string replace -r --filter '<Policy (.*)>' '$1' < /etc/cups/cupsd.conf)"
 
-complete -c lpadmin -s u -xa 'allow:all allow:none (__fish_complete_list , __fish_complete_users allow:)' -d 'Sets user-level access control on a destination. Names starting with "@" are interpreted as UNIX group'
-complete -c lpadmin -s u -xa '(__fish_complete_list , __fish_complete_groups allow: @)' -d 'Sets user-level access control on a destination. Names starting with "@" are interpreted as UNIX group'
-complete -c lpadmin -s u -xa 'deny:all deny:none (__fish_complete_list , __fish_complete_users deny:)' -d 'Sets user-level access control on a destination. Names starting with "@" are interpreted as UNIX group'
-complete -c lpadmin -s u -xa '(__fish_complete_list , __fish_complete_groups deny: @)' -d 'Sets user-level access control on a destination. Names starting with "@" are interpreted as UNIX group'
+complete -c lpadmin -s u -xa 'allow:all allow:none (__fish_complete_list , __fish_complete_users allow:)' -d 'Sets user-level access control on a destination'
+complete -c lpadmin -s u -xa '(__fish_complete_list , __fish_complete_groups allow: @)' -d 'Sets user-level access control on a destination'
+complete -c lpadmin -s u -xa 'deny:all deny:none (__fish_complete_list , __fish_complete_users deny:)' -d 'Sets user-level access control on a destination'
+complete -c lpadmin -s u -xa '(__fish_complete_list , __fish_complete_groups deny: @)' -d 'Sets user-level access control on a destination'

From fe21cb44c957690dde2bd2207767ae84a2d354be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dundar=20G=C3=B6c?= <gocdundar@gmail.com>
Date: Fri, 21 Jan 2022 23:01:59 +0100
Subject: [PATCH 060/262] entr

---
 share/completions/entr.fish | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/completions/entr.fish b/share/completions/entr.fish
index 4d70b65a0..ca020a476 100644
--- a/share/completions/entr.fish
+++ b/share/completions/entr.fish
@@ -1,5 +1,5 @@
-complete -c entr -s r -d 'Launches the utility at startup and reloads it if one of the source files change'
+complete -c entr -s r -d 'Launch utility at startup and reload on file change'
 complete -c entr -s c -d 'Clears the screen before running the utility'
-complete -c entr -s h -l help -d 'Display help and exit'
+complete -c entr -s h -l help -d 'Display help'
 complete -c entr -s v -l version -d 'Output version information'
 complete -c entr -x -a '(__fish_complete_subcommand)'

From af11a628f98f122ecaf945ff98039d1877414249 Mon Sep 17 00:00:00 2001
From: Jeff Dickey <216188+jdxcode@users.noreply.github.com>
Date: Fri, 21 Jan 2022 15:49:55 -0600
Subject: [PATCH 061/262] git diff --quiet has no "-q" flag

https://git-scm.com/docs/git-diff#Documentation/git-diff.txt---quiet
---
 share/completions/git.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 7b950f18a..24f179c7a 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1237,7 +1237,7 @@ complete -c git -n '__fish_git_using_command diff' -l cached -d 'Show diff of ch
 complete -c git -n '__fish_git_using_command diff' -l staged -d 'Show diff of changes in the index'
 complete -c git -n '__fish_git_using_command diff' -l no-index -d 'Compare two paths on the filesystem'
 complete -c git -n '__fish_git_using_command diff' -l exit-code -d 'Exit with 1 if there were differences or 0 if no differences'
-complete -c git -n '__fish_git_using_command diff' -s q -l quiet -d 'Disable all output of the program, implies --exit-code'
+complete -c git -n '__fish_git_using_command diff' -l quiet -d 'Disable all output of the program, implies --exit-code'
 complete -c git -n '__fish_git_using_command diff' -s 1 -l base -d 'Compare the working tree with the "base" version'
 complete -c git -n '__fish_git_using_command diff' -s 2 -l ours -d 'Compare the working tree with the "our branch"'
 complete -c git -n '__fish_git_using_command diff' -s 3 -l theirs -d 'Compare the working tree with the "their branch"'

From 4a6dbe09222f36b478f52602eb434552c343fa58 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Fri, 21 Jan 2022 21:15:21 -0800
Subject: [PATCH 062/262] prompt_* functions: shorten their descriptions

---
 share/functions/prompt_hostname.fish | 2 +-
 share/functions/prompt_login.fish    | 2 +-
 share/functions/prompt_pwd.fish      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/functions/prompt_hostname.fish b/share/functions/prompt_hostname.fish
index 93eb3b104..dcb733578 100644
--- a/share/functions/prompt_hostname.fish
+++ b/share/functions/prompt_hostname.fish
@@ -1,3 +1,3 @@
-function prompt_hostname --description 'Print the hostname, shortened for use in the prompt'
+function prompt_hostname --description 'short hostname for the prompt'
     string replace -r "\..*" "" $hostname
 end
diff --git a/share/functions/prompt_login.fish b/share/functions/prompt_login.fish
index eeafcbb6f..632a462bd 100644
--- a/share/functions/prompt_login.fish
+++ b/share/functions/prompt_login.fish
@@ -1,4 +1,4 @@
-function prompt_login --description "Print a description of the user and host suitable for the prompt"
+function prompt_login --description "display user name for the prompt"
     if not set -q __fish_machine
         set -g __fish_machine
         set -l debian_chroot $debian_chroot
diff --git a/share/functions/prompt_pwd.fish b/share/functions/prompt_pwd.fish
index 8fe7f9815..f75f0dc0b 100644
--- a/share/functions/prompt_pwd.fish
+++ b/share/functions/prompt_pwd.fish
@@ -1,4 +1,4 @@
-function prompt_pwd --description 'Print the current working directory, shortened to fit the prompt'
+function prompt_pwd --description 'short CWD for the prompt'
     set -l options h/help d/dir-length= D/full-length-dirs=
     argparse -n prompt_pwd $options -- $argv
     or return

From fe9822bb20ca8df8b59ed790c568912442aaaca1 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Sat, 22 Jan 2022 20:04:04 -0800
Subject: [PATCH 063/262] Fix welcome text, don't use logger.

Logger was unneccessary - stderr was being captured.

Do the welcome message as HTML - it's easier. Fixes #8661
---
 build_tools/osx_distribution.xml              |  6 ++--
 .../osx_package_resources/welcome.html        | 29 +++++++++++++++++++
 build_tools/osx_package_resources/welcome.rtf | 26 -----------------
 build_tools/osx_package_scripts/postinstall   |  2 +-
 build_tools/osx_package_scripts/preinstall    |  6 ++--
 5 files changed, 36 insertions(+), 33 deletions(-)
 create mode 100644 build_tools/osx_package_resources/welcome.html
 delete mode 100644 build_tools/osx_package_resources/welcome.rtf

diff --git a/build_tools/osx_distribution.xml b/build_tools/osx_distribution.xml
index 6b36f31e2..96df99e48 100644
--- a/build_tools/osx_distribution.xml
+++ b/build_tools/osx_distribution.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <installer-gui-script minSpecVersion="1">
     <title>fish shell</title>
-    <welcome file="welcome.rtf"/>
+    <welcome file="welcome.html" mime-type="text/html"/>
     <background file="terminal_logo.png" scaling="proportional" alignment="bottomleft"/>
     <pkg-ref id="com.ridiculousfish.fish-shell-pkg"/>
-    <options hostArchitectures="arm64,x86_64" />
-    <options customize="never" require-scripts="false"/>
+    <options hostArchitectures="arm64,x86_64" rootVolumeOnly="true"/>
+    <options customize="never" require-scripts="true"/>
     <choices-outline>
         <line choice="default">
             <line choice="com.ridiculousfish.fish-shell-pkg"/>
diff --git a/build_tools/osx_package_resources/welcome.html b/build_tools/osx_package_resources/welcome.html
new file mode 100644
index 000000000..5bfd6e46d
--- /dev/null
+++ b/build_tools/osx_package_resources/welcome.html
@@ -0,0 +1,29 @@
+<html>
+	<head>
+		<style>
+			body {
+				font-family: system-ui;
+				font-size: 10pt;
+			}
+			code, tt {
+				font-family: ui-monospace;
+			}
+
+		</style>
+	</head>
+	<body>
+	<p>
+		<strong>fish</strong> is a smart and user-friendly command line shell. For more information, visit <a href="https://fishshell.com">fishshell.com</a>.
+	</p>
+	<p>
+		<strong>fish</strong> will be installed into <tt>/usr/local/</tt>, and its path will be added to <wbr><tt>/etc/shells</tt> if necessary.
+	</p>
+	<p>
+		Your default shell will <em>not</em> be changed. To make <strong>fish</strong> your login shell after the installation, run:
+	</p>
+	<p>
+	<code>chsh -s /usr/local/bin/fish</code>
+	</p>
+	<p>Enjoy! Bugs can be reported on <a href="https://github.org/fish-shell/fish-shell/">GitHub</a>.</p>
+	</body>
+</html>
\ No newline at end of file
diff --git a/build_tools/osx_package_resources/welcome.rtf b/build_tools/osx_package_resources/welcome.rtf
deleted file mode 100644
index 3be3d8914..000000000
--- a/build_tools/osx_package_resources/welcome.rtf
+++ /dev/null
@@ -1,26 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1485\cocoasubrtf410
-{\fonttbl\f0\fnil\fcharset0 HelveticaNeue;\f1\fnil\fcharset0 Menlo-Regular;}
-{\colortbl;\red255\green255\blue255;}
-{\*\expandedcolortbl;\csgenericrgb\c100000\c100000\c100000;}
-{\info
-{\author dlkfjslfjsfdlkfk}}\margl1440\margr1440\vieww10800\viewh8400\viewkind0
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
-
-\f0\fs30 \cf0 Fish is a smart and user friendly command line shell. For more information, visit {\field{\*\fldinst{HYPERLINK "https://fishshell.com"}}{\fldrslt https://fishshell.com}}\
-\
-fish will be installed into
-\f1\fs26 /usr/local/
-\f0\fs30 , and fish will be added to
-\f1\fs26 /etc/shells
-\f0\fs30  if necessary.\
-\
-Your default shell will
-\i not
-\i0  be changed. To make fish your default, run:\
-\
-
-\f1 chsh -s /usr/local/bin/fish
-\f0 \
-\
-Enjoy!\
-}
\ No newline at end of file
diff --git a/build_tools/osx_package_scripts/postinstall b/build_tools/osx_package_scripts/postinstall
index e9a6a0517..58382a7d0 100755
--- a/build_tools/osx_package_scripts/postinstall
+++ b/build_tools/osx_package_scripts/postinstall
@@ -1,3 +1,3 @@
 #!/bin/sh -x
 
-./add-shell ${DSTVOLUME}usr/local/bin/fish | logger -s -t "${INSTALL_PKG_SESSION_ID}"
+./add-shell ${DSTVOLUME}usr/local/bin/fish
\ No newline at end of file
diff --git a/build_tools/osx_package_scripts/preinstall b/build_tools/osx_package_scripts/preinstall
index 2f2cffb3b..fcb5e8411 100755
--- a/build_tools/osx_package_scripts/preinstall
+++ b/build_tools/osx_package_scripts/preinstall
@@ -1,7 +1,7 @@
 #!/bin/sh -x
 
-logger -s -t "${INSTALL_PKG_SESSION_ID}" "Removing any previous installation"
+echo "Removing any previous installation"
 pkgutil --pkg-info ${INSTALL_PKG_SESSION_ID} && pkgutil pkgutil --only-files --files ${INSTALL_PKG_SESSION_ID} | while read installed
      do rm -v ${DSTVOLUME}${installed}
-done | logger -s -t "${INSTALL_PKG_SESSION_ID}"
-logger -s -t "${INSTALL_PKG_SESSION_ID}" "... removed"
+done
+echo "... removed"

From a617ef7ec1fc90398a77bd6362f48d38f4717822 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Sat, 22 Jan 2022 20:08:32 -0800
Subject: [PATCH 064/262] Fix typo in preinstall script.

---
 build_tools/osx_package_scripts/preinstall | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_tools/osx_package_scripts/preinstall b/build_tools/osx_package_scripts/preinstall
index fcb5e8411..359174617 100755
--- a/build_tools/osx_package_scripts/preinstall
+++ b/build_tools/osx_package_scripts/preinstall
@@ -1,7 +1,7 @@
 #!/bin/sh -x
 
 echo "Removing any previous installation"
-pkgutil --pkg-info ${INSTALL_PKG_SESSION_ID} && pkgutil pkgutil --only-files --files ${INSTALL_PKG_SESSION_ID} | while read installed
+pkgutil --pkg-info ${INSTALL_PKG_SESSION_ID} && pkgutil --only-files --files ${INSTALL_PKG_SESSION_ID} | while read installed
      do rm -v ${DSTVOLUME}${installed}
 done
 echo "... removed"

From cd47411bbbf773016741430588865436ba432545 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Sat, 22 Jan 2022 20:52:29 -0800
Subject: [PATCH 065/262] Shorten `breakpoint` description

---
 src/builtin.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index 30f08af91..92d8955ed 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -365,8 +365,7 @@ static constexpr builtin_data_t builtin_datas[] = {
     {L"bind", &builtin_bind, N_(L"Handle fish key bindings")},
     {L"block", &builtin_block, N_(L"Temporarily block delivery of events")},
     {L"break", &builtin_break_continue, N_(L"Stop the innermost loop")},
-    {L"breakpoint", &builtin_breakpoint,
-     N_(L"Temporarily halt execution of a script and launch an interactive debug prompt")},
+    {L"breakpoint", &builtin_breakpoint, N_(L"Halt execution and start interactive debug prompt")},
     {L"builtin", &builtin_builtin, N_(L"Run a builtin command instead of a function")},
     {L"case", &builtin_generic, N_(L"Conditionally execute a block of commands")},
     {L"cd", &builtin_cd, N_(L"Change working directory")},

From ed0b6cdc9d9be73bda87179276855b2d21bbaced Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Sat, 22 Jan 2022 20:56:07 -0800
Subject: [PATCH 066/262] Shorten fish_sigtrap_handler description.

We can now get two columuns in the pager hitting <TAB> at 124 cols
---
 share/config.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/config.fish b/share/config.fish
index a5792b062..0b56fe618 100644
--- a/share/config.fish
+++ b/share/config.fish
@@ -140,7 +140,7 @@ end
 #
 # Launch debugger on SIGTRAP
 #
-function fish_sigtrap_handler --on-signal TRAP --no-scope-shadowing --description "Signal handler for the TRAP signal. Launches a debug prompt."
+function fish_sigtrap_handler --on-signal TRAP --no-scope-shadowing --description "TRAP signal handler: launches a debug prompt"
     breakpoint
 end
 

From 1262469aea65ab7af743aab5731bf4fe3ca0e0e2 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Sat, 22 Jan 2022 21:01:25 -0800
Subject: [PATCH 067/262] Shorten two more command's descriptions

Two columns at 119 width.
---
 share/config.fish                              | 2 +-
 share/functions/fish_default_key_bindings.fish | 2 +-
 share/functions/fish_default_mode_prompt.fish  | 2 +-
 src/builtin.cpp                                | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/share/config.fish b/share/config.fish
index 0b56fe618..6caec2003 100644
--- a/share/config.fish
+++ b/share/config.fish
@@ -140,7 +140,7 @@ end
 #
 # Launch debugger on SIGTRAP
 #
-function fish_sigtrap_handler --on-signal TRAP --no-scope-shadowing --description "TRAP signal handler: launches a debug prompt"
+function fish_sigtrap_handler --on-signal TRAP --no-scope-shadowing --description "TRAP signal handler: debug prompt"
     breakpoint
 end
 
diff --git a/share/functions/fish_default_key_bindings.fish b/share/functions/fish_default_key_bindings.fish
index f9597d487..bca00fc7c 100644
--- a/share/functions/fish_default_key_bindings.fish
+++ b/share/functions/fish_default_key_bindings.fish
@@ -1,4 +1,4 @@
-function fish_default_key_bindings -d "Default (Emacs-like) key bindings for fish"
+function fish_default_key_bindings -d "Default (emacs-like) key bindings"
     if contains -- -h $argv
         or contains -- --help $argv
         echo "Sorry but this function doesn't support -h or --help"
diff --git a/share/functions/fish_default_mode_prompt.fish b/share/functions/fish_default_mode_prompt.fish
index b90461b3c..21e4af86f 100644
--- a/share/functions/fish_default_mode_prompt.fish
+++ b/share/functions/fish_default_mode_prompt.fish
@@ -1,4 +1,4 @@
-function fish_default_mode_prompt --description "Display the default mode for the prompt"
+function fish_default_mode_prompt --description "Display default prompt mode"
     # Do nothing if not in vi mode
     if test "$fish_key_bindings" = fish_vi_key_bindings
         or test "$fish_key_bindings" = fish_hybrid_key_bindings
diff --git a/src/builtin.cpp b/src/builtin.cpp
index 92d8955ed..ced3fd1ec 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -373,8 +373,7 @@ static constexpr builtin_data_t builtin_datas[] = {
     {L"commandline", &builtin_commandline, N_(L"Set or get the commandline")},
     {L"complete", &builtin_complete, N_(L"Edit command specific completions")},
     {L"contains", &builtin_contains, N_(L"Search for a specified string in a list")},
-    {L"continue", &builtin_break_continue,
-     N_(L"Skip the rest of the current lap of the innermost loop")},
+    {L"continue", &builtin_break_continue, N_(L"Skip over remaining innermost loop")},
     {L"count", &builtin_count, N_(L"Count the number of arguments")},
     {L"disown", &builtin_disown, N_(L"Remove job from job list")},
     {L"echo", &builtin_echo, N_(L"Print arguments")},

From b1deb8af89f6215281152cff312b47f445a68a68 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Sat, 22 Jan 2022 21:12:01 -0800
Subject: [PATCH 068/262] down-or-search: shorten description

---
 share/functions/down-or-search.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/functions/down-or-search.fish b/share/functions/down-or-search.fish
index 16a5182f4..95cebf17f 100644
--- a/share/functions/down-or-search.fish
+++ b/share/functions/down-or-search.fish
@@ -1,4 +1,4 @@
-function down-or-search -d "Depending on cursor position and current mode, either search forward or move down one line"
+function down-or-search -d "search forward or move down one line"
     # If we are already in search mode, continue
     if commandline --search-mode
         commandline -f history-search-forward

From 81c46183fd0c0e4bce88ad5ae85f76515c89bfad Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Sat, 22 Jan 2022 21:18:24 -0800
Subject: [PATCH 069/262] breakpoint: shorter

---
 src/builtin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index ced3fd1ec..291cc7bdb 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -365,7 +365,7 @@ static constexpr builtin_data_t builtin_datas[] = {
     {L"bind", &builtin_bind, N_(L"Handle fish key bindings")},
     {L"block", &builtin_block, N_(L"Temporarily block delivery of events")},
     {L"break", &builtin_break_continue, N_(L"Stop the innermost loop")},
-    {L"breakpoint", &builtin_breakpoint, N_(L"Halt execution and start interactive debug prompt")},
+    {L"breakpoint", &builtin_breakpoint, N_(L"Halt execution and start debug prompt")},
     {L"builtin", &builtin_builtin, N_(L"Run a builtin command instead of a function")},
     {L"case", &builtin_generic, N_(L"Conditionally execute a block of commands")},
     {L"cd", &builtin_cd, N_(L"Change working directory")},

From 275601665f43ba809607c9a90439a710179a4968 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Sat, 22 Jan 2022 21:21:21 -0800
Subject: [PATCH 070/262] Shorten more commands

We're at 2 columns @ 115-wide terminal.
---
 src/builtin.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index 291cc7bdb..070df517c 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -369,7 +369,7 @@ static constexpr builtin_data_t builtin_datas[] = {
     {L"builtin", &builtin_builtin, N_(L"Run a builtin command instead of a function")},
     {L"case", &builtin_generic, N_(L"Conditionally execute a block of commands")},
     {L"cd", &builtin_cd, N_(L"Change working directory")},
-    {L"command", &builtin_command, N_(L"Run a program instead of a function or builtin")},
+    {L"command", &builtin_command, N_(L"Run program instead of a function or builtin")},
     {L"commandline", &builtin_commandline, N_(L"Set or get the commandline")},
     {L"complete", &builtin_complete, N_(L"Edit command specific completions")},
     {L"contains", &builtin_contains, N_(L"Search for a specified string in a list")},
@@ -398,7 +398,7 @@ static constexpr builtin_data_t builtin_datas[] = {
     {L"pwd", &builtin_pwd, N_(L"Print the working directory")},
     {L"random", &builtin_random, N_(L"Generate random number")},
     {L"read", &builtin_read, N_(L"Read a line of input into variables")},
-    {L"realpath", &builtin_realpath, N_(L"Convert path to absolute path without symlinks")},
+    {L"realpath", &builtin_realpath, N_(L"Show absolute path sans symlinks")},
     {L"return", &builtin_return, N_(L"Stop the currently evaluated function")},
     {L"set", &builtin_set, N_(L"Handle environment variables")},
     {L"set_color", &builtin_set_color, N_(L"Set the terminal color")},
@@ -410,7 +410,7 @@ static constexpr builtin_data_t builtin_datas[] = {
     {L"time", &builtin_generic, N_(L"Measure how long a command or block takes")},
     {L"true", &builtin_true, N_(L"Return a successful result")},
     {L"type", &builtin_type, N_(L"Check if a thing is a thing")},
-    {L"ulimit", &builtin_ulimit, N_(L"Set or get the shells resource usage limits")},
+    {L"ulimit", &builtin_ulimit, N_(L"Get/set resource usage limits")},
     {L"wait", &builtin_wait, N_(L"Wait for background processes completed")},
     {L"while", &builtin_generic, N_(L"Perform a command multiple times")},
 };

From 229e315fc5d01f71f93ec156ea228e87067da96f Mon Sep 17 00:00:00 2001
From: exploide <me@exploide.net>
Date: Sat, 22 Jan 2022 18:07:44 +0100
Subject: [PATCH 071/262] tar completion: added useful options

---
 share/completions/tar.fish | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/share/completions/tar.fish b/share/completions/tar.fish
index 3f43963b2..a420ad88c 100644
--- a/share/completions/tar.fish
+++ b/share/completions/tar.fish
@@ -20,17 +20,16 @@ end
 
 complete -c tar -a "(__fish_complete_tar)"
 
-complete -c tar -s A -l catenate -d "Append archive to archive"
-complete -c tar -l concatenate -d "Append archive to archive"
+complete -c tar -s A -l catenate -l concatenate -d "Append archive to archive"
 complete -c tar -s c -l create -d "Create archive"
-complete -c tar -s d -l diff -d "Compare archive and filesystem"
-complete -c tar -l compare -d "Compare archive and filesystem"
+complete -c tar -s d -l diff -l compare -d "Compare archive and filesystem"
 complete -c tar -l delete -d "Delete from archive"
 complete -c tar -s r -l append -d "Append files to archive"
 complete -c tar -s t -l list -d "List archive"
 complete -c tar -s u -l update -d "Append new files"
-complete -c tar -s x -l extract -d "Extract from archive"
-complete -c tar -l get -d "Extract from archive"
+complete -c tar -s x -l extract -l get -d "Extract from archive"
+complete -c tar -s \? -l help -d "Display short option summary"
+complete -c tar -l usage -d "List available options"
 complete -c tar -l atime-preserve -d "Keep access time"
 complete -c tar -s b -l block-size -d "Block size"
 complete -c tar -s B -l read-full-blocks -d "Reblock while reading"
@@ -46,6 +45,7 @@ complete -c tar -s i -l ignore-zeros -d "Ignore zero block in archive"
 complete -c tar -s j -l bzip2 -d "Filter through bzip2"
 complete -c tar -l ignore-failed-read -d "Don't exit on unreadable files"
 complete -c tar -s k -l keep-old-files -d "Don't overwrite"
+complete -c tar -l one-top-level -d "Extract into directory"
 complete -c tar -s K -l starting-file -r -d "Starting file in archive"
 complete -c tar -s l -l one-file-system -d "Stay in local filesystem"
 complete -c tar -s L -l tape-length -r -d "Tape length"

From ec870fff93fae67857acc887ff858243da30aa22 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Tue, 30 Nov 2021 19:19:23 +1000
Subject: [PATCH 072/262] Completion for octave command

---
 share/completions/octave.fish | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 share/completions/octave.fish

diff --git a/share/completions/octave.fish b/share/completions/octave.fish
new file mode 100644
index 000000000..47b81c3fa
--- /dev/null
+++ b/share/completions/octave.fish
@@ -0,0 +1,33 @@
+complete -c octave -x -a '(__fish_complete_suffix .m)'
+
+complete -c octave -s h -l help -d 'Show help'
+complete -c octave -s v -l version -d 'Show version'
+
+complete -c octave -l built-in-docstrings-file -r -d 'Use docs for built-ins'
+complete -c octave -s d -l debug -d 'Enter parser debugging mode'
+complete -c octave -l debug-jit -d 'Enable JIT compiler debugging/tracing'
+complete -c octave -l doc-cache-file -r -d 'Use doc cache file'
+complete -c octave -s x -l echo-commands -d 'Echo commands as they are executed'
+complete -c octave -l eval -x -d 'Evaluate code'
+complete -c octave -l exec-path -r -d 'Set path for executing subprograms'
+complete -c octave -l gui -n 'not __fish_seen_argument --long gui --long no-gui --long no-line-editing' -d 'Start the graphical user interface'
+complete -c octave -l image-path -r -a '(.bmp .gif .jpg .jpeg .pbm .pcx .bgm .png .pnm .ppm .ras .tif .tiff .xwd)' -d 'Add path to head of image search path'
+complete -c octave -l info-file -r -d 'Use top-level info file'
+complete -c octave -l info-program -r -d 'Specify program for reading info files'
+complete -c octave -s i -l interactive -d 'Force interactive behavior'
+complete -c octave -l jit-compiler -d 'Enable the JIT compiler'
+complete -c octave -l line-editing -n 'not __fish_seen_argument --long line-editing --long no-line-editing' -d 'Force readline use for command-line editing'
+complete -c octave -l no-gui -n 'not __fish_seen_argument --long gui --long no-gui' -d 'Disable the graphical user interface'
+complete -c octave -s H -l no-history -d 'Don\'t save commands to the history list'
+complete -c octave -l no-init-file -d 'Don\'t read the ~/.octaverc or .octaverc files'
+complete -c octave -l no-init-path -d 'Don\'t initialize function search path'
+complete -c octave -l no-line-editing -n 'not __fish_seen_argument --long line-editing --long no-line-editing --long gui' -d 'Don\'t use readline for command-line editing'
+complete -c octave -l no-site-file -d 'Don\'t read the site-wide octaverc file'
+complete -c octave -s W -l no-window-system -d 'Disable window system, including graphics'
+complete -c octave -s f -l norc -d 'Don\'t read any initialization files'
+complete -c octave -s p -l path -r -d 'Add path to head of function search path'
+complete -c octave -l persist -d 'Go interactive after --eval or reading'
+complete -c octave -s q -l quiet --long-option silent -d 'Don\'t print message at startup'
+complete -c octave -l texi-macros-file -r -d 'Use Texinfo macros for makeinfo command'
+complete -c octave -l traditional -d 'Set variables for closer MATLAB compatibility'
+complete -c octave -s V -l verbose -d 'Enable verbose output in some cases'

From f881f709925ba660bb82d8438ad270b5147bee4b Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Tue, 30 Nov 2021 20:39:11 +1000
Subject: [PATCH 073/262] Completion for matlab command

---
 share/completions/matlab.fish | 53 +++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 share/completions/matlab.fish

diff --git a/share/completions/matlab.fish b/share/completions/matlab.fish
new file mode 100644
index 000000000..27b1fd47d
--- /dev/null
+++ b/share/completions/matlab.fish
@@ -0,0 +1,53 @@
+function __fish_matlabcheck_no_desktop_nodesktop_opts
+    not __fish_seen_argument --old desktop --old nodesktop
+    return $status
+end
+
+function __fish_matlabcheck_no_batch_r_opts
+    not __fish_seen_argument --old batch --short r
+    return $status
+end
+
+complete -c matlab -s h -l help -d 'Show help'
+
+# Mode options
+complete -c matlab -o desktop -n __fish_matlabcheck_no_desktop_nodesktop_opts -d 'Start without a controlling terminal'
+complete -c matlab -o nodesktop -n __fish_matlabcheck_no_desktop_nodesktop_opts -d 'Run the JVM software without opening the desktop'
+complete -c matlab -o nojvm -d 'Start without the JVM software'
+
+# Display options
+complete -c matlab -o noFigureWindows -d 'Disable the display of figure windows'
+complete -c matlab -o nosplash -d 'Don\'t display the splash screen during startup'
+complete -c matlab -o nodisplay -d 'Start the JVM software without starting desktop'
+complete -c matlab -o display -x -d 'Send X commands to X Window Server display xDisp'
+
+# Set initial working folder
+complete -c matlab -o sd -r -d 'Set the folder'
+complete -c matlab -o useStartupFolderPref -d 'Change the folder to the Initial working folder preference'
+
+# Debugging options
+complete -c matlab -o logfile -r -a '(__fish_complete_suffix .log)' -d 'Copy Command Window output into filename'
+complete -c matlab -s n -d 'Display the environment variables/arguments passed to the executable'
+complete -c matlab -s e -d 'Display all environment variables and their values to standard output'
+complete -c matlab -s Dgdb -x -d 'Start in debug mode'
+complete -c matlab -s Dlldb -x -d 'Start in debug mode'
+complete -c matlab -s Ddbx -x -d 'Start in debug mode'
+complete -c matlab -o jdb -x -d 'Enable use of the Java debugger'
+complete -c matlab -o debug -d 'Display information for debugging X-based problems'
+
+# Execute MATLAB script or function
+complete -c matlab -o batch -x -n __fish_matlabcheck_no_batch_r_opts -d 'Execute script, statement, or function non-interactively'
+complete -c matlab -s r -x -n __fish_matlabcheck_no_batch_r_opts -d 'Execute the statement'
+
+# Use single computational thread
+complete -c matlab -o singleCompThread -d 'Limit to a single computational thread'
+
+# Disable searching custom Java class path
+complete -c matlab -o nouserjavapath -d 'Disable use of javaclasspath.txt and javalibrarypath.txt files'
+
+# OpenGL library options
+complete -c matlab -o softwareopengl -d 'Force to start with software OpenGL libraries'
+complete -c matlab -o nosoftwareopengl -d 'Disable auto-selection of OpenGL software'
+
+# Specify license file
+complete -c matlab -s c -r -d 'Use the specified license file'

From 36699d49d8ae68d768244ecf8d4923da6415ccfd Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 2 Dec 2021 19:29:26 +1000
Subject: [PATCH 074/262] Specify program versions

---
 share/completions/matlab.fish | 1 +
 share/completions/octave.fish | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/share/completions/matlab.fish b/share/completions/matlab.fish
index 27b1fd47d..cec5285ee 100644
--- a/share/completions/matlab.fish
+++ b/share/completions/matlab.fish
@@ -1,3 +1,4 @@
+# Completion for: MATLAB R2021b
 function __fish_matlabcheck_no_desktop_nodesktop_opts
     not __fish_seen_argument --old desktop --old nodesktop
     return $status
diff --git a/share/completions/octave.fish b/share/completions/octave.fish
index 47b81c3fa..74e1bb093 100644
--- a/share/completions/octave.fish
+++ b/share/completions/octave.fish
@@ -1,3 +1,5 @@
+# Completion for: GNU Octave 5.2.0
+
 complete -c octave -x -a '(__fish_complete_suffix .m)'
 
 complete -c octave -s h -l help -d 'Show help'

From 640feeee676b9a3100385ab7a461750d5e84b5b4 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sun, 23 Jan 2022 21:56:46 +0800
Subject: [PATCH 075/262] CHANGELOG: work on 3.4.0

---
 CHANGELOG.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b562d6b0f..6d41f61cc 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,7 +2,7 @@ fish 3.4.0 (released ???)
 =========================
 
 ..
-   Ignore for 3.4.0 changelog: 1363 3625 3954 6477 7602 8059 8077 8079 8084 8096 8118 8127 8128 8130 8137 8139 8146 8151 8153 8161 8170 8176 8183 8184 8191 8192 8195 8202 8204 8205 8206 8219 8221 8222 8224 8227 8228 8229 8230 8231 8235 8236 8237 8238 8239 8241 8243 8249 8252 8253 8256 8257 8260 8268 8270 8271 8277 8280 8285 8287 8289 8295 8299 8305 8306 8308 8310 8311 8314 8321 8323 8326 8327 8334 8335 8337 8338 8344 8353 8358 8365 8367 8368 8380 8381 8385 8391 8394 8403 8406 8409 8410 8419 8429 8430 8433 8438 8439 8441 8444 8446 8449 8456 8457 8471 8472 8476 8477 8478 8479 8480 8487 8492 8495 8497 8500 8511 8518 8521 8522 8526 8527 8528 8548 8549 8559 8575 8584 8587 8588 8570 8591 8596 8597 8601 8608 8612 8613 8614 8615 8621 8623 8626 8630 8633 8636 8639 8647 8650 8643 8647 8651 8654 8655 8656
+   Ignore for 3.4.0 changelog: 1363 3625 3954 6477 7602 8059 8077 8079 8084 8096 8118 8127 8128 8130 8137 8139 8146 8151 8153 8161 8170 8176 8183 8184 8191 8192 8195 8202 8204 8205 8206 8219 8221 8222 8224 8227 8228 8229 8230 8231 8235 8236 8237 8238 8239 8241 8243 8249 8252 8253 8256 8257 8260 8268 8270 8271 8277 8280 8285 8287 8289 8295 8299 8305 8306 8308 8310 8311 8314 8321 8323 8326 8327 8334 8335 8337 8338 8344 8353 8358 8365 8367 8368 8380 8381 8385 8391 8394 8403 8406 8409 8410 8419 8429 8430 8433 8438 8439 8441 8444 8446 8449 8456 8457 8471 8472 8476 8477 8478 8479 8480 8487 8492 8495 8497 8500 8511 8518 8521 8522 8526 8527 8528 8548 8549 8559 8575 8584 8587 8588 8570 8591 8596 8597 8601 8608 8612 8613 8614 8615 8621 8623 8625 8626 8630 8633 8636 8639 8643 8647 8650 8651 8652 8654 8655 8656 8658 8660 8661 8662
 
 
 Notable improvements and fixes
@@ -155,9 +155,11 @@ Completions
   - ``isatty`` (:issue:`8609`)
   - ``istioctl`` (:issue:`8343`)
   - ``kmutil``
+  - ``matlab`` (:issue:`8505`)
   - ``mono`` (:issue:`8415`)
   -  Angular's ``ng`` (:issue:`8111`)
   - ``nodeenv`` (:issue:`8533`)
+  - ``octave`` (:issue:`8505`)
   - ``pabcnet_clear`` (:issue:`8421`)
   - ``qmk`` (:issue:`8180`)
   - ``rakudo`` (:issue:`8113`)

From 2fcea496a99759887e67152f0fb806edc7b58b7d Mon Sep 17 00:00:00 2001
From: Spenser Black <spenserblack01@gmail.com>
Date: Mon, 24 Jan 2022 11:47:33 -0500
Subject: [PATCH 076/262] Complete only filenames after `git show --`

---
 share/completions/git.fish | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 24f179c7a..4795303ac 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -947,10 +947,11 @@ complete -f -c git -n "__fish_git_using_command remote; and __fish_seen_subcomma
 
 ### show
 complete -f -c git -n __fish_git_needs_command -a show -d 'Shows the last commit of a branch'
-complete -f -c git -n '__fish_git_using_command show' -a '(__fish_git_branches)'
-complete -f -c git -n '__fish_git_using_command show' -ka '(__fish_git_tags)' -d Tag
-complete -f -c git -n '__fish_git_using_command show' -ka '(__fish_git_commits)'
-complete -f -c git -n __fish_git_needs_rev_files -xa '(__fish_git_complete_rev_files)'
+complete -f -c git -n '__fish_git_using_command show; and not contains -- -- (commandline -opc)' -a '(__fish_git_branches)'
+complete -f -c git -n '__fish_git_using_command show; and not contains -- -- (commandline -opc)' -ka '(__fish_git_tags)' -d Tag
+complete -f -c git -n '__fish_git_using_command show; and not contains -- -- (commandline -opc)' -ka '(__fish_git_commits)'
+complete -f -c git -n '__fish_git_needs_rev_files; and not contains -- -- (commandline -opc)' -xa '(__fish_git_complete_rev_files)'
+complete -F -c git -n '__fish_git_using_command show; and contains -- -- (commandline -opc)'
 complete -f -c git -n '__fish_git_using_command show' -l format -d 'Pretty-print the contents of the commit logs in a given format' -a '(__fish_git_show_opt format)'
 complete -f -c git -n '__fish_git_using_command show' -l abbrev-commit -d 'Show only a partial hexadecimal commit object name'
 complete -f -c git -n '__fish_git_using_command show' -l no-abbrev-commit -d 'Show the full 40-byte hexadecimal commit object name'

From 4ae29ec1fe20d2c19b5f6a3ed32d887fd2716b29 Mon Sep 17 00:00:00 2001
From: Spenser Black <spenserblack01@gmail.com>
Date: Mon, 24 Jan 2022 11:58:11 -0500
Subject: [PATCH 077/262] Add `--prune` option to `git fetch` and `git pull`

---
 share/completions/git.fish | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 4795303ac..a90323188 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -898,6 +898,7 @@ complete -f -c git -n '__fish_git_using_command fetch' -s v -l verbose -d 'Be ve
 complete -f -c git -n '__fish_git_using_command fetch' -s a -l append -d 'Append ref names and object names'
 # TODO --upload-pack
 complete -f -c git -n '__fish_git_using_command fetch' -s f -l force -d 'Force update of local branches'
+complete -f -c git -n '__fish_git_using_command fetch' -s p -l prune -d 'Remove remote-tracking references that no longer exist on the remote'
 # TODO other options
 
 #### filter-branch
@@ -1627,6 +1628,7 @@ complete -f -c git -n '__fish_git_using_command pull' -s a -l append -d 'Append
 complete -f -c git -n '__fish_git_using_command pull' -s f -l force -d 'Force update of local branches'
 complete -f -c git -n '__fish_git_using_command pull' -s k -l keep -d 'Keep downloaded pack'
 complete -f -c git -n '__fish_git_using_command pull' -l no-tags -d 'Disable automatic tag following'
+complete -f -c git -n '__fish_git_using_command pull' -s p -l prune -d 'Remove remote-tracking references that no longer exist on the remote'
 # TODO --upload-pack
 complete -f -c git -n '__fish_git_using_command pull' -l progress -d 'Force progress status'
 complete -f -c git -n '__fish_git_using_command pull; and not __fish_git_branch_for_remote' -a '(__fish_git_remotes)' -d 'Remote alias'

From 3575bc6c191541d7052768917448590ed7ac83f3 Mon Sep 17 00:00:00 2001
From: Spenser Black <spenserblack01@gmail.com>
Date: Mon, 24 Jan 2022 12:34:52 -0500
Subject: [PATCH 078/262] Hide interactive rebase options when not rebasing

`--abort`, `--skip`, and `--continue` are hidden when a rebase isn't in
progress.
---
 share/completions/git.fish | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index a90323188..be8af7730 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -798,6 +798,10 @@ format:\tSpecify which information to show"
     end
 end
 
+function __fish_git_is_rebasing
+    test -e (__fish_git rev-parse --git-path rebase-merge)
+end
+
 # general options
 complete -f -c git -l help -d 'Display the manual of a git command'
 complete -f -c git -n __fish_git_needs_command -l version -d 'Display version'
@@ -1704,10 +1708,10 @@ complete -f -c git -n '__fish_git_using_command rebase' -a '(__fish_git_branches
 complete -f -c git -n '__fish_git_using_command rebase' -a '(__fish_git_heads)' -d Head
 complete -f -c git -n '__fish_git_using_command rebase' -a '(__fish_git_recent_commits)'
 complete -f -c git -n '__fish_git_using_command rebase' -a '(__fish_git_tags)' -d Tag
-complete -f -c git -n '__fish_git_using_command rebase' -l continue -d 'Restart the rebasing process'
-complete -f -c git -n '__fish_git_using_command rebase' -l abort -d 'Abort the rebase operation'
+complete -f -c git -n '__fish_git_using_command rebase; and __fish_git_is_rebasing' -l continue -d 'Restart the rebasing process'
+complete -f -c git -n '__fish_git_using_command rebase; and __fish_git_is_rebasing' -l abort -d 'Abort the rebase operation'
 complete -f -c git -n '__fish_git_using_command rebase' -l keep-empty -d "Keep the commits that don't change anything"
-complete -f -c git -n '__fish_git_using_command rebase' -l skip -d 'Restart the rebasing process by skipping the current patch'
+complete -f -c git -n '__fish_git_using_command rebase; and __fish_git_is_rebasing' -l skip -d 'Restart the rebasing process by skipping the current patch'
 complete -f -c git -n '__fish_git_using_command rebase' -s m -l merge -d 'Use merging strategies to rebase'
 complete -f -c git -n '__fish_git_using_command rebase' -s q -l quiet -d 'Be quiet'
 complete -f -c git -n '__fish_git_using_command rebase' -s v -l verbose -d 'Be verbose'

From 03b3891d7326182b8fe145f5eb933b26b3f4fe6b Mon Sep 17 00:00:00 2001
From: Spenser Black <spenserblack01@gmail.com>
Date: Mon, 24 Jan 2022 12:39:08 -0500
Subject: [PATCH 079/262] Add `git rebase --edit-todo` completion

---
 share/completions/git.fish | 1 +
 1 file changed, 1 insertion(+)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index be8af7730..1affe02ed 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1710,6 +1710,7 @@ complete -f -c git -n '__fish_git_using_command rebase' -a '(__fish_git_recent_c
 complete -f -c git -n '__fish_git_using_command rebase' -a '(__fish_git_tags)' -d Tag
 complete -f -c git -n '__fish_git_using_command rebase; and __fish_git_is_rebasing' -l continue -d 'Restart the rebasing process'
 complete -f -c git -n '__fish_git_using_command rebase; and __fish_git_is_rebasing' -l abort -d 'Abort the rebase operation'
+complete -f -c git -n '__fish_git_using_command rebase; and __fish_git_is_rebasing' -l edit-todo -d 'Edit the todo list'
 complete -f -c git -n '__fish_git_using_command rebase' -l keep-empty -d "Keep the commits that don't change anything"
 complete -f -c git -n '__fish_git_using_command rebase; and __fish_git_is_rebasing' -l skip -d 'Restart the rebasing process by skipping the current patch'
 complete -f -c git -n '__fish_git_using_command rebase' -s m -l merge -d 'Use merging strategies to rebase'

From 3b690214dc228a1b443d0dfdecbc7bb616b4fd5b Mon Sep 17 00:00:00 2001
From: Spenser Black <spenserblack01@gmail.com>
Date: Mon, 24 Jan 2022 14:04:37 -0500
Subject: [PATCH 080/262] Add `git checkout --[no-]recurse-submodules`

---
 share/completions/git.fish | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 1affe02ed..aeb6a6e0f 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1040,6 +1040,8 @@ complete -f -c git -n '__fish_git_using_command checkout' -s b -d 'Create a new
 complete -f -c git -n '__fish_git_using_command checkout' -s t -l track -d 'Track a new branch'
 complete -f -c git -n '__fish_git_using_command checkout' -l theirs -d 'Keep staged changes'
 complete -f -c git -n '__fish_git_using_command checkout' -l ours -d 'Keep unmerged changes'
+complete -f -c git -n '__fish_git_using_command checkout' -l recurse-submodules -d 'Update the work trees of submodules'
+complete -f -c git -n '__fish_git_using_command checkout' -l no-recurse-submodules -d 'Do not update the work trees of submodules'
 # TODO options
 
 ### apply

From eb7603f1c6ed1fca33da0faa3252e3a62326fecc Mon Sep 17 00:00:00 2001
From: Spenser Black <spenserblack01@gmail.com>
Date: Mon, 24 Jan 2022 15:10:57 -0500
Subject: [PATCH 081/262] Make `__fish_git_is_rebasing` respect `git -C`

Co-authored-by: Johannes Altmanninger <aclopte@gmail.com>
---
 share/completions/git.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index aeb6a6e0f..4d45aea1e 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -799,7 +799,7 @@ format:\tSpecify which information to show"
 end
 
 function __fish_git_is_rebasing
-    test -e (__fish_git rev-parse --git-path rebase-merge)
+    test -e (__fish_git rev-parse --absolute-git-dir)/rebase-merge
 end
 
 # general options

From 3b41f8dfe8828491df018b2a52d8f4866b3a38c5 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Wed, 26 Jan 2022 13:51:45 -0800
Subject: [PATCH 082/262] Add missing newlines

---
 build_tools/osx_package_resources/welcome.html | 2 +-
 build_tools/osx_package_scripts/postinstall    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build_tools/osx_package_resources/welcome.html b/build_tools/osx_package_resources/welcome.html
index 5bfd6e46d..932ff3290 100644
--- a/build_tools/osx_package_resources/welcome.html
+++ b/build_tools/osx_package_resources/welcome.html
@@ -26,4 +26,4 @@
 	</p>
 	<p>Enjoy! Bugs can be reported on <a href="https://github.org/fish-shell/fish-shell/">GitHub</a>.</p>
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/build_tools/osx_package_scripts/postinstall b/build_tools/osx_package_scripts/postinstall
index 58382a7d0..abd59603a 100755
--- a/build_tools/osx_package_scripts/postinstall
+++ b/build_tools/osx_package_scripts/postinstall
@@ -1,3 +1,3 @@
 #!/bin/sh -x
 
-./add-shell ${DSTVOLUME}usr/local/bin/fish
\ No newline at end of file
+./add-shell ${DSTVOLUME}usr/local/bin/fish

From df3b0bd89fad1b4c2274c396ccabc5d050a5a900 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Wed, 26 Jan 2022 15:22:18 +0100
Subject: [PATCH 083/262] Fix commandline state for custom completions with
 variable overrides

Today, a command like "var=val status " has custom completions
because we skip over the var=val variable override when detecting
the command token.
However if the custom completions read the commandline state (via
"commandline -opc") they do see they variable override, which breaks
them, most likely. Try "a=b git ".

For completions of wrapped commands, we already set a transient
commandline. Do the same for commands with  leading variable overrides;
then git completions for "a=b git " will think the commandline is
"git ".
---
 CHANGELOG.rst              |  1 +
 src/complete.cpp           | 16 +++++++++++++---
 tests/checks/complete.fish |  7 +++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 6d41f61cc..97fbb26da 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -175,6 +175,7 @@ Completions
 - Improvements to many completions, especially for ``git`` aliases (:issue:`8129`) and subcommands (:issue:`8134`).
 - Add missing completions for the ``-p`` option of ``xbps-query``.
 - The ``fish_is_nth_token`` function, which is particularly useful in completions for identifying the token number within the command line, replaces various internal functions to do the same (:issue:`8008`).
+- When evaluating custom completions, the command line state no longer includes variable overrides (``var=val``). This unbreaks completions that read ``commandline -op``.
 
 Improved terminal support
 ^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/complete.cpp b/src/complete.cpp
index 559791c7f..043cc7fa9 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1390,7 +1390,7 @@ void completer_t::complete_custom(const wcstring &cmd, const wcstring &cmdline,
     // buitin_commandline will refer to the wrapped command. But not if
     // we're doing autosuggestions.
     maybe_t<cleanup_t> remove_transient{};
-    bool wants_transient = ad->wrap_depth > 0 && !is_autosuggest;
+    bool wants_transient = (ad->wrap_depth > 0 || ad->var_assignments) && !is_autosuggest;
     if (wants_transient) {
         ctx.parser->libdata().transient_commandlines.push_back(cmdline);
         remove_transient.emplace([=] { ctx.parser->libdata().transient_commandlines.pop_back(); });
@@ -1575,6 +1575,7 @@ void completer_t::perform_for_commandline(wcstring cmdline) {
     // Get all the arguments.
     std::vector<tok_t> tokens;
     parse_util_process_extent(cmdline.c_str(), position_in_statement, nullptr, nullptr, &tokens);
+    size_t actual_token_count = tokens.size();
 
     // Hack: fix autosuggestion by removing prefixing "and"s #6249.
     if (is_autosuggest) {
@@ -1603,6 +1604,14 @@ void completer_t::perform_for_commandline(wcstring cmdline) {
         return;
     }
 
+    wcstring *effective_cmdline, effective_cmdline_buf;
+    if (tokens.size() == actual_token_count) {
+        effective_cmdline = &cmdline;
+    } else {
+        effective_cmdline_buf.assign(cmdline, tokens.front().offset);
+        effective_cmdline = &effective_cmdline_buf;
+    }
+
     const tok_t &cmd_tok = tokens.front();
     const tok_t &cur_tok = tokens.back();
 
@@ -1674,7 +1683,8 @@ void completer_t::perform_for_commandline(wcstring cmdline) {
         custom_arg_data_t arg_data{&var_assignments};
         arg_data.had_ddash = had_ddash;
 
-        source_range_t command_range = {cmd_tok.offset, cmd_tok.length};
+        source_offset_t bias = cmdline.size() - effective_cmdline->size();
+        source_range_t command_range = {cmd_tok.offset - bias, cmd_tok.length};
 
         wcstring exp_command = cmd_tok.get_source(cmdline);
         bool unescaped =
@@ -1684,7 +1694,7 @@ void completer_t::perform_for_commandline(wcstring cmdline) {
         if (unescaped) {
             // Have to walk over the command and its entire wrap chain. If any command
             // disables do_file, then they all do.
-            walk_wrap_chain(exp_command, cmdline, command_range, &arg_data);
+            walk_wrap_chain(exp_command, *effective_cmdline, command_range, &arg_data);
             do_file = arg_data.do_file;
 
             // If we're autosuggesting, and the token is empty, don't do file suggestions.
diff --git a/tests/checks/complete.fish b/tests/checks/complete.fish
index 50076af04..118f5bc0a 100644
--- a/tests/checks/complete.fish
+++ b/tests/checks/complete.fish
@@ -454,3 +454,10 @@ function crookshanks --wraps '$path_to_cat'
 end
 complete -C 'crookshanks '
 # CHECK: +pet
+
+# Custom completion works with variable overrides.
+complete cmd_with_fancy_completion -xa '(commandline -opc | count)'
+complete -C"a=1 b=2 cmd_with_fancy_completion "
+# CHECK: 1
+complete -C"a=1 b=2 cmd_with_fancy_completion 1 "
+# CHECK: 2

From c48b02e418f3ffaa5281dcae43d0a0a7b17ff842 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Thu, 27 Jan 2022 04:06:09 +0100
Subject: [PATCH 084/262] fixup! Fix commandline state for custom completions
 with variable overrides

The previous commit added transient commandlines when completing
commands with variable overrides. Transient commandlines require a
parser, but perform_one_completion_cd_test() asked for completions
without giving a parser, which is only okay when asking for
autosuggestions (like perform_one_autosuggestion_cd_test() does).
Let's pass a parser to fix the test.
---
 src/fish_tests.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index c99c15d3b..646cfcdac 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -3574,7 +3574,8 @@ static void perform_one_autosuggestion_cd_test(const wcstring &command, const wc
 
 static void perform_one_completion_cd_test(const wcstring &command, const wcstring &expected,
                                            const environment_t &vars, long line) {
-    completion_list_t comps = complete(command, {}, operation_context_t{vars});
+    completion_list_t comps = complete(
+        command, {}, operation_context_t{parser_t::principal_parser().shared(), vars, no_cancel});
 
     bool expects_error = (expected == L"<error>");
 

From 4f07bb8824bf47a1b6ae278ef224cb73f906ef3b Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 25 Nov 2021 13:35:34 +1000
Subject: [PATCH 085/262] Completion for attrib

---
 share/completions/attrib.fish | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 share/completions/attrib.fish

diff --git a/share/completions/attrib.fish b/share/completions/attrib.fish
new file mode 100644
index 000000000..9f928e32a
--- /dev/null
+++ b/share/completions/attrib.fish
@@ -0,0 +1,24 @@
+function __attrib_generate_args --description 'Function to generate args'
+  set --local current_token (commandline --current-token --cut-at-cursor)
+  switch $current_token
+    case '+*'
+      echo -e 'r\tSet the Read-only file attribute
+a\tSet the Archive file attribute
+s\tSet the System file attribute
+h\tSet the Hidden file attribute
+i\tSet the Not Content Indexed file attribute' | awk -F '\t' "{ printf \"$current_token%s\t%s\n\", \$1, \$2 }"
+    case '-*'
+      echo -e 'r\tUnset the Read-only file attribute
+a\tUnset the Archive file attribute
+s\tUnset the System file attribute
+h\tUnset the Hidden file attribute
+i\tUnset the Not Content Indexed file attribute' | awk -F '\t' "{ printf \"$current_token%s\t%s\n\", \$1, \$2 }"
+    case '*'
+      echo -e '/s\tApply changes recursively
+/d\tApply changes only to directories
+/l\tApply changes to symbolic links and not their targets
+/?\tShow help'
+  end
+end
+
+complete --command attrib --no-files --arguments '(__attrib_generate_args)'
\ No newline at end of file

From bf72247e1a6b21016ffa481be0738af14e64212e Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 25 Nov 2021 14:00:45 +1000
Subject: [PATCH 086/262] Completion for attributes command

---
 share/completions/attributes.fish | 36 +++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 share/completions/attributes.fish

diff --git a/share/completions/attributes.fish b/share/completions/attributes.fish
new file mode 100644
index 000000000..54c1369c6
--- /dev/null
+++ b/share/completions/attributes.fish
@@ -0,0 +1,36 @@
+function __attributes_generate_args --description 'Function to generate args'
+  if ! __fish_seen_subcommand_from disk volume
+    echo -e 'disk\tManipulate disk attributes
+volume\tManipulate volume attributes'
+    return
+  end
+
+  if __fish_seen_subcommand_from disk
+    if ! __fish_seen_subcommand_from set clear
+      echo -e 'set\tSet an attribute of the disk with focus
+clear\tUnset an attribute of the disk with focus'
+      return
+    end
+
+    echo -e 'readonly\tUse readonly attribute
+noerr\tSuppress errors for DiskPart'
+    return
+  end
+
+  if __fish_seen_subcommand_from volume
+    if ! __fish_seen_subcommand_from set clear
+      echo -e 'set\tSet an attribute of the volume with focus
+clear\tUnset an attribute of the disk volume focus'
+      return
+    end
+
+    echo -e 'readonly\tUse readonly attribute
+readonly\tUse hidden attribute
+nodefaultdriveletter\tDon\'t use a drive letter by default
+shadowcopy\tSet volume type to shadow copy volume
+noerr\tSuppress errors for DiskPart'
+    return
+  end
+end
+
+complete --command attributes --no-files --arguments '(__attributes_generate_args)'
\ No newline at end of file

From 63165085e18e59155e2cee5d8cffad17b51033df Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 25 Nov 2021 14:14:17 +1000
Subject: [PATCH 087/262] Completion for choice command

---
 share/completions/choice.fish | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 share/completions/choice.fish

diff --git a/share/completions/choice.fish b/share/completions/choice.fish
new file mode 100644
index 000000000..eb8318050
--- /dev/null
+++ b/share/completions/choice.fish
@@ -0,0 +1,7 @@
+complete --command choice --no-files --arguments '/c\t"Specify the list of choices to be created"
+/n\t"Hide the list of choices"
+/cs\t"Respect case"
+/t\t"Specify the number of seconds to pause before using the default choice"
+/d\t"Use as the default choice"
+/m\t"Specify a message to display before the list of choices"
+/?\t"Show help"'
\ No newline at end of file

From bedb20e4b32970e904448237284bd49f43df5e69 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 25 Nov 2021 14:19:41 +1000
Subject: [PATCH 088/262] Completion for clean command

---
 share/completions/clean.fish | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 share/completions/clean.fish

diff --git a/share/completions/clean.fish b/share/completions/clean.fish
new file mode 100644
index 000000000..576470445
--- /dev/null
+++ b/share/completions/clean.fish
@@ -0,0 +1 @@
+complete --command clean --no-files --arguments 'all\t"Set every sector on the disk to zero"'
\ No newline at end of file

From 555166425b5b1163aba3c36a711c297382ba700e Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 25 Nov 2021 14:28:04 +1000
Subject: [PATCH 089/262] Completion for cleanmgr command

---
 share/completions/cleanmgr.fish | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 share/completions/cleanmgr.fish

diff --git a/share/completions/cleanmgr.fish b/share/completions/cleanmgr.fish
new file mode 100644
index 000000000..c1da12eeb
--- /dev/null
+++ b/share/completions/cleanmgr.fish
@@ -0,0 +1,7 @@
+complete --command cleanmgr --no-files --arguments '/d\t"Use drive to clean-up"
+/sageset\t"Show the Disk Cleanup Settings dialog box and also create a registry key to store the settings that you select"
+/sagerun\t"Run the specified tasks that are assigned to the n value if you use the /sageset option"
+/tuneup\t"Run /sageset and /sagerun for the same n"
+/lowdisk\t"Use default settings"
+/verylowdisk\t"Use default settings and hide all prompts"
+/?\t"Show help"'
\ No newline at end of file

From 064fd61bc49aee6d815d9f97bad094cb65dc203b Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 25 Nov 2021 14:29:07 +1000
Subject: [PATCH 090/262] Completion for cls command

---
 share/completions/cls.fish | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 share/completions/cls.fish

diff --git a/share/completions/cls.fish b/share/completions/cls.fish
new file mode 100644
index 000000000..2e72c5130
--- /dev/null
+++ b/share/completions/cls.fish
@@ -0,0 +1 @@
+complete --command cls --no-files --arguments '/?\t"Show help"'
\ No newline at end of file

From 8092d40cb750aa76160a89dd3606e45d5f485541 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 25 Nov 2021 15:28:47 +1000
Subject: [PATCH 091/262] Completion for cmd command

---
 share/completions/cmd.fish | 46 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 share/completions/cmd.fish

diff --git a/share/completions/cmd.fish b/share/completions/cmd.fish
new file mode 100644
index 000000000..1b2a91a3d
--- /dev/null
+++ b/share/completions/cmd.fish
@@ -0,0 +1,46 @@
+function __cmd_generate_args --description 'Function to generate args'
+  set --local current_token (commandline --current-token --cut-at-cursor)
+  switch $current_token
+    case '/t:*'
+      echo -e '0\tBlack
+1\tBlue
+2\tGreen
+3\tAqua
+4\tRed
+5\tPurple
+6\tYellow
+7\tWhite
+8\tGray
+9\tLight blue
+A\tLight green
+B\tLight aqua
+C\tLight red
+D\tLight purple
+E\tLight yellow
+F\tBright white' | awk -F '\t' "{ printf \"$current_token%s\t%s\n\", \$1, \$2 }"
+    case '/e:*'
+      echo -e 'on\tEnable command extensions
+off\tDisable command extensions' | awk -F '\t' "{ printf \"$current_token%s\t%s\n\", \$1, \$2 }"
+    case '/f:*'
+      echo -e 'on\tEnable file and directory name completion
+off\tDisable file and directory name completion' | awk -F '\t' "{ printf \"$current_token%s\t%s\n\", \$1, \$2 }"
+    case '/v:*'
+      echo -e 'on\tEnable delayed environment variable expansion
+off\tDisable delayed environment variable expansion' | awk -F '\t' "{ printf \"$current_token%s\t%s\n\", \$1, \$2 }"
+    case '*'
+      echo -e '/c\tCarry out the command specified by string and then stop
+/k\tCarry out the command specified by string and continue
+/s\tModify the treatment of string after /c or /k
+/q\tDisable echo
+/d\tDisables execution of AutoRun commands
+/a\tFormat internal command output to a pipe or a file as ANSI
+/u\tFormat internal command output to a pipe or a file as Unicode
+/t\tSet the background and foreground color
+/e\tManage command extensions
+/f\tManage file and directory name completion
+/v\tManage delayed environment variable expansion
+/?\tShow help'
+  end
+end
+
+complete --command cmd --no-files --arguments '(__cmd_generate_args)'

From 36eb3107326f4ff85a00d27d8d37b899d0ce3b41 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 25 Nov 2021 16:39:07 +1000
Subject: [PATCH 092/262] Completion for vol command

---
 share/completions/vol.fish | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 share/completions/vol.fish

diff --git a/share/completions/vol.fish b/share/completions/vol.fish
new file mode 100644
index 000000000..e6dbf0467
--- /dev/null
+++ b/share/completions/vol.fish
@@ -0,0 +1,11 @@
+function __vol_generate_args --description 'Function to generate args'
+  set --local current_token (commandline --current-token --cut-at-cursor)
+  switch $current_token
+    case '/*'
+      echo -e '/?\tShow help'
+    case "*"
+      wmic logicaldisk get name | tail --lines +2
+  end
+end
+
+complete --command vol --no-files --arguments '(__vol_generate_args)'

From 1a005a76ef27df4201a41ddcb56c510e95205dcd Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 25 Nov 2021 16:49:16 +1000
Subject: [PATCH 093/262] Completion for ver command

---
 share/completions/ver.fish | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 share/completions/ver.fish

diff --git a/share/completions/ver.fish b/share/completions/ver.fish
new file mode 100644
index 000000000..d528d30e0
--- /dev/null
+++ b/share/completions/ver.fish
@@ -0,0 +1 @@
+complete --command ver --no-files --arguments '/?\tShow help'

From 3c943d2836880b0a59f9925735b3b83a74844647 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 25 Nov 2021 16:59:24 +1000
Subject: [PATCH 094/262] Completion for comp command

---
 share/completions/comp.fish | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 share/completions/comp.fish

diff --git a/share/completions/comp.fish b/share/completions/comp.fish
new file mode 100644
index 000000000..f24f3753f
--- /dev/null
+++ b/share/completions/comp.fish
@@ -0,0 +1,13 @@
+function __comp_generate_args --description 'Function to generate args'
+  echo -e '/d\tShow differences in decimal format
+/a\tShow differences as characters
+/l\tShow the numbe
+r of the line where a difference occurs, instead of displaying the byte offset
+/n=\tCompare only the number of lines that are specified for each file, even if the files are different sizes
+/c\tPerform a comparison that is not case-sensitive
+/off\tProcess files with the offline attribute set
+/offline\tProcess files with the offline attribute set
+/?\tShow help'
+end
+
+complete --command comp --no-files --arguments '(__comp_generate_args)'

From 7f1ea270081bb71eca42bafb781c29d45ae56741 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 25 Nov 2021 17:30:44 +1000
Subject: [PATCH 095/262] Windows options support in __fish_seen_argument

---
 share/functions/__fish_seen_argument.fish | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/share/functions/__fish_seen_argument.fish b/share/functions/__fish_seen_argument.fish
index 170bd4fa1..6425faa5c 100644
--- a/share/functions/__fish_seen_argument.fish
+++ b/share/functions/__fish_seen_argument.fish
@@ -1,23 +1,30 @@
-function __fish_seen_argument --description 'Check whether argument used'
-    argparse 's/short=+' 'o/old=+' 'l/long=+' -- $argv
+function __fish_seen_argument --description 'Check whether argument is used'
+    argparse 's/short=+' 'o/old=+' 'l/long=+' 'w/windows=+' -- $argv
 
-    set -l cmd (commandline -poc)
-    set -e cmd[1]
-    for t in $cmd
+    set --local tokens (commandline --current-process --tokenize --cut-at-cursor)
+    set --erase tokens[1]
+    
+    for t in $tokens
         for s in $_flag_s
-            if string match -qr "^-[A-z0-9]*"$s"[A-z0-9]*\$" -- $t
+            if string match --regex --quiet -- "^-[A-z0-9]*"$s"[A-z0-9]*\$" $t
                 return 0
             end
         end
 
         for o in $_flag_o
-            if string match -qr "^-$s\$" -- $t
+            if string match --quiet -- "-$s" $t
                 return 0
             end
         end
 
         for l in $_flag_l
-            if string match -q -- "--$l" $t
+            if string match --quiet -- "--$l" $t
+                return 0
+            end
+        end
+
+        for w in $_flag_w
+            if string match --quiet -- "/$w" $t
                 return 0
             end
         end

From 2bd7daec20d0054ff70dd3d287f6a41990002947 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 25 Nov 2021 17:36:03 +1000
Subject: [PATCH 096/262] Completion for copy command

---
 share/completions/copy.fish | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 share/completions/copy.fish

diff --git a/share/completions/copy.fish b/share/completions/copy.fish
new file mode 100644
index 000000000..eb1b4a531
--- /dev/null
+++ b/share/completions/copy.fish
@@ -0,0 +1,16 @@
+function __copy_generate_args --description 'Function to generate args'
+  if not __fish_seen_argument --windows 'a' --windows 'b'
+    echo -e '/a\tIndicate an ASCII text file
+/b\tIndicate a binary file'
+  end
+
+  echo -e '/d\tAllow the encrypted files being copied to be saved as decrypted files at the destination
+/v\tVerify that new files are written correctly
+/n\tUses a short file name, if available
+/y=\tHide prompts to confirm that you want to overwrite an existing destination file
+/-y\tShow prompts to confirm that you want to overwrite an existing destination file
+/z\tCopy networked files in restartable mode
+/?\tShow help'
+end
+
+complete --command copy --no-files --arguments '(__copy_generate_args)'

From 7c2e05f223b01ec63c2dcbffefc58bbf39a420ab Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 25 Nov 2021 17:45:57 +1000
Subject: [PATCH 097/262] Completion for forfiles command

---
 share/completions/forfiles.fish | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 share/completions/forfiles.fish

diff --git a/share/completions/forfiles.fish b/share/completions/forfiles.fish
new file mode 100644
index 000000000..bf101fa72
--- /dev/null
+++ b/share/completions/forfiles.fish
@@ -0,0 +1,10 @@
+function __forfiles_generate_args --description 'Function to generate args'
+  echo -e '/P\tSpecify the path from which to start the search
+/M\tSearch files according to the specified search mask
+/S\tInstruct the forfiles command to search in subdirectories recursively
+/C\tRun the specified command on each file
+/D\tSelect files with a last modified date within the specified time frame
+/?\tShow help'
+end
+
+complete --command forfiles --no-files --arguments '(__forfiles_generate_args)'

From 529f82a990a6bccef1bbc89bb7caea7d621931fb Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 25 Nov 2021 18:12:14 +1000
Subject: [PATCH 098/262] Clean-up all completions

---
 share/completions/attrib.fish     | 16 ++++++++--------
 share/completions/attributes.fish | 26 +++++++++++++-------------
 share/completions/choice.fish     |  6 +++---
 share/completions/clean.fish      |  2 +-
 share/completions/cleanmgr.fish   |  8 ++++----
 share/completions/cmd.fish        |  4 ++--
 share/completions/comp.fish       | 21 ++++++++-------------
 share/completions/copy.fish       |  2 +-
 share/completions/forfiles.fish   | 16 ++++++----------
 share/completions/vol.fish        |  2 +-
 10 files changed, 47 insertions(+), 56 deletions(-)

diff --git a/share/completions/attrib.fish b/share/completions/attrib.fish
index 9f928e32a..11b8e29b0 100644
--- a/share/completions/attrib.fish
+++ b/share/completions/attrib.fish
@@ -8,15 +8,15 @@ s\tSet the System file attribute
 h\tSet the Hidden file attribute
 i\tSet the Not Content Indexed file attribute' | awk -F '\t' "{ printf \"$current_token%s\t%s\n\", \$1, \$2 }"
     case '-*'
-      echo -e 'r\tUnset the Read-only file attribute
-a\tUnset the Archive file attribute
-s\tUnset the System file attribute
-h\tUnset the Hidden file attribute
-i\tUnset the Not Content Indexed file attribute' | awk -F '\t' "{ printf \"$current_token%s\t%s\n\", \$1, \$2 }"
+      echo -e 'r\tClear the Read-only file attribute
+a\tClear the Archive file attribute
+s\tClear the System file attribute
+h\tClear the Hidden file attribute
+i\tClear the Not Content Indexed file attribute' | awk -F '\t' "{ printf \"$current_token%s\t%s\n\", \$1, \$2 }"
     case '*'
-      echo -e '/s\tApply changes recursively
-/d\tApply changes only to directories
-/l\tApply changes to symbolic links and not their targets
+      echo -e '/s\tApply to matching files in the current directory and all of its subdirectories
+/d\tApply attrib and any command-line options to directories
+/l\tApply attrib and any command-line options to the Symbolic Link, rather than the target of it
 /?\tShow help'
   end
 end
diff --git a/share/completions/attributes.fish b/share/completions/attributes.fish
index 54c1369c6..d77f9cdca 100644
--- a/share/completions/attributes.fish
+++ b/share/completions/attributes.fish
@@ -1,34 +1,34 @@
 function __attributes_generate_args --description 'Function to generate args'
   if ! __fish_seen_subcommand_from disk volume
-    echo -e 'disk\tManipulate disk attributes
-volume\tManipulate volume attributes'
+    echo -e 'disk\tDisplay, set, or clear the attributes of a disk
+volume\tDisplay, set, or clear the attributes of a volume'
     return
   end
 
   if __fish_seen_subcommand_from disk
     if ! __fish_seen_subcommand_from set clear
-      echo -e 'set\tSet an attribute of the disk with focus
-clear\tUnset an attribute of the disk with focus'
+      echo -e 'set\tSet the specified attribute of the disk with focus
+clear\tClear the specified attribute of the disk with focus'
       return
     end
 
-    echo -e 'readonly\tUse readonly attribute
-noerr\tSuppress errors for DiskPart'
+    echo -e 'readonly\tSpecify that the disk is read-only
+noerr\tWhen an error is encountered, DiskPart continues to process commands'
     return
   end
 
   if __fish_seen_subcommand_from volume
     if ! __fish_seen_subcommand_from set clear
-      echo -e 'set\tSet an attribute of the volume with focus
-clear\tUnset an attribute of the disk volume focus'
+      echo -e 'set\tSet the specified attribute of the volume with focus
+clear\tClear the specified attribute of the volume with focus'
       return
     end
 
-    echo -e 'readonly\tUse readonly attribute
-readonly\tUse hidden attribute
-nodefaultdriveletter\tDon\'t use a drive letter by default
-shadowcopy\tSet volume type to shadow copy volume
-noerr\tSuppress errors for DiskPart'
+    echo -e 'readonly\tSpecify that the volume is read-only
+readonly\tSpecify that the volume is hidden
+nodefaultdriveletter\tSpecify that the volume does not receive a drive letter by default
+shadowcopy\tSpecify that the volume is a shadow copy volume
+noerr\tWhen an error is encountered, DiskPart continues to process commands'
     return
   end
 end
diff --git a/share/completions/choice.fish b/share/completions/choice.fish
index eb8318050..25ddaf93b 100644
--- a/share/completions/choice.fish
+++ b/share/completions/choice.fish
@@ -1,7 +1,7 @@
 complete --command choice --no-files --arguments '/c\t"Specify the list of choices to be created"
 /n\t"Hide the list of choices"
-/cs\t"Respect case"
-/t\t"Specify the number of seconds to pause before using the default choice"
-/d\t"Use as the default choice"
+/cs\t"Specify that the choices are case-sensitive"
+/t\t"Specify the number of seconds to pause before using the default choice specified by /d"
+/d\t"Specify the default choice to use after waiting the number of seconds specified by /t"
 /m\t"Specify a message to display before the list of choices"
 /?\t"Show help"'
\ No newline at end of file
diff --git a/share/completions/clean.fish b/share/completions/clean.fish
index 576470445..8d1720d0b 100644
--- a/share/completions/clean.fish
+++ b/share/completions/clean.fish
@@ -1 +1 @@
-complete --command clean --no-files --arguments 'all\t"Set every sector on the disk to zero"'
\ No newline at end of file
+complete --command clean --no-files --arguments 'all\t"Specify that each and every sector on the disk is set to zero"'
\ No newline at end of file
diff --git a/share/completions/cleanmgr.fish b/share/completions/cleanmgr.fish
index c1da12eeb..d09d3c915 100644
--- a/share/completions/cleanmgr.fish
+++ b/share/completions/cleanmgr.fish
@@ -1,7 +1,7 @@
-complete --command cleanmgr --no-files --arguments '/d\t"Use drive to clean-up"
-/sageset\t"Show the Disk Cleanup Settings dialog box and also create a registry key to store the settings that you select"
+complete --command cleanmgr --no-files --arguments '/d\t"Specify the drive that you want Disk Cleanup to clean"
+/sageset\t"Display the Disk Cleanup Settings dialog box and also create a registry keyt"
 /sagerun\t"Run the specified tasks that are assigned to the n value if you use the /sageset option"
 /tuneup\t"Run /sageset and /sagerun for the same n"
-/lowdisk\t"Use default settings"
-/verylowdisk\t"Use default settings and hide all prompts"
+/lowdisk\t"Run with the default settings"
+/verylowdisk\t"Run with the default settings, no user prompts"
 /?\t"Show help"'
\ No newline at end of file
diff --git a/share/completions/cmd.fish b/share/completions/cmd.fish
index 1b2a91a3d..118221185 100644
--- a/share/completions/cmd.fish
+++ b/share/completions/cmd.fish
@@ -31,8 +31,8 @@ off\tDisable delayed environment variable expansion' | awk -F '\t' "{ printf \"$
       echo -e '/c\tCarry out the command specified by string and then stop
 /k\tCarry out the command specified by string and continue
 /s\tModify the treatment of string after /c or /k
-/q\tDisable echo
-/d\tDisables execution of AutoRun commands
+/q\tTurn the echo off
+/d\tDisable execution of AutoRun commands
 /a\tFormat internal command output to a pipe or a file as ANSI
 /u\tFormat internal command output to a pipe or a file as Unicode
 /t\tSet the background and foreground color
diff --git a/share/completions/comp.fish b/share/completions/comp.fish
index f24f3753f..a2fba7a2f 100644
--- a/share/completions/comp.fish
+++ b/share/completions/comp.fish
@@ -1,13 +1,8 @@
-function __comp_generate_args --description 'Function to generate args'
-  echo -e '/d\tShow differences in decimal format
-/a\tShow differences as characters
-/l\tShow the numbe
-r of the line where a difference occurs, instead of displaying the byte offset
-/n=\tCompare only the number of lines that are specified for each file, even if the files are different sizes
-/c\tPerform a comparison that is not case-sensitive
-/off\tProcess files with the offline attribute set
-/offline\tProcess files with the offline attribute set
-/?\tShow help'
-end
-
-complete --command comp --no-files --arguments '(__comp_generate_args)'
+complete --command comp --no-files --arguments '/d\t"Display differences in decimal format"
+/a\t"Display differences as characters"
+/l\t"Displays the number of the line where a difference occurs, instead of displaying the byte offset"
+/n=\t"Compare only the number of lines that are specified for each file, even if the files are different sizes"
+/c\t"Perform a comparison that is not case-sensitive"
+/off\t"Process files with the offline attribute set"
+/offline\t"Process files with the offline attribute set"
+/?\t"Show help"'
diff --git a/share/completions/copy.fish b/share/completions/copy.fish
index eb1b4a531..127f9b8e6 100644
--- a/share/completions/copy.fish
+++ b/share/completions/copy.fish
@@ -6,7 +6,7 @@ function __copy_generate_args --description 'Function to generate args'
 
   echo -e '/d\tAllow the encrypted files being copied to be saved as decrypted files at the destination
 /v\tVerify that new files are written correctly
-/n\tUses a short file name, if available
+/n\tUse a short file name, if available
 /y=\tHide prompts to confirm that you want to overwrite an existing destination file
 /-y\tShow prompts to confirm that you want to overwrite an existing destination file
 /z\tCopy networked files in restartable mode
diff --git a/share/completions/forfiles.fish b/share/completions/forfiles.fish
index bf101fa72..f716d4f76 100644
--- a/share/completions/forfiles.fish
+++ b/share/completions/forfiles.fish
@@ -1,10 +1,6 @@
-function __forfiles_generate_args --description 'Function to generate args'
-  echo -e '/P\tSpecify the path from which to start the search
-/M\tSearch files according to the specified search mask
-/S\tInstruct the forfiles command to search in subdirectories recursively
-/C\tRun the specified command on each file
-/D\tSelect files with a last modified date within the specified time frame
-/?\tShow help'
-end
-
-complete --command forfiles --no-files --arguments '(__forfiles_generate_args)'
+complete --command forfiles --no-files --arguments '/P\t"Specify the path from which to start the search"
+/M\t"Search files according to the specified search mask"
+/S\t"Instruct the forfiles command to search in subdirectories recursively"
+/C\t"Run the specified command on each file"
+/D\t"Select files with a last modified date within the specified time frame"
+/?\t"Show help"'
diff --git a/share/completions/vol.fish b/share/completions/vol.fish
index e6dbf0467..71f6f46a0 100644
--- a/share/completions/vol.fish
+++ b/share/completions/vol.fish
@@ -3,7 +3,7 @@ function __vol_generate_args --description 'Function to generate args'
   switch $current_token
     case '/*'
       echo -e '/?\tShow help'
-    case "*"
+    case '*'
       wmic logicaldisk get name | tail --lines +2
   end
 end

From 080c215d48dcd86880fdcef98ca334d9bbac0f75 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 25 Nov 2021 19:00:48 +1000
Subject: [PATCH 099/262] Completion for pause command

---
 share/completions/pause.fish | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 share/completions/pause.fish

diff --git a/share/completions/pause.fish b/share/completions/pause.fish
new file mode 100644
index 000000000..baa9da3f1
--- /dev/null
+++ b/share/completions/pause.fish
@@ -0,0 +1 @@
+complete --command pause --no-files --arguments '/?\t"Show help"'
\ No newline at end of file

From 3a8936313243767bc34cd6657934ab5888e82aa4 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 25 Nov 2021 19:37:38 +1000
Subject: [PATCH 100/262] Completion for reg command

---
 share/completions/reg.fish | 80 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 share/completions/reg.fish

diff --git a/share/completions/reg.fish b/share/completions/reg.fish
new file mode 100644
index 000000000..943b9be69
--- /dev/null
+++ b/share/completions/reg.fish
@@ -0,0 +1,80 @@
+function __reg_generate_args --description 'Function to generate args'
+  if not __fish_seen_subcommand_from add compare copy delete export import load query restore save unload
+    echo -e 'add\tAdd a new subkey or entry to the registry
+compare\tCompare specified registry subkeys or entries
+copy\tCopy a registry entry to a specified location on the local or remote computer
+delete\tDelete a subkey or entries from the registry
+export\tCopy the specified subkeys, entries, and values of the local computer into a file
+import\tCopy the contents of a file that contains registry data into the registry of the local computer
+load\tWrite saved subkeys and entries into a different subkey in the registry
+query\tReturn a list of the next tier of subkeys and entries
+restore\tWrite saved subkeys and entries back to the registry
+save\tSave a copy of specified subkeys, entries, and values of the registry in a specified file
+unload\tRemove a section of the registry that was loaded using the reg load operation'
+    return
+  end
+
+  set --local current_token (commandline --current-token --cut-at-cursor)
+
+  echo -e '/?\tShow help'
+
+  if __fish_seen_subcommand_from add
+    if not __fish_seen_argument --windows '/v' --windows '/ve'
+      echo -e '/v\tSpecify the name of the add registry entry
+/ve\tSpecify that the added registry entry has a null value'
+    end
+
+    echo -e '/t\tSpecify the type for the registry entry
+/s\tSpecify the character to be used to separate multiple instances of data
+/d\tSpecify the data for the new registry entry
+/f\tAdd the registry entry without prompting for confirmation'
+  else if __fish_seen_subcommand_from compare
+    if not __fish_seen_argument --windows '/v' --windows '/ve'
+      echo -e '/v\tSpecify the value name to compare under the subkey
+/ve\tSpecify that only entries that have a value name of null should be compared'
+    end
+
+    if not __fish_seen_argument --windows '/oa' --windows '/od' --windows '/os' --windows '/on'
+      echo -e '/oa\tSpecify that all differences and matches are displayed
+/od\tSpecify that only differences are displayed
+/os\tSpecify that only matches are displayed
+/on\tSpecify that nothing is displayed'
+    end
+
+    echo -e '/s\tSpecify the type for the registry entry'
+  else if __fish_seen_subcommand_from copy
+    echo -e '/s\tCopy all subkeys and entries under the specified subkey
+/f\tCopy the subkey without prompting for confirmation'
+  else if __fish_seen_subcommand_from delete
+    if not __fish_seen_argument --windows '/v' --windows '/ve' --windows '/va'
+      echo -e '/v\tDelete a specific entry under the subkey
+/ve\tSpecify that only entries that have no value will be deleted
+/va\tDelete all entries under the specified subkey'
+    end
+
+    echo -e '/f\tDelete the existing registry subkey or entry without asking for confirmation'
+  else if __fish_seen_subcommand_from export
+    echo -e '/y\tOverwrite any existing file with the name filename without prompting for confirmation'
+  else if __fish_seen_subcommand_from query
+    if not __fish_seen_argument --windows '/v' --windows '/ve'
+      echo -e '/v\tSpecify the registry value name that is to be queried
+/ve\tRun a query for value names that are empty'
+    end
+
+    if not __fish_seen_argument --windows '/k' --windows '/d'
+      echo -e '/k\tSpecify to search in key names only
+/d\tSpecify to search in data only'
+    end
+
+    echo -e '/se\tSpecify the single value separator to search for in the value name type REG_MULTI_SZ
+/f\tSpecify the data or pattern to search for
+/c\tSpecify that the query is case sensitive
+/e\tSpecify to return only exact matches
+/t\tSpecify registry types to search
+/z\tSpecify to include the numeric equivalent for the registry type in search results'
+  else if __fish_seen_subcommand_from save
+    echo -e '/y\tOverwrite an existing file with the name filename without prompting for confirmation'
+  end
+end
+
+complete --command reg --no-files --arguments '(__reg_generate_args)'
\ No newline at end of file

From 4b6e4fb7f0ad8ca8c6c33673aef976db58a9d3ef Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 25 Nov 2021 19:38:15 +1000
Subject: [PATCH 101/262] Remove unused var in reg.fish

---
 share/completions/reg.fish | 2 --
 1 file changed, 2 deletions(-)

diff --git a/share/completions/reg.fish b/share/completions/reg.fish
index 943b9be69..3937d24f6 100644
--- a/share/completions/reg.fish
+++ b/share/completions/reg.fish
@@ -14,8 +14,6 @@ unload\tRemove a section of the registry that was loaded using the reg load oper
     return
   end
 
-  set --local current_token (commandline --current-token --cut-at-cursor)
-
   echo -e '/?\tShow help'
 
   if __fish_seen_subcommand_from add

From 1bd01436d925d095f4525e20ddf5dfca093ce653 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 25 Nov 2021 19:46:22 +1000
Subject: [PATCH 102/262] Completion for setx command

---
 share/completions/setx.fish | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 share/completions/setx.fish

diff --git a/share/completions/setx.fish b/share/completions/setx.fish
new file mode 100644
index 000000000..b31aca7d5
--- /dev/null
+++ b/share/completions/setx.fish
@@ -0,0 +1,15 @@
+function __setx_generate_args --description 'Function to generate args'
+  echo -e '/u\tSpecify the name or IP address of a remote computer
+/p\tSpecify the password of the user account that is specified in the /u parameter
+/f\tSpecify the file that you want to use
+/d\tSpecify delimiters to be used in addition to the four built-in delimiters
+/?\tShow help'
+
+  if not __fish_seen_argument --windows '/a' --windows '/m' --windows '/x'
+    echo -e '/a\tSpecify absolute coordinates and offset as search parameters
+/m\tSpecify to set the variable in the system environment
+/x\tDisplay file coordinates, ignoring the /a, /r, and /d command-line options'
+  end
+end
+
+complete --command setx --no-files --arguments '(__setx_generate_args)'
\ No newline at end of file

From 5aac064b2c761860deb5e6f38ad2a308c66ba49a Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 25 Nov 2021 22:29:52 +1000
Subject: [PATCH 103/262] Fix second for loop in __fish_seen_argument

---
 share/functions/__fish_seen_argument.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/functions/__fish_seen_argument.fish b/share/functions/__fish_seen_argument.fish
index 6425faa5c..2ec21a802 100644
--- a/share/functions/__fish_seen_argument.fish
+++ b/share/functions/__fish_seen_argument.fish
@@ -12,7 +12,7 @@ function __fish_seen_argument --description 'Check whether argument is used'
         end
 
         for o in $_flag_o
-            if string match --quiet -- "-$s" $t
+            if string match --quiet -- "-$o" $t
                 return 0
             end
         end

From da1fdc758b657b0ee323af7f432b2dca38d44631 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 25 Nov 2021 22:39:33 +1000
Subject: [PATCH 104/262] Fix reg completion

---
 share/completions/reg.fish | 58 +++++++++++++++++++++++++++++---------
 1 file changed, 44 insertions(+), 14 deletions(-)

diff --git a/share/completions/reg.fish b/share/completions/reg.fish
index 3937d24f6..fea605f85 100644
--- a/share/completions/reg.fish
+++ b/share/completions/reg.fish
@@ -14,10 +14,23 @@ unload\tRemove a section of the registry that was loaded using the reg load oper
     return
   end
 
-  echo -e '/?\tShow help'
+  set --local previous_token (commandline --tokenize --cut-at-cursor)[-1]
 
   if __fish_seen_subcommand_from add
-    if not __fish_seen_argument --windows '/v' --windows '/ve'
+    if test "$previous_token" = '/t'
+      echo 'REG_SZ
+REG_MULTI_SZ
+REG_DWORD_BIG_ENDIAN
+REG_DWORD
+REG_BINARY
+REG_DWORD_LITTLE_ENDIAN
+REG_LINK
+REG_FULL_RESOURCE_DESCRIPTOR
+REG_EXPAND_SZ'
+      return
+    end
+
+    if not __fish_seen_argument --windows 'v' --windows 've'
       echo -e '/v\tSpecify the name of the add registry entry
 /ve\tSpecify that the added registry entry has a null value'
     end
@@ -25,41 +38,56 @@ unload\tRemove a section of the registry that was loaded using the reg load oper
     echo -e '/t\tSpecify the type for the registry entry
 /s\tSpecify the character to be used to separate multiple instances of data
 /d\tSpecify the data for the new registry entry
-/f\tAdd the registry entry without prompting for confirmation'
+/f\tAdd the registry entry without prompting for confirmation
+/?\tShow help'
   else if __fish_seen_subcommand_from compare
-    if not __fish_seen_argument --windows '/v' --windows '/ve'
+    if not __fish_seen_argument --windows 'v' --windows 've'
       echo -e '/v\tSpecify the value name to compare under the subkey
 /ve\tSpecify that only entries that have a value name of null should be compared'
     end
 
-    if not __fish_seen_argument --windows '/oa' --windows '/od' --windows '/os' --windows '/on'
+    if not __fish_seen_argument --windows 'oa' --windows 'od' --windows 'os' --windows 'on'
       echo -e '/oa\tSpecify that all differences and matches are displayed
 /od\tSpecify that only differences are displayed
 /os\tSpecify that only matches are displayed
 /on\tSpecify that nothing is displayed'
     end
 
-    echo -e '/s\tSpecify the type for the registry entry'
+    echo -e '/s\tSpecify the type for the registry entry
+/?\tShow help'
   else if __fish_seen_subcommand_from copy
     echo -e '/s\tCopy all subkeys and entries under the specified subkey
-/f\tCopy the subkey without prompting for confirmation'
+/f\tCopy the subkey without prompting for confirmation
+/?\tShow help'
   else if __fish_seen_subcommand_from delete
-    if not __fish_seen_argument --windows '/v' --windows '/ve' --windows '/va'
+    if not __fish_seen_argument --windows 'v' --windows 've' --windows 'va'
       echo -e '/v\tDelete a specific entry under the subkey
 /ve\tSpecify that only entries that have no value will be deleted
 /va\tDelete all entries under the specified subkey'
     end
 
-    echo -e '/f\tDelete the existing registry subkey or entry without asking for confirmation'
+    echo -e '/f\tDelete the existing registry subkey or entry without asking for confirmation
+/?\tShow help'
   else if __fish_seen_subcommand_from export
-    echo -e '/y\tOverwrite any existing file with the name filename without prompting for confirmation'
+    echo -e '/y\tOverwrite any existing file with the name filename without prompting for confirmation
+/?\tShow help'
   else if __fish_seen_subcommand_from query
-    if not __fish_seen_argument --windows '/v' --windows '/ve'
+    if test "$previous_token" = '/t'
+      echo 'REG_SZ
+REG_MULTI_SZ
+REG_EXPAND_SZ
+REG_DWORD
+REG_BINARY
+REG_NONE'
+      return
+    end
+
+    if not __fish_seen_argument --windows 'v' --windows 've'
       echo -e '/v\tSpecify the registry value name that is to be queried
 /ve\tRun a query for value names that are empty'
     end
 
-    if not __fish_seen_argument --windows '/k' --windows '/d'
+    if not __fish_seen_argument --windows 'k' --windows 'd'
       echo -e '/k\tSpecify to search in key names only
 /d\tSpecify to search in data only'
     end
@@ -69,9 +97,11 @@ unload\tRemove a section of the registry that was loaded using the reg load oper
 /c\tSpecify that the query is case sensitive
 /e\tSpecify to return only exact matches
 /t\tSpecify registry types to search
-/z\tSpecify to include the numeric equivalent for the registry type in search results'
+/z\tSpecify to include the numeric equivalent for the registry type in search results
+/?\tShow help'
   else if __fish_seen_subcommand_from save
-    echo -e '/y\tOverwrite an existing file with the name filename without prompting for confirmation'
+    echo -e '/y\tOverwrite an existing file with the name filename without prompting for confirmation
+/?\tShow help'
   end
 end
 

From 5574d136228b32f0a6568740d7245a0062346c17 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 25 Nov 2021 22:44:26 +1000
Subject: [PATCH 105/262] Fix setx completion

---
 share/completions/setx.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/completions/setx.fish b/share/completions/setx.fish
index b31aca7d5..fa222c9dd 100644
--- a/share/completions/setx.fish
+++ b/share/completions/setx.fish
@@ -5,7 +5,7 @@ function __setx_generate_args --description 'Function to generate args'
 /d\tSpecify delimiters to be used in addition to the four built-in delimiters
 /?\tShow help'
 
-  if not __fish_seen_argument --windows '/a' --windows '/m' --windows '/x'
+  if not __fish_seen_argument --windows 'a' --windows 'm' --windows 'x'
     echo -e '/a\tSpecify absolute coordinates and offset as search parameters
 /m\tSpecify to set the variable in the system environment
 /x\tDisplay file coordinates, ignoring the /a, /r, and /d command-line options'

From 9de5e1918fa5de4b8d64bc38571317fcee480813 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 25 Nov 2021 22:44:50 +1000
Subject: [PATCH 106/262] +/- hints for attrib command

---
 share/completions/attrib.fish | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/share/completions/attrib.fish b/share/completions/attrib.fish
index 11b8e29b0..9a3e05a66 100644
--- a/share/completions/attrib.fish
+++ b/share/completions/attrib.fish
@@ -14,7 +14,9 @@ s\tClear the System file attribute
 h\tClear the Hidden file attribute
 i\tClear the Not Content Indexed file attribute' | awk -F '\t' "{ printf \"$current_token%s\t%s\n\", \$1, \$2 }"
     case '*'
-      echo -e '/s\tApply to matching files in the current directory and all of its subdirectories
+      echo -e '+\tSet the file attribute
+-\tClear the file attribute
+/s\tApply to matching files in the current directory and all of its subdirectories
 /d\tApply attrib and any command-line options to directories
 /l\tApply attrib and any command-line options to the Symbolic Link, rather than the target of it
 /?\tShow help'

From 76e200e3f530e0729f89f3c5b17b72064609df6d Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 25 Nov 2021 23:16:03 +1000
Subject: [PATCH 107/262] Completions for cmdkey command

---
 share/completions/cmdkey.fish | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 share/completions/cmdkey.fish

diff --git a/share/completions/cmdkey.fish b/share/completions/cmdkey.fish
new file mode 100644
index 000000000..adf20554a
--- /dev/null
+++ b/share/completions/cmdkey.fish
@@ -0,0 +1,21 @@
+function __cmdkey_generate_args --description 'Function to generate args'
+  if not __fish_seen_argument --windows 'add' --windows 'generic'
+    echo -e '/add\tAdd a user name and password to the list
+/generic\tAdd generic credentials to the list'
+  end
+
+  if not __fish_seen_argument --windows 'smartcard' --windows 'user'
+    echo -e '/smartcard\tRetrieve the credential from a smart card
+/user:\tSpecify the user or account name to store with this entry'
+  end
+
+  if __fish_seen_argument --windows 'user'
+    echo -e '/pass\tSpecify the password to store with this entry'
+  end
+
+  echo -e '/delete\tDelete a user name and password from the list
+/list:\tDisplay the list of stored user names and credentials
+/?\tShow help'
+end
+
+complete --command cmdkey --no-files --arguments '(__cmdkey_generate_args)'

From 832c0a3be24633a8c7c305f6a8bb922a8d6edf84 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 25 Nov 2021 23:34:37 +1000
Subject: [PATCH 108/262] Helper function __fish_generate_password add

---
 share/functions/__fish_generate_password.fish | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 share/functions/__fish_generate_password.fish

diff --git a/share/functions/__fish_generate_password.fish b/share/functions/__fish_generate_password.fish
new file mode 100644
index 000000000..14e3f1847
--- /dev/null
+++ b/share/functions/__fish_generate_password.fish
@@ -0,0 +1,3 @@
+function __fish_generate_password --description 'Generate password'
+  date +%s | sha256sum | base64 | head -c 32; echo
+end
\ No newline at end of file

From e08125c85ac59968e3c37bcdb34382a89ee48d82 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 25 Nov 2021 23:34:56 +1000
Subject: [PATCH 109/262] Format __fish_generate_password

---
 share/functions/__fish_generate_password.fish | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/share/functions/__fish_generate_password.fish b/share/functions/__fish_generate_password.fish
index 14e3f1847..8d72ca146 100644
--- a/share/functions/__fish_generate_password.fish
+++ b/share/functions/__fish_generate_password.fish
@@ -1,3 +1,4 @@
 function __fish_generate_password --description 'Generate password'
-  date +%s | sha256sum | base64 | head -c 32; echo
+  date +%s | sha256sum | base64 | head -c 32
+  echo
 end
\ No newline at end of file

From 16380074a51f2c7b98c3a3449d165cb0906dfa69 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 25 Nov 2021 23:35:46 +1000
Subject: [PATCH 110/262] --bytes instead of -c in __fish_generate_password

---
 share/functions/__fish_generate_password.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/functions/__fish_generate_password.fish b/share/functions/__fish_generate_password.fish
index 8d72ca146..fae03e853 100644
--- a/share/functions/__fish_generate_password.fish
+++ b/share/functions/__fish_generate_password.fish
@@ -1,4 +1,4 @@
 function __fish_generate_password --description 'Generate password'
-  date +%s | sha256sum | base64 | head -c 32
+  date +%s | sha256sum | base64 | head --bytes 32
   echo
 end
\ No newline at end of file

From ae95c072c9ea56f4aeb7860019ce5b8762620589 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 10:00:31 +1000
Subject: [PATCH 111/262] Generate shorter passwords

---
 share/functions/__fish_generate_password.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/functions/__fish_generate_password.fish b/share/functions/__fish_generate_password.fish
index fae03e853..f096e9e4a 100644
--- a/share/functions/__fish_generate_password.fish
+++ b/share/functions/__fish_generate_password.fish
@@ -1,4 +1,4 @@
 function __fish_generate_password --description 'Generate password'
-  date +%s | sha256sum | base64 | head --bytes 32
+  date +%s | sha256sum | base64 | head --bytes 10
   echo
 end
\ No newline at end of file

From e137df393a572a93958b3a7252a570b9b83af471 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 10:04:20 +1000
Subject: [PATCH 112/262] Better /u, /p support for setx command

---
 share/completions/setx.fish | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/share/completions/setx.fish b/share/completions/setx.fish
index fa222c9dd..c7200de8a 100644
--- a/share/completions/setx.fish
+++ b/share/completions/setx.fish
@@ -1,4 +1,16 @@
 function __setx_generate_args --description 'Function to generate args'
+  set --local previous_token (commandline --tokenize --cut-at-cursor)[-1]
+
+  if test "$previous_token" = '/u'
+    wmic UserAccount get Name | sed --quiet '1b;/./p'
+    return
+  end
+
+  if test "$previous_token" = '/p'
+    __fish_generate_password
+    return
+  end
+
   echo -e '/u\tSpecify the name or IP address of a remote computer
 /p\tSpecify the password of the user account that is specified in the /u parameter
 /f\tSpecify the file that you want to use

From 656d3479dcb26b47087c84916e955d77181285ca Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 10:12:56 +1000
Subject: [PATCH 113/262] Drive suggestions for attrib command

---
 share/completions/attrib.fish | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/share/completions/attrib.fish b/share/completions/attrib.fish
index 9a3e05a66..dbab37ad8 100644
--- a/share/completions/attrib.fish
+++ b/share/completions/attrib.fish
@@ -13,13 +13,15 @@ a\tClear the Archive file attribute
 s\tClear the System file attribute
 h\tClear the Hidden file attribute
 i\tClear the Not Content Indexed file attribute' | awk -F '\t' "{ printf \"$current_token%s\t%s\n\", \$1, \$2 }"
-    case '*'
+    case '/*'
       echo -e '+\tSet the file attribute
 -\tClear the file attribute
 /s\tApply to matching files in the current directory and all of its subdirectories
 /d\tApply attrib and any command-line options to directories
 /l\tApply attrib and any command-line options to the Symbolic Link, rather than the target of it
 /?\tShow help'
+    case '*'
+      wmic logicaldisk get caption | sed --quiet '1b;/./p'
   end
 end
 

From cd991d5936a086f3ace427d7066197aaaae4490d Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 10:20:09 +1000
Subject: [PATCH 114/262] /d support for cleanmgr command

---
 share/completions/cleanmgr.fish | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/share/completions/cleanmgr.fish b/share/completions/cleanmgr.fish
index d09d3c915..a5318a986 100644
--- a/share/completions/cleanmgr.fish
+++ b/share/completions/cleanmgr.fish
@@ -1,7 +1,18 @@
-complete --command cleanmgr --no-files --arguments '/d\t"Specify the drive that you want Disk Cleanup to clean"
-/sageset\t"Display the Disk Cleanup Settings dialog box and also create a registry keyt"
-/sagerun\t"Run the specified tasks that are assigned to the n value if you use the /sageset option"
-/tuneup\t"Run /sageset and /sagerun for the same n"
-/lowdisk\t"Run with the default settings"
-/verylowdisk\t"Run with the default settings, no user prompts"
-/?\t"Show help"'
\ No newline at end of file
+function __cleanmgr_generate_args --description 'Function to generate args'
+  set --local previous_token (commandline --tokenize --cut-at-cursor)[-1]
+
+  if test "$previous_token" = '/d'
+    wmic logicaldisk get caption | sed --quiet '1b;/./p'
+    return
+  end
+
+  echo -e '/d\tSpecify the drive that you want Disk Cleanup to clean
+/sageset\tDisplay the Disk Cleanup Settings dialog box and also create a registry keyt
+/sagerun\tRun the specified tasks that are assigned to the n value if you use the /sageset option
+/tuneup\tRun /sageset and /sagerun for the same n
+/lowdisk\tRun with the default settings
+/verylowdisk\tRun with the default settings, no user prompts
+/?\tShow help'
+end
+
+complete --command cleanmgr --no-files --arguments '(__cleanmgr_generate_args)'
\ No newline at end of file

From 61a77ef9fc7cbc7a52114ac2b5ad86ceb082f1c2 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 10:25:12 +1000
Subject: [PATCH 115/262] Hide /c, /k when needed for cmd command

---
 share/completions/cmd.fish | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/share/completions/cmd.fish b/share/completions/cmd.fish
index 118221185..01d103cb7 100644
--- a/share/completions/cmd.fish
+++ b/share/completions/cmd.fish
@@ -28,9 +28,12 @@ off\tDisable file and directory name completion' | awk -F '\t' "{ printf \"$curr
       echo -e 'on\tEnable delayed environment variable expansion
 off\tDisable delayed environment variable expansion' | awk -F '\t' "{ printf \"$current_token%s\t%s\n\", \$1, \$2 }"
     case '*'
-      echo -e '/c\tCarry out the command specified by string and then stop
-/k\tCarry out the command specified by string and continue
-/s\tModify the treatment of string after /c or /k
+      if not __fish_seen_argument --windows 'c' --windows 'k'
+        echo -e '/c\tCarry out the command specified by string and then stop
+/k\tCarry out the command specified by string and continue'
+      end
+
+      echo -e '/s\tModify the treatment of string after /c or /k
 /q\tTurn the echo off
 /d\tDisable execution of AutoRun commands
 /a\tFormat internal command output to a pipe or a file as ANSI

From c3f928b2fa7b9ef006bc30ab3bd7d8403f79cb97 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 10:28:13 +1000
Subject: [PATCH 116/262] Hide /-y, /y when needed for copy command

---
 share/completions/copy.fish | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/share/completions/copy.fish b/share/completions/copy.fish
index 127f9b8e6..7e5fcc3cd 100644
--- a/share/completions/copy.fish
+++ b/share/completions/copy.fish
@@ -4,11 +4,14 @@ function __copy_generate_args --description 'Function to generate args'
 /b\tIndicate a binary file'
   end
 
+  if not __fish_seen_argument --windows 'y' --windows '-y'
+    echo -e '/y=\tHide prompts to confirm that you want to overwrite an existing destination file
+/-y\tShow prompts to confirm that you want to overwrite an existing destination file'
+  end
+
   echo -e '/d\tAllow the encrypted files being copied to be saved as decrypted files at the destination
 /v\tVerify that new files are written correctly
 /n\tUse a short file name, if available
-/y=\tHide prompts to confirm that you want to overwrite an existing destination file
-/-y\tShow prompts to confirm that you want to overwrite an existing destination file
 /z\tCopy networked files in restartable mode
 /?\tShow help'
 end

From 16c1850ae0a953248d9a41e24881d21e62565541 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 12:11:47 +1000
Subject: [PATCH 117/262] Complete for md command

---
 share/completions/md.fish | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 share/completions/md.fish

diff --git a/share/completions/md.fish b/share/completions/md.fish
new file mode 100644
index 000000000..959517f27
--- /dev/null
+++ b/share/completions/md.fish
@@ -0,0 +1,11 @@
+function __md_generate_args --description 'Function to generate args'
+  set --local current_token (commandline --current-token --cut-at-cursor)
+  switch $current_token
+    case '/*'
+      echo -e '/?\tShow help'
+    case '*'
+      wmic logicaldisk get name | tail --lines +2
+  end
+end
+
+complete --command md --no-files --arguments '(__md_generate_args)'

From 71f43c5fda732234afa04c970a296b2d86f9726d Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 12:19:07 +1000
Subject: [PATCH 118/262] Completion for rd command

---
 share/functions/rd.fish | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 share/functions/rd.fish

diff --git a/share/functions/rd.fish b/share/functions/rd.fish
new file mode 100644
index 000000000..2abc8d5ea
--- /dev/null
+++ b/share/functions/rd.fish
@@ -0,0 +1,13 @@
+function __rd_generate_args --description 'Function to generate args'
+  set --local current_token (commandline --current-token --cut-at-cursor)
+  switch $current_token
+    case '/*'
+      echo -e '/s\tDelete a directory tree
+/q\tSpecify quiet mode
+/?\tShow help'
+    case '*'
+      wmic logicaldisk get name | tail --lines +2
+  end
+end
+
+complete --command rd --no-files --arguments '(__rd_generate_args)'

From c7534b2dd5bf668cad1bc4faa5720487e6ef4c50 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 14:38:34 +1000
Subject: [PATCH 119/262] Completion for schtasks command

---
 share/completions/schtasks.fish | 219 ++++++++++++++++++++++++++++++++
 1 file changed, 219 insertions(+)
 create mode 100644 share/completions/schtasks.fish

diff --git a/share/completions/schtasks.fish b/share/completions/schtasks.fish
new file mode 100644
index 000000000..10b74cbca
--- /dev/null
+++ b/share/completions/schtasks.fish
@@ -0,0 +1,219 @@
+function __schtasks_list_tasks --description 'Helper function to list tasks'
+  schtasks | awk '/^=/ { show = 1; next } show { print $1 }'
+end
+
+function __schtasks_change_generate_args --argument-names previous_token
+  if test "$previous_token" = '/tn'
+    __schtasks_list_tasks
+    return
+  end
+
+  if string match --regex --quiet -- "$previous_token" '^/r?u$'
+    wmic useraccount get name | tail +2
+    return
+  end
+
+  if test "$previous_token" = '/rp'
+    __fish_generate_password
+    return
+  end
+
+  if not __fish_seen_argument --windows 'et' --windows 'du'
+    echo -e '/et\tSpecify the end time for the task
+/du\tA value that specifies the duration to run the task'
+  end
+
+  if not __fish_seen_argument --windows 'ENABLE' --windows 'DISABLE'
+    echo -e '/ENABLE\tSpecify to enable the scheduled task
+/DISABLE\tSpecify to disable the scheduled task'
+  end
+
+  echo -e '/tn\tIdentify the task to be changed
+/s\tSpecify the name or IP address of a remote computer
+/u\tRun this command with the permissions of the specified user account
+/p\tSpecify the password of the user account specified in the /u parameter
+/ru\tChange the user name under which the scheduled task has to run
+/rp\tSpecify a new password for the existing user account, or the user account specified by /ru
+/tr\tChange the program that the task runs
+/st\tSpecify the start time for the task
+/ri\tSpecify the repetition interval for the scheduled task
+/k\tStop the program that the task runs at the time specified by /et or /du
+/sd\tSpecify the first date on which the task should be run
+/ed\tSpecify the last date on which the task should be run
+/it\tSpecify to run the scheduled task only when the run as user is logged on to the computer
+/z\tSpecify to delete the task upon the completion of its schedule
+/?\tShow help'
+end
+
+function __schtasks_create_generate_args --argument-names previous_token
+  if test "$previous_token" = '/sc'
+    echo -e 'MINUTE\tSpecify the number of minutes before the task should run
+HOURLY\tSpecify the number of hours before the task should run
+DAILY\tSpecify the number of days before the task should run
+WEEKLY\tSpecify the number of weeks before the task should run
+MONTHLY\tSpecify the number of months before the task should run
+ONCE\tSpecify that that task runs once at a specified date and time
+ONSTART\tSpecify that the task runs every time the system starts
+ONLOGON\tSpecify that the task runs whenever a user logs on
+ONIDLE\tSpecify that the task runs whenever the system is idle for a specified period of time'
+    return
+  end
+
+  if string match --regex --quiet -- "$previous_token" '^/r?u$'
+    wmic useraccount get name | tail +2
+    return
+  end
+
+  if test "$previous_token" = '/rp'
+    __fish_generate_password
+    return
+  end
+
+  if test "$previous_token" = '/mo'
+    echo -e 'MINUTE\tSpecify that the task runs every n minutes
+HOURLY\tSpecify that the task runs every n hours
+DAILY\tSpecify that the task runs every n days
+WEEKLY\tSpecify that the task runs every n weeks
+MONTHLY\tSpecify that the task runs every n months
+ONCE\tSpecify that the task runs once
+ONSTART\tSpecify that the task runs at startup
+ONLOGON\tSpecify that the task runs when the user specified by the /u parameter logs on
+ONIDLE\tSpecify that the task runs after the system is idle for the number of minutes specified by /i'
+    return
+  end
+
+  if not __fish_seen_argument --windows 'et' --windows 'du'
+    echo -e '/et\tSpecify the time of day that a minute or hourly task schedule ends
+/du\tSpecify a maximum length of time for a minute or hourly schedule'
+  end
+
+  echo -e '/sc\tSpecify the schedule type
+/tn\tSpecify a name for the task
+/tr\tSpecify the program or command that the task runs
+/s\tSpecify the name or IP address of a remote computer
+/u\tRun this command with the permissions of the specified user account
+/p\tSpecify the password of the user account specified in the /u parameter
+/ru\tRun the task with permissions of the specified user account
+/rp\tSpecify a the password for the existing user account, or the user account specified by /ru
+/mo\tSpecify how often the task runs within its schedule type
+/d\tSpecify how often the task runs within its schedule type
+/m\tSpecify a month or months of the year during which the scheduled task should run
+/i\tSpecify how many minutes the computer is idle before the task starts
+/st\tSpecify the start time for the task
+/ri\tSpecify the repetition interval for the scheduled task
+/k\tStop the program that the task runs at the time specified by /et or /du
+/sd\tSpecify the date on which the task schedule starts
+/ed\tSpecify the date on which the schedule ends
+/it\tSpecify to run the scheduled task only when the run as user is logged on to the computer
+/z\tSpecify to delete the task upon the completion of its schedule
+/f\tSpecify to create the task and suppress warnings if the specified task already exists
+/?\tShow help'
+end
+
+function __schtasks_delete_generate_args --argument-names previous_token
+  if test "$previous_token" = '/tn'
+    __schtasks_list_tasks
+    return
+  end
+
+  if test "$previous_token" = '/u'
+    wmic useraccount get name | tail +2
+    return
+  end
+
+  echo -e '/tn\tIdentify the task to be deleted
+/f\tSuppress the confirmation message
+/s\tSpecify the name or IP address of a remote computer
+/u\tRun this command with the permissions of the specified user account
+/p\tSpecify the password of the user account specified in the /u parameter
+/?\tShow help'
+end
+
+function __schtasks_end_generate_args --argument-names previous_token
+  if test "$previous_token" = '/tn'
+    __schtasks_list_tasks
+    return
+  end
+
+  if test "$previous_token" = '/u'
+    wmic useraccount get name | tail +2
+    return
+  end
+
+  echo -e '/tn\tIdentify the task that started the program
+/s\tSpecify the name or IP address of a remote computer
+/u\tRun this command with the permissions of the specified user account
+/p\tSpecify the password of the user account specified in the /u parameter
+/?\tShow help'
+end
+
+function __schtasks_query_generate_args --argument-names previous_token
+  if test "$previous_token" = '/fo'
+    echo -e 'TABLE
+LIST
+CSV'
+    return
+  end
+
+  if test "$previous_token" = '/u'
+    wmic useraccount get name | tail +2
+    return
+  end
+
+  echo -e '/fo\tSpecify the output format
+/nh\tRemove column headings from the table display
+/v\tAdd the advanced properties of the task to the display
+/s\tSpecify the name or IP address of a remote computer
+/u\tRun this command with the permissions of the specified user account
+/p\tSpecify the password of the user account specified in the /u parameter
+/?\tShow help'
+end
+
+function __schtasks_run_generate_args --argument-names previous_token
+  if test "$previous_token" = '/tn'
+    __schtasks_list_tasks
+    return
+  end
+
+  if test "$previous_token" = '/u'
+    wmic useraccount get name | tail +2
+    return
+  end
+
+  echo -e '/tn\tIdentify the task to start
+/s\tSpecify the name or IP address of a remote computer
+/u\tRun this command with the permissions of the specified user account
+/p\tSpecify the password of the user account specified in the /u parameter
+/?\tShow help'
+end
+
+function __schtasks_generate_args --description 'Function to generate args'
+  if not __fish_seen_argument --windows change --windows create --windows delete --windows end \
+    --windows query --windows run
+    echo -e '/change\tChange one or more properties of a task
+/create\tSchedule a new task
+/delete\tDelete a scheduled task
+/end\tStop a program started by a task
+/query\tDisplay tasks scheduled to run on the computer
+/run\tStart a scheduled task immediately'
+    return
+  end
+
+  set --local previous_token (commandline --tokenize --cut-at-cursor)[-1]
+  
+  if __fish_seen_argument --windows change
+    __schtasks_change_generate_args "$previous_token"
+  else if __fish_seen_argument --windows create
+    __schtasks_create_generate_args "$previous_token"
+  else if __fish_seen_argument --windows delete
+    __schtasks_delete_generate_args "$previous_token"
+  else if __fish_seen_argument --windows end
+    __schtasks_end_generate_args "$previous_token"
+  else if __fish_seen_argument --windows query
+    __schtasks_query_generate_args "$previous_token"
+  else if __fish_seen_argument --windows run
+    __schtasks_run_generate_args "$previous_token"
+  end
+end
+
+complete --command schtasks --no-files --arguments '(__schtasks_generate_args)'
\ No newline at end of file

From ee74ebd314e0b44defaaea0b941a63058bb337e8 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 15:02:13 +1000
Subject: [PATCH 120/262] Completion for powershell command

---
 share/completions/powershell.fish | 32 +++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 share/completions/powershell.fish

diff --git a/share/completions/powershell.fish b/share/completions/powershell.fish
new file mode 100644
index 000000000..bc970824d
--- /dev/null
+++ b/share/completions/powershell.fish
@@ -0,0 +1,32 @@
+complete --command powershell --short-option '?' --old-option Help --description 'Show help'
+
+complete --command powershell --old-option PSConsoleFile --require-parameter \
+  --description 'Load the specified PowerShell console file'
+complete --command powershell --old-option Version --require-parameter --arguments '2.0 3.0' \
+  --description 'Start the specified version of PowerShell'
+complete --command powershell --old-option NoLogo --description 'Hides the copyright banner at startup'
+complete --command powershell --old-option NoExit \
+  --description 'Do not exit after running startup commands'
+complete --command powershell --old-option Sta \
+  --description 'Start PowerShell using a single-threaded apartment'
+complete --command powershell --old-option Mta \
+  --description 'Start PowerShell using a multi-threaded apartment'
+complete --command powershell --old-option NoProfile --description 'Does not load the PowerShell profile'
+complete --command powershell --old-option NonInteractive \
+  --description 'Do not present an interactive prompt to the user'
+complete --command powershell --old-option InputFormat --no-files --require-parameter \
+  --arguments 'Text XML'  --description 'Describe the format of data sent to PowerShell'
+complete --command powershell --old-option OutputFormat --no-files --require-parameter \
+  --arguments 'Text XML'  --description 'Determine how output from PowerShell is formatted'
+complete --command powershell --old-option WindowStyle --no-files --require-parameter \
+  --arguments 'Normal Minimized Maximized Hidden' --description 'Set the window style for the session'
+complete --command powershell --old-option EncodedCommand --require-parameter \
+  --description 'Accept a base-64-encoded string version of a command'
+complete --command powershell --old-option ConfigurationName  --no-files --require-parameter \
+  --description 'Specify a configuration endpoint in which PowerShell is run'
+complete --command powershell --old-option File --require-parameter
+complete --command powershell --old-option ExecutionPolicy  --no-files --require-parameter \
+  --arguments 'AllSigned Bypass Default RemoteSigned Restricted Undefined Unrestricted' \
+  --description 'Sets the default execution policy for the current session'
+complete --command powershell --old-option Command  --no-files --require-parameter \
+  --description 'Execute the specified commands at the PowerShell command prompt'

From 5f1384c6c3c0b75f72d116a4590f208356832a52 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 15:24:42 +1000
Subject: [PATCH 121/262] Distribute code into several functions for reg

---
 share/completions/reg.fish | 186 +++++++++++++++++++++----------------
 1 file changed, 107 insertions(+), 79 deletions(-)

diff --git a/share/completions/reg.fish b/share/completions/reg.fish
index fea605f85..1b58e612a 100644
--- a/share/completions/reg.fish
+++ b/share/completions/reg.fish
@@ -1,3 +1,103 @@
+function __reg_add_generate_args --argument-names previous_token
+  if test "$previous_token" = '/t'
+    echo 'REG_SZ
+REG_MULTI_SZ
+REG_DWORD_BIG_ENDIAN
+REG_DWORD
+REG_BINARY
+REG_DWORD_LITTLE_ENDIAN
+REG_LINK
+REG_FULL_RESOURCE_DESCRIPTOR
+REG_EXPAND_SZ'
+    return
+  end
+
+  if not __fish_seen_argument --windows 'v' --windows 've'
+    echo -e '/v\tSpecify the name of the add registry entry
+/ve\tSpecify that the added registry entry has a null value'
+  end
+
+  echo -e '/t\tSpecify the type for the registry entry
+/s\tSpecify the character to be used to separate multiple instances of data
+/d\tSpecify the data for the new registry entry
+/f\tAdd the registry entry without prompting for confirmation
+/?\tShow help'
+end
+
+function __reg_compare_generate_args --argument-names previous_token
+  if not __fish_seen_argument --windows 'v' --windows 've'
+    echo -e '/v\tSpecify the value name to compare under the subkey
+/ve\tSpecify that only entries that have a value name of null should be compared'
+  end
+
+  if not __fish_seen_argument --windows 'oa' --windows 'od' --windows 'os' --windows 'on'
+    echo -e '/oa\tSpecify that all differences and matches are displayed
+/od\tSpecify that only differences are displayed
+/os\tSpecify that only matches are displayed
+/on\tSpecify that nothing is displayed'
+  end
+
+  echo -e '/s\tSpecify the type for the registry entry
+/?\tShow help'
+end
+
+function __reg_copy_generate_args --argument-names previous_token
+  echo -e '/s\tCopy all subkeys and entries under the specified subkey
+/f\tCopy the subkey without prompting for confirmation
+/?\tShow help'  
+end
+
+function __reg_delete_generate_args --argument-names previous_token
+  if not __fish_seen_argument --windows 'v' --windows 've' --windows 'va'
+    echo -e '/v\tDelete a specific entry under the subkey
+/ve\tSpecify that only entries that have no value will be deleted
+/va\tDelete all entries under the specified subkey'
+  end
+
+  echo -e '/f\tDelete the existing registry subkey or entry without asking for confirmation
+/?\tShow help'
+end
+
+function __reg_export_generate_args --argument-names previous_token
+  echo -e '/y\tOverwrite any existing file with the name filename without prompting for confirmation
+/?\tShow help'  
+end
+
+function __reg_query_generate_args --argument-names previous_token
+  if test "$previous_token" = '/t'
+    echo 'REG_SZ
+REG_MULTI_SZ
+REG_EXPAND_SZ
+REG_DWORD
+REG_BINARY
+REG_NONE'
+    return
+  end
+
+  if not __fish_seen_argument --windows 'v' --windows 've'
+    echo -e '/v\tSpecify the registry value name that is to be queried
+/ve\tRun a query for value names that are empty'
+  end
+
+  if not __fish_seen_argument --windows 'k' --windows 'd'
+    echo -e '/k\tSpecify to search in key names only
+/d\tSpecify to search in data only'
+  end
+
+  echo -e '/se\tSpecify the single value separator to search for in the value name type REG_MULTI_SZ
+/f\tSpecify the data or pattern to search for
+/c\tSpecify that the query is case sensitive
+/e\tSpecify to return only exact matches
+/t\tSpecify registry types to search
+/z\tSpecify to include the numeric equivalent for the registry type in search results
+/?\tShow help'
+end
+
+function __reg_save_generate_args --argument-names previous_token
+  echo -e '/y\tOverwrite an existing file with the name filename without prompting for confirmation
+/?\tShow help'
+end
+
 function __reg_generate_args --description 'Function to generate args'
   if not __fish_seen_subcommand_from add compare copy delete export import load query restore save unload
     echo -e 'add\tAdd a new subkey or entry to the registry
@@ -17,91 +117,19 @@ unload\tRemove a section of the registry that was loaded using the reg load oper
   set --local previous_token (commandline --tokenize --cut-at-cursor)[-1]
 
   if __fish_seen_subcommand_from add
-    if test "$previous_token" = '/t'
-      echo 'REG_SZ
-REG_MULTI_SZ
-REG_DWORD_BIG_ENDIAN
-REG_DWORD
-REG_BINARY
-REG_DWORD_LITTLE_ENDIAN
-REG_LINK
-REG_FULL_RESOURCE_DESCRIPTOR
-REG_EXPAND_SZ'
-      return
-    end
-
-    if not __fish_seen_argument --windows 'v' --windows 've'
-      echo -e '/v\tSpecify the name of the add registry entry
-/ve\tSpecify that the added registry entry has a null value'
-    end
-
-    echo -e '/t\tSpecify the type for the registry entry
-/s\tSpecify the character to be used to separate multiple instances of data
-/d\tSpecify the data for the new registry entry
-/f\tAdd the registry entry without prompting for confirmation
-/?\tShow help'
+    __reg_add_generate_args
   else if __fish_seen_subcommand_from compare
-    if not __fish_seen_argument --windows 'v' --windows 've'
-      echo -e '/v\tSpecify the value name to compare under the subkey
-/ve\tSpecify that only entries that have a value name of null should be compared'
-    end
-
-    if not __fish_seen_argument --windows 'oa' --windows 'od' --windows 'os' --windows 'on'
-      echo -e '/oa\tSpecify that all differences and matches are displayed
-/od\tSpecify that only differences are displayed
-/os\tSpecify that only matches are displayed
-/on\tSpecify that nothing is displayed'
-    end
-
-    echo -e '/s\tSpecify the type for the registry entry
-/?\tShow help'
+    __reg_compare_generate_args
   else if __fish_seen_subcommand_from copy
-    echo -e '/s\tCopy all subkeys and entries under the specified subkey
-/f\tCopy the subkey without prompting for confirmation
-/?\tShow help'
+    __reg_copy_generate_args
   else if __fish_seen_subcommand_from delete
-    if not __fish_seen_argument --windows 'v' --windows 've' --windows 'va'
-      echo -e '/v\tDelete a specific entry under the subkey
-/ve\tSpecify that only entries that have no value will be deleted
-/va\tDelete all entries under the specified subkey'
-    end
-
-    echo -e '/f\tDelete the existing registry subkey or entry without asking for confirmation
-/?\tShow help'
+    __reg_delete_generate_args
   else if __fish_seen_subcommand_from export
-    echo -e '/y\tOverwrite any existing file with the name filename without prompting for confirmation
-/?\tShow help'
+    __reg_export_generate_args
   else if __fish_seen_subcommand_from query
-    if test "$previous_token" = '/t'
-      echo 'REG_SZ
-REG_MULTI_SZ
-REG_EXPAND_SZ
-REG_DWORD
-REG_BINARY
-REG_NONE'
-      return
-    end
-
-    if not __fish_seen_argument --windows 'v' --windows 've'
-      echo -e '/v\tSpecify the registry value name that is to be queried
-/ve\tRun a query for value names that are empty'
-    end
-
-    if not __fish_seen_argument --windows 'k' --windows 'd'
-      echo -e '/k\tSpecify to search in key names only
-/d\tSpecify to search in data only'
-    end
-
-    echo -e '/se\tSpecify the single value separator to search for in the value name type REG_MULTI_SZ
-/f\tSpecify the data or pattern to search for
-/c\tSpecify that the query is case sensitive
-/e\tSpecify to return only exact matches
-/t\tSpecify registry types to search
-/z\tSpecify to include the numeric equivalent for the registry type in search results
-/?\tShow help'
+    __reg_query_generate_args
   else if __fish_seen_subcommand_from save
-    echo -e '/y\tOverwrite an existing file with the name filename without prompting for confirmation
-/?\tShow help'
+    __reg_save_generate_args
   end
 end
 

From 2c55213b8169027deca8cd4589d8b7d1cf6433f4 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 15:26:04 +1000
Subject: [PATCH 122/262] Replace ! with not for attributes

---
 share/completions/attributes.fish | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/completions/attributes.fish b/share/completions/attributes.fish
index d77f9cdca..fdc9711be 100644
--- a/share/completions/attributes.fish
+++ b/share/completions/attributes.fish
@@ -1,12 +1,12 @@
 function __attributes_generate_args --description 'Function to generate args'
-  if ! __fish_seen_subcommand_from disk volume
+  if not __fish_seen_subcommand_from disk volume
     echo -e 'disk\tDisplay, set, or clear the attributes of a disk
 volume\tDisplay, set, or clear the attributes of a volume'
     return
   end
 
   if __fish_seen_subcommand_from disk
-    if ! __fish_seen_subcommand_from set clear
+    if not __fish_seen_subcommand_from set clear
       echo -e 'set\tSet the specified attribute of the disk with focus
 clear\tClear the specified attribute of the disk with focus'
       return
@@ -18,7 +18,7 @@ noerr\tWhen an error is encountered, DiskPart continues to process commands'
   end
 
   if __fish_seen_subcommand_from volume
-    if ! __fish_seen_subcommand_from set clear
+    if not __fish_seen_subcommand_from set clear
       echo -e 'set\tSet the specified attribute of the volume with focus
 clear\tClear the specified attribute of the volume with focus'
       return

From 0281017c5ae4113e9cde84afbef43d69414bdca2 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 17:14:56 +1000
Subject: [PATCH 123/262] Add __fish_list_windows_users function

---
 share/functions/__fish_list_windows_users.fish | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 share/functions/__fish_list_windows_users.fish

diff --git a/share/functions/__fish_list_windows_users.fish b/share/functions/__fish_list_windows_users.fish
new file mode 100644
index 000000000..a4d53b8fc
--- /dev/null
+++ b/share/functions/__fish_list_windows_users.fish
@@ -0,0 +1,3 @@
+function __fish_list_windows_users --description 'Lists Windows user names'
+  wmic useraccount get name | tail +2
+end
\ No newline at end of file

From e118bde5c8965e623797741286e1106beaed2b82 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 17:36:26 +1000
Subject: [PATCH 124/262] Enhance cmdkey completion: - error fixes - more
 accurate hints

---
 share/completions/cmdkey.fish | 39 +++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/share/completions/cmdkey.fish b/share/completions/cmdkey.fish
index adf20554a..a31cfbe86 100644
--- a/share/completions/cmdkey.fish
+++ b/share/completions/cmdkey.fish
@@ -1,21 +1,34 @@
 function __cmdkey_generate_args --description 'Function to generate args'
-  if not __fish_seen_argument --windows 'add' --windows 'generic'
-    echo -e '/add\tAdd a user name and password to the list
-/generic\tAdd generic credentials to the list'
-  end
+  set --local current_token (commandline --current-token --cut-at-cursor)
+  set --local previous_token (commandline --tokenize --cut-at-cursor)[-1]
 
-  if not __fish_seen_argument --windows 'smartcard' --windows 'user'
-    echo -e '/smartcard\tRetrieve the credential from a smart card
+  switch $current_token
+    case '/user:*'
+      __fish_list_windows_users
+    case '*'
+      if test "$previous_token" = '/delete'
+        echo -e '/ras\tDelete remote access entry'
+        return
+      end
+
+      if not __fish_seen_argument --windows 'add:' --windows 'generic:'
+        echo -e '/add:\tAdd a user name and password to the list
+/generic:\tAdd generic credentials to the list'
+      end
+    
+      if not __fish_seen_argument --windows 'smartcard' --windows 'user:'
+        echo -e '/smartcard\tRetrieve the credential from a smart card
 /user:\tSpecify the user or account name to store with this entry'
-  end
-
-  if __fish_seen_argument --windows 'user'
-    echo -e '/pass\tSpecify the password to store with this entry'
-  end
-
-  echo -e '/delete\tDelete a user name and password from the list
+      end
+    
+      if __fish_seen_argument --windows 'user:'
+        echo -e '/pass:\tSpecify the password to store with this entry'
+      end
+    
+      echo -e '/delete\tDelete a user name and password from the list
 /list:\tDisplay the list of stored user names and credentials
 /?\tShow help'
+  end
 end
 
 complete --command cmdkey --no-files --arguments '(__cmdkey_generate_args)'

From cd64ed5d27954fc2f6adc21b6d5d0980178599f2 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 17:48:31 +1000
Subject: [PATCH 125/262] Fix awk command for cmdkey

---
 share/completions/cmdkey.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/completions/cmdkey.fish b/share/completions/cmdkey.fish
index a31cfbe86..3685da72b 100644
--- a/share/completions/cmdkey.fish
+++ b/share/completions/cmdkey.fish
@@ -4,7 +4,7 @@ function __cmdkey_generate_args --description 'Function to generate args'
 
   switch $current_token
     case '/user:*'
-      __fish_list_windows_users
+      __fish_list_windows_users | awk "{ printf \"%s%s\n\", \"$current_token\", \$0 }"
     case '*'
       if test "$previous_token" = '/delete'
         echo -e '/ras\tDelete remote access entry'

From 05ba662dcd65adce15d13c8be802ee31da9c8db8 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 18:15:55 +1000
Subject: [PATCH 126/262] Fix reg completion: - /s description fix

---
 share/completions/reg.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/completions/reg.fish b/share/completions/reg.fish
index 1b58e612a..b3faf4325 100644
--- a/share/completions/reg.fish
+++ b/share/completions/reg.fish
@@ -37,7 +37,7 @@ function __reg_compare_generate_args --argument-names previous_token
 /on\tSpecify that nothing is displayed'
   end
 
-  echo -e '/s\tSpecify the type for the registry entry
+  echo -e '/s\tCompare all subkeys and entries recursively
 /?\tShow help'
 end
 

From fbbf498afbb423304ae065544339bacc9bf60f6d Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 18:36:14 +1000
Subject: [PATCH 127/262] Enhance setx completion: - more accurate hints

---
 share/completions/setx.fish | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/share/completions/setx.fish b/share/completions/setx.fish
index c7200de8a..fb5fd20c4 100644
--- a/share/completions/setx.fish
+++ b/share/completions/setx.fish
@@ -2,26 +2,27 @@ function __setx_generate_args --description 'Function to generate args'
   set --local previous_token (commandline --tokenize --cut-at-cursor)[-1]
 
   if test "$previous_token" = '/u'
-    wmic UserAccount get Name | sed --quiet '1b;/./p'
+    __fish_list_windows_users
     return
   end
 
-  if test "$previous_token" = '/p'
-    __fish_generate_password
-    return
+  if not __fish_seen_argument --windows 'a' --windows 'r' --windows 'x'
+    echo -e '/a\tSpecify absolute coordinates and offset as search parameters
+/r\tSpecify relative coordinates and offset from String as search parameters
+/x\tDisplay file coordinates, ignoring the /a, /r, and /d command-line options'
+  end 
+
+  if __fish_seen_argument --windows 'a' --windows 'r'
+    echo -e '/m\tSpecify to set the variable in the system environment'
   end
 
-  echo -e '/u\tSpecify the name or IP address of a remote computer
+  echo -e '/s\tSpecify the name or IP address of a remote computer
+/u\tRun the script with the credentials of the specified user account
 /p\tSpecify the password of the user account that is specified in the /u parameter
+/k\tSpecify that the variable is set based on information from a registry key
 /f\tSpecify the file that you want to use
 /d\tSpecify delimiters to be used in addition to the four built-in delimiters
 /?\tShow help'
-
-  if not __fish_seen_argument --windows 'a' --windows 'm' --windows 'x'
-    echo -e '/a\tSpecify absolute coordinates and offset as search parameters
-/m\tSpecify to set the variable in the system environment
-/x\tDisplay file coordinates, ignoring the /a, /r, and /d command-line options'
-  end
 end
 
 complete --command setx --no-files --arguments '(__setx_generate_args)'
\ No newline at end of file

From 909cade1f5d36e26913f80614e8a2b9b751d5f1f Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 18:39:45 +1000
Subject: [PATCH 128/262] Add __fish_list_windows_drives

---
 share/functions/__fish_list_windows_drives.fish | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 share/functions/__fish_list_windows_drives.fish

diff --git a/share/functions/__fish_list_windows_drives.fish b/share/functions/__fish_list_windows_drives.fish
new file mode 100644
index 000000000..3de8cfb5a
--- /dev/null
+++ b/share/functions/__fish_list_windows_drives.fish
@@ -0,0 +1,3 @@
+function __fish_list_windows_drives --description 'Lists Windows drives'
+  wmic logicaldisk get name | tail +2
+end
\ No newline at end of file

From a2ae67f629b3d663920f57ccb42b3a83511d9bcb Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 18:40:45 +1000
Subject: [PATCH 129/262] Clean-up attrib completion: - use
 __fish_list_windows_drives

---
 share/completions/attrib.fish | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/share/completions/attrib.fish b/share/completions/attrib.fish
index dbab37ad8..e38871a48 100644
--- a/share/completions/attrib.fish
+++ b/share/completions/attrib.fish
@@ -1,5 +1,6 @@
 function __attrib_generate_args --description 'Function to generate args'
   set --local current_token (commandline --current-token --cut-at-cursor)
+  
   switch $current_token
     case '+*'
       echo -e 'r\tSet the Read-only file attribute
@@ -21,7 +22,7 @@ i\tClear the Not Content Indexed file attribute' | awk -F '\t' "{ printf \"$curr
 /l\tApply attrib and any command-line options to the Symbolic Link, rather than the target of it
 /?\tShow help'
     case '*'
-      wmic logicaldisk get caption | sed --quiet '1b;/./p'
+      __fish_list_windows_drives
   end
 end
 

From 1ee3f1fc8c3de1fd6abdcf5a5eabef48c2f0e05b Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 18:46:02 +1000
Subject: [PATCH 130/262] Clean-up attributes completion: - distribute code to
 several functions

---
 share/completions/attributes.fish | 52 +++++++++++++++++--------------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/share/completions/attributes.fish b/share/completions/attributes.fish
index fdc9711be..3c7aa8400 100644
--- a/share/completions/attributes.fish
+++ b/share/completions/attributes.fish
@@ -1,3 +1,28 @@
+function __attributes_disk_generate_args
+  if not __fish_seen_subcommand_from set clear
+    echo -e 'set\tSet the specified attribute of the disk with focus
+clear\tClear the specified attribute of the disk with focus'
+    return
+  end
+
+  echo -e 'readonly\tSpecify that the disk is read-only
+noerr\tWhen an error is encountered, DiskPart continues to process commands'
+end
+
+function __attributes_volume_generate_args
+  if not __fish_seen_subcommand_from set clear
+    echo -e 'set\tSet the specified attribute of the volume with focus
+clear\tClear the specified attribute of the volume with focus'
+    return
+  end
+
+  echo -e 'readonly\tSpecify that the volume is read-only
+readonly\tSpecify that the volume is hidden
+nodefaultdriveletter\tSpecify that the volume does not receive a drive letter by default
+shadowcopy\tSpecify that the volume is a shadow copy volume
+noerr\tWhen an error is encountered, DiskPart continues to process commands'
+end
+
 function __attributes_generate_args --description 'Function to generate args'
   if not __fish_seen_subcommand_from disk volume
     echo -e 'disk\tDisplay, set, or clear the attributes of a disk
@@ -6,30 +31,9 @@ volume\tDisplay, set, or clear the attributes of a volume'
   end
 
   if __fish_seen_subcommand_from disk
-    if not __fish_seen_subcommand_from set clear
-      echo -e 'set\tSet the specified attribute of the disk with focus
-clear\tClear the specified attribute of the disk with focus'
-      return
-    end
-
-    echo -e 'readonly\tSpecify that the disk is read-only
-noerr\tWhen an error is encountered, DiskPart continues to process commands'
-    return
-  end
-
-  if __fish_seen_subcommand_from volume
-    if not __fish_seen_subcommand_from set clear
-      echo -e 'set\tSet the specified attribute of the volume with focus
-clear\tClear the specified attribute of the volume with focus'
-      return
-    end
-
-    echo -e 'readonly\tSpecify that the volume is read-only
-readonly\tSpecify that the volume is hidden
-nodefaultdriveletter\tSpecify that the volume does not receive a drive letter by default
-shadowcopy\tSpecify that the volume is a shadow copy volume
-noerr\tWhen an error is encountered, DiskPart continues to process commands'
-    return
+    __attributes_disk_generate_args
+  else if __fish_seen_subcommand_from volume
+    __attributes_volume_generate_args
   end
 end
 

From 430cae58bfee865613ffd3c3e66b8ea29e00eb7f Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 18:47:42 +1000
Subject: [PATCH 131/262] Clean-up cleanmgr completion: - use
 __fish_list_windows_drives

---
 share/completions/cleanmgr.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/completions/cleanmgr.fish b/share/completions/cleanmgr.fish
index a5318a986..94416163b 100644
--- a/share/completions/cleanmgr.fish
+++ b/share/completions/cleanmgr.fish
@@ -2,7 +2,7 @@ function __cleanmgr_generate_args --description 'Function to generate args'
   set --local previous_token (commandline --tokenize --cut-at-cursor)[-1]
 
   if test "$previous_token" = '/d'
-    wmic logicaldisk get caption | sed --quiet '1b;/./p'
+    __fish_list_windows_drives
     return
   end
 

From 4d3039059de2c065f212e81b652b858f15366b33 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 18:48:38 +1000
Subject: [PATCH 132/262] Reformat cmd completion

---
 share/completions/cmd.fish | 1 +
 1 file changed, 1 insertion(+)

diff --git a/share/completions/cmd.fish b/share/completions/cmd.fish
index 01d103cb7..262090c51 100644
--- a/share/completions/cmd.fish
+++ b/share/completions/cmd.fish
@@ -1,5 +1,6 @@
 function __cmd_generate_args --description 'Function to generate args'
   set --local current_token (commandline --current-token --cut-at-cursor)
+  
   switch $current_token
     case '/t:*'
       echo -e '0\tBlack

From 2683dc4af85b1805eda76d687d5c380260f86a97 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 18:50:41 +1000
Subject: [PATCH 133/262] Clean-up vol completion: - use
 __fish_list_windows_drives - reformat

---
 share/completions/vol.fish | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/share/completions/vol.fish b/share/completions/vol.fish
index 71f6f46a0..1f85b687d 100644
--- a/share/completions/vol.fish
+++ b/share/completions/vol.fish
@@ -1,10 +1,11 @@
 function __vol_generate_args --description 'Function to generate args'
   set --local current_token (commandline --current-token --cut-at-cursor)
+  
   switch $current_token
     case '/*'
       echo -e '/?\tShow help'
     case '*'
-      wmic logicaldisk get name | tail --lines +2
+      __fish_list_windows_drives
   end
 end
 

From cf59ef143583ca6076de20195b594fdea67a64e4 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 19:00:59 +1000
Subject: [PATCH 134/262] Fix setx completion: - more accurate hints for /s,
 /u, /p opts

---
 share/completions/setx.fish | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/share/completions/setx.fish b/share/completions/setx.fish
index fb5fd20c4..c98e1e373 100644
--- a/share/completions/setx.fish
+++ b/share/completions/setx.fish
@@ -6,6 +6,14 @@ function __setx_generate_args --description 'Function to generate args'
     return
   end
 
+  if __fish_seen_argument --windows 's'
+    echo -e '/u\tRun the script with the credentials of the specified user account'
+  end
+
+  if __fish_seen_argument --windows 'u'
+    echo -e '/p\tSpecify the password of the user account that is specified in the /u parameter'
+  end
+
   if not __fish_seen_argument --windows 'a' --windows 'r' --windows 'x'
     echo -e '/a\tSpecify absolute coordinates and offset as search parameters
 /r\tSpecify relative coordinates and offset from String as search parameters
@@ -17,8 +25,6 @@ function __setx_generate_args --description 'Function to generate args'
   end
 
   echo -e '/s\tSpecify the name or IP address of a remote computer
-/u\tRun the script with the credentials of the specified user account
-/p\tSpecify the password of the user account that is specified in the /u parameter
 /k\tSpecify that the variable is set based on information from a registry key
 /f\tSpecify the file that you want to use
 /d\tSpecify delimiters to be used in addition to the four built-in delimiters

From f38cba9a2d8950250ae1cd1906b5ef64f0809989 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 19:08:09 +1000
Subject: [PATCH 135/262] Clean-up attrib completion: - remove
 __fish_list_windows_drives call - hide /d, /l without /s

---
 share/completions/attrib.fish | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/share/completions/attrib.fish b/share/completions/attrib.fish
index e38871a48..2460db4cc 100644
--- a/share/completions/attrib.fish
+++ b/share/completions/attrib.fish
@@ -14,15 +14,16 @@ a\tClear the Archive file attribute
 s\tClear the System file attribute
 h\tClear the Hidden file attribute
 i\tClear the Not Content Indexed file attribute' | awk -F '\t' "{ printf \"$current_token%s\t%s\n\", \$1, \$2 }"
-    case '/*'
+    case '*'
+      if __fish_seen_argument --windows 's'
+        echo -e '/d\tApply attrib and any command-line options to directories
+/l\tApply attrib and any command-line options to the Symbolic Link, rather than the target of it'
+      end
+
       echo -e '+\tSet the file attribute
 -\tClear the file attribute
 /s\tApply to matching files in the current directory and all of its subdirectories
-/d\tApply attrib and any command-line options to directories
-/l\tApply attrib and any command-line options to the Symbolic Link, rather than the target of it
 /?\tShow help'
-    case '*'
-      __fish_list_windows_drives
   end
 end
 

From e22e8932a5dc88b0a152ec61f8e764e99b80eb37 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 19:19:29 +1000
Subject: [PATCH 136/262] Clean-up schtasks completion: - conditionally show
 /u, /p options - use  __fish_list_windows_users function

---
 share/completions/schtasks.fish | 72 ++++++++++++++++++++++++---------
 1 file changed, 54 insertions(+), 18 deletions(-)

diff --git a/share/completions/schtasks.fish b/share/completions/schtasks.fish
index 10b74cbca..a2a2899a5 100644
--- a/share/completions/schtasks.fish
+++ b/share/completions/schtasks.fish
@@ -9,7 +9,7 @@ function __schtasks_change_generate_args --argument-names previous_token
   end
 
   if string match --regex --quiet -- "$previous_token" '^/r?u$'
-    wmic useraccount get name | tail +2
+    __fish_list_windows_users
     return
   end
 
@@ -18,6 +18,14 @@ function __schtasks_change_generate_args --argument-names previous_token
     return
   end
 
+  if __fish_seen_argument --windows 's'
+    echo -e '/u\tRun this command with the permissions of the specified user account'
+  end
+
+  if __fish_seen_argument --windows 'u'
+    echo -e '/p\tSpecify the password of the user account specified in the /u parameter'
+  end
+
   if not __fish_seen_argument --windows 'et' --windows 'du'
     echo -e '/et\tSpecify the end time for the task
 /du\tA value that specifies the duration to run the task'
@@ -30,8 +38,6 @@ function __schtasks_change_generate_args --argument-names previous_token
 
   echo -e '/tn\tIdentify the task to be changed
 /s\tSpecify the name or IP address of a remote computer
-/u\tRun this command with the permissions of the specified user account
-/p\tSpecify the password of the user account specified in the /u parameter
 /ru\tChange the user name under which the scheduled task has to run
 /rp\tSpecify a new password for the existing user account, or the user account specified by /ru
 /tr\tChange the program that the task runs
@@ -60,7 +66,7 @@ ONIDLE\tSpecify that the task runs whenever the system is idle for a specified p
   end
 
   if string match --regex --quiet -- "$previous_token" '^/r?u$'
-    wmic useraccount get name | tail +2
+    __fish_list_windows_users
     return
   end
 
@@ -82,6 +88,14 @@ ONIDLE\tSpecify that the task runs after the system is idle for the number of mi
     return
   end
 
+  if __fish_seen_argument --windows 's'
+    echo -e '/u\tRun this command with the permissions of the specified user account'
+  end
+
+  if __fish_seen_argument --windows 'u'
+    echo -e '/p\tSpecify the password of the user account specified in the /u parameter'
+  end
+
   if not __fish_seen_argument --windows 'et' --windows 'du'
     echo -e '/et\tSpecify the time of day that a minute or hourly task schedule ends
 /du\tSpecify a maximum length of time for a minute or hourly schedule'
@@ -91,8 +105,6 @@ ONIDLE\tSpecify that the task runs after the system is idle for the number of mi
 /tn\tSpecify a name for the task
 /tr\tSpecify the program or command that the task runs
 /s\tSpecify the name or IP address of a remote computer
-/u\tRun this command with the permissions of the specified user account
-/p\tSpecify the password of the user account specified in the /u parameter
 /ru\tRun the task with permissions of the specified user account
 /rp\tSpecify a the password for the existing user account, or the user account specified by /ru
 /mo\tSpecify how often the task runs within its schedule type
@@ -117,15 +129,21 @@ function __schtasks_delete_generate_args --argument-names previous_token
   end
 
   if test "$previous_token" = '/u'
-    wmic useraccount get name | tail +2
+    __fish_list_windows_users
     return
   end
 
+  if __fish_seen_argument --windows 's'
+    echo -e '/u\tRun this command with the permissions of the specified user account'
+  end
+
+  if __fish_seen_argument --windows 'u'
+    echo -e '/p\tSpecify the password of the user account specified in the /u parameter'
+  end
+
   echo -e '/tn\tIdentify the task to be deleted
 /f\tSuppress the confirmation message
 /s\tSpecify the name or IP address of a remote computer
-/u\tRun this command with the permissions of the specified user account
-/p\tSpecify the password of the user account specified in the /u parameter
 /?\tShow help'
 end
 
@@ -136,14 +154,20 @@ function __schtasks_end_generate_args --argument-names previous_token
   end
 
   if test "$previous_token" = '/u'
-    wmic useraccount get name | tail +2
+    __fish_list_windows_users
     return
   end
 
+  if __fish_seen_argument --windows 's'
+    echo -e '/u\tRun this command with the permissions of the specified user account'
+  end
+
+  if __fish_seen_argument --windows 'u'
+    echo -e '/p\tSpecify the password of the user account specified in the /u parameter'
+  end
+
   echo -e '/tn\tIdentify the task that started the program
 /s\tSpecify the name or IP address of a remote computer
-/u\tRun this command with the permissions of the specified user account
-/p\tSpecify the password of the user account specified in the /u parameter
 /?\tShow help'
 end
 
@@ -156,16 +180,22 @@ CSV'
   end
 
   if test "$previous_token" = '/u'
-    wmic useraccount get name | tail +2
+    __fish_list_windows_users
     return
   end
 
+  if __fish_seen_argument --windows 's'
+    echo -e '/u\tRun this command with the permissions of the specified user account'
+  end
+
+  if __fish_seen_argument --windows 'u'
+    echo -e '/p\tSpecify the password of the user account specified in the /u parameter'
+  end
+
   echo -e '/fo\tSpecify the output format
 /nh\tRemove column headings from the table display
 /v\tAdd the advanced properties of the task to the display
 /s\tSpecify the name or IP address of a remote computer
-/u\tRun this command with the permissions of the specified user account
-/p\tSpecify the password of the user account specified in the /u parameter
 /?\tShow help'
 end
 
@@ -176,14 +206,20 @@ function __schtasks_run_generate_args --argument-names previous_token
   end
 
   if test "$previous_token" = '/u'
-    wmic useraccount get name | tail +2
+    __fish_list_windows_users
     return
   end
 
+  if __fish_seen_argument --windows 's'
+    echo -e '/u\tRun this command with the permissions of the specified user account'
+  end
+
+  if __fish_seen_argument --windows 'u'
+    echo -e '/p\tSpecify the password of the user account specified in the /u parameter'
+  end
+
   echo -e '/tn\tIdentify the task to start
 /s\tSpecify the name or IP address of a remote computer
-/u\tRun this command with the permissions of the specified user account
-/p\tSpecify the password of the user account specified in the /u parameter
 /?\tShow help'
 end
 

From 1cd0726913258340857618fba753bdee0bb173c1 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 19:29:54 +1000
Subject: [PATCH 137/262] Clean-up md/rd completions: - use
 __fish_list_windows_drives - hide dependent options

---
 share/completions/md.fish | 2 +-
 share/functions/rd.fish   | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/share/completions/md.fish b/share/completions/md.fish
index 959517f27..fb14ab057 100644
--- a/share/completions/md.fish
+++ b/share/completions/md.fish
@@ -4,7 +4,7 @@ function __md_generate_args --description 'Function to generate args'
     case '/*'
       echo -e '/?\tShow help'
     case '*'
-      wmic logicaldisk get name | tail --lines +2
+      __fish_list_windows_drives
   end
 end
 
diff --git a/share/functions/rd.fish b/share/functions/rd.fish
index 2abc8d5ea..a4e0dd92c 100644
--- a/share/functions/rd.fish
+++ b/share/functions/rd.fish
@@ -2,11 +2,14 @@ function __rd_generate_args --description 'Function to generate args'
   set --local current_token (commandline --current-token --cut-at-cursor)
   switch $current_token
     case '/*'
+      if __fish_seen_argument --windows 's'
+        echo -e '/q\tSpecify quiet mode'
+      end
+
       echo -e '/s\tDelete a directory tree
-/q\tSpecify quiet mode
 /?\tShow help'
     case '*'
-      wmic logicaldisk get name | tail --lines +2
+      __fish_list_windows_drives
   end
 end
 

From 7bf82bfd32d0fd6de567b4b8898c2a36439fd404 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Fri, 26 Nov 2021 21:09:31 +1000
Subject: [PATCH 138/262] Update __schtasks_list_tasks function

---
 share/completions/schtasks.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/completions/schtasks.fish b/share/completions/schtasks.fish
index a2a2899a5..fe2410f9c 100644
--- a/share/completions/schtasks.fish
+++ b/share/completions/schtasks.fish
@@ -1,5 +1,5 @@
 function __schtasks_list_tasks --description 'Helper function to list tasks'
-  schtasks | awk '/^=/ { show = 1; next } show { print $1 }'
+  schtasks /query /fo csv /nh | awk -F ',' '{ print $1 }'
 end
 
 function __schtasks_change_generate_args --argument-names previous_token

From d3ad5fe3988230ce84ba42c2a99ad8b8a2367c57 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 2 Dec 2021 00:36:40 +1000
Subject: [PATCH 139/262] Remove complete for internal cmd commands

---
 share/completions/cls.fish   |  1 -
 share/completions/copy.fish  | 19 -------------------
 share/completions/md.fish    | 11 -----------
 share/completions/pause.fish |  1 -
 share/completions/ver.fish   |  1 -
 share/completions/vol.fish   | 12 ------------
 share/functions/rd.fish      | 16 ----------------
 7 files changed, 61 deletions(-)
 delete mode 100644 share/completions/cls.fish
 delete mode 100644 share/completions/copy.fish
 delete mode 100644 share/completions/md.fish
 delete mode 100644 share/completions/pause.fish
 delete mode 100644 share/completions/ver.fish
 delete mode 100644 share/completions/vol.fish
 delete mode 100644 share/functions/rd.fish

diff --git a/share/completions/cls.fish b/share/completions/cls.fish
deleted file mode 100644
index 2e72c5130..000000000
--- a/share/completions/cls.fish
+++ /dev/null
@@ -1 +0,0 @@
-complete --command cls --no-files --arguments '/?\t"Show help"'
\ No newline at end of file
diff --git a/share/completions/copy.fish b/share/completions/copy.fish
deleted file mode 100644
index 7e5fcc3cd..000000000
--- a/share/completions/copy.fish
+++ /dev/null
@@ -1,19 +0,0 @@
-function __copy_generate_args --description 'Function to generate args'
-  if not __fish_seen_argument --windows 'a' --windows 'b'
-    echo -e '/a\tIndicate an ASCII text file
-/b\tIndicate a binary file'
-  end
-
-  if not __fish_seen_argument --windows 'y' --windows '-y'
-    echo -e '/y=\tHide prompts to confirm that you want to overwrite an existing destination file
-/-y\tShow prompts to confirm that you want to overwrite an existing destination file'
-  end
-
-  echo -e '/d\tAllow the encrypted files being copied to be saved as decrypted files at the destination
-/v\tVerify that new files are written correctly
-/n\tUse a short file name, if available
-/z\tCopy networked files in restartable mode
-/?\tShow help'
-end
-
-complete --command copy --no-files --arguments '(__copy_generate_args)'
diff --git a/share/completions/md.fish b/share/completions/md.fish
deleted file mode 100644
index fb14ab057..000000000
--- a/share/completions/md.fish
+++ /dev/null
@@ -1,11 +0,0 @@
-function __md_generate_args --description 'Function to generate args'
-  set --local current_token (commandline --current-token --cut-at-cursor)
-  switch $current_token
-    case '/*'
-      echo -e '/?\tShow help'
-    case '*'
-      __fish_list_windows_drives
-  end
-end
-
-complete --command md --no-files --arguments '(__md_generate_args)'
diff --git a/share/completions/pause.fish b/share/completions/pause.fish
deleted file mode 100644
index baa9da3f1..000000000
--- a/share/completions/pause.fish
+++ /dev/null
@@ -1 +0,0 @@
-complete --command pause --no-files --arguments '/?\t"Show help"'
\ No newline at end of file
diff --git a/share/completions/ver.fish b/share/completions/ver.fish
deleted file mode 100644
index d528d30e0..000000000
--- a/share/completions/ver.fish
+++ /dev/null
@@ -1 +0,0 @@
-complete --command ver --no-files --arguments '/?\tShow help'
diff --git a/share/completions/vol.fish b/share/completions/vol.fish
deleted file mode 100644
index 1f85b687d..000000000
--- a/share/completions/vol.fish
+++ /dev/null
@@ -1,12 +0,0 @@
-function __vol_generate_args --description 'Function to generate args'
-  set --local current_token (commandline --current-token --cut-at-cursor)
-  
-  switch $current_token
-    case '/*'
-      echo -e '/?\tShow help'
-    case '*'
-      __fish_list_windows_drives
-  end
-end
-
-complete --command vol --no-files --arguments '(__vol_generate_args)'
diff --git a/share/functions/rd.fish b/share/functions/rd.fish
deleted file mode 100644
index a4e0dd92c..000000000
--- a/share/functions/rd.fish
+++ /dev/null
@@ -1,16 +0,0 @@
-function __rd_generate_args --description 'Function to generate args'
-  set --local current_token (commandline --current-token --cut-at-cursor)
-  switch $current_token
-    case '/*'
-      if __fish_seen_argument --windows 's'
-        echo -e '/q\tSpecify quiet mode'
-      end
-
-      echo -e '/s\tDelete a directory tree
-/?\tShow help'
-    case '*'
-      __fish_list_windows_drives
-  end
-end
-
-complete --command rd --no-files --arguments '(__rd_generate_args)'

From 3f7cfdd1449977daba82f3c443bfba0cdbe05ecd Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Thu, 16 Dec 2021 08:03:02 +1000
Subject: [PATCH 140/262] Concise option/value descriptions

---
 share/completions/attrib.fish     |  6 +++---
 share/completions/attributes.fish |  2 +-
 share/completions/choice.fish     |  8 ++++----
 share/completions/cleanmgr.fish   |  6 +++---
 share/completions/cmd.fish        |  6 +++---
 share/completions/cmdkey.fish     | 18 +++++++++---------
 share/completions/comp.fish       |  4 ++--
 share/completions/powershell.fish |  2 +-
 share/completions/reg.fish        | 22 +++++++++++-----------
 share/completions/schtasks.fish   | 10 +++++-----
 share/completions/setx.fish       |  8 ++++----
 11 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/share/completions/attrib.fish b/share/completions/attrib.fish
index 2460db4cc..27809dce0 100644
--- a/share/completions/attrib.fish
+++ b/share/completions/attrib.fish
@@ -1,6 +1,6 @@
 function __attrib_generate_args --description 'Function to generate args'
   set --local current_token (commandline --current-token --cut-at-cursor)
-  
+
   switch $current_token
     case '+*'
       echo -e 'r\tSet the Read-only file attribute
@@ -17,7 +17,7 @@ i\tClear the Not Content Indexed file attribute' | awk -F '\t' "{ printf \"$curr
     case '*'
       if __fish_seen_argument --windows 's'
         echo -e '/d\tApply attrib and any command-line options to directories
-/l\tApply attrib and any command-line options to the Symbolic Link, rather than the target of it'
+/l\tApply attrib and any command-line options to the Symbolic Link'
       end
 
       echo -e '+\tSet the file attribute
@@ -27,4 +27,4 @@ i\tClear the Not Content Indexed file attribute' | awk -F '\t' "{ printf \"$curr
   end
 end
 
-complete --command attrib --no-files --arguments '(__attrib_generate_args)'
\ No newline at end of file
+complete --command attrib --no-files --arguments '(__attrib_generate_args)'
diff --git a/share/completions/attributes.fish b/share/completions/attributes.fish
index 3c7aa8400..497a7d2a9 100644
--- a/share/completions/attributes.fish
+++ b/share/completions/attributes.fish
@@ -37,4 +37,4 @@ volume\tDisplay, set, or clear the attributes of a volume'
   end
 end
 
-complete --command attributes --no-files --arguments '(__attributes_generate_args)'
\ No newline at end of file
+complete --command attributes --no-files --arguments '(__attributes_generate_args)'
diff --git a/share/completions/choice.fish b/share/completions/choice.fish
index 25ddaf93b..fe2b90a06 100644
--- a/share/completions/choice.fish
+++ b/share/completions/choice.fish
@@ -1,7 +1,7 @@
 complete --command choice --no-files --arguments '/c\t"Specify the list of choices to be created"
 /n\t"Hide the list of choices"
 /cs\t"Specify that the choices are case-sensitive"
-/t\t"Specify the number of seconds to pause before using the default choice specified by /d"
-/d\t"Specify the default choice to use after waiting the number of seconds specified by /t"
-/m\t"Specify a message to display before the list of choices"
-/?\t"Show help"'
\ No newline at end of file
+/t\t"Specify the number of seconds"
+/d\t"Specify the default choice"
+/m\t"Specify a message"
+/?\t"Show help"'
diff --git a/share/completions/cleanmgr.fish b/share/completions/cleanmgr.fish
index 94416163b..2e70b91c4 100644
--- a/share/completions/cleanmgr.fish
+++ b/share/completions/cleanmgr.fish
@@ -6,13 +6,13 @@ function __cleanmgr_generate_args --description 'Function to generate args'
     return
   end
 
-  echo -e '/d\tSpecify the drive that you want Disk Cleanup to clean
+  echo -e '/d\tSpecify the drive
 /sageset\tDisplay the Disk Cleanup Settings dialog box and also create a registry keyt
-/sagerun\tRun the specified tasks that are assigned to the n value if you use the /sageset option
+/sagerun\tRun the specified tasks that are assigned to the n value
 /tuneup\tRun /sageset and /sagerun for the same n
 /lowdisk\tRun with the default settings
 /verylowdisk\tRun with the default settings, no user prompts
 /?\tShow help'
 end
 
-complete --command cleanmgr --no-files --arguments '(__cleanmgr_generate_args)'
\ No newline at end of file
+complete --command cleanmgr --no-files --arguments '(__cleanmgr_generate_args)'
diff --git a/share/completions/cmd.fish b/share/completions/cmd.fish
index 262090c51..28aaffed1 100644
--- a/share/completions/cmd.fish
+++ b/share/completions/cmd.fish
@@ -1,6 +1,6 @@
 function __cmd_generate_args --description 'Function to generate args'
   set --local current_token (commandline --current-token --cut-at-cursor)
-  
+
   switch $current_token
     case '/t:*'
       echo -e '0\tBlack
@@ -37,8 +37,8 @@ off\tDisable delayed environment variable expansion' | awk -F '\t' "{ printf \"$
       echo -e '/s\tModify the treatment of string after /c or /k
 /q\tTurn the echo off
 /d\tDisable execution of AutoRun commands
-/a\tFormat internal command output to a pipe or a file as ANSI
-/u\tFormat internal command output to a pipe or a file as Unicode
+/a\tFormat internal command output as ANSI
+/u\tFormat internal command output as Unicode
 /t\tSet the background and foreground color
 /e\tManage command extensions
 /f\tManage file and directory name completion
diff --git a/share/completions/cmdkey.fish b/share/completions/cmdkey.fish
index 3685da72b..e4d607986 100644
--- a/share/completions/cmdkey.fish
+++ b/share/completions/cmdkey.fish
@@ -12,20 +12,20 @@ function __cmdkey_generate_args --description 'Function to generate args'
       end
 
       if not __fish_seen_argument --windows 'add:' --windows 'generic:'
-        echo -e '/add:\tAdd a user name and password to the list
-/generic:\tAdd generic credentials to the list'
+        echo -e '/add:\tAdd a user name and password
+/generic:\tAdd generic credentials'
       end
-    
+
       if not __fish_seen_argument --windows 'smartcard' --windows 'user:'
-        echo -e '/smartcard\tRetrieve the credential from a smart card
-/user:\tSpecify the user or account name to store with this entry'
+        echo -e '/smartcard\tRetrieve the credential
+/user:\tSpecify the user or account name'
       end
-    
+
       if __fish_seen_argument --windows 'user:'
-        echo -e '/pass:\tSpecify the password to store with this entry'
+        echo -e '/pass:\tSpecify the password'
       end
-    
-      echo -e '/delete\tDelete a user name and password from the list
+
+      echo -e '/delete\tDelete a user name and password
 /list:\tDisplay the list of stored user names and credentials
 /?\tShow help'
   end
diff --git a/share/completions/comp.fish b/share/completions/comp.fish
index a2fba7a2f..a67dc5b75 100644
--- a/share/completions/comp.fish
+++ b/share/completions/comp.fish
@@ -1,7 +1,7 @@
 complete --command comp --no-files --arguments '/d\t"Display differences in decimal format"
 /a\t"Display differences as characters"
-/l\t"Displays the number of the line where a difference occurs, instead of displaying the byte offset"
-/n=\t"Compare only the number of lines that are specified for each file, even if the files are different sizes"
+/l\t"Displays the number of the line where a difference occurs"
+/n=\t"Compare only the number of lines that are specified for each file"
 /c\t"Perform a comparison that is not case-sensitive"
 /off\t"Process files with the offline attribute set"
 /offline\t"Process files with the offline attribute set"
diff --git a/share/completions/powershell.fish b/share/completions/powershell.fish
index bc970824d..3c4ca5bf5 100644
--- a/share/completions/powershell.fish
+++ b/share/completions/powershell.fish
@@ -17,7 +17,7 @@ complete --command powershell --old-option NonInteractive \
 complete --command powershell --old-option InputFormat --no-files --require-parameter \
   --arguments 'Text XML'  --description 'Describe the format of data sent to PowerShell'
 complete --command powershell --old-option OutputFormat --no-files --require-parameter \
-  --arguments 'Text XML'  --description 'Determine how output from PowerShell is formatted'
+  --arguments 'Text XML'  --description 'Determine how output is formatted'
 complete --command powershell --old-option WindowStyle --no-files --require-parameter \
   --arguments 'Normal Minimized Maximized Hidden' --description 'Set the window style for the session'
 complete --command powershell --old-option EncodedCommand --require-parameter \
diff --git a/share/completions/reg.fish b/share/completions/reg.fish
index b3faf4325..fbfe67164 100644
--- a/share/completions/reg.fish
+++ b/share/completions/reg.fish
@@ -18,7 +18,7 @@ REG_EXPAND_SZ'
   end
 
   echo -e '/t\tSpecify the type for the registry entry
-/s\tSpecify the character to be used to separate multiple instances of data
+/s\tSpecify the character to be used
 /d\tSpecify the data for the new registry entry
 /f\tAdd the registry entry without prompting for confirmation
 /?\tShow help'
@@ -26,7 +26,7 @@ end
 
 function __reg_compare_generate_args --argument-names previous_token
   if not __fish_seen_argument --windows 'v' --windows 've'
-    echo -e '/v\tSpecify the value name to compare under the subkey
+    echo -e '/v\tSpecify the value name
 /ve\tSpecify that only entries that have a value name of null should be compared'
   end
 
@@ -44,7 +44,7 @@ end
 function __reg_copy_generate_args --argument-names previous_token
   echo -e '/s\tCopy all subkeys and entries under the specified subkey
 /f\tCopy the subkey without prompting for confirmation
-/?\tShow help'  
+/?\tShow help'
 end
 
 function __reg_delete_generate_args --argument-names previous_token
@@ -60,7 +60,7 @@ end
 
 function __reg_export_generate_args --argument-names previous_token
   echo -e '/y\tOverwrite any existing file with the name filename without prompting for confirmation
-/?\tShow help'  
+/?\tShow help'
 end
 
 function __reg_query_generate_args --argument-names previous_token
@@ -75,7 +75,7 @@ REG_NONE'
   end
 
   if not __fish_seen_argument --windows 'v' --windows 've'
-    echo -e '/v\tSpecify the registry value name that is to be queried
+    echo -e '/v\tSpecify the registry value name
 /ve\tRun a query for value names that are empty'
   end
 
@@ -84,7 +84,7 @@ REG_NONE'
 /d\tSpecify to search in data only'
   end
 
-  echo -e '/se\tSpecify the single value separator to search for in the value name type REG_MULTI_SZ
+  echo -e '/se\tSpecify the single value separator
 /f\tSpecify the data or pattern to search for
 /c\tSpecify that the query is case sensitive
 /e\tSpecify to return only exact matches
@@ -100,15 +100,15 @@ end
 
 function __reg_generate_args --description 'Function to generate args'
   if not __fish_seen_subcommand_from add compare copy delete export import load query restore save unload
-    echo -e 'add\tAdd a new subkey or entry to the registry
+    echo -e 'add\tAdd a new subkey or entry
 compare\tCompare specified registry subkeys or entries
-copy\tCopy a registry entry to a specified location on the local or remote computer
-delete\tDelete a subkey or entries from the registry
+copy\tCopy a registry entry
+delete\tDelete a subkey or entries
 export\tCopy the specified subkeys, entries, and values of the local computer into a file
 import\tCopy the contents of a file that contains registry data into the registry of the local computer
 load\tWrite saved subkeys and entries into a different subkey in the registry
 query\tReturn a list of the next tier of subkeys and entries
-restore\tWrite saved subkeys and entries back to the registry
+restore\tWrite saved subkeys and entries back
 save\tSave a copy of specified subkeys, entries, and values of the registry in a specified file
 unload\tRemove a section of the registry that was loaded using the reg load operation'
     return
@@ -133,4 +133,4 @@ unload\tRemove a section of the registry that was loaded using the reg load oper
   end
 end
 
-complete --command reg --no-files --arguments '(__reg_generate_args)'
\ No newline at end of file
+complete --command reg --no-files --arguments '(__reg_generate_args)'
diff --git a/share/completions/schtasks.fish b/share/completions/schtasks.fish
index fe2410f9c..8dbdc636e 100644
--- a/share/completions/schtasks.fish
+++ b/share/completions/schtasks.fish
@@ -28,7 +28,7 @@ function __schtasks_change_generate_args --argument-names previous_token
 
   if not __fish_seen_argument --windows 'et' --windows 'du'
     echo -e '/et\tSpecify the end time for the task
-/du\tA value that specifies the duration to run the task'
+/du\tA value that specifies the duration'
   end
 
   if not __fish_seen_argument --windows 'ENABLE' --windows 'DISABLE'
@@ -193,8 +193,8 @@ CSV'
   end
 
   echo -e '/fo\tSpecify the output format
-/nh\tRemove column headings from the table display
-/v\tAdd the advanced properties of the task to the display
+/nh\tRemove column headings
+/v\tAdd the advanced properties of the task
 /s\tSpecify the name or IP address of a remote computer
 /?\tShow help'
 end
@@ -236,7 +236,7 @@ function __schtasks_generate_args --description 'Function to generate args'
   end
 
   set --local previous_token (commandline --tokenize --cut-at-cursor)[-1]
-  
+
   if __fish_seen_argument --windows change
     __schtasks_change_generate_args "$previous_token"
   else if __fish_seen_argument --windows create
@@ -252,4 +252,4 @@ function __schtasks_generate_args --description 'Function to generate args'
   end
 end
 
-complete --command schtasks --no-files --arguments '(__schtasks_generate_args)'
\ No newline at end of file
+complete --command schtasks --no-files --arguments '(__schtasks_generate_args)'
diff --git a/share/completions/setx.fish b/share/completions/setx.fish
index c98e1e373..54718871b 100644
--- a/share/completions/setx.fish
+++ b/share/completions/setx.fish
@@ -16,9 +16,9 @@ function __setx_generate_args --description 'Function to generate args'
 
   if not __fish_seen_argument --windows 'a' --windows 'r' --windows 'x'
     echo -e '/a\tSpecify absolute coordinates and offset as search parameters
-/r\tSpecify relative coordinates and offset from String as search parameters
+/r\tSpecify relative coordinates and offset
 /x\tDisplay file coordinates, ignoring the /a, /r, and /d command-line options'
-  end 
+  end
 
   if __fish_seen_argument --windows 'a' --windows 'r'
     echo -e '/m\tSpecify to set the variable in the system environment'
@@ -27,8 +27,8 @@ function __setx_generate_args --description 'Function to generate args'
   echo -e '/s\tSpecify the name or IP address of a remote computer
 /k\tSpecify that the variable is set based on information from a registry key
 /f\tSpecify the file that you want to use
-/d\tSpecify delimiters to be used in addition to the four built-in delimiters
+/d\tSpecify delimiters to be used
 /?\tShow help'
 end
 
-complete --command setx --no-files --arguments '(__setx_generate_args)'
\ No newline at end of file
+complete --command setx --no-files --arguments '(__setx_generate_args)'

From bc52198b5ec7ba20425c8eac251565ab66d01350 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Mon, 24 Jan 2022 15:36:58 +1000
Subject: [PATCH 141/262] Simplify choice completion

---
 share/completions/choice.fish | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/share/completions/choice.fish b/share/completions/choice.fish
index fe2b90a06..94e8578ec 100644
--- a/share/completions/choice.fish
+++ b/share/completions/choice.fish
@@ -1,7 +1,7 @@
-complete --command choice --no-files --arguments '/c\t"Specify the list of choices to be created"
-/n\t"Hide the list of choices"
-/cs\t"Specify that the choices are case-sensitive"
-/t\t"Specify the number of seconds"
-/d\t"Specify the default choice"
-/m\t"Specify a message"
-/?\t"Show help"'
+complete --command choice --no-files --arguments '/c' --description "Specify the list of choices to be created"
+complete --command choice --no-files --arguments '/n' --description "Hide the list of choices"
+complete --command choice --no-files --arguments '/cs' --description "Specify that the choices are case-sensitive"
+complete --command choice --no-files --arguments '/t' --description "Specify the number of seconds"
+complete --command choice --no-files --arguments '/d' --description "Specify the default choice"
+complete --command choice --no-files --arguments '/m' --description "Specify a message"
+complete --command choice --no-files --arguments '/?' --description "Show help"

From 72ce745f6011257892e20e11daf3a420e76e4041 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Mon, 24 Jan 2022 15:41:01 +1000
Subject: [PATCH 142/262] Use --description for clean command

---
 share/completions/clean.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/completions/clean.fish b/share/completions/clean.fish
index 8d1720d0b..17d587b01 100644
--- a/share/completions/clean.fish
+++ b/share/completions/clean.fish
@@ -1 +1 @@
-complete --command clean --no-files --arguments 'all\t"Specify that each and every sector on the disk is set to zero"'
\ No newline at end of file
+complete --command clean --no-files --arguments 'all' --description "Specify that each and every sector on the disk is set to zero"

From f047ef4ea2bc90a87531fbbc17d79f3eda9e7831 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Mon, 24 Jan 2022 15:42:54 +1000
Subject: [PATCH 143/262] Remove __fish_generate_password function

---
 share/completions/schtasks.fish               | 10 ----------
 share/functions/__fish_generate_password.fish |  4 ----
 2 files changed, 14 deletions(-)
 delete mode 100644 share/functions/__fish_generate_password.fish

diff --git a/share/completions/schtasks.fish b/share/completions/schtasks.fish
index 8dbdc636e..248c60baa 100644
--- a/share/completions/schtasks.fish
+++ b/share/completions/schtasks.fish
@@ -13,11 +13,6 @@ function __schtasks_change_generate_args --argument-names previous_token
     return
   end
 
-  if test "$previous_token" = '/rp'
-    __fish_generate_password
-    return
-  end
-
   if __fish_seen_argument --windows 's'
     echo -e '/u\tRun this command with the permissions of the specified user account'
   end
@@ -70,11 +65,6 @@ ONIDLE\tSpecify that the task runs whenever the system is idle for a specified p
     return
   end
 
-  if test "$previous_token" = '/rp'
-    __fish_generate_password
-    return
-  end
-
   if test "$previous_token" = '/mo'
     echo -e 'MINUTE\tSpecify that the task runs every n minutes
 HOURLY\tSpecify that the task runs every n hours
diff --git a/share/functions/__fish_generate_password.fish b/share/functions/__fish_generate_password.fish
deleted file mode 100644
index f096e9e4a..000000000
--- a/share/functions/__fish_generate_password.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function __fish_generate_password --description 'Generate password'
-  date +%s | sha256sum | base64 | head --bytes 10
-  echo
-end
\ No newline at end of file

From c5a8e700bb2d92ba45e18e882b39dc3bbd0deb7d Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Mon, 24 Jan 2022 15:51:09 +1000
Subject: [PATCH 144/262] Replace "generate" to "complete" in functions

---
 share/completions/attrib.fish     |  4 ++--
 share/completions/attributes.fish | 12 ++++++------
 share/completions/cleanmgr.fish   |  4 ++--
 share/completions/cmd.fish        |  4 ++--
 share/completions/cmdkey.fish     |  4 ++--
 share/completions/reg.fish        | 32 +++++++++++++++----------------
 share/completions/schtasks.fish   | 28 +++++++++++++--------------
 share/completions/setx.fish       |  4 ++--
 8 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/share/completions/attrib.fish b/share/completions/attrib.fish
index 27809dce0..ee9747281 100644
--- a/share/completions/attrib.fish
+++ b/share/completions/attrib.fish
@@ -1,4 +1,4 @@
-function __attrib_generate_args --description 'Function to generate args'
+function __attrib_complete_args --description 'Function to generate args'
   set --local current_token (commandline --current-token --cut-at-cursor)
 
   switch $current_token
@@ -27,4 +27,4 @@ i\tClear the Not Content Indexed file attribute' | awk -F '\t' "{ printf \"$curr
   end
 end
 
-complete --command attrib --no-files --arguments '(__attrib_generate_args)'
+complete --command attrib --no-files --arguments '(__attrib_complete_args)'
diff --git a/share/completions/attributes.fish b/share/completions/attributes.fish
index 497a7d2a9..d6310302b 100644
--- a/share/completions/attributes.fish
+++ b/share/completions/attributes.fish
@@ -1,4 +1,4 @@
-function __attributes_disk_generate_args
+function __attributes_disk_complete_args
   if not __fish_seen_subcommand_from set clear
     echo -e 'set\tSet the specified attribute of the disk with focus
 clear\tClear the specified attribute of the disk with focus'
@@ -9,7 +9,7 @@ clear\tClear the specified attribute of the disk with focus'
 noerr\tWhen an error is encountered, DiskPart continues to process commands'
 end
 
-function __attributes_volume_generate_args
+function __attributes_volume_complete_args
   if not __fish_seen_subcommand_from set clear
     echo -e 'set\tSet the specified attribute of the volume with focus
 clear\tClear the specified attribute of the volume with focus'
@@ -23,7 +23,7 @@ shadowcopy\tSpecify that the volume is a shadow copy volume
 noerr\tWhen an error is encountered, DiskPart continues to process commands'
 end
 
-function __attributes_generate_args --description 'Function to generate args'
+function __attributes_complete_args --description 'Function to generate args'
   if not __fish_seen_subcommand_from disk volume
     echo -e 'disk\tDisplay, set, or clear the attributes of a disk
 volume\tDisplay, set, or clear the attributes of a volume'
@@ -31,10 +31,10 @@ volume\tDisplay, set, or clear the attributes of a volume'
   end
 
   if __fish_seen_subcommand_from disk
-    __attributes_disk_generate_args
+    __attributes_disk_complete_args
   else if __fish_seen_subcommand_from volume
-    __attributes_volume_generate_args
+    __attributes_volume_complete_args
   end
 end
 
-complete --command attributes --no-files --arguments '(__attributes_generate_args)'
+complete --command attributes --no-files --arguments '(__attributes_complete_args)'
diff --git a/share/completions/cleanmgr.fish b/share/completions/cleanmgr.fish
index 2e70b91c4..c4d7a20d1 100644
--- a/share/completions/cleanmgr.fish
+++ b/share/completions/cleanmgr.fish
@@ -1,4 +1,4 @@
-function __cleanmgr_generate_args --description 'Function to generate args'
+function __cleanmgr_complete_args --description 'Function to generate args'
   set --local previous_token (commandline --tokenize --cut-at-cursor)[-1]
 
   if test "$previous_token" = '/d'
@@ -15,4 +15,4 @@ function __cleanmgr_generate_args --description 'Function to generate args'
 /?\tShow help'
 end
 
-complete --command cleanmgr --no-files --arguments '(__cleanmgr_generate_args)'
+complete --command cleanmgr --no-files --arguments '(__cleanmgr_complete_args)'
diff --git a/share/completions/cmd.fish b/share/completions/cmd.fish
index 28aaffed1..eb95f95a8 100644
--- a/share/completions/cmd.fish
+++ b/share/completions/cmd.fish
@@ -1,4 +1,4 @@
-function __cmd_generate_args --description 'Function to generate args'
+function __cmd_complete_args --description 'Function to generate args'
   set --local current_token (commandline --current-token --cut-at-cursor)
 
   switch $current_token
@@ -47,4 +47,4 @@ off\tDisable delayed environment variable expansion' | awk -F '\t' "{ printf \"$
   end
 end
 
-complete --command cmd --no-files --arguments '(__cmd_generate_args)'
+complete --command cmd --no-files --arguments '(__cmd_complete_args)'
diff --git a/share/completions/cmdkey.fish b/share/completions/cmdkey.fish
index e4d607986..ced4d4f45 100644
--- a/share/completions/cmdkey.fish
+++ b/share/completions/cmdkey.fish
@@ -1,4 +1,4 @@
-function __cmdkey_generate_args --description 'Function to generate args'
+function __cmdkey_complete_args --description 'Function to generate args'
   set --local current_token (commandline --current-token --cut-at-cursor)
   set --local previous_token (commandline --tokenize --cut-at-cursor)[-1]
 
@@ -31,4 +31,4 @@ function __cmdkey_generate_args --description 'Function to generate args'
   end
 end
 
-complete --command cmdkey --no-files --arguments '(__cmdkey_generate_args)'
+complete --command cmdkey --no-files --arguments '(__cmdkey_complete_args)'
diff --git a/share/completions/reg.fish b/share/completions/reg.fish
index fbfe67164..1c2496f28 100644
--- a/share/completions/reg.fish
+++ b/share/completions/reg.fish
@@ -1,4 +1,4 @@
-function __reg_add_generate_args --argument-names previous_token
+function __reg_add_complete_args --argument-names previous_token
   if test "$previous_token" = '/t'
     echo 'REG_SZ
 REG_MULTI_SZ
@@ -24,7 +24,7 @@ REG_EXPAND_SZ'
 /?\tShow help'
 end
 
-function __reg_compare_generate_args --argument-names previous_token
+function __reg_compare_complete_args --argument-names previous_token
   if not __fish_seen_argument --windows 'v' --windows 've'
     echo -e '/v\tSpecify the value name
 /ve\tSpecify that only entries that have a value name of null should be compared'
@@ -41,13 +41,13 @@ function __reg_compare_generate_args --argument-names previous_token
 /?\tShow help'
 end
 
-function __reg_copy_generate_args --argument-names previous_token
+function __reg_copy_complete_args --argument-names previous_token
   echo -e '/s\tCopy all subkeys and entries under the specified subkey
 /f\tCopy the subkey without prompting for confirmation
 /?\tShow help'
 end
 
-function __reg_delete_generate_args --argument-names previous_token
+function __reg_delete_complete_args --argument-names previous_token
   if not __fish_seen_argument --windows 'v' --windows 've' --windows 'va'
     echo -e '/v\tDelete a specific entry under the subkey
 /ve\tSpecify that only entries that have no value will be deleted
@@ -58,12 +58,12 @@ function __reg_delete_generate_args --argument-names previous_token
 /?\tShow help'
 end
 
-function __reg_export_generate_args --argument-names previous_token
+function __reg_export_complete_args --argument-names previous_token
   echo -e '/y\tOverwrite any existing file with the name filename without prompting for confirmation
 /?\tShow help'
 end
 
-function __reg_query_generate_args --argument-names previous_token
+function __reg_query_complete_args --argument-names previous_token
   if test "$previous_token" = '/t'
     echo 'REG_SZ
 REG_MULTI_SZ
@@ -93,12 +93,12 @@ REG_NONE'
 /?\tShow help'
 end
 
-function __reg_save_generate_args --argument-names previous_token
+function __reg_save_complete_args --argument-names previous_token
   echo -e '/y\tOverwrite an existing file with the name filename without prompting for confirmation
 /?\tShow help'
 end
 
-function __reg_generate_args --description 'Function to generate args'
+function __reg_complete_args --description 'Function to generate args'
   if not __fish_seen_subcommand_from add compare copy delete export import load query restore save unload
     echo -e 'add\tAdd a new subkey or entry
 compare\tCompare specified registry subkeys or entries
@@ -117,20 +117,20 @@ unload\tRemove a section of the registry that was loaded using the reg load oper
   set --local previous_token (commandline --tokenize --cut-at-cursor)[-1]
 
   if __fish_seen_subcommand_from add
-    __reg_add_generate_args
+    __reg_add_complete_args
   else if __fish_seen_subcommand_from compare
-    __reg_compare_generate_args
+    __reg_compare_complete_args
   else if __fish_seen_subcommand_from copy
-    __reg_copy_generate_args
+    __reg_copy_complete_args
   else if __fish_seen_subcommand_from delete
-    __reg_delete_generate_args
+    __reg_delete_complete_args
   else if __fish_seen_subcommand_from export
-    __reg_export_generate_args
+    __reg_export_complete_args
   else if __fish_seen_subcommand_from query
-    __reg_query_generate_args
+    __reg_query_complete_args
   else if __fish_seen_subcommand_from save
-    __reg_save_generate_args
+    __reg_save_complete_args
   end
 end
 
-complete --command reg --no-files --arguments '(__reg_generate_args)'
+complete --command reg --no-files --arguments '(__reg_complete_args)'
diff --git a/share/completions/schtasks.fish b/share/completions/schtasks.fish
index 248c60baa..76ea3ac34 100644
--- a/share/completions/schtasks.fish
+++ b/share/completions/schtasks.fish
@@ -2,7 +2,7 @@ function __schtasks_list_tasks --description 'Helper function to list tasks'
   schtasks /query /fo csv /nh | awk -F ',' '{ print $1 }'
 end
 
-function __schtasks_change_generate_args --argument-names previous_token
+function __schtasks_change_complete_args --argument-names previous_token
   if test "$previous_token" = '/tn'
     __schtasks_list_tasks
     return
@@ -46,7 +46,7 @@ function __schtasks_change_generate_args --argument-names previous_token
 /?\tShow help'
 end
 
-function __schtasks_create_generate_args --argument-names previous_token
+function __schtasks_create_complete_args --argument-names previous_token
   if test "$previous_token" = '/sc'
     echo -e 'MINUTE\tSpecify the number of minutes before the task should run
 HOURLY\tSpecify the number of hours before the task should run
@@ -112,7 +112,7 @@ ONIDLE\tSpecify that the task runs after the system is idle for the number of mi
 /?\tShow help'
 end
 
-function __schtasks_delete_generate_args --argument-names previous_token
+function __schtasks_delete_complete_args --argument-names previous_token
   if test "$previous_token" = '/tn'
     __schtasks_list_tasks
     return
@@ -137,7 +137,7 @@ function __schtasks_delete_generate_args --argument-names previous_token
 /?\tShow help'
 end
 
-function __schtasks_end_generate_args --argument-names previous_token
+function __schtasks_end_complete_args --argument-names previous_token
   if test "$previous_token" = '/tn'
     __schtasks_list_tasks
     return
@@ -161,7 +161,7 @@ function __schtasks_end_generate_args --argument-names previous_token
 /?\tShow help'
 end
 
-function __schtasks_query_generate_args --argument-names previous_token
+function __schtasks_query_complete_args --argument-names previous_token
   if test "$previous_token" = '/fo'
     echo -e 'TABLE
 LIST
@@ -189,7 +189,7 @@ CSV'
 /?\tShow help'
 end
 
-function __schtasks_run_generate_args --argument-names previous_token
+function __schtasks_run_complete_args --argument-names previous_token
   if test "$previous_token" = '/tn'
     __schtasks_list_tasks
     return
@@ -213,7 +213,7 @@ function __schtasks_run_generate_args --argument-names previous_token
 /?\tShow help'
 end
 
-function __schtasks_generate_args --description 'Function to generate args'
+function __schtasks_complete_args --description 'Function to generate args'
   if not __fish_seen_argument --windows change --windows create --windows delete --windows end \
     --windows query --windows run
     echo -e '/change\tChange one or more properties of a task
@@ -228,18 +228,18 @@ function __schtasks_generate_args --description 'Function to generate args'
   set --local previous_token (commandline --tokenize --cut-at-cursor)[-1]
 
   if __fish_seen_argument --windows change
-    __schtasks_change_generate_args "$previous_token"
+    __schtasks_change_complete_args "$previous_token"
   else if __fish_seen_argument --windows create
-    __schtasks_create_generate_args "$previous_token"
+    __schtasks_create_complete_args "$previous_token"
   else if __fish_seen_argument --windows delete
-    __schtasks_delete_generate_args "$previous_token"
+    __schtasks_delete_complete_args "$previous_token"
   else if __fish_seen_argument --windows end
-    __schtasks_end_generate_args "$previous_token"
+    __schtasks_end_complete_args "$previous_token"
   else if __fish_seen_argument --windows query
-    __schtasks_query_generate_args "$previous_token"
+    __schtasks_query_complete_args "$previous_token"
   else if __fish_seen_argument --windows run
-    __schtasks_run_generate_args "$previous_token"
+    __schtasks_run_complete_args "$previous_token"
   end
 end
 
-complete --command schtasks --no-files --arguments '(__schtasks_generate_args)'
+complete --command schtasks --no-files --arguments '(__schtasks_complete_args)'
diff --git a/share/completions/setx.fish b/share/completions/setx.fish
index 54718871b..fbf20a8dc 100644
--- a/share/completions/setx.fish
+++ b/share/completions/setx.fish
@@ -1,4 +1,4 @@
-function __setx_generate_args --description 'Function to generate args'
+function __setx_complete_args --description 'Function to generate args'
   set --local previous_token (commandline --tokenize --cut-at-cursor)[-1]
 
   if test "$previous_token" = '/u'
@@ -31,4 +31,4 @@ function __setx_generate_args --description 'Function to generate args'
 /?\tShow help'
 end
 
-complete --command setx --no-files --arguments '(__setx_generate_args)'
+complete --command setx --no-files --arguments '(__setx_complete_args)'

From 7ae194cb031476e13eb84f2aa86ed31ad1dcc84a Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Mon, 24 Jan 2022 16:04:36 +1000
Subject: [PATCH 145/262] Rename __fish_list_windows_drives function: - new
 name is __fish_print_windows_drives

---
 share/completions/cleanmgr.fish                 | 2 +-
 share/functions/__fish_list_windows_drives.fish | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/completions/cleanmgr.fish b/share/completions/cleanmgr.fish
index c4d7a20d1..b5310b4dd 100644
--- a/share/completions/cleanmgr.fish
+++ b/share/completions/cleanmgr.fish
@@ -2,7 +2,7 @@ function __cleanmgr_complete_args --description 'Function to generate args'
   set --local previous_token (commandline --tokenize --cut-at-cursor)[-1]
 
   if test "$previous_token" = '/d'
-    __fish_list_windows_drives
+    __fish_print_windows_drives
     return
   end
 
diff --git a/share/functions/__fish_list_windows_drives.fish b/share/functions/__fish_list_windows_drives.fish
index 3de8cfb5a..a5743af15 100644
--- a/share/functions/__fish_list_windows_drives.fish
+++ b/share/functions/__fish_list_windows_drives.fish
@@ -1,3 +1,3 @@
-function __fish_list_windows_drives --description 'Lists Windows drives'
+function __fish_print_windows_drives --description 'Print Windows drives'
   wmic logicaldisk get name | tail +2
-end
\ No newline at end of file
+end

From 78bd0f9cdbc51db0008b63238f29b9bd5ac4fc3f Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Mon, 24 Jan 2022 20:10:56 +1000
Subject: [PATCH 146/262] Prettify all commands: - rename *list* functions to
 *print* - use short options everywhere - delegate less work to functions

---
 share/completions/attrib.fish                 | 27 +++---
 share/completions/attributes.fish             | 15 ++--
 share/completions/choice.fish                 | 14 +--
 share/completions/clean.fish                  |  2 +-
 share/completions/cleanmgr.fish               | 23 ++---
 share/completions/cmd.fish                    | 62 +++++++------
 share/completions/cmdkey.fish                 | 46 +++++-----
 share/completions/comp.fish                   | 16 ++--
 share/completions/forfiles.fish               | 13 +--
 share/completions/reg.fish                    | 36 ++++----
 share/completions/schtasks.fish               | 90 +++++++++----------
 share/completions/setx.fish                   | 54 ++++++-----
 .../functions/__fish_list_windows_users.fish  |  3 -
 ....fish => __fish_print_windows_drives.fish} |  0
 .../functions/__fish_print_windows_users.fish |  3 +
 15 files changed, 206 insertions(+), 198 deletions(-)
 delete mode 100644 share/functions/__fish_list_windows_users.fish
 rename share/functions/{__fish_list_windows_drives.fish => __fish_print_windows_drives.fish} (100%)
 create mode 100644 share/functions/__fish_print_windows_users.fish

diff --git a/share/completions/attrib.fish b/share/completions/attrib.fish
index ee9747281..0ccaca6c6 100644
--- a/share/completions/attrib.fish
+++ b/share/completions/attrib.fish
@@ -1,5 +1,5 @@
-function __attrib_complete_args --description 'Function to generate args'
-  set --local current_token (commandline --current-token --cut-at-cursor)
+function __attrib_complete_args -d 'Function to generate args'
+  set -l current_token (commandline -tc)
 
   switch $current_token
     case '+*'
@@ -14,17 +14,18 @@ a\tClear the Archive file attribute
 s\tClear the System file attribute
 h\tClear the Hidden file attribute
 i\tClear the Not Content Indexed file attribute' | awk -F '\t' "{ printf \"$current_token%s\t%s\n\", \$1, \$2 }"
-    case '*'
-      if __fish_seen_argument --windows 's'
-        echo -e '/d\tApply attrib and any command-line options to directories
-/l\tApply attrib and any command-line options to the Symbolic Link'
-      end
-
-      echo -e '+\tSet the file attribute
--\tClear the file attribute
-/s\tApply to matching files in the current directory and all of its subdirectories
-/?\tShow help'
   end
 end
 
-complete --command attrib --no-files --arguments '(__attrib_complete_args)'
+complete -c attrib -f -a '(__attrib_complete_args)'
+
+complete -c attrib -f -n '__fish_seen_argument -w s' -a d \
+    -d 'Apply attrib and any command-line options to directories'
+complete -c attrib -f -n '__fish_seen_argument -w s' -a l \
+    -d 'Apply attrib and any command-line options to the Symbolic Link'
+
+complete -c attrib -f -a + -d 'Set the file attribute'
+complete -c attrib -f -a - -d 'Clear the file attribute'
+complete -c attrib -f -a /s \
+    -d 'Apply to matching files in the current directory and all of its subdirectories'
+complete -c attrib -f -a '/?' -d 'Show help'
diff --git a/share/completions/attributes.fish b/share/completions/attributes.fish
index d6310302b..47e1d9cc7 100644
--- a/share/completions/attributes.fish
+++ b/share/completions/attributes.fish
@@ -16,14 +16,17 @@ clear\tClear the specified attribute of the volume with focus'
     return
   end
 
-  echo -e 'readonly\tSpecify that the volume is read-only
-readonly\tSpecify that the volume is hidden
+  if not __fish_seen_subcommand_from readonly hidden nodefaultdriveletter shadowcopy
+    echo -e 'readonly\tSpecify that the volume is read-only
+hidden\tSpecify that the volume is hidden
 nodefaultdriveletter\tSpecify that the volume does not receive a drive letter by default
-shadowcopy\tSpecify that the volume is a shadow copy volume
-noerr\tWhen an error is encountered, DiskPart continues to process commands'
+shadowcopy\tSpecify that the volume is a shadow copy volume'
+  end
+
+  echo -e 'noerr\tWhen an error is encountered, DiskPart continues to process commands'
 end
 
-function __attributes_complete_args --description 'Function to generate args'
+function __attributes_complete_args -d 'Function to generate args'
   if not __fish_seen_subcommand_from disk volume
     echo -e 'disk\tDisplay, set, or clear the attributes of a disk
 volume\tDisplay, set, or clear the attributes of a volume'
@@ -37,4 +40,4 @@ volume\tDisplay, set, or clear the attributes of a volume'
   end
 end
 
-complete --command attributes --no-files --arguments '(__attributes_complete_args)'
+complete -c attributes -f -a '(__attributes_complete_args)'
diff --git a/share/completions/choice.fish b/share/completions/choice.fish
index 94e8578ec..f4bb425e7 100644
--- a/share/completions/choice.fish
+++ b/share/completions/choice.fish
@@ -1,7 +1,7 @@
-complete --command choice --no-files --arguments '/c' --description "Specify the list of choices to be created"
-complete --command choice --no-files --arguments '/n' --description "Hide the list of choices"
-complete --command choice --no-files --arguments '/cs' --description "Specify that the choices are case-sensitive"
-complete --command choice --no-files --arguments '/t' --description "Specify the number of seconds"
-complete --command choice --no-files --arguments '/d' --description "Specify the default choice"
-complete --command choice --no-files --arguments '/m' --description "Specify a message"
-complete --command choice --no-files --arguments '/?' --description "Show help"
+complete -c choice -f -a /c -d "Specify the list of choices to be created"
+complete -c choice -f -a /n -d "Hide the list of choices"
+complete -c choice -f -a /cs -d "Specify that the choices are case-sensitive"
+complete -c choice -f -a /t -d "Specify the number of seconds"
+complete -c choice -f -a /d -d "Specify the default choice"
+complete -c choice -f -a /m -d "Specify a message"
+complete -c choice -f -a '/?' -d "Show help"
diff --git a/share/completions/clean.fish b/share/completions/clean.fish
index 17d587b01..b08fba20b 100644
--- a/share/completions/clean.fish
+++ b/share/completions/clean.fish
@@ -1 +1 @@
-complete --command clean --no-files --arguments 'all' --description "Specify that each and every sector on the disk is set to zero"
+complete -c clean -f -a all -d "Specify that each and every sector on the disk is set to zero"
diff --git a/share/completions/cleanmgr.fish b/share/completions/cleanmgr.fish
index b5310b4dd..046fa447f 100644
--- a/share/completions/cleanmgr.fish
+++ b/share/completions/cleanmgr.fish
@@ -1,18 +1,19 @@
-function __cleanmgr_complete_args --description 'Function to generate args'
-  set --local previous_token (commandline --tokenize --cut-at-cursor)[-1]
+function __cleanmgr_complete_args -d 'Function to generate args'
+  set -l previous_token (commandline -oc)[-1]
 
   if test "$previous_token" = '/d'
     __fish_print_windows_drives
     return
   end
-
-  echo -e '/d\tSpecify the drive
-/sageset\tDisplay the Disk Cleanup Settings dialog box and also create a registry keyt
-/sagerun\tRun the specified tasks that are assigned to the n value
-/tuneup\tRun /sageset and /sagerun for the same n
-/lowdisk\tRun with the default settings
-/verylowdisk\tRun with the default settings, no user prompts
-/?\tShow help'
 end
 
-complete --command cleanmgr --no-files --arguments '(__cleanmgr_complete_args)'
+complete -c cleanmgr -f -a '(__cleanmgr_complete_args)'
+
+complete -c cleanmgr -f -a /d -d 'Specify the drive'
+complete -c cleanmgr -f -a /sageset \
+    -d 'Display the Disk Cleanup Settings dialog box and also create a registry key'
+complete -c cleanmgr -f -a /sagerun -d 'Run the specified tasks that are assigned to the n value'
+complete -c cleanmgr -f -a /tuneup -d 'Run /sageset and /sagerun for the same n'
+complete -c cleanmgr -f -a /lowdisk -d 'Run with the default settings'
+complete -c cleanmgr -f -a /verylowdisk -d 'Run with the default settings, no user prompts'
+complete -c cleanmgr -f -a '/?' -d 'Show help'
diff --git a/share/completions/cmd.fish b/share/completions/cmd.fish
index eb95f95a8..ffcc16c3f 100644
--- a/share/completions/cmd.fish
+++ b/share/completions/cmd.fish
@@ -1,9 +1,9 @@
-function __cmd_complete_args --description 'Function to generate args'
-  set --local current_token (commandline --current-token --cut-at-cursor)
+function __cmd_complete_args -d 'Function to generate args'
+    set -l current_token (commandline -tc)
 
-  switch $current_token
-    case '/t:*'
-      echo -e '0\tBlack
+    switch $current_token
+        case '/t:*'
+            echo -e '0\tBlack
 1\tBlue
 2\tGreen
 3\tAqua
@@ -19,32 +19,36 @@ C\tLight red
 D\tLight purple
 E\tLight yellow
 F\tBright white' | awk -F '\t' "{ printf \"$current_token%s\t%s\n\", \$1, \$2 }"
-    case '/e:*'
-      echo -e 'on\tEnable command extensions
+        case '/e:*'
+            echo -e 'on\tEnable command extensions
 off\tDisable command extensions' | awk -F '\t' "{ printf \"$current_token%s\t%s\n\", \$1, \$2 }"
-    case '/f:*'
-      echo -e 'on\tEnable file and directory name completion
+        case '/f:*'
+            echo -e 'on\tEnable file and directory name completion
 off\tDisable file and directory name completion' | awk -F '\t' "{ printf \"$current_token%s\t%s\n\", \$1, \$2 }"
-    case '/v:*'
-      echo -e 'on\tEnable delayed environment variable expansion
+        case '/v:*'
+            echo -e 'on\tEnable delayed environment variable expansion
 off\tDisable delayed environment variable expansion' | awk -F '\t' "{ printf \"$current_token%s\t%s\n\", \$1, \$2 }"
-    case '*'
-      if not __fish_seen_argument --windows 'c' --windows 'k'
-        echo -e '/c\tCarry out the command specified by string and then stop
-/k\tCarry out the command specified by string and continue'
-      end
-
-      echo -e '/s\tModify the treatment of string after /c or /k
-/q\tTurn the echo off
-/d\tDisable execution of AutoRun commands
-/a\tFormat internal command output as ANSI
-/u\tFormat internal command output as Unicode
-/t\tSet the background and foreground color
-/e\tManage command extensions
-/f\tManage file and directory name completion
-/v\tManage delayed environment variable expansion
-/?\tShow help'
-  end
+    end
 end
 
-complete --command cmd --no-files --arguments '(__cmd_complete_args)'
+complete -c cmd -f -a '(__cmd_complete_args)'
+
+complete -c cmd -f -n 'not __fish_seen_argument -w c -w k' -a /c \
+    -d 'Carry out the command specified by string and then stop'
+complete -c cmd -f -n 'not __fish_seen_argument -w c -w k' -a /k \
+    -d 'Carry out the command specified by string and continue'
+
+complete -c cmd -f -a /s -d 'Modify the treatment of string after /c or /k'
+complete -c cmd -f -a /q -d 'Turn the echo off'
+complete -c cmd -f -a /d -d 'Disable execution of AutoRun commands'
+
+complete -c cmd -f -n 'not __fish_seen_argument -w a -w u' -a /a \
+    -d 'Format internal command output as ANSI'
+complete -c cmd -f -n 'not __fish_seen_argument -w a -w u' -a /u \
+    -d 'Format internal command output as Unicode'
+
+complete -c cmd -f -a /t -d 'Set the background and foreground color'
+complete -c cmd -f -a /e -d 'Manage command extensions'
+complete -c cmd -f -a /f -d 'Manage file and directory name completion'
+complete -c cmd -f -a /v -d 'Manage delayed environment variable expansion'
+complete -c cmd -f -a '/?' -d 'Show help'
diff --git a/share/completions/cmdkey.fish b/share/completions/cmdkey.fish
index ced4d4f45..8a76ec817 100644
--- a/share/completions/cmdkey.fish
+++ b/share/completions/cmdkey.fish
@@ -1,34 +1,34 @@
-function __cmdkey_complete_args --description 'Function to generate args'
-  set --local current_token (commandline --current-token --cut-at-cursor)
-  set --local previous_token (commandline --tokenize --cut-at-cursor)[-1]
+function __cmdkey_complete_args -d 'Function to generate args'
+  set -l current_token (commandline -tc)
+  set -l previous_token (commandline -oc)[-1]
 
   switch $current_token
     case '/user:*'
-      __fish_list_windows_users | awk "{ printf \"%s%s\n\", \"$current_token\", \$0 }"
+      __fish_print_windows_users | awk "{ printf \"%s%s\n\", \"$current_token\", \$0 }"
     case '*'
       if test "$previous_token" = '/delete'
         echo -e '/ras\tDelete remote access entry'
         return
       end
-
-      if not __fish_seen_argument --windows 'add:' --windows 'generic:'
-        echo -e '/add:\tAdd a user name and password
-/generic:\tAdd generic credentials'
-      end
-
-      if not __fish_seen_argument --windows 'smartcard' --windows 'user:'
-        echo -e '/smartcard\tRetrieve the credential
-/user:\tSpecify the user or account name'
-      end
-
-      if __fish_seen_argument --windows 'user:'
-        echo -e '/pass:\tSpecify the password'
-      end
-
-      echo -e '/delete\tDelete a user name and password
-/list:\tDisplay the list of stored user names and credentials
-/?\tShow help'
   end
 end
 
-complete --command cmdkey --no-files --arguments '(__cmdkey_complete_args)'
+complete -c cmdkey -f -a '(__cmdkey_complete_args)'
+
+complete -c cmdkey -f -n "not __fish_seen_argument -w add: -w generic:" -a /add: \
+    -d 'Add a user name and password'
+complete -c cmdkey -f -n "not __fish_seen_argument -w add: -w generic:" -a /generic: \
+    -d 'Add generic credentials'
+
+complete -c cmdkey -f -n "not __fish_seen_argument -w smartcard -w user:" -a /smartcard \
+    -d 'Retrieve the credential'
+complete -c cmdkey -f -n "not __fish_seen_argument -w smartcard -w user:" -a /user: \
+    -d 'Specify the user or account name'
+
+complete -c cmdkey -f -n "__fish_seen_argument -w user:" -a /pass: -d 'Specify the password'
+
+complete -c cmdkey -f -a /delete: -d 'Specify the user or account name'
+complete -c cmdkey -f -a /delete -d 'Specify the user or account name'
+
+complete -c cmdkey -f -a /list: -d 'Display the list of stored user names and credentials'
+complete -c cmdkey -f -a '/?' -d 'Show help'
diff --git a/share/completions/comp.fish b/share/completions/comp.fish
index a67dc5b75..c2e9adddb 100644
--- a/share/completions/comp.fish
+++ b/share/completions/comp.fish
@@ -1,8 +1,8 @@
-complete --command comp --no-files --arguments '/d\t"Display differences in decimal format"
-/a\t"Display differences as characters"
-/l\t"Displays the number of the line where a difference occurs"
-/n=\t"Compare only the number of lines that are specified for each file"
-/c\t"Perform a comparison that is not case-sensitive"
-/off\t"Process files with the offline attribute set"
-/offline\t"Process files with the offline attribute set"
-/?\t"Show help"'
+complete -c comp -f -a /d -d 'Display differences in decimal format'
+complete -c comp -f -a /a -d 'Display differences as characters'
+complete -c comp -f -a /l -d 'Displays the number of the line where a difference occurs'
+complete -c comp -f -a /n -d 'Compare only the number of lines that are specified for each file'
+complete -c comp -f -a /c -d 'Perform a comparison that is not case-sensitive'
+complete -c comp -f -a /off -d 'Process files with the offline attribute set'
+complete -c comp -f -a /offline -d 'Process files with the offline attribute set'
+complete -c comp -f -a '/?' -d 'Show help'
diff --git a/share/completions/forfiles.fish b/share/completions/forfiles.fish
index f716d4f76..b66e85501 100644
--- a/share/completions/forfiles.fish
+++ b/share/completions/forfiles.fish
@@ -1,6 +1,7 @@
-complete --command forfiles --no-files --arguments '/P\t"Specify the path from which to start the search"
-/M\t"Search files according to the specified search mask"
-/S\t"Instruct the forfiles command to search in subdirectories recursively"
-/C\t"Run the specified command on each file"
-/D\t"Select files with a last modified date within the specified time frame"
-/?\t"Show help"'
+complete -c forfiles -f -a /P -d 'Specify the path from which to start the search'
+complete -c forfiles -f -a /M -d 'Search files according to the specified search mask'
+complete -c forfiles -f -a /S -d 'Instruct the forfiles command to search in subdirectories recursively'
+complete -c forfiles -f -a /C -d 'Run the specified command on each file'
+complete -c forfiles -f -a /D \
+    -d 'Select files with a last modified date within the specified time frame'
+complete -c forfiles -f -a '/?' -d 'Show help'
diff --git a/share/completions/reg.fish b/share/completions/reg.fish
index 1c2496f28..8d41ee8f8 100644
--- a/share/completions/reg.fish
+++ b/share/completions/reg.fish
@@ -1,4 +1,4 @@
-function __reg_add_complete_args --argument-names previous_token
+function __reg_add_complete_args -a previous_token
   if test "$previous_token" = '/t'
     echo 'REG_SZ
 REG_MULTI_SZ
@@ -12,7 +12,7 @@ REG_EXPAND_SZ'
     return
   end
 
-  if not __fish_seen_argument --windows 'v' --windows 've'
+  if not __fish_seen_argument -w 'v' -w 've'
     echo -e '/v\tSpecify the name of the add registry entry
 /ve\tSpecify that the added registry entry has a null value'
   end
@@ -24,13 +24,13 @@ REG_EXPAND_SZ'
 /?\tShow help'
 end
 
-function __reg_compare_complete_args --argument-names previous_token
-  if not __fish_seen_argument --windows 'v' --windows 've'
+function __reg_compare_complete_args
+  if not __fish_seen_argument -w 'v' -w 've'
     echo -e '/v\tSpecify the value name
 /ve\tSpecify that only entries that have a value name of null should be compared'
   end
 
-  if not __fish_seen_argument --windows 'oa' --windows 'od' --windows 'os' --windows 'on'
+  if not __fish_seen_argument -w 'oa' -w 'od' -w 'os' -w 'on'
     echo -e '/oa\tSpecify that all differences and matches are displayed
 /od\tSpecify that only differences are displayed
 /os\tSpecify that only matches are displayed
@@ -41,14 +41,14 @@ function __reg_compare_complete_args --argument-names previous_token
 /?\tShow help'
 end
 
-function __reg_copy_complete_args --argument-names previous_token
+function __reg_copy_complete_args
   echo -e '/s\tCopy all subkeys and entries under the specified subkey
 /f\tCopy the subkey without prompting for confirmation
 /?\tShow help'
 end
 
-function __reg_delete_complete_args --argument-names previous_token
-  if not __fish_seen_argument --windows 'v' --windows 've' --windows 'va'
+function __reg_delete_complete_args
+  if not __fish_seen_argument -w 'v' -w 've' -w 'va'
     echo -e '/v\tDelete a specific entry under the subkey
 /ve\tSpecify that only entries that have no value will be deleted
 /va\tDelete all entries under the specified subkey'
@@ -58,12 +58,12 @@ function __reg_delete_complete_args --argument-names previous_token
 /?\tShow help'
 end
 
-function __reg_export_complete_args --argument-names previous_token
+function __reg_export_complete_args
   echo -e '/y\tOverwrite any existing file with the name filename without prompting for confirmation
 /?\tShow help'
 end
 
-function __reg_query_complete_args --argument-names previous_token
+function __reg_query_complete_args -a previous_token
   if test "$previous_token" = '/t'
     echo 'REG_SZ
 REG_MULTI_SZ
@@ -74,12 +74,12 @@ REG_NONE'
     return
   end
 
-  if not __fish_seen_argument --windows 'v' --windows 've'
+  if not __fish_seen_argument -w 'v' -w 've'
     echo -e '/v\tSpecify the registry value name
 /ve\tRun a query for value names that are empty'
   end
 
-  if not __fish_seen_argument --windows 'k' --windows 'd'
+  if not __fish_seen_argument -w 'k' -w 'd'
     echo -e '/k\tSpecify to search in key names only
 /d\tSpecify to search in data only'
   end
@@ -93,12 +93,12 @@ REG_NONE'
 /?\tShow help'
 end
 
-function __reg_save_complete_args --argument-names previous_token
+function __reg_save_complete_args
   echo -e '/y\tOverwrite an existing file with the name filename without prompting for confirmation
 /?\tShow help'
 end
 
-function __reg_complete_args --description 'Function to generate args'
+function __reg_complete_args -d 'Function to generate args'
   if not __fish_seen_subcommand_from add compare copy delete export import load query restore save unload
     echo -e 'add\tAdd a new subkey or entry
 compare\tCompare specified registry subkeys or entries
@@ -114,10 +114,10 @@ unload\tRemove a section of the registry that was loaded using the reg load oper
     return
   end
 
-  set --local previous_token (commandline --tokenize --cut-at-cursor)[-1]
+  set -l previous_token (commandline -oc)[-1]
 
   if __fish_seen_subcommand_from add
-    __reg_add_complete_args
+    __reg_add_complete_args $previous_token
   else if __fish_seen_subcommand_from compare
     __reg_compare_complete_args
   else if __fish_seen_subcommand_from copy
@@ -127,10 +127,10 @@ unload\tRemove a section of the registry that was loaded using the reg load oper
   else if __fish_seen_subcommand_from export
     __reg_export_complete_args
   else if __fish_seen_subcommand_from query
-    __reg_query_complete_args
+    __reg_query_complete_args $previous_token
   else if __fish_seen_subcommand_from save
     __reg_save_complete_args
   end
 end
 
-complete --command reg --no-files --arguments '(__reg_complete_args)'
+complete -c reg -f -a '(__reg_complete_args)'
diff --git a/share/completions/schtasks.fish b/share/completions/schtasks.fish
index 76ea3ac34..0546dc518 100644
--- a/share/completions/schtasks.fish
+++ b/share/completions/schtasks.fish
@@ -1,32 +1,32 @@
-function __schtasks_list_tasks --description 'Helper function to list tasks'
+function __schtasks_print_tasks -d 'Helper function to print tasks'
   schtasks /query /fo csv /nh | awk -F ',' '{ print $1 }'
 end
 
-function __schtasks_change_complete_args --argument-names previous_token
+function __schtasks_change_complete_args -a previous_token
   if test "$previous_token" = '/tn'
-    __schtasks_list_tasks
+    __schtasks_print_tasks
     return
   end
 
-  if string match --regex --quiet -- "$previous_token" '^/r?u$'
-    __fish_list_windows_users
+  if string match -r -q -- "$previous_token" '^/r?u$'
+    __fish_print_windows_users
     return
   end
 
-  if __fish_seen_argument --windows 's'
+  if __fish_seen_argument -w 's'
     echo -e '/u\tRun this command with the permissions of the specified user account'
   end
 
-  if __fish_seen_argument --windows 'u'
+  if __fish_seen_argument -w 'u'
     echo -e '/p\tSpecify the password of the user account specified in the /u parameter'
   end
 
-  if not __fish_seen_argument --windows 'et' --windows 'du'
+  if not __fish_seen_argument -w 'et' -w 'du'
     echo -e '/et\tSpecify the end time for the task
 /du\tA value that specifies the duration'
   end
 
-  if not __fish_seen_argument --windows 'ENABLE' --windows 'DISABLE'
+  if not __fish_seen_argument -w 'ENABLE' -w 'DISABLE'
     echo -e '/ENABLE\tSpecify to enable the scheduled task
 /DISABLE\tSpecify to disable the scheduled task'
   end
@@ -46,7 +46,7 @@ function __schtasks_change_complete_args --argument-names previous_token
 /?\tShow help'
 end
 
-function __schtasks_create_complete_args --argument-names previous_token
+function __schtasks_create_complete_args -a previous_token
   if test "$previous_token" = '/sc'
     echo -e 'MINUTE\tSpecify the number of minutes before the task should run
 HOURLY\tSpecify the number of hours before the task should run
@@ -60,8 +60,8 @@ ONIDLE\tSpecify that the task runs whenever the system is idle for a specified p
     return
   end
 
-  if string match --regex --quiet -- "$previous_token" '^/r?u$'
-    __fish_list_windows_users
+  if string match -r -q -- "$previous_token" '^/r?u$'
+    __fish_print_windows_users
     return
   end
 
@@ -78,15 +78,15 @@ ONIDLE\tSpecify that the task runs after the system is idle for the number of mi
     return
   end
 
-  if __fish_seen_argument --windows 's'
+  if __fish_seen_argument -w 's'
     echo -e '/u\tRun this command with the permissions of the specified user account'
   end
 
-  if __fish_seen_argument --windows 'u'
+  if __fish_seen_argument -w 'u'
     echo -e '/p\tSpecify the password of the user account specified in the /u parameter'
   end
 
-  if not __fish_seen_argument --windows 'et' --windows 'du'
+  if not __fish_seen_argument -w 'et' -w 'du'
     echo -e '/et\tSpecify the time of day that a minute or hourly task schedule ends
 /du\tSpecify a maximum length of time for a minute or hourly schedule'
   end
@@ -112,22 +112,22 @@ ONIDLE\tSpecify that the task runs after the system is idle for the number of mi
 /?\tShow help'
 end
 
-function __schtasks_delete_complete_args --argument-names previous_token
+function __schtasks_delete_complete_args -a previous_token
   if test "$previous_token" = '/tn'
-    __schtasks_list_tasks
+    __schtasks_print_tasks
     return
   end
 
   if test "$previous_token" = '/u'
-    __fish_list_windows_users
+    __fish_print_windows_users
     return
   end
 
-  if __fish_seen_argument --windows 's'
+  if __fish_seen_argument -w 's'
     echo -e '/u\tRun this command with the permissions of the specified user account'
   end
 
-  if __fish_seen_argument --windows 'u'
+  if __fish_seen_argument -w 'u'
     echo -e '/p\tSpecify the password of the user account specified in the /u parameter'
   end
 
@@ -137,22 +137,22 @@ function __schtasks_delete_complete_args --argument-names previous_token
 /?\tShow help'
 end
 
-function __schtasks_end_complete_args --argument-names previous_token
+function __schtasks_end_complete_args -a previous_token
   if test "$previous_token" = '/tn'
-    __schtasks_list_tasks
+    __schtasks_print_tasks
     return
   end
 
   if test "$previous_token" = '/u'
-    __fish_list_windows_users
+    __fish_print_windows_users
     return
   end
 
-  if __fish_seen_argument --windows 's'
+  if __fish_seen_argument -w 's'
     echo -e '/u\tRun this command with the permissions of the specified user account'
   end
 
-  if __fish_seen_argument --windows 'u'
+  if __fish_seen_argument -w 'u'
     echo -e '/p\tSpecify the password of the user account specified in the /u parameter'
   end
 
@@ -161,7 +161,7 @@ function __schtasks_end_complete_args --argument-names previous_token
 /?\tShow help'
 end
 
-function __schtasks_query_complete_args --argument-names previous_token
+function __schtasks_query_complete_args -a previous_token
   if test "$previous_token" = '/fo'
     echo -e 'TABLE
 LIST
@@ -170,15 +170,15 @@ CSV'
   end
 
   if test "$previous_token" = '/u'
-    __fish_list_windows_users
+    __fish_print_windows_users
     return
   end
 
-  if __fish_seen_argument --windows 's'
+  if __fish_seen_argument -w 's'
     echo -e '/u\tRun this command with the permissions of the specified user account'
   end
 
-  if __fish_seen_argument --windows 'u'
+  if __fish_seen_argument -w 'u'
     echo -e '/p\tSpecify the password of the user account specified in the /u parameter'
   end
 
@@ -189,22 +189,22 @@ CSV'
 /?\tShow help'
 end
 
-function __schtasks_run_complete_args --argument-names previous_token
+function __schtasks_run_complete_args -a previous_token
   if test "$previous_token" = '/tn'
-    __schtasks_list_tasks
+    __schtasks_print_tasks
     return
   end
 
   if test "$previous_token" = '/u'
-    __fish_list_windows_users
+    __fish_print_windows_users
     return
   end
 
-  if __fish_seen_argument --windows 's'
+  if __fish_seen_argument -w 's'
     echo -e '/u\tRun this command with the permissions of the specified user account'
   end
 
-  if __fish_seen_argument --windows 'u'
+  if __fish_seen_argument -w 'u'
     echo -e '/p\tSpecify the password of the user account specified in the /u parameter'
   end
 
@@ -213,9 +213,9 @@ function __schtasks_run_complete_args --argument-names previous_token
 /?\tShow help'
 end
 
-function __schtasks_complete_args --description 'Function to generate args'
-  if not __fish_seen_argument --windows change --windows create --windows delete --windows end \
-    --windows query --windows run
+function __schtasks_complete_args -d 'Function to generate args'
+  if not __fish_seen_argument -w change -w create -w delete -w end \
+    -w query -w run
     echo -e '/change\tChange one or more properties of a task
 /create\tSchedule a new task
 /delete\tDelete a scheduled task
@@ -225,21 +225,21 @@ function __schtasks_complete_args --description 'Function to generate args'
     return
   end
 
-  set --local previous_token (commandline --tokenize --cut-at-cursor)[-1]
+  set --local previous_token (commandline -oc)[-1]
 
-  if __fish_seen_argument --windows change
+  if __fish_seen_argument -w change
     __schtasks_change_complete_args "$previous_token"
-  else if __fish_seen_argument --windows create
+  else if __fish_seen_argument -w create
     __schtasks_create_complete_args "$previous_token"
-  else if __fish_seen_argument --windows delete
+  else if __fish_seen_argument -w delete
     __schtasks_delete_complete_args "$previous_token"
-  else if __fish_seen_argument --windows end
+  else if __fish_seen_argument -w end
     __schtasks_end_complete_args "$previous_token"
-  else if __fish_seen_argument --windows query
+  else if __fish_seen_argument -w query
     __schtasks_query_complete_args "$previous_token"
-  else if __fish_seen_argument --windows run
+  else if __fish_seen_argument -w run
     __schtasks_run_complete_args "$previous_token"
   end
 end
 
-complete --command schtasks --no-files --arguments '(__schtasks_complete_args)'
+complete -c schtasks -f -a '(__schtasks_complete_args)'
diff --git a/share/completions/setx.fish b/share/completions/setx.fish
index fbf20a8dc..f30ad6bfd 100644
--- a/share/completions/setx.fish
+++ b/share/completions/setx.fish
@@ -1,34 +1,32 @@
-function __setx_complete_args --description 'Function to generate args'
-  set --local previous_token (commandline --tokenize --cut-at-cursor)[-1]
+function __setx_complete_args -d 'Function to generate args'
+  set -l previous_token (commandline -oc)[-1]
 
   if test "$previous_token" = '/u'
-    __fish_list_windows_users
+    __fish_print_windows_users
     return
   end
-
-  if __fish_seen_argument --windows 's'
-    echo -e '/u\tRun the script with the credentials of the specified user account'
-  end
-
-  if __fish_seen_argument --windows 'u'
-    echo -e '/p\tSpecify the password of the user account that is specified in the /u parameter'
-  end
-
-  if not __fish_seen_argument --windows 'a' --windows 'r' --windows 'x'
-    echo -e '/a\tSpecify absolute coordinates and offset as search parameters
-/r\tSpecify relative coordinates and offset
-/x\tDisplay file coordinates, ignoring the /a, /r, and /d command-line options'
-  end
-
-  if __fish_seen_argument --windows 'a' --windows 'r'
-    echo -e '/m\tSpecify to set the variable in the system environment'
-  end
-
-  echo -e '/s\tSpecify the name or IP address of a remote computer
-/k\tSpecify that the variable is set based on information from a registry key
-/f\tSpecify the file that you want to use
-/d\tSpecify delimiters to be used
-/?\tShow help'
 end
 
-complete --command setx --no-files --arguments '(__setx_complete_args)'
+complete -c setx -f -a '(__setx_complete_args)'
+
+complete -c setx -f -n '__fish_seen_argument -w s' -a /u \
+    -d 'Run the script with the credentials of the specified user account'
+complete -c setx -f -n '__fish_seen_argument -w u' -a /p \
+    -d 'Specify the password of the user account that is specified in the /u parameter'
+
+complete -c setx -f -n 'not __fish_seen_argument -w a -w r -w x' -a /a \
+    -d 'Specify absolute coordinates and offset as search parameters'
+complete -c setx -f -n 'not __fish_seen_argument -w a -w r -w x' -a /r \
+    -d 'Specify relative coordinates and offset'
+complete -c setx -f -n 'not __fish_seen_argument -w a -w r -w x' -a /x \
+    -d 'Display file coordinates, ignoring the /a, /r, and /d command-line options'
+
+complete -c setx -f -n '__fish_seen_argument -w a -w r' -a /m \
+    -d 'Specify to set the variable in the system environment'
+
+complete -c setx -f -a /s -d 'Specify the name or IP address of a remote computer'
+complete -c setx -f -a /k \
+    -d 'Specify that the variable is set based on information from a registry key'
+complete -c setx -f -a /f -d 'Specify the file that you want to use'
+complete -c setx -f -a /d -d 'Specify delimiters to be used'
+complete -c setx -f -a '/?' -d 'Show help'
diff --git a/share/functions/__fish_list_windows_users.fish b/share/functions/__fish_list_windows_users.fish
deleted file mode 100644
index a4d53b8fc..000000000
--- a/share/functions/__fish_list_windows_users.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function __fish_list_windows_users --description 'Lists Windows user names'
-  wmic useraccount get name | tail +2
-end
\ No newline at end of file
diff --git a/share/functions/__fish_list_windows_drives.fish b/share/functions/__fish_print_windows_drives.fish
similarity index 100%
rename from share/functions/__fish_list_windows_drives.fish
rename to share/functions/__fish_print_windows_drives.fish
diff --git a/share/functions/__fish_print_windows_users.fish b/share/functions/__fish_print_windows_users.fish
new file mode 100644
index 000000000..51fa8c365
--- /dev/null
+++ b/share/functions/__fish_print_windows_users.fish
@@ -0,0 +1,3 @@
+function __fish_print_windows_users --description 'Print Windows user names'
+  wmic useraccount get name | tail +2
+end

From cdae6536fd345d57c3306cc587806713a7418e26 Mon Sep 17 00:00:00 2001
From: EmilySeville7cfg <EmilySeville7cf@gmail.com>
Date: Mon, 24 Jan 2022 20:43:28 +1000
Subject: [PATCH 147/262] Standardize complex commands: - attributes - reg -
 schtasks

---
 share/completions/attributes.fish | 11 ++++---
 share/completions/reg.fish        | 49 +++++++++++++++++++++----------
 share/completions/schtasks.fish   | 30 ++++++++++++-------
 3 files changed, 58 insertions(+), 32 deletions(-)

diff --git a/share/completions/attributes.fish b/share/completions/attributes.fish
index 47e1d9cc7..5ebd7a893 100644
--- a/share/completions/attributes.fish
+++ b/share/completions/attributes.fish
@@ -27,12 +27,6 @@ shadowcopy\tSpecify that the volume is a shadow copy volume'
 end
 
 function __attributes_complete_args -d 'Function to generate args'
-  if not __fish_seen_subcommand_from disk volume
-    echo -e 'disk\tDisplay, set, or clear the attributes of a disk
-volume\tDisplay, set, or clear the attributes of a volume'
-    return
-  end
-
   if __fish_seen_subcommand_from disk
     __attributes_disk_complete_args
   else if __fish_seen_subcommand_from volume
@@ -41,3 +35,8 @@ volume\tDisplay, set, or clear the attributes of a volume'
 end
 
 complete -c attributes -f -a '(__attributes_complete_args)'
+
+complete -c attributes -f -n 'not __fish_seen_subcommand_from disk volume' -a disk \
+    -d 'Display, set, or clear the attributes of a disk'
+complete -c attributes -f -n 'not __fish_seen_subcommand_from dick volume' -a volume \
+    -d 'Display, set, or clear the attributes of a volume'
diff --git a/share/completions/reg.fish b/share/completions/reg.fish
index 8d41ee8f8..bef362841 100644
--- a/share/completions/reg.fish
+++ b/share/completions/reg.fish
@@ -99,21 +99,6 @@ function __reg_save_complete_args
 end
 
 function __reg_complete_args -d 'Function to generate args'
-  if not __fish_seen_subcommand_from add compare copy delete export import load query restore save unload
-    echo -e 'add\tAdd a new subkey or entry
-compare\tCompare specified registry subkeys or entries
-copy\tCopy a registry entry
-delete\tDelete a subkey or entries
-export\tCopy the specified subkeys, entries, and values of the local computer into a file
-import\tCopy the contents of a file that contains registry data into the registry of the local computer
-load\tWrite saved subkeys and entries into a different subkey in the registry
-query\tReturn a list of the next tier of subkeys and entries
-restore\tWrite saved subkeys and entries back
-save\tSave a copy of specified subkeys, entries, and values of the registry in a specified file
-unload\tRemove a section of the registry that was loaded using the reg load operation'
-    return
-  end
-
   set -l previous_token (commandline -oc)[-1]
 
   if __fish_seen_subcommand_from add
@@ -134,3 +119,37 @@ unload\tRemove a section of the registry that was loaded using the reg load oper
 end
 
 complete -c reg -f -a '(__reg_complete_args)'
+
+complete -c reg -f \
+    -n 'not __fish_seen_subcommand_from add compare copy delete export import load query restore save unload' -a add \
+    -d 'Add a new subkey or entry'
+complete -c reg -f \
+    -n 'not __fish_seen_subcommand_from add compare copy delete export import load query restore save unload' -a compare \
+    -d 'Compare specified registry subkeys or entries'
+complete -c reg -f \
+    -n 'not __fish_seen_subcommand_from add compare copy delete export import load query restore save unload' -a copy \
+    -d 'Copy a registry entry'
+complete -c reg -f \
+    -n 'not __fish_seen_subcommand_from add compare copy delete export import load query restore save unload' -a delete \
+    -d 'Delete a subkey or entries'
+complete -c reg -f \
+    -n 'not __fish_seen_subcommand_from add compare copy delete export import load query restore save unload' -a export \
+    -d 'Copy the specified subkeys, entries, and values of the local computer into a file'
+complete -c reg -f \
+    -n 'not __fish_seen_subcommand_from add compare copy delete export import load query restore save unload' -a import \
+    -d 'Copy the contents of a file that contains registry data into the registry of the local computer'
+complete -c reg -f \
+    -n 'not __fish_seen_subcommand_from add compare copy delete export import load query restore save unload' -a load \
+    -d 'Write saved subkeys and entries into a different subkey in the registry'
+complete -c reg -f \
+    -n 'not __fish_seen_subcommand_from add compare copy delete export import load query restore save unload' -a query \
+    -d 'Return a list of the next tier of subkeys and entries'
+complete -c reg -f \
+    -n 'not __fish_seen_subcommand_from add compare copy delete export import load query restore save unload' -a restore \
+    -d 'Write saved subkeys and entries back'
+complete -c reg -f \
+    -n 'not __fish_seen_subcommand_from add compare copy delete export import load query restore save unload' -a save \
+    -d 'Save a copy of specified subkeys, entries, and values of the registry in a specified file'
+complete -c reg -f \
+    -n 'not __fish_seen_subcommand_from add compare copy delete export import load query restore save unload' -a unload \
+    -d 'Remove a section of the registry that was loaded using the reg load operation'
diff --git a/share/completions/schtasks.fish b/share/completions/schtasks.fish
index 0546dc518..320714e7e 100644
--- a/share/completions/schtasks.fish
+++ b/share/completions/schtasks.fish
@@ -214,17 +214,6 @@ function __schtasks_run_complete_args -a previous_token
 end
 
 function __schtasks_complete_args -d 'Function to generate args'
-  if not __fish_seen_argument -w change -w create -w delete -w end \
-    -w query -w run
-    echo -e '/change\tChange one or more properties of a task
-/create\tSchedule a new task
-/delete\tDelete a scheduled task
-/end\tStop a program started by a task
-/query\tDisplay tasks scheduled to run on the computer
-/run\tStart a scheduled task immediately'
-    return
-  end
-
   set --local previous_token (commandline -oc)[-1]
 
   if __fish_seen_argument -w change
@@ -243,3 +232,22 @@ function __schtasks_complete_args -d 'Function to generate args'
 end
 
 complete -c schtasks -f -a '(__schtasks_complete_args)'
+
+complete -c schtasks -f -n 'not __fish_seen_argument -w change -w create -w delete -w end \
+    -w query -w run' -a /change \
+    -d 'Change one or more properties of a task'
+complete -c schtasks -f -n 'not __fish_seen_argument -w change -w create -w delete -w end \
+    -w query -w run' -a /create \
+    -d 'Schedule a new task'
+complete -c schtasks -f -n 'not __fish_seen_argument -w change -w create -w delete -w end \
+    -w query -w run' -a /delete \
+    -d 'Delete a scheduled task'
+complete -c schtasks -f -n 'not __fish_seen_argument -w change -w create -w delete -w end \
+    -w query -w run' -a /end \
+    -d 'Stop a program started by a task'
+complete -c schtasks -f -n 'not __fish_seen_argument -w change -w create -w delete -w end \
+    -w query -w run' -a /query \
+    -d 'Display tasks scheduled to run on the computer'
+complete -c schtasks -f -n 'not __fish_seen_argument -w change -w create -w delete -w end \
+    -w query -w run' -a /run \
+    -d 'Start a scheduled task immediately'

From b8fd6b5f311c289c0c735dadfacaec8edb2ccfa9 Mon Sep 17 00:00:00 2001
From: ridiculousfish <rf@fishshell.com>
Date: Wed, 26 Jan 2022 22:02:23 -0800
Subject: [PATCH 148/262] Run fish_indent over new Windows completions

---
 share/completions/attrib.fish                 |  14 +-
 share/completions/attributes.fish             |  36 +--
 share/completions/cleanmgr.fish               |  10 +-
 share/completions/cmdkey.fish                 |  22 +-
 share/completions/powershell.fish             |  34 +--
 share/completions/reg.fish                    |  98 ++++----
 share/completions/schtasks.fish               | 236 +++++++++---------
 share/completions/setx.fish                   |  10 +-
 .../__fish_print_windows_drives.fish          |   2 +-
 .../functions/__fish_print_windows_users.fish |   2 +-
 share/functions/__fish_seen_argument.fish     |   2 +-
 11 files changed, 233 insertions(+), 233 deletions(-)

diff --git a/share/completions/attrib.fish b/share/completions/attrib.fish
index 0ccaca6c6..4f461222c 100644
--- a/share/completions/attrib.fish
+++ b/share/completions/attrib.fish
@@ -1,20 +1,20 @@
 function __attrib_complete_args -d 'Function to generate args'
-  set -l current_token (commandline -tc)
+    set -l current_token (commandline -tc)
 
-  switch $current_token
-    case '+*'
-      echo -e 'r\tSet the Read-only file attribute
+    switch $current_token
+        case '+*'
+            echo -e 'r\tSet the Read-only file attribute
 a\tSet the Archive file attribute
 s\tSet the System file attribute
 h\tSet the Hidden file attribute
 i\tSet the Not Content Indexed file attribute' | awk -F '\t' "{ printf \"$current_token%s\t%s\n\", \$1, \$2 }"
-    case '-*'
-      echo -e 'r\tClear the Read-only file attribute
+        case '-*'
+            echo -e 'r\tClear the Read-only file attribute
 a\tClear the Archive file attribute
 s\tClear the System file attribute
 h\tClear the Hidden file attribute
 i\tClear the Not Content Indexed file attribute' | awk -F '\t' "{ printf \"$current_token%s\t%s\n\", \$1, \$2 }"
-  end
+    end
 end
 
 complete -c attrib -f -a '(__attrib_complete_args)'
diff --git a/share/completions/attributes.fish b/share/completions/attributes.fish
index 5ebd7a893..648182d7c 100644
--- a/share/completions/attributes.fish
+++ b/share/completions/attributes.fish
@@ -1,37 +1,37 @@
 function __attributes_disk_complete_args
-  if not __fish_seen_subcommand_from set clear
-    echo -e 'set\tSet the specified attribute of the disk with focus
+    if not __fish_seen_subcommand_from set clear
+        echo -e 'set\tSet the specified attribute of the disk with focus
 clear\tClear the specified attribute of the disk with focus'
-    return
-  end
+        return
+    end
 
-  echo -e 'readonly\tSpecify that the disk is read-only
+    echo -e 'readonly\tSpecify that the disk is read-only
 noerr\tWhen an error is encountered, DiskPart continues to process commands'
 end
 
 function __attributes_volume_complete_args
-  if not __fish_seen_subcommand_from set clear
-    echo -e 'set\tSet the specified attribute of the volume with focus
+    if not __fish_seen_subcommand_from set clear
+        echo -e 'set\tSet the specified attribute of the volume with focus
 clear\tClear the specified attribute of the volume with focus'
-    return
-  end
+        return
+    end
 
-  if not __fish_seen_subcommand_from readonly hidden nodefaultdriveletter shadowcopy
-    echo -e 'readonly\tSpecify that the volume is read-only
+    if not __fish_seen_subcommand_from readonly hidden nodefaultdriveletter shadowcopy
+        echo -e 'readonly\tSpecify that the volume is read-only
 hidden\tSpecify that the volume is hidden
 nodefaultdriveletter\tSpecify that the volume does not receive a drive letter by default
 shadowcopy\tSpecify that the volume is a shadow copy volume'
-  end
+    end
 
-  echo -e 'noerr\tWhen an error is encountered, DiskPart continues to process commands'
+    echo -e 'noerr\tWhen an error is encountered, DiskPart continues to process commands'
 end
 
 function __attributes_complete_args -d 'Function to generate args'
-  if __fish_seen_subcommand_from disk
-    __attributes_disk_complete_args
-  else if __fish_seen_subcommand_from volume
-    __attributes_volume_complete_args
-  end
+    if __fish_seen_subcommand_from disk
+        __attributes_disk_complete_args
+    else if __fish_seen_subcommand_from volume
+        __attributes_volume_complete_args
+    end
 end
 
 complete -c attributes -f -a '(__attributes_complete_args)'
diff --git a/share/completions/cleanmgr.fish b/share/completions/cleanmgr.fish
index 046fa447f..4ebb4545a 100644
--- a/share/completions/cleanmgr.fish
+++ b/share/completions/cleanmgr.fish
@@ -1,10 +1,10 @@
 function __cleanmgr_complete_args -d 'Function to generate args'
-  set -l previous_token (commandline -oc)[-1]
+    set -l previous_token (commandline -oc)[-1]
 
-  if test "$previous_token" = '/d'
-    __fish_print_windows_drives
-    return
-  end
+    if test "$previous_token" = /d
+        __fish_print_windows_drives
+        return
+    end
 end
 
 complete -c cleanmgr -f -a '(__cleanmgr_complete_args)'
diff --git a/share/completions/cmdkey.fish b/share/completions/cmdkey.fish
index 8a76ec817..e9abe1a6c 100644
--- a/share/completions/cmdkey.fish
+++ b/share/completions/cmdkey.fish
@@ -1,16 +1,16 @@
 function __cmdkey_complete_args -d 'Function to generate args'
-  set -l current_token (commandline -tc)
-  set -l previous_token (commandline -oc)[-1]
+    set -l current_token (commandline -tc)
+    set -l previous_token (commandline -oc)[-1]
 
-  switch $current_token
-    case '/user:*'
-      __fish_print_windows_users | awk "{ printf \"%s%s\n\", \"$current_token\", \$0 }"
-    case '*'
-      if test "$previous_token" = '/delete'
-        echo -e '/ras\tDelete remote access entry'
-        return
-      end
-  end
+    switch $current_token
+        case '/user:*'
+            __fish_print_windows_users | awk "{ printf \"%s%s\n\", \"$current_token\", \$0 }"
+        case '*'
+            if test "$previous_token" = /delete
+                echo -e '/ras\tDelete remote access entry'
+                return
+            end
+    end
 end
 
 complete -c cmdkey -f -a '(__cmdkey_complete_args)'
diff --git a/share/completions/powershell.fish b/share/completions/powershell.fish
index 3c4ca5bf5..8fc3f5786 100644
--- a/share/completions/powershell.fish
+++ b/share/completions/powershell.fish
@@ -1,32 +1,32 @@
 complete --command powershell --short-option '?' --old-option Help --description 'Show help'
 
 complete --command powershell --old-option PSConsoleFile --require-parameter \
-  --description 'Load the specified PowerShell console file'
+    --description 'Load the specified PowerShell console file'
 complete --command powershell --old-option Version --require-parameter --arguments '2.0 3.0' \
-  --description 'Start the specified version of PowerShell'
+    --description 'Start the specified version of PowerShell'
 complete --command powershell --old-option NoLogo --description 'Hides the copyright banner at startup'
 complete --command powershell --old-option NoExit \
-  --description 'Do not exit after running startup commands'
+    --description 'Do not exit after running startup commands'
 complete --command powershell --old-option Sta \
-  --description 'Start PowerShell using a single-threaded apartment'
+    --description 'Start PowerShell using a single-threaded apartment'
 complete --command powershell --old-option Mta \
-  --description 'Start PowerShell using a multi-threaded apartment'
+    --description 'Start PowerShell using a multi-threaded apartment'
 complete --command powershell --old-option NoProfile --description 'Does not load the PowerShell profile'
 complete --command powershell --old-option NonInteractive \
-  --description 'Do not present an interactive prompt to the user'
+    --description 'Do not present an interactive prompt to the user'
 complete --command powershell --old-option InputFormat --no-files --require-parameter \
-  --arguments 'Text XML'  --description 'Describe the format of data sent to PowerShell'
+    --arguments 'Text XML' --description 'Describe the format of data sent to PowerShell'
 complete --command powershell --old-option OutputFormat --no-files --require-parameter \
-  --arguments 'Text XML'  --description 'Determine how output is formatted'
+    --arguments 'Text XML' --description 'Determine how output is formatted'
 complete --command powershell --old-option WindowStyle --no-files --require-parameter \
-  --arguments 'Normal Minimized Maximized Hidden' --description 'Set the window style for the session'
+    --arguments 'Normal Minimized Maximized Hidden' --description 'Set the window style for the session'
 complete --command powershell --old-option EncodedCommand --require-parameter \
-  --description 'Accept a base-64-encoded string version of a command'
-complete --command powershell --old-option ConfigurationName  --no-files --require-parameter \
-  --description 'Specify a configuration endpoint in which PowerShell is run'
+    --description 'Accept a base-64-encoded string version of a command'
+complete --command powershell --old-option ConfigurationName --no-files --require-parameter \
+    --description 'Specify a configuration endpoint in which PowerShell is run'
 complete --command powershell --old-option File --require-parameter
-complete --command powershell --old-option ExecutionPolicy  --no-files --require-parameter \
-  --arguments 'AllSigned Bypass Default RemoteSigned Restricted Undefined Unrestricted' \
-  --description 'Sets the default execution policy for the current session'
-complete --command powershell --old-option Command  --no-files --require-parameter \
-  --description 'Execute the specified commands at the PowerShell command prompt'
+complete --command powershell --old-option ExecutionPolicy --no-files --require-parameter \
+    --arguments 'AllSigned Bypass Default RemoteSigned Restricted Undefined Unrestricted' \
+    --description 'Sets the default execution policy for the current session'
+complete --command powershell --old-option Command --no-files --require-parameter \
+    --description 'Execute the specified commands at the PowerShell command prompt'
diff --git a/share/completions/reg.fish b/share/completions/reg.fish
index bef362841..fccfe565e 100644
--- a/share/completions/reg.fish
+++ b/share/completions/reg.fish
@@ -1,6 +1,6 @@
 function __reg_add_complete_args -a previous_token
-  if test "$previous_token" = '/t'
-    echo 'REG_SZ
+    if test "$previous_token" = /t
+        echo 'REG_SZ
 REG_MULTI_SZ
 REG_DWORD_BIG_ENDIAN
 REG_DWORD
@@ -9,15 +9,15 @@ REG_DWORD_LITTLE_ENDIAN
 REG_LINK
 REG_FULL_RESOURCE_DESCRIPTOR
 REG_EXPAND_SZ'
-    return
-  end
+        return
+    end
 
-  if not __fish_seen_argument -w 'v' -w 've'
-    echo -e '/v\tSpecify the name of the add registry entry
+    if not __fish_seen_argument -w v -w ve
+        echo -e '/v\tSpecify the name of the add registry entry
 /ve\tSpecify that the added registry entry has a null value'
-  end
+    end
 
-  echo -e '/t\tSpecify the type for the registry entry
+    echo -e '/t\tSpecify the type for the registry entry
 /s\tSpecify the character to be used
 /d\tSpecify the data for the new registry entry
 /f\tAdd the registry entry without prompting for confirmation
@@ -25,66 +25,66 @@ REG_EXPAND_SZ'
 end
 
 function __reg_compare_complete_args
-  if not __fish_seen_argument -w 'v' -w 've'
-    echo -e '/v\tSpecify the value name
+    if not __fish_seen_argument -w v -w ve
+        echo -e '/v\tSpecify the value name
 /ve\tSpecify that only entries that have a value name of null should be compared'
-  end
+    end
 
-  if not __fish_seen_argument -w 'oa' -w 'od' -w 'os' -w 'on'
-    echo -e '/oa\tSpecify that all differences and matches are displayed
+    if not __fish_seen_argument -w oa -w od -w os -w on
+        echo -e '/oa\tSpecify that all differences and matches are displayed
 /od\tSpecify that only differences are displayed
 /os\tSpecify that only matches are displayed
 /on\tSpecify that nothing is displayed'
-  end
+    end
 
-  echo -e '/s\tCompare all subkeys and entries recursively
+    echo -e '/s\tCompare all subkeys and entries recursively
 /?\tShow help'
 end
 
 function __reg_copy_complete_args
-  echo -e '/s\tCopy all subkeys and entries under the specified subkey
+    echo -e '/s\tCopy all subkeys and entries under the specified subkey
 /f\tCopy the subkey without prompting for confirmation
 /?\tShow help'
 end
 
 function __reg_delete_complete_args
-  if not __fish_seen_argument -w 'v' -w 've' -w 'va'
-    echo -e '/v\tDelete a specific entry under the subkey
+    if not __fish_seen_argument -w v -w ve -w va
+        echo -e '/v\tDelete a specific entry under the subkey
 /ve\tSpecify that only entries that have no value will be deleted
 /va\tDelete all entries under the specified subkey'
-  end
+    end
 
-  echo -e '/f\tDelete the existing registry subkey or entry without asking for confirmation
+    echo -e '/f\tDelete the existing registry subkey or entry without asking for confirmation
 /?\tShow help'
 end
 
 function __reg_export_complete_args
-  echo -e '/y\tOverwrite any existing file with the name filename without prompting for confirmation
+    echo -e '/y\tOverwrite any existing file with the name filename without prompting for confirmation
 /?\tShow help'
 end
 
 function __reg_query_complete_args -a previous_token
-  if test "$previous_token" = '/t'
-    echo 'REG_SZ
+    if test "$previous_token" = /t
+        echo 'REG_SZ
 REG_MULTI_SZ
 REG_EXPAND_SZ
 REG_DWORD
 REG_BINARY
 REG_NONE'
-    return
-  end
+        return
+    end
 
-  if not __fish_seen_argument -w 'v' -w 've'
-    echo -e '/v\tSpecify the registry value name
+    if not __fish_seen_argument -w v -w ve
+        echo -e '/v\tSpecify the registry value name
 /ve\tRun a query for value names that are empty'
-  end
+    end
 
-  if not __fish_seen_argument -w 'k' -w 'd'
-    echo -e '/k\tSpecify to search in key names only
+    if not __fish_seen_argument -w k -w d
+        echo -e '/k\tSpecify to search in key names only
 /d\tSpecify to search in data only'
-  end
+    end
 
-  echo -e '/se\tSpecify the single value separator
+    echo -e '/se\tSpecify the single value separator
 /f\tSpecify the data or pattern to search for
 /c\tSpecify that the query is case sensitive
 /e\tSpecify to return only exact matches
@@ -94,28 +94,28 @@ REG_NONE'
 end
 
 function __reg_save_complete_args
-  echo -e '/y\tOverwrite an existing file with the name filename without prompting for confirmation
+    echo -e '/y\tOverwrite an existing file with the name filename without prompting for confirmation
 /?\tShow help'
 end
 
 function __reg_complete_args -d 'Function to generate args'
-  set -l previous_token (commandline -oc)[-1]
+    set -l previous_token (commandline -oc)[-1]
 
-  if __fish_seen_subcommand_from add
-    __reg_add_complete_args $previous_token
-  else if __fish_seen_subcommand_from compare
-    __reg_compare_complete_args
-  else if __fish_seen_subcommand_from copy
-    __reg_copy_complete_args
-  else if __fish_seen_subcommand_from delete
-    __reg_delete_complete_args
-  else if __fish_seen_subcommand_from export
-    __reg_export_complete_args
-  else if __fish_seen_subcommand_from query
-    __reg_query_complete_args $previous_token
-  else if __fish_seen_subcommand_from save
-    __reg_save_complete_args
-  end
+    if __fish_seen_subcommand_from add
+        __reg_add_complete_args $previous_token
+    else if __fish_seen_subcommand_from compare
+        __reg_compare_complete_args
+    else if __fish_seen_subcommand_from copy
+        __reg_copy_complete_args
+    else if __fish_seen_subcommand_from delete
+        __reg_delete_complete_args
+    else if __fish_seen_subcommand_from export
+        __reg_export_complete_args
+    else if __fish_seen_subcommand_from query
+        __reg_query_complete_args $previous_token
+    else if __fish_seen_subcommand_from save
+        __reg_save_complete_args
+    end
 end
 
 complete -c reg -f -a '(__reg_complete_args)'
diff --git a/share/completions/schtasks.fish b/share/completions/schtasks.fish
index 320714e7e..44553ec66 100644
--- a/share/completions/schtasks.fish
+++ b/share/completions/schtasks.fish
@@ -1,37 +1,37 @@
 function __schtasks_print_tasks -d 'Helper function to print tasks'
-  schtasks /query /fo csv /nh | awk -F ',' '{ print $1 }'
+    schtasks /query /fo csv /nh | awk -F ',' '{ print $1 }'
 end
 
 function __schtasks_change_complete_args -a previous_token
-  if test "$previous_token" = '/tn'
-    __schtasks_print_tasks
-    return
-  end
+    if test "$previous_token" = /tn
+        __schtasks_print_tasks
+        return
+    end
 
-  if string match -r -q -- "$previous_token" '^/r?u$'
-    __fish_print_windows_users
-    return
-  end
+    if string match -r -q -- "$previous_token" '^/r?u$'
+        __fish_print_windows_users
+        return
+    end
 
-  if __fish_seen_argument -w 's'
-    echo -e '/u\tRun this command with the permissions of the specified user account'
-  end
+    if __fish_seen_argument -w s
+        echo -e '/u\tRun this command with the permissions of the specified user account'
+    end
 
-  if __fish_seen_argument -w 'u'
-    echo -e '/p\tSpecify the password of the user account specified in the /u parameter'
-  end
+    if __fish_seen_argument -w u
+        echo -e '/p\tSpecify the password of the user account specified in the /u parameter'
+    end
 
-  if not __fish_seen_argument -w 'et' -w 'du'
-    echo -e '/et\tSpecify the end time for the task
+    if not __fish_seen_argument -w et -w du
+        echo -e '/et\tSpecify the end time for the task
 /du\tA value that specifies the duration'
-  end
+    end
 
-  if not __fish_seen_argument -w 'ENABLE' -w 'DISABLE'
-    echo -e '/ENABLE\tSpecify to enable the scheduled task
+    if not __fish_seen_argument -w ENABLE -w DISABLE
+        echo -e '/ENABLE\tSpecify to enable the scheduled task
 /DISABLE\tSpecify to disable the scheduled task'
-  end
+    end
 
-  echo -e '/tn\tIdentify the task to be changed
+    echo -e '/tn\tIdentify the task to be changed
 /s\tSpecify the name or IP address of a remote computer
 /ru\tChange the user name under which the scheduled task has to run
 /rp\tSpecify a new password for the existing user account, or the user account specified by /ru
@@ -47,8 +47,8 @@ function __schtasks_change_complete_args -a previous_token
 end
 
 function __schtasks_create_complete_args -a previous_token
-  if test "$previous_token" = '/sc'
-    echo -e 'MINUTE\tSpecify the number of minutes before the task should run
+    if test "$previous_token" = /sc
+        echo -e 'MINUTE\tSpecify the number of minutes before the task should run
 HOURLY\tSpecify the number of hours before the task should run
 DAILY\tSpecify the number of days before the task should run
 WEEKLY\tSpecify the number of weeks before the task should run
@@ -57,16 +57,16 @@ ONCE\tSpecify that that task runs once at a specified date and time
 ONSTART\tSpecify that the task runs every time the system starts
 ONLOGON\tSpecify that the task runs whenever a user logs on
 ONIDLE\tSpecify that the task runs whenever the system is idle for a specified period of time'
-    return
-  end
+        return
+    end
 
-  if string match -r -q -- "$previous_token" '^/r?u$'
-    __fish_print_windows_users
-    return
-  end
+    if string match -r -q -- "$previous_token" '^/r?u$'
+        __fish_print_windows_users
+        return
+    end
 
-  if test "$previous_token" = '/mo'
-    echo -e 'MINUTE\tSpecify that the task runs every n minutes
+    if test "$previous_token" = /mo
+        echo -e 'MINUTE\tSpecify that the task runs every n minutes
 HOURLY\tSpecify that the task runs every n hours
 DAILY\tSpecify that the task runs every n days
 WEEKLY\tSpecify that the task runs every n weeks
@@ -75,23 +75,23 @@ ONCE\tSpecify that the task runs once
 ONSTART\tSpecify that the task runs at startup
 ONLOGON\tSpecify that the task runs when the user specified by the /u parameter logs on
 ONIDLE\tSpecify that the task runs after the system is idle for the number of minutes specified by /i'
-    return
-  end
+        return
+    end
 
-  if __fish_seen_argument -w 's'
-    echo -e '/u\tRun this command with the permissions of the specified user account'
-  end
+    if __fish_seen_argument -w s
+        echo -e '/u\tRun this command with the permissions of the specified user account'
+    end
 
-  if __fish_seen_argument -w 'u'
-    echo -e '/p\tSpecify the password of the user account specified in the /u parameter'
-  end
+    if __fish_seen_argument -w u
+        echo -e '/p\tSpecify the password of the user account specified in the /u parameter'
+    end
 
-  if not __fish_seen_argument -w 'et' -w 'du'
-    echo -e '/et\tSpecify the time of day that a minute or hourly task schedule ends
+    if not __fish_seen_argument -w et -w du
+        echo -e '/et\tSpecify the time of day that a minute or hourly task schedule ends
 /du\tSpecify a maximum length of time for a minute or hourly schedule'
-  end
+    end
 
-  echo -e '/sc\tSpecify the schedule type
+    echo -e '/sc\tSpecify the schedule type
 /tn\tSpecify a name for the task
 /tr\tSpecify the program or command that the task runs
 /s\tSpecify the name or IP address of a remote computer
@@ -113,76 +113,76 @@ ONIDLE\tSpecify that the task runs after the system is idle for the number of mi
 end
 
 function __schtasks_delete_complete_args -a previous_token
-  if test "$previous_token" = '/tn'
-    __schtasks_print_tasks
-    return
-  end
+    if test "$previous_token" = /tn
+        __schtasks_print_tasks
+        return
+    end
 
-  if test "$previous_token" = '/u'
-    __fish_print_windows_users
-    return
-  end
+    if test "$previous_token" = /u
+        __fish_print_windows_users
+        return
+    end
 
-  if __fish_seen_argument -w 's'
-    echo -e '/u\tRun this command with the permissions of the specified user account'
-  end
+    if __fish_seen_argument -w s
+        echo -e '/u\tRun this command with the permissions of the specified user account'
+    end
 
-  if __fish_seen_argument -w 'u'
-    echo -e '/p\tSpecify the password of the user account specified in the /u parameter'
-  end
+    if __fish_seen_argument -w u
+        echo -e '/p\tSpecify the password of the user account specified in the /u parameter'
+    end
 
-  echo -e '/tn\tIdentify the task to be deleted
+    echo -e '/tn\tIdentify the task to be deleted
 /f\tSuppress the confirmation message
 /s\tSpecify the name or IP address of a remote computer
 /?\tShow help'
 end
 
 function __schtasks_end_complete_args -a previous_token
-  if test "$previous_token" = '/tn'
-    __schtasks_print_tasks
-    return
-  end
+    if test "$previous_token" = /tn
+        __schtasks_print_tasks
+        return
+    end
 
-  if test "$previous_token" = '/u'
-    __fish_print_windows_users
-    return
-  end
+    if test "$previous_token" = /u
+        __fish_print_windows_users
+        return
+    end
 
-  if __fish_seen_argument -w 's'
-    echo -e '/u\tRun this command with the permissions of the specified user account'
-  end
+    if __fish_seen_argument -w s
+        echo -e '/u\tRun this command with the permissions of the specified user account'
+    end
 
-  if __fish_seen_argument -w 'u'
-    echo -e '/p\tSpecify the password of the user account specified in the /u parameter'
-  end
+    if __fish_seen_argument -w u
+        echo -e '/p\tSpecify the password of the user account specified in the /u parameter'
+    end
 
-  echo -e '/tn\tIdentify the task that started the program
+    echo -e '/tn\tIdentify the task that started the program
 /s\tSpecify the name or IP address of a remote computer
 /?\tShow help'
 end
 
 function __schtasks_query_complete_args -a previous_token
-  if test "$previous_token" = '/fo'
-    echo -e 'TABLE
+    if test "$previous_token" = /fo
+        echo -e 'TABLE
 LIST
 CSV'
-    return
-  end
+        return
+    end
 
-  if test "$previous_token" = '/u'
-    __fish_print_windows_users
-    return
-  end
+    if test "$previous_token" = /u
+        __fish_print_windows_users
+        return
+    end
 
-  if __fish_seen_argument -w 's'
-    echo -e '/u\tRun this command with the permissions of the specified user account'
-  end
+    if __fish_seen_argument -w s
+        echo -e '/u\tRun this command with the permissions of the specified user account'
+    end
 
-  if __fish_seen_argument -w 'u'
-    echo -e '/p\tSpecify the password of the user account specified in the /u parameter'
-  end
+    if __fish_seen_argument -w u
+        echo -e '/p\tSpecify the password of the user account specified in the /u parameter'
+    end
 
-  echo -e '/fo\tSpecify the output format
+    echo -e '/fo\tSpecify the output format
 /nh\tRemove column headings
 /v\tAdd the advanced properties of the task
 /s\tSpecify the name or IP address of a remote computer
@@ -190,45 +190,45 @@ CSV'
 end
 
 function __schtasks_run_complete_args -a previous_token
-  if test "$previous_token" = '/tn'
-    __schtasks_print_tasks
-    return
-  end
+    if test "$previous_token" = /tn
+        __schtasks_print_tasks
+        return
+    end
 
-  if test "$previous_token" = '/u'
-    __fish_print_windows_users
-    return
-  end
+    if test "$previous_token" = /u
+        __fish_print_windows_users
+        return
+    end
 
-  if __fish_seen_argument -w 's'
-    echo -e '/u\tRun this command with the permissions of the specified user account'
-  end
+    if __fish_seen_argument -w s
+        echo -e '/u\tRun this command with the permissions of the specified user account'
+    end
 
-  if __fish_seen_argument -w 'u'
-    echo -e '/p\tSpecify the password of the user account specified in the /u parameter'
-  end
+    if __fish_seen_argument -w u
+        echo -e '/p\tSpecify the password of the user account specified in the /u parameter'
+    end
 
-  echo -e '/tn\tIdentify the task to start
+    echo -e '/tn\tIdentify the task to start
 /s\tSpecify the name or IP address of a remote computer
 /?\tShow help'
 end
 
 function __schtasks_complete_args -d 'Function to generate args'
-  set --local previous_token (commandline -oc)[-1]
+    set --local previous_token (commandline -oc)[-1]
 
-  if __fish_seen_argument -w change
-    __schtasks_change_complete_args "$previous_token"
-  else if __fish_seen_argument -w create
-    __schtasks_create_complete_args "$previous_token"
-  else if __fish_seen_argument -w delete
-    __schtasks_delete_complete_args "$previous_token"
-  else if __fish_seen_argument -w end
-    __schtasks_end_complete_args "$previous_token"
-  else if __fish_seen_argument -w query
-    __schtasks_query_complete_args "$previous_token"
-  else if __fish_seen_argument -w run
-    __schtasks_run_complete_args "$previous_token"
-  end
+    if __fish_seen_argument -w change
+        __schtasks_change_complete_args "$previous_token"
+    else if __fish_seen_argument -w create
+        __schtasks_create_complete_args "$previous_token"
+    else if __fish_seen_argument -w delete
+        __schtasks_delete_complete_args "$previous_token"
+    else if __fish_seen_argument -w end
+        __schtasks_end_complete_args "$previous_token"
+    else if __fish_seen_argument -w query
+        __schtasks_query_complete_args "$previous_token"
+    else if __fish_seen_argument -w run
+        __schtasks_run_complete_args "$previous_token"
+    end
 end
 
 complete -c schtasks -f -a '(__schtasks_complete_args)'
diff --git a/share/completions/setx.fish b/share/completions/setx.fish
index f30ad6bfd..8dd3e4996 100644
--- a/share/completions/setx.fish
+++ b/share/completions/setx.fish
@@ -1,10 +1,10 @@
 function __setx_complete_args -d 'Function to generate args'
-  set -l previous_token (commandline -oc)[-1]
+    set -l previous_token (commandline -oc)[-1]
 
-  if test "$previous_token" = '/u'
-    __fish_print_windows_users
-    return
-  end
+    if test "$previous_token" = /u
+        __fish_print_windows_users
+        return
+    end
 end
 
 complete -c setx -f -a '(__setx_complete_args)'
diff --git a/share/functions/__fish_print_windows_drives.fish b/share/functions/__fish_print_windows_drives.fish
index a5743af15..0d92b4560 100644
--- a/share/functions/__fish_print_windows_drives.fish
+++ b/share/functions/__fish_print_windows_drives.fish
@@ -1,3 +1,3 @@
 function __fish_print_windows_drives --description 'Print Windows drives'
-  wmic logicaldisk get name | tail +2
+    wmic logicaldisk get name | tail +2
 end
diff --git a/share/functions/__fish_print_windows_users.fish b/share/functions/__fish_print_windows_users.fish
index 51fa8c365..8f91769b4 100644
--- a/share/functions/__fish_print_windows_users.fish
+++ b/share/functions/__fish_print_windows_users.fish
@@ -1,3 +1,3 @@
 function __fish_print_windows_users --description 'Print Windows user names'
-  wmic useraccount get name | tail +2
+    wmic useraccount get name | tail +2
 end
diff --git a/share/functions/__fish_seen_argument.fish b/share/functions/__fish_seen_argument.fish
index 2ec21a802..146e9ce8e 100644
--- a/share/functions/__fish_seen_argument.fish
+++ b/share/functions/__fish_seen_argument.fish
@@ -3,7 +3,7 @@ function __fish_seen_argument --description 'Check whether argument is used'
 
     set --local tokens (commandline --current-process --tokenize --cut-at-cursor)
     set --erase tokens[1]
-    
+
     for t in $tokens
         for s in $_flag_s
             if string match --regex --quiet -- "^-[A-z0-9]*"$s"[A-z0-9]*\$" $t

From 30216b2d620ec4e354149ab45b3d4d3bacba309f Mon Sep 17 00:00:00 2001
From: ridiculousfish <rf@fishshell.com>
Date: Wed, 26 Jan 2022 22:05:50 -0800
Subject: [PATCH 149/262] CHANGELOG: new Windows command completions

This relnotes completions from #8486
---
 CHANGELOG.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 97fbb26da..7260155ac 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -169,7 +169,7 @@ Completions
   - ``topgrade`` (:issue:`8651`)
   -  ``wine``, ``wineboot`` and ``winemaker`` (:issue:`8411`)
   -  Windows Subsystem for Linux (WSL)'s ``wslpath`` (:issue:`8364`)
-  -  Windows' ``color`` (:issue:`8483`)
+  -  Windows' ``color`` (:issue:`8483`), ``attrib``, ``attributes``, ``choice``, ``clean``, ``cleanmgr``, ``cmd``, ``cmdkey``, ``comp``, ``forfiles``, ``powershell``, ``reg``, ``schtasks``, ``setx`` (:issue:`8486`)
   - ``zef`` (:issue:`8114`)
 
 - Improvements to many completions, especially for ``git`` aliases (:issue:`8129`) and subcommands (:issue:`8134`).

From 2369eb61e2e5958275d4e7d91b6d961678bc7642 Mon Sep 17 00:00:00 2001
From: ridiculousfish <rf@fishshell.com>
Date: Wed, 26 Jan 2022 22:29:06 -0800
Subject: [PATCH 150/262] Try to fix the launchpad build

A recent change used a C++14 overload of std::string::assign which
defaulted the last parameter. Explicitly pass npos to make it C++11
friendly again.
---
 src/complete.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index 043cc7fa9..5ee3ce877 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1608,7 +1608,7 @@ void completer_t::perform_for_commandline(wcstring cmdline) {
     if (tokens.size() == actual_token_count) {
         effective_cmdline = &cmdline;
     } else {
-        effective_cmdline_buf.assign(cmdline, tokens.front().offset);
+        effective_cmdline_buf.assign(cmdline, tokens.front().offset, wcstring::npos);
         effective_cmdline = &effective_cmdline_buf;
     }
 

From 34753cf0f6db60ea688fee8239e3bc6bf84e1f5f Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Thu, 27 Jan 2022 15:53:56 -0800
Subject: [PATCH 151/262] up-or-search: shorten description

---
 share/functions/up-or-search.fish | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/share/functions/up-or-search.fish b/share/functions/up-or-search.fish
index 3d7ae1417..22583b0f4 100644
--- a/share/functions/up-or-search.fish
+++ b/share/functions/up-or-search.fish
@@ -1,4 +1,5 @@
-function up-or-search -d "Depending on cursor position and current mode, either search backward or move up one line"
+# Depending on cursor position and current mode, either search backward or move up one line"
+function up-or-search -d "Search backward or move cursor up 1 line"
     # If we are already in search mode, continue
     if commandline --search-mode
         commandline -f history-search-backward

From c6166f8cedf768e5ca2373ed13ab64c6681a34b2 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Thu, 27 Jan 2022 16:21:22 -0800
Subject: [PATCH 152/262] Shorten more.

More vain attempts to get a bare <TAB> showing as 2 columns in the
pager. This now happens in a 101 column terminal.
---
 share/config.fish                              |  2 +-
 share/functions/down-or-search.fish            |  2 +-
 share/functions/fish_default_key_bindings.fish |  2 +-
 share/functions/fish_default_mode_prompt.fish  |  2 +-
 share/functions/fish_status_to_signal.fish     |  2 +-
 share/functions/fish_vcs_prompt.fish           |  2 +-
 share/functions/up-or-search.fish              |  2 +-
 src/builtin.cpp                                | 10 +++++-----
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/share/config.fish b/share/config.fish
index 6caec2003..622988f74 100644
--- a/share/config.fish
+++ b/share/config.fish
@@ -140,7 +140,7 @@ end
 #
 # Launch debugger on SIGTRAP
 #
-function fish_sigtrap_handler --on-signal TRAP --no-scope-shadowing --description "TRAP signal handler: debug prompt"
+function fish_sigtrap_handler --on-signal TRAP --no-scope-shadowing --description "TRAP handler: debug prompt"
     breakpoint
 end
 
diff --git a/share/functions/down-or-search.fish b/share/functions/down-or-search.fish
index 95cebf17f..bc4553141 100644
--- a/share/functions/down-or-search.fish
+++ b/share/functions/down-or-search.fish
@@ -1,4 +1,4 @@
-function down-or-search -d "search forward or move down one line"
+function down-or-search -d "search forward or move down 1 line"
     # If we are already in search mode, continue
     if commandline --search-mode
         commandline -f history-search-forward
diff --git a/share/functions/fish_default_key_bindings.fish b/share/functions/fish_default_key_bindings.fish
index bca00fc7c..44311ad87 100644
--- a/share/functions/fish_default_key_bindings.fish
+++ b/share/functions/fish_default_key_bindings.fish
@@ -1,4 +1,4 @@
-function fish_default_key_bindings -d "Default (emacs-like) key bindings"
+function fish_default_key_bindings -d "emacs-like key binds"
     if contains -- -h $argv
         or contains -- --help $argv
         echo "Sorry but this function doesn't support -h or --help"
diff --git a/share/functions/fish_default_mode_prompt.fish b/share/functions/fish_default_mode_prompt.fish
index 21e4af86f..f8ae0ccaa 100644
--- a/share/functions/fish_default_mode_prompt.fish
+++ b/share/functions/fish_default_mode_prompt.fish
@@ -1,4 +1,4 @@
-function fish_default_mode_prompt --description "Display default prompt mode"
+function fish_default_mode_prompt --description "Display vi prompt mode"
     # Do nothing if not in vi mode
     if test "$fish_key_bindings" = fish_vi_key_bindings
         or test "$fish_key_bindings" = fish_hybrid_key_bindings
diff --git a/share/functions/fish_status_to_signal.fish b/share/functions/fish_status_to_signal.fish
index 609ac3ff4..057345aac 100644
--- a/share/functions/fish_status_to_signal.fish
+++ b/share/functions/fish_status_to_signal.fish
@@ -1,4 +1,4 @@
-function fish_status_to_signal --description "Print signal name from argument (\$status), or just argument"
+function fish_status_to_signal --description "Convert exit code to signal name"
     __fish_make_completion_signals # Make sure signals are cached
     for arg in $argv
         if test $arg -gt 128
diff --git a/share/functions/fish_vcs_prompt.fish b/share/functions/fish_vcs_prompt.fish
index ed2d90725..4b1723d36 100644
--- a/share/functions/fish_vcs_prompt.fish
+++ b/share/functions/fish_vcs_prompt.fish
@@ -1,4 +1,4 @@
-function fish_vcs_prompt --description "Print the prompts for all available vcsen"
+function fish_vcs_prompt --description "Print all vcs prompts"
     # If a prompt succeeded, we assume that it's printed the correct info.
     # This is so we don't try svn if git already worked.
     fish_git_prompt $argv
diff --git a/share/functions/up-or-search.fish b/share/functions/up-or-search.fish
index 22583b0f4..1a1bfdab0 100644
--- a/share/functions/up-or-search.fish
+++ b/share/functions/up-or-search.fish
@@ -1,5 +1,5 @@
 # Depending on cursor position and current mode, either search backward or move up one line"
-function up-or-search -d "Search backward or move cursor up 1 line"
+function up-or-search -d "Search back or move cursor up 1 line"
     # If we are already in search mode, continue
     if commandline --search-mode
         commandline -f history-search-backward
diff --git a/src/builtin.cpp b/src/builtin.cpp
index 070df517c..683f49079 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -358,7 +358,7 @@ static constexpr builtin_data_t builtin_datas[] = {
     {L":", &builtin_true, N_(L"Return a successful result")},
     {L"[", &builtin_test, N_(L"Test a condition")},
     {L"_", &builtin_gettext, N_(L"Translate a string")},
-    {L"and", &builtin_generic, N_(L"Execute command if previous command succeeded")},
+    {L"and", &builtin_generic, N_(L"Run command if last command succeeded")},
     {L"argparse", &builtin_argparse, N_(L"Parse options in fish script")},
     {L"begin", &builtin_generic, N_(L"Create a block of code")},
     {L"bg", &builtin_bg, N_(L"Send job to background")},
@@ -366,10 +366,10 @@ static constexpr builtin_data_t builtin_datas[] = {
     {L"block", &builtin_block, N_(L"Temporarily block delivery of events")},
     {L"break", &builtin_break_continue, N_(L"Stop the innermost loop")},
     {L"breakpoint", &builtin_breakpoint, N_(L"Halt execution and start debug prompt")},
-    {L"builtin", &builtin_builtin, N_(L"Run a builtin command instead of a function")},
-    {L"case", &builtin_generic, N_(L"Conditionally execute a block of commands")},
+    {L"builtin", &builtin_builtin, N_(L"Run a builtin specifically")},
+    {L"case", &builtin_generic, N_(L"Block of code to run conditionally")},
     {L"cd", &builtin_cd, N_(L"Change working directory")},
-    {L"command", &builtin_command, N_(L"Run program instead of a function or builtin")},
+    {L"command", &builtin_command, N_(L"Run a command specifically")},
     {L"commandline", &builtin_commandline, N_(L"Set or get the commandline")},
     {L"complete", &builtin_complete, N_(L"Edit command specific completions")},
     {L"contains", &builtin_contains, N_(L"Search for a specified string in a list")},
@@ -405,7 +405,7 @@ static constexpr builtin_data_t builtin_datas[] = {
     {L"source", &builtin_source, N_(L"Evaluate contents of file")},
     {L"status", &builtin_status, N_(L"Return status information about fish")},
     {L"string", &builtin_string, N_(L"Manipulate strings")},
-    {L"switch", &builtin_generic, N_(L"Conditionally execute a block of commands")},
+    {L"switch", &builtin_generic, N_(L"Conditionally run blocks of code")},
     {L"test", &builtin_test, N_(L"Test a condition")},
     {L"time", &builtin_generic, N_(L"Measure how long a command or block takes")},
     {L"true", &builtin_true, N_(L"Return a successful result")},

From 03b23dd1b659467c4f25b337a9aafa6910783ba2 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Thu, 27 Jan 2022 16:38:14 -0800
Subject: [PATCH 153/262] Update default colors

 - Use named colors instead of hex values - not sure how this
   happened in the first place, these all map to basic named colors.

 - Reinitialize if these were last set on fish <3.4, new variables
   have been added.

 - Break this into a separate function for the sake of
   __fish_config_interactive complexity, and allow for running
  manually.
---
 .../functions/__fish_config_interactive.fish  | 49 ++-----------------
 share/functions/fish_initialize_colors.fish   | 44 +++++++++++++++++
 2 files changed, 47 insertions(+), 46 deletions(-)
 create mode 100644 share/functions/fish_initialize_colors.fish

diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index d148dc280..0b2e2518f 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -26,52 +26,9 @@ function __fish_config_interactive -d "Initializations that should be performed
         end
     end
 
-    #
     # If we are starting up for the first time, set various defaults.
-    if test $__fish_initialized -lt 3100
-
-        # Regular syntax highlighting colors
-        __init_uvar fish_color_normal normal
-        __init_uvar fish_color_command 005fd7
-        __init_uvar fish_color_param 00afff
-        __init_uvar fish_color_redirection 00afff
-        __init_uvar fish_color_comment 990000
-        __init_uvar fish_color_error ff0000
-        __init_uvar fish_color_escape 00a6b2
-        __init_uvar fish_color_operator 00a6b2
-        __init_uvar fish_color_end 009900
-        __init_uvar fish_color_quote 999900
-        __init_uvar fish_color_autosuggestion 555 brblack
-        __init_uvar fish_color_user brgreen
-        __init_uvar fish_color_host normal
-        __init_uvar fish_color_host_remote yellow
-        __init_uvar fish_color_valid_path --underline
-        __init_uvar fish_color_status red
-
-        __init_uvar fish_color_cwd green
-        __init_uvar fish_color_cwd_root red
-
-        # Background color for search matches
-        __init_uvar fish_color_search_match bryellow --background=brblack
-
-        # Background color for selections
-        __init_uvar fish_color_selection white --bold --background=brblack
-
-        # XXX fish_color_cancel was added in 2.6, but this was added to post-2.3 initialization
-        # when 2.4 and 2.5 were already released
-        __init_uvar fish_color_cancel -r
-
-        # Pager colors
-        __init_uvar fish_pager_color_prefix normal --bold --underline
-        __init_uvar fish_pager_color_completion
-        __init_uvar fish_pager_color_description B3A06D yellow
-        __init_uvar fish_pager_color_progress brwhite --background=cyan
-        __init_uvar fish_pager_color_selected_background -r
-
-        #
-        # Directory history colors
-        #
-        __init_uvar fish_color_history_current --bold
+    if test $__fish_initialized -lt 3400
+        fish_initialize_colors
     end
 
     #
@@ -283,5 +240,5 @@ end" >$__fish_config_dir/config.fish
 
     # Bump this whenever some code below needs to run once when upgrading to a new version.
     # The universal variable __fish_initialized is initialized in share/config.fish.
-    set __fish_initialized 3100
+    set __fish_initialized 3400
 end
diff --git a/share/functions/fish_initialize_colors.fish b/share/functions/fish_initialize_colors.fish
new file mode 100644
index 000000000..c9a3af5c2
--- /dev/null
+++ b/share/functions/fish_initialize_colors.fish
@@ -0,0 +1,44 @@
+function fish_initialize_colors -d "Set default color uvars"
+	# Regular syntax highlighting colors
+        __init_uvar fish_color_normal normal
+        __init_uvar fish_color_command blue
+        __init_uvar fish_color_param cyan
+        __init_uvar fish_color_redirection cyan --bold
+        __init_uvar fish_color_comment red
+        __init_uvar fish_color_error brred
+        __init_uvar fish_color_escape brcyan
+        __init_uvar fish_color_operator brcyan
+        __init_uvar fish_color_end green
+        __init_uvar fish_color_quote yellow
+        __init_uvar fish_color_autosuggestion 555 brblack
+        __init_uvar fish_color_user brgreen
+        __init_uvar fish_color_host normal
+        __init_uvar fish_color_host_remote yellow
+        __init_uvar fish_color_valid_path --underline
+        __init_uvar fish_color_status red
+
+        __init_uvar fish_color_cwd green
+        __init_uvar fish_color_cwd_root red
+
+        # Background color for search matches
+        __init_uvar fish_color_search_match --background=111
+
+        # Background color for selections
+        __init_uvar fish_color_selection white --bold --background=brblack
+
+        # XXX fish_color_cancel was added in 2.6, but this was added to post-2.3 initialization
+        # when 2.4 and 2.5 were already released
+        __init_uvar fish_color_cancel -r
+
+        # Pager colors
+        __init_uvar fish_pager_color_prefix normal --bold --underline
+        __init_uvar fish_pager_color_completion 888
+        __init_uvar fish_pager_color_description B3A06D yellow
+        __init_uvar fish_pager_color_progress brwhite --background=cyan
+        __init_uvar fish_pager_color_selected_background --background=111
+
+        #
+        # Directory history colors
+        #
+        __init_uvar fish_color_history_current --bold
+end

From e05844a3cdc739d23415c8dc6f9e4d7a1dce356a Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Fri, 28 Jan 2022 04:38:01 -0800
Subject: [PATCH 154/262] default colors: use reverse for pager selection.

I accidentally set some arbitrary grey in my previous commit,
causing a low contrast situation OOB.
---
 share/functions/fish_initialize_colors.fish | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/share/functions/fish_initialize_colors.fish b/share/functions/fish_initialize_colors.fish
index c9a3af5c2..0cbf3fafd 100644
--- a/share/functions/fish_initialize_colors.fish
+++ b/share/functions/fish_initialize_colors.fish
@@ -31,11 +31,11 @@ function fish_initialize_colors -d "Set default color uvars"
         __init_uvar fish_color_cancel -r
 
         # Pager colors
-        __init_uvar fish_pager_color_prefix normal --bold --underline
-        __init_uvar fish_pager_color_completion 888
-        __init_uvar fish_pager_color_description B3A06D yellow
+        __init_uvar fish_pager_color_prefix cyan --bold --underline
+        __init_uvar fish_pager_color_completion normal
+        __init_uvar fish_pager_color_description B3A06D yellow -i
         __init_uvar fish_pager_color_progress brwhite --background=cyan
-        __init_uvar fish_pager_color_selected_background --background=111
+        __init_uvar fish_pager_color_selected_background -r
 
         #
         # Directory history colors

From 77fa3df7dc52a03f7dc4dca5471eb4eab34cf797 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Fri, 28 Jan 2022 06:59:14 -0800
Subject: [PATCH 155/262] killall completions: let pager combine signal numbers
 and names

Before:
https://user-images.githubusercontent.com/291142/151565480-80eccc8e-2c00-4e5a-a718-a5b51f224e14.png

After:
https://user-images.githubusercontent.com/291142/151569789-aa2d94f8-4bcc-4c60-a62f-54ca19b58b12.png
---
 share/completions/killall.fish | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/share/completions/killall.fish b/share/completions/killall.fish
index 217827298..679e4f0b6 100644
--- a/share/completions/killall.fish
+++ b/share/completions/killall.fish
@@ -13,7 +13,7 @@ for i in $__kill_signals
     set -q numname[2]
     and set -l name $numname[2]
     complete -c killall -o $number -d $name
-    complete -c killall -o $name
+    complete -c killall -o $name -d $name
     # The `-s` flag doesn't work in OS X
     test "$OS" != Darwin
     and complete -c killall -s s -x -a "$number $name"
@@ -30,17 +30,17 @@ if killall --version >/dev/null 2>/dev/null # GNU
     complete -c killall -s w -l wait -d 'Wait for all killed processes to die'
     complete -c killall -s v -l version -d 'Print version'
 else # probably BSD
-    complete -c killall -s v -d 'Be more verbose about what will be done'
-    complete -c killall -s e -d 'Use effective UID instead of the real UID for matching processes specified with the -u option'
-    complete -c killall -s help -d 'Print help and exit'
-    complete -c killall -s l -d 'List names of available signals and exit'
-    complete -c killall -s m -d 'Case sensitive argument match for processed'
-    complete -c killall -s s -d 'Simulate, but do not send any signals'
-    complete -c killall -s d -d "Print detailed info. Doesn't send signals"
-    complete -c killall -s u -x -a "(__fish_complete_users)" -d 'Kill only processes the specified user owns. Command names are optional'
+    complete -c killall -s v -d 'Print what is done'
+    complete -c killall -s e -d 'Use effective UID instead of the real UID for -u'
+    complete -c killall -s help
+    complete -c killall -s l -d 'List names of available signals'
+    complete -c killall -s m -d 'Case sensitive process matching'
+    complete -c killall -s s -d "Simulate, send no signals"
+    complete -c killall -s d -d "Simulate & summarize, send no signals"
+    complete -c killall -s u -x -a "(__fish_complete_users)" -d "kill given user's processes"
     complete -c killall -s -u -l user -x -a "(__fish_complete_users)"
-    complete -c killall -s t -d 'Limit to processes running on specified TTY'
+    complete -c killall -s t -d 'Limit to processes on specified TTY'
     complete -c killall -s t -xa "(ps a -o tty | sed 1d | uniq)"
-    complete -c killall -s c -x -d 'Limit to processes matching specified PROCNAME'
-    complete -c killall -s z -d 'Do not skip zombies'
+    complete -c killall -s c -x -d 'Limit to processes matching pattern'
+    complete -c killall -s z -d "Don't skip zombies"
 end

From 75d1a0cb5a9036a0db768438a56980951e60209b Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Fri, 28 Jan 2022 19:43:43 -0800
Subject: [PATCH 156/262] welcome.html: Provide fallback font-families as we
 are unsure Yosemite know's about system-ui.

We do know `-apple-system` predated `system-ui` and are otherwise
aware that `Menlo` and `Helvetica Neue` will exist and be 'right'
on 10.10 and earlier.
---
 build_tools/osx_package_resources/welcome.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build_tools/osx_package_resources/welcome.html b/build_tools/osx_package_resources/welcome.html
index 932ff3290..9e6078b45 100644
--- a/build_tools/osx_package_resources/welcome.html
+++ b/build_tools/osx_package_resources/welcome.html
@@ -2,11 +2,11 @@
 	<head>
 		<style>
 			body {
-				font-family: system-ui;
+				font-family: system-ui, -apple-system, "Helvetica Neue", sans-serif;
 				font-size: 10pt;
 			}
 			code, tt {
-				font-family: ui-monospace;
+				font-family: ui-monospace, Menlo, monospace;
 			}
 
 		</style>

From 76bde0839fb3c9cabd2c4510b9b05cdc3c1f7e41 Mon Sep 17 00:00:00 2001
From: NextAlone <12210746+NextAlone@users.noreply.github.com>
Date: Sat, 29 Jan 2022 18:27:00 +0800
Subject: [PATCH 157/262] Fix gradle tasks completion (#8672)

The regex for task names was a bit off, so
- include uppercase letters, to support `TMessagesProj:assembleMiniRelease`
- don't include characters like `[]` (which happen to lie between ASCII `A` and `z`)
- include numbers, which are presumably valid in an identifier
- explicitly include the optional ` - ` bit in the regex
---
 share/completions/gradle.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/completions/gradle.fish b/share/completions/gradle.fish
index 46cec347f..da0d8e1f7 100644
--- a/share/completions/gradle.fish
+++ b/share/completions/gradle.fish
@@ -54,7 +54,7 @@ function __fish_gradle_get_task_completion
 
     set -l gradle_cache_file (__fish_gradle_create_completion_cache_file "{$PWD}-tasks")
     if not test -f "$gradle_cache_file" -a -s "$gradle_cache_file"
-        command gradle -q tasks --all 2>/dev/null | string match --regex '^[a-z][A-z:]+.*' | string replace ' - ' \t >"$gradle_cache_file"
+        command gradle -q tasks --all 2>/dev/null | string match --regex '^(?!-)[A-Za-z0-9:-]+(?: - .*)?$' | string replace ' - ' \t >"$gradle_cache_file"
     end
 
     # return possible tasks

From cdb81e4001640e0889467b234d6dd943112b1f6a Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Sat, 29 Jan 2022 22:23:15 -0800
Subject: [PATCH 158/262] basename: add completions

simple ones for the two options mine supports
---
 share/completions/basename.fish | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 share/completions/basename.fish

diff --git a/share/completions/basename.fish b/share/completions/basename.fish
new file mode 100644
index 000000000..20aade653
--- /dev/null
+++ b/share/completions/basename.fish
@@ -0,0 +1,3 @@
+# author: floam 2022-01-29
+complete basename -s a -d 'work on multiple arguments'
+complete basename -s s -d 'remove trailing suffix'

From c3e5cc5652f2fb18a1333e20ad0d264bf79c0a9d Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Sat, 29 Jan 2022 22:31:09 -0800
Subject: [PATCH 159/262] macOS cat completions: add the -l lock option

---
 share/completions/cat.fish | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/share/completions/cat.fish b/share/completions/cat.fish
index 84698290b..4d4bbd584 100644
--- a/share/completions/cat.fish
+++ b/share/completions/cat.fish
@@ -15,7 +15,8 @@ else # OS X
     complete -c cat -s e -d "Show unprintables, end lines with \$"
     complete -c cat -s n -d "Enumerate lines"
     complete -c cat -s s -d "Squeeze away >1 blank lines"
-    complete -c cat -s t -d "Show unprintables; tab as '^I'"
+    complete -c cat -s t -d "Show unprintables; tab as ^I"
     complete -c cat -s u -d "Disable output buffering"
     complete -c cat -s v -d "Escape non-printing chars"
+    complete -c cat -s l -d "Set/block on F_SETLKW stdout lock"
 end

From 7c022753cff1a3644629924ad8c40367a4408c59 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Sat, 29 Jan 2022 22:48:41 -0800
Subject: [PATCH 160/262] chgrp: do not-GNU

Add versions for macOS.
---
 share/completions/chgrp.fish | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/share/completions/chgrp.fish b/share/completions/chgrp.fish
index 309f465e0..b2622c442 100644
--- a/share/completions/chgrp.fish
+++ b/share/completions/chgrp.fish
@@ -1,12 +1,24 @@
-
-complete -c chgrp -s c -l changes -d "Output diagnostic for changed files"
-complete -c chgrp -l dereference -d "Dereference symbolic links"
-complete -c chgrp -s h -l no-dereference -d "Do not dereference symbolic links"
-complete -c chgrp -l from -d "Change from owner/group"
-complete -c chgrp -s f -l silent -d "Suppress errors"
-complete -c chgrp -l reference -d "Use same owner/group as file" -r
-complete -c chgrp -s R -l recursive -d "Operate recursively"
-complete -c chgrp -s v -l verbose -d "Output diagnostic for every file"
-complete -c chgrp -s h -l help -d "Display help and exit"
-complete -c chgrp -l version -d "Display version and exit"
-complete -c chgrp -d Group -a "(__fish_complete_groups)"
+if chgrp --version 2>/dev/null # not unix
+	complete -c chgrp -s c -l changes -d "Output diagnostic for changed files"
+	complete -c chgrp -l dereference -d "Dereference symlinks"
+	complete -c chgrp -s h -l no-dereference -d "Don't dereference symlinks"
+	complete -c chgrp -l from -d "Change from owner/group"
+	complete -c chgrp -s f -l silent -d "Suppress errors"
+	complete -c chgrp -l reference -d "Use same owner/group as file" -r
+	complete -c chgrp -s R -l recursive -d "Operate recursively"
+	complete -c chgrp -s v -l verbose -d "Output diagnostic for every file"
+	complete -c chgrp -l help -d "Display help and exit"
+	complete -c chgrp -l version -d "Display version and exit"
+	complete -c chgrp -d Group -a "(__fish_complete_groups)"
+else # not Linux
+	complete -c chgrp -s h -d "Don't dereference symlinks"
+	complete -c chgrp -s H -d "Follow specified symlinks with -R"
+	complete -c chgrp -s L -d "Follow all symlinks with -R"
+	complete -c chgrp -s P -d "Follow no symlinks with -R"
+	complete -c chgrp -s f -d "Suppress errors"
+	complete -c chgrp -s n -d "id is numeric; avoid lookup"
+	complete -c chgrp -s R -d "Operate recursively"
+	complete -c chgrp -s v -d "Output filenames"
+	complete -c chgrp -s x -d "Don'1t traverse fs mount points"
+	complete -c chgrp -d Group -a "(__fish_complete_groups)"
+end
\ No newline at end of file

From 9121e14279c77a99faf77e667200ed78eda0d00b Mon Sep 17 00:00:00 2001
From: NextAlone <12210746+NextAlone@users.noreply.github.com>
Date: Sun, 30 Jan 2022 00:35:32 +0800
Subject: [PATCH 161/262] Add ln completion -r --relative

---
 share/completions/ln.fish | 1 +
 1 file changed, 1 insertion(+)

diff --git a/share/completions/ln.fish b/share/completions/ln.fish
index a8c79e1dc..7ad0e483a 100644
--- a/share/completions/ln.fish
+++ b/share/completions/ln.fish
@@ -11,6 +11,7 @@ complete -c ln -s S -l suffix -d 'Override the usual ~ backup suffix'
 complete -c ln -s t -l target-directory -d 'Specify the DIRECTORY in which to create the links' -a '(__fish_complete_directories)'
 complete -c ln -s T -l no-target-directory -d 'Treat LINK_NAME as a normal file'
 complete -c ln -s v -l verbose -d 'Print name of each linked file'
+complete -c ln -s r -l relative -d 'With -s, create links relative to link location'
 
 complete -c ln -f -l help -d 'Display help and exit'
 complete -c ln -f -l version -d 'Output version information and exit'

From 63960f646b44c43da986838cdd9fd310d48a585a Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 30 Jan 2022 14:59:55 +0100
Subject: [PATCH 162/262] completions/ln: sort flags to match the GNU ln man
 page

---
 share/completions/ln.fish | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/completions/ln.fish b/share/completions/ln.fish
index 7ad0e483a..806346ba9 100644
--- a/share/completions/ln.fish
+++ b/share/completions/ln.fish
@@ -1,4 +1,3 @@
-complete -c ln -s s -l symbolic -d 'Make symbolic links instead of hard links'
 complete -c ln -l backup -d 'Make a backup of each existing destination file' -a "none off numbered t existing nil simple never"
 complete -c ln -s b -d 'Make a backup of each existing destination file'
 complete -c ln -s d -l directory -d 'Allow superuser to attempt to hard link directories'
@@ -7,11 +6,12 @@ complete -c ln -s i -l interactive -d 'Prompt whether to remove destinations'
 complete -c ln -s L -l logical -d 'Dereference TARGETs that are symbolic links'
 complete -c ln -s n -l no-dereference -d 'Treat symlink to directory as if it were a file'
 complete -c ln -s P -l physical -d 'Make hard links directly to symbolic links'
+complete -c ln -s r -l relative -d 'With -s, create links relative to link location'
+complete -c ln -s s -l symbolic -d 'Make symbolic links instead of hard links'
 complete -c ln -s S -l suffix -d 'Override the usual ~ backup suffix'
 complete -c ln -s t -l target-directory -d 'Specify the DIRECTORY in which to create the links' -a '(__fish_complete_directories)'
 complete -c ln -s T -l no-target-directory -d 'Treat LINK_NAME as a normal file'
 complete -c ln -s v -l verbose -d 'Print name of each linked file'
-complete -c ln -s r -l relative -d 'With -s, create links relative to link location'
 
 complete -c ln -f -l help -d 'Display help and exit'
 complete -c ln -f -l version -d 'Output version information and exit'

From e575a6323260b78c117530a072bc5feccb6cd0cd Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Sun, 30 Jan 2022 19:48:20 -0800
Subject: [PATCH 163/262] chmod completions for non-GNU chmod

And chgrp fixup.
---
 share/completions/chgrp.fish |  4 ++--
 share/completions/chmod.fish | 29 +++++++++++++++++++----------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/share/completions/chgrp.fish b/share/completions/chgrp.fish
index b2622c442..20b3f7761 100644
--- a/share/completions/chgrp.fish
+++ b/share/completions/chgrp.fish
@@ -19,6 +19,6 @@ else # not Linux
 	complete -c chgrp -s n -d "id is numeric; avoid lookup"
 	complete -c chgrp -s R -d "Operate recursively"
 	complete -c chgrp -s v -d "Output filenames"
-	complete -c chgrp -s x -d "Don'1t traverse fs mount points"
+	complete -c chgrp -s x -d "Don't traverse fs mountpoints"
 	complete -c chgrp -d Group -a "(__fish_complete_groups)"
-end
\ No newline at end of file
+end
diff --git a/share/completions/chmod.fish b/share/completions/chmod.fish
index 3ad274bc3..ed8fcb0fb 100644
--- a/share/completions/chmod.fish
+++ b/share/completions/chmod.fish
@@ -4,13 +4,22 @@
 # man page by the make_completions.py script, but may
 # have been hand edited since.
 #
-
-complete -c chmod -s c -l changes -d 'Like verbose but report only when a change is made'
-complete -c chmod -l no-preserve-root -d 'Do not treat / specially (the default)'
-complete -c chmod -l preserve-root -d 'Fail to operate recursively on /'
-complete -c chmod -s f -l silent -l quiet -d 'Suppress most error messages'
-complete -c chmod -s v -l verbose -d 'Output a diagnostic for every file processed'
-complete -c chmod -l reference -d 'Use RFILEs mode instead of MODE values' -r
-complete -c chmod -s R -l recursive -d 'Change files and directories recursively'
-complete -c chmod -l help -d 'Display help and exit'
-complete -c chmod -l version -d 'Display version and exit'
+if chmod --version 2>/dev/null # gnu's not unix
+	complete chmod -s c -l changes -d 'Like -v but report only changes'
+	complete chmod -l no-preserve-root -d 'Don\'t treat / special (default)'
+	complete chmod -l preserve-root -d 'Fail to operate recursively on /'
+	complete chmod -s f -l silent -l quiet -d 'Suppress most errors'
+	complete chmod -s v -l verbose -d 'Prints each file processed'
+	complete chmod -l reference -d 'Use RFILEs mode instead of MODE values' -r
+	complete chmod -s R -l recursive -d 'Operate recursively'
+	complete chmod -l help -d 'Display help and exit'
+	complete chmod -l version -d 'Display version and exit'
+else # guess it might be unix
+	complete chmod -s f -d 'Suppress errors'
+	complete chmod -s H -d "Follow given symlinks with -R"
+	complete chmod -s h -d "Don't dereference given symlinks"
+	complete chmod -s L -d "Follow all symlinks with -R"
+	complete chmod -s P -d "Follow no symlinks with -R"
+	complete chmod -s R -d 'Operate recursively'
+	complete chmod -s v -d 'Prints each file processed'
+end

From 05cdacc8d4089a08cf19873951fbdcac8f579749 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Mon, 31 Jan 2022 16:25:42 -0600
Subject: [PATCH 164/262] Prevent queued-up flash() calls from blocking input

Closes #8610.
---
 src/reader.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/reader.cpp b/src/reader.cpp
index 62c3af304..23e10dba5 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -37,6 +37,7 @@
 
 #include <algorithm>
 #include <atomic>
+#include <chrono>
 #include <csignal>
 #include <cwchar>
 #include <functional>
@@ -628,6 +629,9 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
     /// Whether this is the first prompt.
     bool first_prompt{true};
 
+    /// The time when the last flash() completed
+    std::chrono::time_point<std::chrono::steady_clock> last_flash;
+
     /// The representation of the current screen contents.
     screen_t screen;
 
@@ -1879,6 +1883,15 @@ void reader_data_t::select_completion_in_direction(selection_motion_t dir) {
 
 /// Flash the screen. This function changes the color of the current line momentarily.
 void reader_data_t::flash() {
+    // Multiple flashes may be enqueued by keypress repeat events and can pile up to cause a
+    // significant delay in processing future input while all the flash() calls complete, as we
+    // effectively sleep for 100ms each go. See #8610.
+    auto now = std::chrono::steady_clock::now();
+    if ((now - last_flash) < std::chrono::milliseconds{50}) {
+        last_flash = now;
+        return;
+    }
+
     struct timespec pollint;
     editable_line_t *el = &command_line;
     layout_data_t data = make_layout_data();
@@ -1901,6 +1914,10 @@ void reader_data_t::flash() {
     data.colors = std::move(saved_colors);
     this->rendered_layout = std::move(data);
     paint_layout(L"unflash");
+
+    // Save the time we stopped flashing as the time of the most recent flash. We can't just
+    // increment the old `now` value because the sleep is non-deterministic.
+    last_flash = std::chrono::steady_clock::now();
 }
 
 maybe_t<source_range_t> reader_data_t::get_selection() const {

From d059c3b5b25a7d815791ef0e035de3e70a539466 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Mon, 31 Jan 2022 16:28:21 -0600
Subject: [PATCH 165/262] src/reader.cpp: Remove needless use of macro

---
 src/reader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index 23e10dba5..6bafe2878 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1930,7 +1930,7 @@ maybe_t<source_range_t> reader_data_t::get_selection() const {
 
 /// Characters that may not be part of a token that is to be replaced by a case insensitive
 /// completion.
-#define REPLACE_UNCLEAN L"$*?({})"
+const wchar_t *REPLACE_UNCLEAN = L"$*?({})";
 
 /// Check if the specified string can be replaced by a case insensitive completion with the
 /// specified flags.

From 56a49208561ddc44ab8718cb7c3b6b534da07bb6 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Mon, 31 Jan 2022 21:27:12 -0800
Subject: [PATCH 166/262] chgrp, chmod completions: pipe both stderr and stdout
 to /dev/null

Seems like --version output writes to stdout on the GNU utils.
---
 share/completions/chgrp.fish | 2 +-
 share/completions/chmod.fish | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/share/completions/chgrp.fish b/share/completions/chgrp.fish
index 20b3f7761..39387540e 100644
--- a/share/completions/chgrp.fish
+++ b/share/completions/chgrp.fish
@@ -1,4 +1,4 @@
-if chgrp --version 2>/dev/null # not unix
+if chgrp --version &>/dev/null # not unix
 	complete -c chgrp -s c -l changes -d "Output diagnostic for changed files"
 	complete -c chgrp -l dereference -d "Dereference symlinks"
 	complete -c chgrp -s h -l no-dereference -d "Don't dereference symlinks"
diff --git a/share/completions/chmod.fish b/share/completions/chmod.fish
index ed8fcb0fb..cf3307ce7 100644
--- a/share/completions/chmod.fish
+++ b/share/completions/chmod.fish
@@ -1,10 +1,4 @@
-#
-# Command specific completions for the chmod command.
-# These completions where generated from the commands
-# man page by the make_completions.py script, but may
-# have been hand edited since.
-#
-if chmod --version 2>/dev/null # gnu's not unix
+if chmod --version &>/dev/null # gnu's not unix
 	complete chmod -s c -l changes -d 'Like -v but report only changes'
 	complete chmod -l no-preserve-root -d 'Don\'t treat / special (default)'
 	complete chmod -l preserve-root -d 'Fail to operate recursively on /'

From 9ec359d133b434f71406bc6d29f448c33784c81f Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Mon, 31 Jan 2022 21:54:07 -0800
Subject: [PATCH 167/262] update chown completions

Add completions that are correct on darwin and probably bsd.
Add missing -H, -L, -P completions to GNU chown.
Remove errant GNU completion claiming -h is short for --help.
---
 share/completions/chown.fish | 37 ++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/share/completions/chown.fish b/share/completions/chown.fish
index 922e9ee4a..9ca348a70 100644
--- a/share/completions/chown.fish
+++ b/share/completions/chown.fish
@@ -1,12 +1,25 @@
-complete -c chown -s c -l changes -d "Output diagnostic for changed files"
-complete -c chown -l dereference -d "Dereference symbolic links"
-complete -c chown -s h -l no-dereference -d "Do not dereference symbolic links"
-complete -c chown -l from -d "Change from owner/group"
-complete -c chown -s f -l silent -d "Suppress errors"
-complete -c chown -l reference -d "Use same owner/group as file" -r
-complete -c chown -s R -l recursive -d "Operate recursively"
-complete -c chown -s v -l verbose -d "Output diagnostic for every file"
-complete -c chown -s h -l help -d "Display help and exit"
-complete -c chown -l version -d "Display version and exit"
-complete -c chown -d Username -a "(__fish_print_users):"
-complete -c chown -d Username -a "(string match -r -- '.*:' (commandline -ct))(__fish_complete_groups)"
+if chown --version &>/dev/null # gee, and you is not eunichs
+	complete chown -s c -l changes -d "Output diagnostic for changed files"
+	complete chown -l dereference -d "Dereference symbolic links"
+	complete chown -s h -l no-dereference -d "Do not dereference symbolic links"
+	complete chown -l from -d "Change from owner/group"
+	complete chown -s f -l silent -d "Suppress errors"
+	complete chown -l reference -d "Use same owner/group as file" -r
+	complete chown -s R -l recursive -d "Operate recursively"
+	complete chown -s v -l verbose -d "Output diagnostic for every file"
+	complete chown -l help -d "Display help and exit"
+	complete chown -l version -d "Display version and exit"
+else
+	complete chown -s R -d 'Operate recursively'
+	complete chown -s f -d "Suppress errors"
+	complete chown -s h -d "Do not dereference symbolic links"
+	complete chown -s n -d "uid/gid is numeric; avoid lookup"
+	complete chown -s v -d "Output filenames as modified"
+	complete chown -s x -d "Don't traverse fs mount points"
+end
+
+complete chown -s H -d "Follow given symlinks with -R"
+complete chown -s L -d "Follow all symlinks with -R"
+complete chown -s P -d "Follow no symlinks with -R"
+complete chown -d User -a "(__fish_print_users):"
+complete chown -d User -a "(string match -r -- '.*:' (commandline -ct))(__fish_complete_groups)"

From d40f805d94a9379d341f2a158da6a4a45ceb99c1 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Mon, 31 Jan 2022 22:15:53 -0800
Subject: [PATCH 168/262] cp completions: update for current macOS

macOS has learned a few FreeBSD flags since I put this together:
-s, -x, -l
---
 share/completions/cp.fish | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/share/completions/cp.fish b/share/completions/cp.fish
index 7c3cb219a..42e9e5c27 100644
--- a/share/completions/cp.fish
+++ b/share/completions/cp.fish
@@ -31,7 +31,7 @@ else # BSD/macOS
     set -l uname (uname -s)
     # Solaris:   cp [-R | r [H | L | P ]] [-fi ] [-p        ]
     # openbsd:   cp	[-R |   [H | L | P ]] [-fi ] [-pv       ]
-    # macos:     cp [-R |   [H | L | P ]] [-fin] [-pva   cX ] # -c: clone -X: copy xattrs
+    # macos:     cp [-R |   [H | L | P ]] [-fin] [-pvalxscX ] # -c: clone -X: copy xattrs
     # netbsd:    cp [-R |   [H | L | P ]] [-fi ] [-pval    N] # -l: hard link instead of copy -N: don't copy file flags
     # dragonfly: cp [-R |   [H | L | P ]] [-fin] [-pvalx    ] # -x: don't traverse mount points
     # freebsd:   cp	[-R |   [H | L | P ]] [-fin] [-pvalxs   ] # -s: symlink instead of copy
@@ -62,7 +62,6 @@ else # BSD/macOS
     if test "$uname" = Darwin
         complete -c cp -s c -d "Clone using clonefile(2)"
         complete -c cp -s X -d "Omit xattrs, resource forks"
-        exit 0
     end
     complete -c cp -s l -d "Hard link instead of copying"
     if test "$uname" = NetBSD
@@ -70,7 +69,7 @@ else # BSD/macOS
         exit 0
     end
     complete -c cp -s x -d "Don't traverse mount points"
-    if test "$uname" = FreeBSD
+    if test "$uname" = FreeBSD -o "$uname" = Darwin
         complete -c cp -s s -d "Symlink instead of copying"
     end
 end

From 1d9f34e8bfcb68854e943f86c80192d5c2eaf4e0 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Mon, 31 Jan 2022 22:28:13 -0800
Subject: [PATCH 169/262] cut completions: fix for BSD/macOS

Sharpened the pencil on a few description strings as well.
---
 share/completions/cut.fish | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/share/completions/cut.fish b/share/completions/cut.fish
index 0d92280a2..4e6823a6c 100644
--- a/share/completions/cut.fish
+++ b/share/completions/cut.fish
@@ -1,11 +1,21 @@
-complete -c cut -s b -l bytes -x -d "Output byte range"
-complete -c cut -s c -l characters -x -d "Output character range"
-complete -c cut -s d -l delimiter -x -d "Select field delimiter"
-complete -c cut -s f -l fields -x -d "Select fields"
-complete -c cut -s n -d "Don't split multi byte characters"
-complete -c cut -l complement -d "complement the set of selected bytes, characters or fields"
-complete -c cut -s s -l only-delimited -d "Do not print lines without delimiter"
-complete -c cut -l output-delimiter -x -d "Select output delimiter"
-complete -c cut -s z -l zero-terminated -d "line delimiter is NUL, not newline"
-complete -c cut -l help -d "Display help and exit"
-complete -c cut -l version -d "Display version and exit"
+if cut --version &>/dev/null
+	complete -c cut -s b -l bytes -x -d "Select byte positions"
+	complete -c cut -s c -l characters -x -d "Select characters"
+	complete -c cut -s d -l delimiter -x -d "Select field delimiter"
+	complete -c cut -s f -l fields -x -d "Select fields"
+	complete -c cut -s n -d "Don't split multi-byte characters"
+	complete -c cut -l complement -d "complement the set of selected bytes, characters or fields"
+	complete -c cut -s s -l only-delimited -d "Suppress lines without delimiter"
+	complete -c cut -l output-delimiter -x -d "Select output delimiter"
+	complete -c cut -s z -l zero-terminated -d "line delimiter is NUL, not newline"
+	complete -c cut -l help -d "Display help and exit"
+	complete -c cut -l version -d "Display version and exit"
+else
+	complete -c cut -s b -x -d "Select byte positions"
+	complete -c cut -s c -x -d "Output character range"
+	complete -c cut -s d -x -d "Delimiter instead of \t to use"
+	complete -c cut -s f -x -d "Select fields"
+	complete -c cut -s n -d "Don't split multi-byte characters"
+	complete -c cut -s s -d "Supress lines without delimiter"
+	complete -c cut -s w -d "Use whitespace as delimiter"
+end

From 12a4091774f9661db1a389e3e1d0d83e9cc0d1e7 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Mon, 31 Jan 2022 22:33:16 -0800
Subject: [PATCH 170/262] df completions: shorten a description

---
 share/completions/df.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/completions/df.fish b/share/completions/df.fish
index 1f77d036f..51ad6e281 100644
--- a/share/completions/df.fish
+++ b/share/completions/df.fish
@@ -33,6 +33,6 @@ else
     complete -c df -s a -d "Show all file systems"
     complete -c df -s g -d "Show sizes in gigabytes"
     complete -c df -s m -d "Show sizes in megabytes"
-    complete -c df -s n -d "Print out the previously obtained statistics from the file systems"
+    complete -c df -s n -d "Use cached statistics"
 
 end

From c75603c475a291a80d93cd4e533f6d21c0f9aa0f Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Mon, 31 Jan 2022 23:09:33 -0800
Subject: [PATCH 171/262] env completions: Update for FreeBSD `env`

This isn't perfect, NetBSD for example takes -0 but not -v, -P,
or -S.
---
 share/completions/env.fish | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/share/completions/env.fish b/share/completions/env.fish
index ef7284bcc..0225e4adf 100644
--- a/share/completions/env.fish
+++ b/share/completions/env.fish
@@ -1,6 +1,15 @@
-function __fish_env_remaining_args
-    argparse -s s/ignore-environment u/unset= h-help v-version -- (commandline -opc) (commandline -ct) 2>/dev/null
-    or return 1
+if env --version &> /dev/null
+    set -l is_gnu --is-gnu
+end
+
+function __fish_env_remaining_args -V is_gnu
+    if set -q is_gnu[1]
+        argparse -s i/ignore-environment u/unset= help version -- (commandline -opc) (commandline -ct) 2>/dev/null
+        or return 1
+    else
+        argparse -s 0 i P= S= u= v -- (commandline -opc) (commandline -ct) 2>/dev/null
+        or return 1
+    end
 
     # argv[1] is `env` or an alias.
     set -e argv[1]
@@ -28,10 +37,20 @@ function __fish_complete_env_subcommand
 end
 
 complete -c env -a "(__fish_complete_env_subcommand)"
-
-# complete VAR= only if the cursor is left of the =, otherwise complete the file right of the =
 complete -c env -n 'not __fish_env_remaining_args; and not string match -eq = -- (commandline -ct)' -a "(set -n)=" -f -d "Redefine variable"
-complete -c env -n 'not __fish_env_remaining_args' -s i -l ignore-environment -d "Start with an empty environment"
-complete -c env -n 'not __fish_env_remaining_args' -s u -l unset -d "Remove variable from the environment" -x -a "(set -n)"
-complete -c env -n 'not __fish_env_remaining_args' -l help -d "Display help and exit"
-complete -c env -n 'not __fish_env_remaining_args' -l version -d "Display version and exit"
+
+if set -q is_gnu
+    # complete VAR= only if the cursor is left of the =, otherwise complete the file right of the =
+    complete -c env -n 'not __fish_env_remaining_args' -s i -l ignore-environment -d "Start with an empty environment"
+    complete -c env -n 'not __fish_env_remaining_args' -s u -l unset -d "Unset environment variable" -x -a "(set -n)"
+    complete -c env -n 'not __fish_env_remaining_args' -l help -d "Display help and exit"
+    complete -c env -n 'not __fish_env_remaining_args' -l version -d "Display version and exit"
+else
+    # complete VAR= only if the cursor is left of the =, otherwise complete the file right of the =
+    complete -c env -n 'not __fish_env_remaining_args' -s 0 -d "End output lines with NUL"
+    complete -c env -n 'not __fish_env_remaining_args' -s i -d "Start with empty environment"
+    complete -c env -n 'not __fish_env_remaining_args' -s P -d "Provide an alternate PATH"
+    complete -c env -n 'not __fish_env_remaining_args' -s S -d "Split argument into args on ' '"
+    complete -c env -n 'not __fish_env_remaining_args' -s u -d "Unset environment variable" -x -a "(set -n)"
+    complete -c env -n 'not __fish_env_remaining_args' -s v -d "Verbose output on processing"
+end

From 8e0d192f50f79f720bb24eb122f44043344b161b Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Mon, 31 Jan 2022 23:38:19 -0800
Subject: [PATCH 172/262] mdfind: Update with shorter descriptions

---
 share/completions/mdfind.fish | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/share/completions/mdfind.fish b/share/completions/mdfind.fish
index b5598621f..9b9f86794 100644
--- a/share/completions/mdfind.fish
+++ b/share/completions/mdfind.fish
@@ -1,12 +1,13 @@
 # completion for mdfind (macOS)
 
-complete -c mdfind -o attr -x -d 'Fetches the value of the specified attribute'
-complete -c mdfind -o count -f -d 'Query only reports matching items count'
-complete -c mdfind -o onlyin -x -a '(__fish_complete_directories (commandline -ct))' -d 'Search only within given directory'
-complete -c mdfind -o live -f -d 'Query should stay active'
-complete -c mdfind -o name -x -d 'Search on file name only'
-complete -c mdfind -o reprint -f -d 'Reprint results on live update'
-complete -c mdfind -s s -x -d 'Show contents of smart folder'
-complete -c mdfind -s 0 -f -d 'Use NUL (\0) as a path separator, for use with xargs -0'
-complete -c mdfind -o literal -f -d 'Force the provided query string to be taken as a literal'
-complete -c mdfind -o interpret -f -d 'Interprete query string as Spotlight query'
+complete mdfind -d "find files matching given query"
+complete mdfind -o attr -x -d 'Show given attribute'
+complete mdfind -o count -f -d 'Print number of matches'
+complete mdfind -o onlyin -x -a '(__fish_complete_directories (commandline -ct))' -d 'Search within directory'
+complete mdfind -o live -f -d 'Query should stay active'
+complete mdfind -o name -x -d 'Search on file name only'
+complete mdfind -o reprint -f -d 'Reprint -live results'
+complete mdfind -s s -x -d 'List a smart folder'
+complete mdfind -s 0 -f -d 'NUL path separators'
+complete mdfind -o literal -f -d 'Literal metadata query'
+complete mdfind -o interpret -f -d 'Spotlight-like search'

From 6b586d3e098dbc472711d7a27592352ff3596eee Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Tue, 1 Feb 2022 00:33:11 -0800
Subject: [PATCH 173/262] non-GNU `id` completions

---
 share/completions/id.fish | 40 ++++++++++++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/share/completions/id.fish b/share/completions/id.fish
index bb1d6ca79..c63914b29 100644
--- a/share/completions/id.fish
+++ b/share/completions/id.fish
@@ -1,14 +1,32 @@
-complete -c id -xa "(__fish_complete_users)"
+complete id -xa "(__fish_complete_users)"
 
 if string match -eq 'GNU coreutils' (id --version 2>&1)
-    complete -c id -s Z -l context -d "Print security context"
-    complete -c id -s z -l zero -d "Delimit entries with NUL"
+    complete id -s Z -l context -d "Print security context"
+    complete id -s z -l zero -d "Delimit entries with NUL"
+    complete id -s n -l name -d "Print name, not number"
+    complete id -s g -l group -d "Print effective group id"
+    complete id -s G -l groups -d "Print all group ids"
+    complete id -s r -l real -d "Print real ID, not effective"
+    complete id -s u -l user -d "Print effective user ID"
+    complete id -l help -d "Display help and exit"
+    complete id -l version -d "Display version and exit"
+else
+    # macOS id shell_cmds-240.100.15
+    #      id [user]
+    #      id -A
+    #      id -F [user]
+    #      id -G [-n] [user]
+    #      id -P [user]
+    #      id -g [-nr] [user]
+    #      id -p [user]
+    #      id -u [-nr] [user]
+    complete id -s A -d "Print process audit ID"
+    complete id -s F -d "Print full name of the user"
+    complete id -s G -d "Print all group ids"
+    complete id -s P -d "Print as passwd file entry"
+    complete id -s g -d "Print effective group id"
+    complete id -s n -d "Print name, not number"
+    complete id -s p -d "Human-readable output"
+    complete id -s r -d "Print real ID, not effective"
+    complete id -s u -d "Print effective user ID"
 end
-
-complete -c id -s g -l group -d "Print effective group id"
-complete -c id -s G -l groups -d "Print all group ids"
-complete -c id -s n -l name -d "Print name, not number"
-complete -c id -s r -l real -d "Print real ID, not effective"
-complete -c id -s u -l user -d "Print effective user ID"
-complete -c id -l help -d "Display help and exit"
-complete -c id -l version -d "Display version and exit"

From a03e245e13884f1bd0320b6be1c06c1f81367b69 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Tue, 1 Feb 2022 00:47:18 -0800
Subject: [PATCH 174/262] Update CHANGELOG.rst

---
 CHANGELOG.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7260155ac..aef798178 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -173,6 +173,7 @@ Completions
   - ``zef`` (:issue:`8114`)
 
 - Improvements to many completions, especially for ``git`` aliases (:issue:`8129`) and subcommands (:issue:`8134`).
+- Many adjustments to complete correct options for system utilities on BSD and macOS.
 - Add missing completions for the ``-p`` option of ``xbps-query``.
 - The ``fish_is_nth_token`` function, which is particularly useful in completions for identifying the token number within the command line, replaces various internal functions to do the same (:issue:`8008`).
 - When evaluating custom completions, the command line state no longer includes variable overrides (``var=val``). This unbreaks completions that read ``commandline -op``.

From cd3658d457bec1c50f96d0ca40e003eb1a8506f9 Mon Sep 17 00:00:00 2001
From: Jason Nader <ammgws@users.noreply.github.com>
Date: Wed, 2 Feb 2022 00:33:47 +0900
Subject: [PATCH 175/262] Ensure short option description is not overridden

Without this the description for `-o` was being set to "Set the page margins when printing text files"
---
 share/functions/__fish_complete_lpr.fish | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/share/functions/__fish_complete_lpr.fish b/share/functions/__fish_complete_lpr.fish
index eb157a392..74616e15d 100644
--- a/share/functions/__fish_complete_lpr.fish
+++ b/share/functions/__fish_complete_lpr.fish
@@ -19,7 +19,6 @@ function __fish_complete_lpr -d 'Complete lpr common options' --argument-names c
 
     switch $cmd
         case lp lpr
-            complete -c $cmd -s o -d 'Sets a job option' -xa '(__fish_complete_lpr_option)'
             complete -c $cmd -s m -d 'Send an email on job completion'
 
             complete -c $cmd -s o -xa landscape -d 'Landscape mode'
@@ -33,5 +32,7 @@ function __fish_complete_lpr -d 'Complete lpr common options' --argument-names c
             complete -c $cmd -s o -xa 'cpi=' -d 'Set the number of characters per inch to use'
             complete -c $cmd -s o -xa 'lpi=' -d 'Set the number of lines per inch to use'
             complete -c $cmd -s o -xa 'page-bottom= page-left= page-right= page-top=' -d 'Set the page margins when printing text files'
+            # this must be last
+            complete -c $cmd -s o -d 'Sets a job option' -xa '(__fish_complete_lpr_option)'
     end
 end

From 4c9e31afe9df10b85e97adb6589016bda6636d6a Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 3 Feb 2022 13:03:05 +0100
Subject: [PATCH 176/262] Move color initialization back

This was an undocumented undunderscored function that wouldn't be
super useful to actually use manually (because it still checked if the
variable was set!). It also relied on `__init_uvar`, which was only
set in `__fish_config_interactive`.

Additionally it didn't remove any complexity because this was all very
simple "do thing a, do thing b, do thing c" stuff. It added a layer of
indirection instead, and made fish startup dependent on another
function.

If you want to reset your colorscheme to the default, use fish_config.
---
 .../functions/__fish_config_interactive.fish  | 43 +++++++++++++++++-
 share/functions/fish_initialize_colors.fish   | 44 -------------------
 2 files changed, 42 insertions(+), 45 deletions(-)
 delete mode 100644 share/functions/fish_initialize_colors.fish

diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index 0b2e2518f..162e15045 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -28,7 +28,48 @@ function __fish_config_interactive -d "Initializations that should be performed
 
     # If we are starting up for the first time, set various defaults.
     if test $__fish_initialized -lt 3400
-        fish_initialize_colors
+	    # Regular syntax highlighting colors
+        __init_uvar fish_color_normal normal
+        __init_uvar fish_color_command blue
+        __init_uvar fish_color_param cyan
+        __init_uvar fish_color_redirection cyan --bold
+        __init_uvar fish_color_comment red
+        __init_uvar fish_color_error brred
+        __init_uvar fish_color_escape brcyan
+        __init_uvar fish_color_operator brcyan
+        __init_uvar fish_color_end green
+        __init_uvar fish_color_quote yellow
+        __init_uvar fish_color_autosuggestion 555 brblack
+        __init_uvar fish_color_user brgreen
+        __init_uvar fish_color_host normal
+        __init_uvar fish_color_host_remote yellow
+        __init_uvar fish_color_valid_path --underline
+        __init_uvar fish_color_status red
+
+        __init_uvar fish_color_cwd green
+        __init_uvar fish_color_cwd_root red
+
+        # Background color for search matches
+        __init_uvar fish_color_search_match --background=111
+
+        # Background color for selections
+        __init_uvar fish_color_selection white --bold --background=brblack
+
+        # XXX fish_color_cancel was added in 2.6, but this was added to post-2.3 initialization
+        # when 2.4 and 2.5 were already released
+        __init_uvar fish_color_cancel -r
+
+        # Pager colors
+        __init_uvar fish_pager_color_prefix cyan --bold --underline
+        __init_uvar fish_pager_color_completion normal
+        __init_uvar fish_pager_color_description B3A06D yellow -i
+        __init_uvar fish_pager_color_progress brwhite --background=cyan
+        __init_uvar fish_pager_color_selected_background -r
+
+        #
+        # Directory history colors
+        #
+        __init_uvar fish_color_history_current --bold
     end
 
     #
diff --git a/share/functions/fish_initialize_colors.fish b/share/functions/fish_initialize_colors.fish
deleted file mode 100644
index 0cbf3fafd..000000000
--- a/share/functions/fish_initialize_colors.fish
+++ /dev/null
@@ -1,44 +0,0 @@
-function fish_initialize_colors -d "Set default color uvars"
-	# Regular syntax highlighting colors
-        __init_uvar fish_color_normal normal
-        __init_uvar fish_color_command blue
-        __init_uvar fish_color_param cyan
-        __init_uvar fish_color_redirection cyan --bold
-        __init_uvar fish_color_comment red
-        __init_uvar fish_color_error brred
-        __init_uvar fish_color_escape brcyan
-        __init_uvar fish_color_operator brcyan
-        __init_uvar fish_color_end green
-        __init_uvar fish_color_quote yellow
-        __init_uvar fish_color_autosuggestion 555 brblack
-        __init_uvar fish_color_user brgreen
-        __init_uvar fish_color_host normal
-        __init_uvar fish_color_host_remote yellow
-        __init_uvar fish_color_valid_path --underline
-        __init_uvar fish_color_status red
-
-        __init_uvar fish_color_cwd green
-        __init_uvar fish_color_cwd_root red
-
-        # Background color for search matches
-        __init_uvar fish_color_search_match --background=111
-
-        # Background color for selections
-        __init_uvar fish_color_selection white --bold --background=brblack
-
-        # XXX fish_color_cancel was added in 2.6, but this was added to post-2.3 initialization
-        # when 2.4 and 2.5 were already released
-        __init_uvar fish_color_cancel -r
-
-        # Pager colors
-        __init_uvar fish_pager_color_prefix cyan --bold --underline
-        __init_uvar fish_pager_color_completion normal
-        __init_uvar fish_pager_color_description B3A06D yellow -i
-        __init_uvar fish_pager_color_progress brwhite --background=cyan
-        __init_uvar fish_pager_color_selected_background -r
-
-        #
-        # Directory history colors
-        #
-        __init_uvar fish_color_history_current --bold
-end

From 84e7fbd4662e34f073217bf771b146823d450504 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 3 Feb 2022 13:08:17 +0100
Subject: [PATCH 177/262] Make default .theme file consistent with uvars

This takes the changes from 03b23dd1b659467c4f25b337a9aafa6910783ba2
and applies them to the .theme version as well.

(note: It's *possible* to just go through fish_config in future, but
we do not want to do that right now because that can have issues on
upgrade)
---
 .../web_config/themes/fish default.theme      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/share/tools/web_config/themes/fish default.theme b/share/tools/web_config/themes/fish default.theme
index c62480492..4a66a85ac 100644
--- a/share/tools/web_config/themes/fish default.theme	
+++ b/share/tools/web_config/themes/fish default.theme	
@@ -1,19 +1,19 @@
 # name: fish default
 
 fish_color_normal normal
-fish_color_command 005fd7
-fish_color_quote 999900
-fish_color_redirection 00afff
-fish_color_end 009900
-fish_color_error ff0000
-fish_color_param 00afff
-fish_color_comment 990000
+fish_color_command blue
+fish_color_quote yellow
+fish_color_redirection cyan --bold
+fish_color_end green
+fish_color_error brred
+fish_color_param cyan
+fish_color_comment red
 fish_color_match --background=brblue
 fish_color_search_match bryellow --background=brblack
 fish_color_selection white --bold --background=brblack
 fish_color_history_current --bold
-fish_color_operator 00a6b2
-fish_color_escape 00a6b2
+fish_color_operator brcyan
+fish_color_escape brcyan
 fish_color_cwd green
 fish_color_valid_path --underline
 fish_color_cwd_root red
@@ -21,10 +21,10 @@ fish_color_user brgreen
 fish_color_autosuggestion 555 brblack
 fish_pager_color_completion normal
 fish_color_host normal
-fish_pager_color_description B3A06D yellow
+fish_pager_color_description B3A06D yellow -i
 fish_color_cancel -r
 fish_pager_color_prefix normal --bold --underline
 fish_pager_color_progress brwhite --background=cyan
 fish_pager_color_selected_background -r
-fish_color_option 00afff
-fish_color_keyword 005fd7
+fish_color_option cyan
+fish_color_keyword blue

From 0afb9b570933c7fea7b12059aa29abb7c7290339 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 3 Feb 2022 13:52:59 +0100
Subject: [PATCH 178/262] fish_title: Shorten command to 20 characters

Otherwise this makes massive terminal tabs
---
 share/functions/fish_title.fish | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/functions/fish_title.fish b/share/functions/fish_title.fish
index ec3d3e5ff..b509b54ee 100644
--- a/share/functions/fish_title.fish
+++ b/share/functions/fish_title.fish
@@ -4,14 +4,14 @@ function fish_title
         # An override for the current command is passed as the first parameter.
         # This is used by `fg` to show the true process name, among others.
         if set -q argv[1]
-            echo -- $argv[1] (prompt_pwd -d 1 -D 0)
+            echo -- (string sub -l 20 -- $argv[1]) (prompt_pwd -d 1 -D 0)
         else
             # Don't print "fish" because it's redundant
             set -l command (status current-command)
             if test "$command" = fish
                 set command
             end
-            echo -- $command (prompt_pwd -d 1 -D 1)
+            echo -- (string sub -l 20 -- $command) (prompt_pwd -d 1 -D 1)
         end
     end
 end

From 065b769c1d28822b990bd192e38ac0935f51c047 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Thu, 3 Feb 2022 22:39:30 +0800
Subject: [PATCH 179/262] CHANGELOG: work on 3.4.0

---
 CHANGELOG.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index aef798178..b462950f0 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,7 +2,7 @@ fish 3.4.0 (released ???)
 =========================
 
 ..
-   Ignore for 3.4.0 changelog: 1363 3625 3954 6477 7602 8059 8077 8079 8084 8096 8118 8127 8128 8130 8137 8139 8146 8151 8153 8161 8170 8176 8183 8184 8191 8192 8195 8202 8204 8205 8206 8219 8221 8222 8224 8227 8228 8229 8230 8231 8235 8236 8237 8238 8239 8241 8243 8249 8252 8253 8256 8257 8260 8268 8270 8271 8277 8280 8285 8287 8289 8295 8299 8305 8306 8308 8310 8311 8314 8321 8323 8326 8327 8334 8335 8337 8338 8344 8353 8358 8365 8367 8368 8380 8381 8385 8391 8394 8403 8406 8409 8410 8419 8429 8430 8433 8438 8439 8441 8444 8446 8449 8456 8457 8471 8472 8476 8477 8478 8479 8480 8487 8492 8495 8497 8500 8511 8518 8521 8522 8526 8527 8528 8548 8549 8559 8575 8584 8587 8588 8570 8591 8596 8597 8601 8608 8612 8613 8614 8615 8621 8623 8625 8626 8630 8633 8636 8639 8643 8647 8650 8651 8652 8654 8655 8656 8658 8660 8661 8662
+   Ignore for 3.4.0 changelog: 1363 3625 3954 6477 7602 8059 8077 8079 8084 8096 8118 8127 8128 8130 8137 8139 8146 8151 8153 8161 8170 8176 8183 8184 8191 8192 8195 8202 8204 8205 8206 8219 8221 8222 8224 8227 8228 8229 8230 8231 8235 8236 8237 8238 8239 8241 8243 8249 8252 8253 8256 8257 8260 8268 8270 8271 8277 8280 8285 8287 8289 8295 8299 8305 8306 8308 8310 8311 8314 8321 8323 8326 8327 8334 8335 8337 8338 8344 8353 8358 8365 8367 8368 8380 8381 8385 8391 8394 8403 8406 8409 8410 8419 8429 8430 8433 8438 8439 8441 8444 8446 8449 8456 8457 8471 8472 8476 8477 8478 8479 8480 8487 8492 8495 8497 8500 8511 8518 8521 8522 8526 8527 8528 8548 8549 8559 8575 8584 8587 8588 8570 8591 8596 8597 8601 8608 8612 8613 8614 8615 8621 8623 8625 8626 8630 8633 8636 8639 8643 8647 8650 8651 8652 8654 8655 8656 8658 8660 8661 8662 8665 8672 8675 8676 8686
 
 
 Notable improvements and fixes
@@ -120,6 +120,7 @@ Interactive improvements
 - ``funcsave`` will remove a saved copy of a function that has been erased with ``functions --erase``.
 - The Web-based configuration tool gained a number of improvements, including the ability to set pager colors.
 - The default ``fish_title`` prints a shorter title with shortened $PWD and no more redundant "fish" (:issue:`8641`).
+- Holding down an arrow key won't freeze the terminal with long periods of flashing (:issue:`8610`).
 
 New or improved bindings
 ^^^^^^^^^^^^^^^^^^^^^^^^

From 348a5b6bafcd0df2194d4c380a03f6b1bb8ae1f2 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 30 Jan 2022 19:19:43 +0100
Subject: [PATCH 180/262] Restyle detection of terminals that support OSC 7

We detect one terminal (foot) with a "string match" command, and all others in a long "test"
command.  Let's put the detection of each terminal on a new line. This should be easier to read
and change. It also allows to lose one level of indentation.
---
 .../functions/__fish_config_interactive.fish  | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index 162e15045..64cb7b41a 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -257,16 +257,19 @@ function __fish_config_interactive -d "Initializations that should be performed
     # Notify terminals when $PWD changes (issue #906).
     # VTE based terminals, Terminal.app, iTerm.app (TODO), and foot support this.
     if not set -q FISH_UNIT_TESTS_RUNNING
-        if string match -q -- 'foot*' $TERM
-            or test 0"$VTE_VERSION" -ge 3405 -o "$TERM_PROGRAM" = Apple_Terminal -a (string match -r '\d+' 0"$TERM_PROGRAM_VERSION") -ge 309 -o "$TERM_PROGRAM" = WezTerm
-            function __update_cwd_osc --on-variable PWD --description 'Notify capable terminals when $PWD changes'
-                if status --is-command-substitution || set -q INSIDE_EMACS
-                    return
-                end
-                printf \e\]7\;file://%s%s\a $hostname (string escape --style=url $PWD)
-            end
-            __update_cwd_osc # Run once because we might have already inherited a PWD from an old tab
+        and begin
+            string match -q -- 'foot*' $TERM
+            or test 0"$VTE_VERSION" -ge 3405
+            or test "$TERM_PROGRAM" = Apple_Terminal && test (string match -r '\d+' 0"$TERM_PROGRAM_VERSION") -ge 309
+            or test "$TERM_PROGRAM" = WezTerm
         end
+        function __update_cwd_osc --on-variable PWD --description 'Notify capable terminals when $PWD changes'
+            if status --is-command-substitution || set -q INSIDE_EMACS
+                return
+            end
+            printf \e\]7\;file://%s%s\a $hostname (string escape --style=url $PWD)
+        end
+        __update_cwd_osc # Run once because we might have already inherited a PWD from an old tab
     end
 
     # Create empty configuration directores if they do not already exist

From 1b127193643fd18cdf14d1a32590e9e5f5f684e3 Mon Sep 17 00:00:00 2001
From: Emily Grace Seville <emilyseville7cf@gmail.com>
Date: Thu, 18 Nov 2021 02:43:29 +1000
Subject: [PATCH 181/262] Extend mono completions

Work on mono.fish
- rewrite runtime option completions

Add new mono tools:
- gacutil
- xsp
- mkbundle
- ilasm
- monodis
- ikdasm
- monop
- sqlsharp
- gendarme
- csharp

Closes #8452
---
 CHANGELOG.rst                   |   2 +-
 share/completions/csharp.fish   |   4 +
 share/completions/gacutil.fish  |  25 +++++
 share/completions/gendarme.fish |  17 +++
 share/completions/ikdasm.fish   |   8 ++
 share/completions/ilasm.fish    |  10 ++
 share/completions/mkbundle.fish |  56 ++++++++++
 share/completions/mono.fish     | 176 +++++++++++++++++++++++++++-----
 share/completions/monodis.fish  |  45 ++++++++
 share/completions/monop.fish    |  10 ++
 share/completions/sqlsharp.fish |   3 +
 share/completions/xsp.fish      |  30 ++++++
 12 files changed, 359 insertions(+), 27 deletions(-)
 create mode 100644 share/completions/csharp.fish
 create mode 100644 share/completions/gacutil.fish
 create mode 100644 share/completions/gendarme.fish
 create mode 100644 share/completions/ikdasm.fish
 create mode 100644 share/completions/ilasm.fish
 create mode 100644 share/completions/mkbundle.fish
 create mode 100644 share/completions/monodis.fish
 create mode 100644 share/completions/monop.fish
 create mode 100644 share/completions/sqlsharp.fish
 create mode 100644 share/completions/xsp.fish

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b462950f0..ab9830f47 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -157,7 +157,7 @@ Completions
   - ``istioctl`` (:issue:`8343`)
   - ``kmutil``
   - ``matlab`` (:issue:`8505`)
-  - ``mono`` (:issue:`8415`)
+  - ``mono`` (:issue:`8415`) and related tools ``csharp``, ``gacutil``, ``gendarme``, ``ikdasm``, ``ilasm``, ``mkbundle``, ``monodis``, ``monop``, ``sqlsharp`` and ``xsp``.
   -  Angular's ``ng`` (:issue:`8111`)
   - ``nodeenv`` (:issue:`8533`)
   - ``octave`` (:issue:`8505`)
diff --git a/share/completions/csharp.fish b/share/completions/csharp.fish
new file mode 100644
index 000000000..a32361315
--- /dev/null
+++ b/share/completions/csharp.fish
@@ -0,0 +1,4 @@
+complete -c csharp -l attach -f -r -a '(ps -A | awk \'NR > 1 { printf "%s\t%s\n", $1, $4 }\')' -d
+'Inject into other processes'
+complete -c csharp -s e -f -r -d 'Specify expression to execute'
+complete -c csharp -s s -r -d 'Use file to execute'
diff --git a/share/completions/gacutil.fish b/share/completions/gacutil.fish
new file mode 100644
index 000000000..0abb5a233
--- /dev/null
+++ b/share/completions/gacutil.fish
@@ -0,0 +1,25 @@
+set -l COMMANDS -s i -o il -s u -o ul -o us -s l
+
+complete -c gacutil -s '?' -d 'Show help'
+
+complete -c gacutil -s i -c "! __fish_seen_argument $COMMANDS" \
+    -d 'Install an assembly into the global assembly cache'
+complete -c gacutil -o il -c "! __fish_seen_argument $COMMANDS" \
+    -d 'Install one or more assemblies into the global assembly cache'
+complete -c gacutil -s u -c "! __fish_seen_argument $COMMANDS" \
+    -d 'Uninstall an assembly from the global assembly cache'
+complete -c gacutil -o ul -c "! __fish_seen_argument $COMMANDS" \
+    -d 'Uninstall one or more assemblies from the global assembly cache'
+complete -c gacutil -o us -c "! __fish_seen_argument $COMMANDS" \
+    -d 'Uninstall an assembly using the specifed assembly\'s full name'
+complete -c gacutil -s l -c "! __fish_seen_argument $COMMANDS" \
+    -d 'List the contents of the global assembly cache'
+
+complete -c gacutil -o package -c '__fish_seen_argument $COMMANDS' \
+    -d 'Create a directory in prefix/lib/mono'
+complete -c gacutil -o gacdir -c "__fish_seen_argument $COMMANDS" \
+    -d 'Use the GACs base directory'
+complete -c gacutil -o root -c "__fish_seen_argument $COMMANDS" \
+    -d 'Integrate with automake tools or packaging tools that require a prefix directory to be specified'
+complete -c gacutil -o check_refs -c '__fish_seen_argument -s i -o il' \
+    -d 'Check the assembly being installed into the GAC does not reference any non strong named assemblies'
diff --git a/share/completions/gendarme.fish b/share/completions/gendarme.fish
new file mode 100644
index 000000000..44b6a8007
--- /dev/null
+++ b/share/completions/gendarme.fish
@@ -0,0 +1,17 @@
+complete -c gendarme -l version -d 'Show version'
+
+complete -c gendarme -l config -r -d 'Use config file'
+complete -c gendarme -l set -x -d 'Use rule set from config file'
+complete -c gendarme -l xml -r -d 'Convert stdout to XML and redirect to file'
+complete -c gendarme -l html -r -d 'Convert stdout to HTML and redirect to file'
+complete -c gendarme -l console -d 'Show the defects on stdout'
+complete -c gendarme -l ignore -r -d 'Exclude the defects from file'
+complete -c gendarme -l limit -x -d 'Specify defect limit'
+complete -c gendarme -l severity -x \
+    -a 'all audit audit+ low low+ low- medium medium+ medium- high high+ high- critical critical-' \
+    -d 'Filter the reported defects to include the specified severity levels'
+complete -c gendarme -l confidence -x \
+    -a 'all low low+ normal normal+ normal- high high+ high- total total-' \
+    -d 'Filter the reported defects to include the specified confidence levels'
+complete -c gendarme -l quiet -d 'Discard stdout'
+complete -c gendarme -s v -l verbose -d 'Show more messages'
diff --git a/share/completions/ikdasm.fish b/share/completions/ikdasm.fish
new file mode 100644
index 000000000..76c6dec4b
--- /dev/null
+++ b/share/completions/ikdasm.fish
@@ -0,0 +1,8 @@
+complete -c ikdasm -o help -d 'Show help'
+
+complete -c ikdasm -o out -r -d 'Redirect stdout to file'
+complete -c ikdasm -o assembly -d 'Include Assembly table contents'
+complete -c ikdasm -o assemblyref -d 'Include AssemblyRef table contents'
+complete -c ikdasm -o moduleref -d 'Include ModuleRef table contents'
+complete -c ikdasm -o exported -d 'Include ExportedType table contents'
+complete -c ikdasm -o customattr -d 'Include CustomAttribute table contents'
diff --git a/share/completions/ilasm.fish b/share/completions/ilasm.fish
new file mode 100644
index 000000000..f23c2743c
--- /dev/null
+++ b/share/completions/ilasm.fish
@@ -0,0 +1,10 @@
+complete -c ilasm -l help -d 'Show help and exit'
+complete -c ilasm -l version -d 'Show version and exit'
+
+complete -c ilasm -o 'output:' -r -d 'Specify the output file name'
+complete -c ilasm -o exe -d 'Generate an exe'
+complete -c ilasm -o scan_only -d 'Just scan the IL code and display tokens'
+complete -c ilasm -o show_tokens -d 'Show tokens as they are parsed'
+complete -c ilasm -o show_method_def -d 'Display method information when a method is defined'
+complete -c ilasm -o show_method_ref -d 'Display method information when a method is referenced'
+complete -c ilasm -o 'key:' -d 'Strongname (sign) the output assembly using the key pair'
diff --git a/share/completions/mkbundle.fish b/share/completions/mkbundle.fish
new file mode 100644
index 000000000..ee49aeac7
--- /dev/null
+++ b/share/completions/mkbundle.fish
@@ -0,0 +1,56 @@
+function __fish_mkbundle_cross_args
+    mkbundle --list-targets | awk -F '	- ' '/^Targets available/ { exit } !/^Available targets/ { printf "%s\t%s\n", gensub(/^\t/, "", 1, $1), $2 }'
+end
+
+# Options
+complete -c mkbundle -l config -r -d 'Bundle DLLMAP Mono config file'
+complete -c mkbundle -l config-dir -r -d 'Use MONO_CFG_DIR environment variable as config dir'
+complete -c mkbundle -n 'not __fish_seen_argument -l sdk -l cross' -l cross -x -a '(__fish_mkbundle_cross_args)' \
+    -d 'Create bundle for the specified target platform'
+complete -c mkbundle -l deps \
+    -d 'Bundle all of the referenced assemblies for the assemblies listed on the command line option'
+complete -c mkbundle -l env -x -d 'Specify value for the environment variable'
+complete -c mkbundle -l fetch-target -x \
+    -d 'Download a precompiled runtime for the specified target from the Mono distribution site'
+complete -c mkbundle -l i18n -x -d 'Use encoding tables to ship with the executable'
+complete -c mkbundle -s L -r -d 'Use path for look for assemblies'
+complete -c mkbundle -l library -r -d 'Embed the dynamic library file'
+complete -c mkbundle -l lists-targets -d 'Show all of the available remote cross compilation targets'
+complete -c mkbundle -l local-targets -d 'Show all of the available local cross compilation targets'
+complete -c mkbundle -l cil-strip -r -d 'Use a CIL stripper that mkbundle will use if able to'
+complete -c mkbundle -l in-tree -r \
+    -d 'Use mkbundle with a mono source repository from which to pull the necessary headers for compilation'
+complete -c mkbundle -l managed-linker -r \
+    -d 'Use mkbundle access to a managed linker to preprocess the assemblies'
+complete -c mkbundle -l machine-config -r \
+    -d 'Use the given FILE as the machine.config file for the generated application'
+complete -c mkbundle -l no-config \
+    -d 'Prevent mkbundle from automatically bundling a config file'
+complete -c mkbundle -l nodeps \
+    -d 'Exclude all the assemblies but those were specified on the command line'
+complete -c mkbundle -s o -r -d 'Use output file name'
+complete -c mkbundle -l options -r -d 'Specify configuration options to the Mono runtime'
+complete -c mkbundle -n 'not __fish_seen_argument -l sdk -l cross' -l sdk -r \
+    -d 'Use a path from which mkbundle will resolve the Mono SDK from'
+complete -c mkbundle -l target-server -r -d 'Use a different server to provide cross-compiled runtimes'
+complete -c mkbundle -l mono-api-struct-path -r \
+    -d 'Use file with the definition of the BundleMonoAPI structure'
+
+# Old embedding options
+complete -c mkbundle -s c -d 'Produce the stub file, do not compile the resulting stub'
+complete -c mkbundle -o oo -r \
+    -d 'Specify the name to be used for the helper object file that contains the bundle'
+complete -c mkbundle -l keeptemp \
+    -d 'Prevent mkbundle from deleting temporary files that it uses to produce the bundle'
+complete -c mkbundle -l nomain -d 'Generate the host stub without a main() function'
+complete -c mkbundle -l static -d 'Statically link to mono and glib'
+complete -c mkbundle -s z -d 'Compress the assemblies before embedding'
+
+# AOT options
+complete -c mkbundle -l aot-runtime -r \
+    -d 'Use the path to the mono runtime to use for AOTing assemblies'
+complete -c mkbundle -l aot-dedup \
+    -d 'Deduplicate AOT\'ed methods based on a unique mangling of method names'
+complete -c mkbundle -l aot-mode -x \
+    -a 'full\t"Generate the necessary stubs to not require runtime code generation" llvmonly\t"Do the same, but force all codegen to go through the llvm backend"' \
+    -d 'Specifiy AOT mode'
diff --git a/share/completions/mono.fish b/share/completions/mono.fish
index 5463d571d..824bd3931 100644
--- a/share/completions/mono.fish
+++ b/share/completions/mono.fish
@@ -1,29 +1,153 @@
-complete -c mono -s h -l help -d 'Show help and exit'
-complete -c mono -s V -l version -a number -f -d 'Show version and exit'
+# Runtime options
+complete -c mono -s h -l help -d 'Show help'
+complete -c mono -s V -l version -a number -f -d 'Show version'
 
-complete -c mono -l aot -a 'asmonly bind-to-runtime-version data-outfile direct-icalls
-  direct-pinvoke dwarfdebug full hybrid llvm llvmonly llvmopts llvmllc mcpu dedup-include
-  info interp depfile ld-flags llvm-path msym-dir mtriple nimt-trampolines ngsharedvt-trampolines
-  nodebug no-direct-calls nrgctx-trampolines nrgctx-fetch-trampolines ntrampolines outfile
-  print-skipped-methods profile profile-only readonly-value save-temps,keep-temps soft-debug
-  static stats temp-path threads tool-prefix verbose write-symbols,no-write-symbols no-opt' \
+complete -c mono -l aot -a '(__fish_append , \\
+  asmonly\t"Instruct the AOT compiler to output assembly code instead of an object file" \\
+  bind-to-runtime-version\t"Force the generated AOT files to be bound to the runtime version of the compiling Mono" \\
+  data-outfile\t"Instruct the AOT code generator to output certain data constructs into a separate file" \\
+  direct-icalls\t"Invoke icalls directly instead of going through the operating system symbol lookup operation" \\
+  direct-pinvoke\t"Invoke PInvoke methods directly instead of going through the operating system symbol lookup operation" \\
+  dwarfdebug\t"Instruct the AOT compiler to emit DWARF debugging information" \\
+  full\t"Create binaries which can be used with the --full-aot option" \\
+  hybrid\t"Create binaries which can be used with the --hybrid-aot option" \\
+  llvm\t"Perform AOT with the LLVM backend instead of the Mono backend where possible" \\
+  llvmonly\t"Perform AOT with the LLVM backend exclusively and the Mono backend will not be used" \\
+  llvmopts\t"Specify flags to the built-in set of flags passed to the LLVM optimizer" \\
+  llvmllc\t"Specify flags to the built-in set of flags passed to the LLVM static compiler (llc)" \\
+  mcpu\t"Allow AOT mode to use all instructions current CPU supports" \\
+  dedup-include\t"Pass compilation where we compile the methods that we had previously skipped" \\
+  info\t"Print the architecture the AOT in this copy of Mono targets and quit" \\
+  interp\t"Generate all required wrappers, so that it is possible to run --interpreter without any  code generation at runtime" \\
+  depfile\t"Output a gcc -M style dependency file" \\
+  ld-flags\t"Specify flags to pass to the C linker (if the current AOT mode calls for invoking it)" \\
+  llvm-path\t"Same for the llvm tools \\\'opt\\\' and \\\'llc\\\'" \\
+  msym-dir\t"Instruct the AOT compiler to generate offline sequence points .msym files" \\
+  mtriple\t"Use the GNU style target triple <TRIPLE> to determine some code generation options" \\
+  nimt-trampolines\t"Precreate IMT trampolines in the AOT image" \\
+  ngsharedvt-trampolines\t"Precreate value type generic sharing trampolines in the AOT image" \\
+  nodebug\t"Instruct the AOT compiler to not output any debugging information" \\
+  no-direct-calls\t"Prevent the AOT compiler from generating a direct calls to a method" \\
+  nrgctx-trampolines\t"Precreate generic sharing trampolines in the AOT image" \\
+  nrgctx-fetch-trampolines\t"Precreate generic sharing fetch trampolines in the AOT image" \\
+  ntrampolines\t"Precreate method trampolines in the AOT image" \\
+  outfile\t"Instruct the AOT compiler to save the output to the specified file" \\
+  print-skipped-methods\t"Output the skipped methods to the console" \\
+  profile\t"Specify a file to use for profile-guided optimization" \\
+  profile-only\t"" \\
+  readonly-value\t"Override the value of a static readonly field" \\
+  save-temps,keep-temps\t"Instruct the AOT compiler to keep temporary files" \\
+  soft-debug\t"Instruct the compiler to generate sequence point checks" \\
+  static\t"Create  an ELF object file (.o) or .s file which can be statically linked into an executable when embedding the mono runtime" \\
+  stats\t"Print various stats collected during AOT compilation" \\
+  temp-path\t"Specify path to store temporary files created during AOT compilation" \\
+  threads\t"Use multiple threads when compiling the methods" \\
+  tool-prefix\t"Prepend <PREFIX> to the name of tools ran by the AOT compiler" \\
+  verbose\t"Print additional information about type loading failures" \\
+  write-symbols,no-write-symbols\t"Instruct the AOT compiler to emit (or not emit) debug symbol information" \\
+  no-opt\t"Instruct the AOT compiler tot no call opt when compiling with LLVM")' \
     -f -d 'Precompile CIL code to native code'
-complete -c mono -l debug -a 'casts mdb-optimizations gdb' -f -d 'Use debug mode'
-complete -c mono -l debugger-agent -a 'address loglevel logfile server setpgid suspend
-  transport' -f -d 'Use debugger agent'
-complete -c mono -l profile -d 'Use profiler module'
-complete -c mono -l trace -d 'Trace expression'
-complete -c mono -l jitmap -d 'Generate JIT method map in /tmp/perf-PID.map'
 
-complete -c mono -l config -F -r -d 'Use config'
-complete -c mono -s v -l verbose -d 'Increase verbosity level'
-complete -c mono -l runtime -f -d 'Use runtime version'
-complete -c mono -l optimize -a 'abcrem all aot branch cfold cmov deadce consprop copyprop
-  fcmov float32 gshared inline intrins linears leaf loop peephole precomp sched shared
-  sse2 tailc' -f -d 'Use optimizations'
-complete -c mono -l attach -a disable -f -d 'Specify attach agent options'
-complete -c mono -l llvm -d 'Use LLVM'
-complete -c mono -l nollvm -d 'Don\'t use LLVM'
-complete -c mono -l gc -a 'sgen boehm' -f -d 'Specify garbage collector'
-complete -c mono -l handlers -d 'Use custom handlers'
-complete -c mono -l aot-path -f -d 'Add directories for AOT image search'
+complete -c mono -l aot-path -d 'Show additional directories to search for AOT images'
+complete -c mono -l apply-bindings \
+    -d 'Apply the assembly bindings from the specified configuration file when running the AOT compiler'
+complete -c mono -l assembly-loader \
+    -a 'strict\t"Check that the public key token, culture and version of a candidate assembly matches the requested strong name" legacy\t"Allow candidate as long as the name matches"' \
+    -f -d 'Use assembly loader mode'
+complete -c mono -l attach -a disable -f -d 'Disable the attach functionality'
+complete -c mono -l config -d 'Read configuration from file instead of using default one'
+
+complete -c mono -l debugger-agent -a '(__fish_append , \\
+  address\t"Specify the IP address where your debugger client is listening to" \\
+  loglevel\t"Specify the diagnostics log level for" \\
+  logfile\t"Instruct the AOT code generator to output certain data constructs into a separate file" \\
+  server\t"Specify the file where the log will be stored, it defaults to standard output" \\
+  setpgid\t"If set to yes, Mono will call setpgid(0, 0) on startup" \\
+  suspend\t"Suspend the vm on startup until it connects successfully to a debugger front end" \\
+  transport\t"Specify the transport that the debugger will use to communicate")' \
+    -f -d 'Use a debugging agent inside the Mono runtime and connect it to a client user interface'
+
+complete -c mono -l desktop \
+    -d 'Configure the virtual machine to be better suited for desktop applications'
+complete -c mono -l full-aot \
+    -d 'Prevent from generation any code at runtime and depend exclusively on the code generated from using mono --aot=full previously'
+complete -c mono -l full-aot-interp \
+    -d 'Same as --full-aot with fallback to the interpreter'
+complete -c mono -l gc -a 'boehm\tBoehm sgen\tSGen' -f -d 'Use the Garbage Collector engine'
+complete -c mono -l gc-debug -f -d 'Specify MONO_GC_DEBUG environment variable value'
+complete -c mono -l gc-params -f -d 'Specify MONO_GC_PARAMS environment variable value'
+test "$(uname)" = Darwin && complete -c mono -l arch -a '32\t"32 bit" 64\t"64 bit"' -f \
+    -d 'Use the bitness of the Mono binary used, if available'
+complete -c mono -l interpreter -d 'Use Mono interpreter to execute a given assembly'
+complete -c mono -l hybrid-aot -d 'Run assemblies that have been stripped of IL'
+complete -c mono -l llvm -d 'Use the LLVM optimization and code generation engine to JIT or AOT compile'
+complete -c mono -l ffast-math -d 'Use Mono and LLVM aggressive floating point optimizations'
+
+complete -c mono -s o -l optimize -a '(__fish_append , \\
+  abcrem\t"Array bound checks removal" \\
+  all\t"Turn on all optimizations" \\
+  aot\t"Usage of Ahead Of Time compiled code" \\
+  branch\t"Branch optimizations" \\
+  cfold\t"Constant folding" \\
+  cmov\t"Conditional moves [arch-dependency]" \\
+  deadce\t"Dead code elimination" \\
+  consprop\t"Constant propagation" \\
+  copyprop\t"Copy propagation" \\
+  fcmov\t"Fast x86 FP compares [arch-dependency]" \\
+  float32\t"Perform 32-bit float arithmetic using 32-bit operations" \\
+  gshared\t"Enable generic code sharing" \\
+  inline\t"Inline method calls" \\
+  intrins\t"Intrinsic method implementations" \\
+  linears\t"Linear scan global reg allocation" \\
+  leaf\t"Leaf procedures optimizations" \\
+  loop\t"Loop related optimizations" \\
+  peephole\t"Peephole postpass" \\
+  precomp\t"Precompile all methods before executing Main" \\
+  sched\t"Instruction scheduling" \\
+  shared\t"Emit per-domain code" \\
+  sse2\t"SSE2 instructions on x86 [arch-dependency]" \\
+  tailc\t"Tail recursion and tail calls" \\
+  transport\t"Specify the transport that the debugger will use to communicate")' \
+    -f -d 'Use optimizations'
+
+complete -c mono -l response -d 'Use a response file'
+complete -c mono -l runtime -a '(mono --version)' -f -d 'Use Mono version'
+complete -c mono -l server -d 'Optimize the virtual machine to be better suited for server operations'
+complete -c mono -l use-map-jit -d 'Generate code using MAP_JIT on MacOS'
+complete -c mono -l verify-all \
+    -d 'Verify mscorlib and assemblies in the global assembly cache for valid IL, and all user code for IL verifiability'
+
+# Development options
+complete -c mono -l debug -a '(__fish_append , \\
+  casts\t"Produce a detailed error when throwing a InvalidCastException" \\
+  mdb-optimizations\t"Disable some JIT optimizations which are usually only disabled when running inside the debugger" \\
+  gdb\t"Generate and register debugging information with gdb")' \
+    -f -d 'Use the debugging mode in the runtime'
+
+complete -c mono -l profile -f -d 'Use a profiler module with the given arguments'
+complete -c mono -l trace -f -d 'Show method names as they are invoked'
+complete -c mono -l no-x86-stack-align -d 'Don\'t align stack frames on the x86 architecture'
+complete -c mono -l jitmap -d 'Generate a JIT method map in a /tmp/perf-PID.map file'
+
+# JIT maintainer options
+complete -c mono -l bisect -f -d 'This flag is used by the automatic optimization bug bisector'
+complete -c mono -l break -x \
+    -d 'Insert a breakpoint before the method whose name is \'method\' (namespace.class:methodname)'
+complete -c mono -l breakonex -d 'Use a breakpoint on exceptions'
+complete -c mono -l compile -x -d 'Compile a method (namespace.name:methodname)'
+complete -c mono -l compile-all -d 'Compile all the methods in an assembly'
+complete -c mono -l graph \
+    -a 'cfg\t"Control Flow Graph (CFG)"
+    dtree\t"Dominator Tree" code\t"CFG showing code"
+    ssa\t"CFG showing code after SSA translation"
+    optcode\t"CFG showing code after IR optimizations"' \
+    -x -d 'Generate a postscript file with a graph with the details about the specified method'
+complete -c mono -l ncompile \
+    -d 'Instruct the runtime on the number of times that the method(-s) specified by --compile/--compile-all to be compiled'
+complete -c mono -l stats \
+    -d 'Display information about the work done by the runtime during the execution of an application'
+complete -c mono -l wapi \
+    -a 'hps\t"Delete the global semaphore"
+    semdel\t"List the currently used handles"' \
+    -x -d 'Perform maintenance of the process shared data'
+complete -c mono -s v -l verbose -d 'Show more messages'
diff --git a/share/completions/monodis.fish b/share/completions/monodis.fish
new file mode 100644
index 000000000..064beae03
--- /dev/null
+++ b/share/completions/monodis.fish
@@ -0,0 +1,45 @@
+# Options
+complete -c monodis -s h -l help -d 'Show help'
+
+complete -c monodis -l output -r -d 'Redirect stdout to file'
+complete -c monodis -l mscorlib -d 'Use \'mscorlib\' as the assembly name for non-corlib assemblies'
+complete -c monodis -l show-method-tokens -d 'Show tokens for disassembled methods'
+complete -c monodis -l show-tokens -d 'Show tokens for strings, types, methods, fields, ...'
+
+# Options to display metadata tables
+complete -c monodis -l assembly -d 'Include Assembly table contents'
+complete -c monodis -l assemblyref -d 'Include AssemblyRef table contents'
+complete -c monodis -l classlayout -d 'Include ClassLayout table contents'
+complete -c monodis -l constant -d 'Include Constant table contents'
+complete -c monodis -l customattr -d 'Include CustomAttribute table contents'
+complete -c monodis -l declsec -d 'Include DeclSec table contents'
+complete -c monodis -l event -d 'Include Event table contents'
+complete -c monodis -l exported -d 'Include ExportedType table contents'
+complete -c monodis -l fields -d 'Include Field table contents'
+complete -c monodis -l file -d 'Include File table contents'
+complete -c monodis -l forward-decls -d 'Include forward declarations for classes'
+complete -c monodis -l genericpar -d 'Include GenericParam table contents'
+complete -c monodis -l implmap -d 'Include ImplMap table contents'
+complete -c monodis -l interface -d 'Include InterfaceImpl table contents'
+complete -c monodis -l manifest -d 'Include ManifestResource table contents'
+complete -c monodis -l marshal -d 'Include FieldMarshal table contents'
+complete -c monodis -l numberref -d 'Include MemberRef table contents'
+complete -c monodis -l method -d 'Include MethodRef table contents'
+complete -c monodis -l methodimpl -d 'Include MethodImpl table contents'
+complete -c monodis -l methodspec -d 'Include MethodSpec table contents'
+complete -c monodis -l methodsem -d 'Include MethodSemantics table contents'
+complete -c monodis -l module -d 'Include Module table contents'
+complete -c monodis -l moduleref -d 'Include ModuleRef table contents'
+complete -c monodis -l mresources -d 'Save all the managed resources embedded in the assembly into the current directory'
+complete -c monodis -l presources -d 'Show offsets and names of manifest resources embedded in the assembly'
+complete -c monodis -l nested -d 'Include NestedClass table contents'
+complete -c monodis -l param -d 'Include Param table contents'
+complete -c monodis -l parconst -d 'Include GenericParameterConstraint table contents'
+complete -c monodis -l property -d 'Include Property table contents'
+complete -c monodis -l propertymap -d 'Include PropertyMap table contents'
+complete -c monodis -l standalonesig -d 'Include StandAloneSig table contents'
+complete -c monodis -l typedef -d 'Include TypeDef table contents'
+complete -c monodis -l typespec -d 'Include TypeRef table contents'
+complete -c monodis -l blob -d 'Use hex for entire contents of the blob stream'
+complete -c monodis -l strings -d 'Include Strings table contents'
+complete -c monodis -l userstrings -d 'Include User-Strings heap contents'
diff --git a/share/completions/monop.fish b/share/completions/monop.fish
new file mode 100644
index 000000000..c00488ec8
--- /dev/null
+++ b/share/completions/monop.fish
@@ -0,0 +1,10 @@
+complete -c monop -s r -d 'Specifies the assembly to use for looking up the type'
+complete -c monop -s a -d 'Renders all of the types in the specified assembly'
+complete -c monop -s s -s k -l search -d 'Searches through all known assemblies for types containing \'class\''
+complete -c monop -l refs -d 'Print a list of the referenced assemblies for an assembly.'
+complete -c monop -s f -l filter-obsolete -d 'Do not show obsolete types and members'
+complete -c monop -s d -l declared-only -d 'Only show members declared in the type'
+complete -c monop -s p -l private -d 'Show private members'
+complete -c monop -l runtime-version -d 'Print runtime version'
+complete -c monop -o xa -d 'Set the lookup path to the Xamarin.Android directory'
+complete -c monop -o xi -d 'Set the lookup path to the Xamarin.iOS directory'
diff --git a/share/completions/sqlsharp.fish b/share/completions/sqlsharp.fish
new file mode 100644
index 000000000..89e95c250
--- /dev/null
+++ b/share/completions/sqlsharp.fish
@@ -0,0 +1,3 @@
+complete -c sqlsharp -s f -r -d 'Read SQL commands from file'
+complete -c sqlsharp -s o -r -d 'Redirect stdout to file'
+complete -c sqlsharp -s s -d 'Use silent mode'
diff --git a/share/completions/xsp.fish b/share/completions/xsp.fish
new file mode 100644
index 000000000..9abdd2d6f
--- /dev/null
+++ b/share/completions/xsp.fish
@@ -0,0 +1,30 @@
+complete -c xsp -l help -d 'Show help'
+complete -c xsp -l version -d 'Show version'
+
+complete -c xsp -l address -x -d 'Use the IP address to listen on'
+complete -c xsp -l port -x -d 'Use the port where the XSP server will listen to requests'
+complete -c xsp -l backlog -x -d 'Use the backlog of connections to set on the listener socket'
+complete -c xsp -l minThreads -x -d 'Specify minimum number of threads the threadpool allocates'
+complete -c xsp -l filename -r -d 'Use unix socket file name to listen on'
+complete -c xsp -l root -r -d 'Use root directory for XSP'
+complete -c xsp -l appconfigfile -r -d 'Add application definitions from the XML configuration file'
+complete -c xsp -l appconfigdir -r \
+    -d 'Add application definitions from all XML files found in the specified directory'
+complete -c xsp -l applications -r \
+    -d 'Use a comma separated list of virtual directory and real directory for all the applications'
+complete -c xsp -l master -d 'Use this instance by mod_mono to create ASP.NET applications on demand'
+complete -c xsp -l no-hidden -d 'Do not protect hidden files/directories from being accessed by clients'
+complete -c xsp -l https -d 'Enable HTTPS support on the server'
+complete -c xsp -l https-client-accept -d 'Like --https enable HTTPS support on the server'
+complete -c xsp -l https-client-require -d 'Like --https enable HTTPS support on the server'
+complete -c xsp -l p12file -r -d 'Use to specify the PKCS#12 file to use'
+complete -c xsp -l cert -r -d 'Use to specify the server X.509 certificate file'
+complete -c xsp -l pkpwd -r -d 'Use password to decode the private key'
+
+complete -c xsp -l protocol \
+    -a 'Default\t"Auto-detect the client protocol and adjust the server protocol accordingly" Tls\t"Tls protocol" Ssl3\t"Ssl3 protocol"' \
+    -x -d 'Use protocols available for encrypting the communications'
+
+complete -c xsp -l terminate -d 'Gracefully terminates a running mod-mono-server instance'
+complete -c xsp -l verbose -d 'Show more messages'
+complete -c xsp -l pidfile -r -d 'Redirect xsp4 PID output in stdout to file'

From 0e6313b98b3a6c391e8103489f892448abf33a12 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sat, 5 Feb 2022 20:29:24 +0100
Subject: [PATCH 182/262] help: error out on unknown help topic

Probably too minor for a changelog?

Fixes #8698
---
 share/functions/help.fish | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/share/functions/help.fish b/share/functions/help.fish
index dabaea6e8..1d2fecf15 100644
--- a/share/functions/help.fish
+++ b/share/functions/help.fish
@@ -113,6 +113,7 @@ function help --description 'Show help for the fish shell'
 
     # HACK: Hardcode all section titles for each page.
     # This could possibly be automated.
+    set -l intropages introduction where-to-go installation starting-and-exiting default-shell uninstalling shebang-line configuration examples resources other-help-pages
     set -l for_bash_pages arithmetic-expansion bash-command-substitutions blocks-and-loops builtins-and-other-commands command-substitutions fish-for-bash-users heredocs process-substitution prompts quoting special-variables string-manipulation subshells test-test variables wildcards-globs
     set -l faqpages faq-ssh-interactive faq-unicode faq-uninstalling frequently-asked-questions how-can-i-use-as-a-shortcut-for-cd how-do-i-change-the-greeting-message how-do-i-check-whether-a-variable-is-defined how-do-i-check-whether-a-variable-is-not-empty how-do-i-customize-my-syntax-highlighting-colors how-do-i-get-the-exit-status-of-a-command how-do-i-make-fish-my-default-shell how-do-i-run-a-command-every-login-what-s-fish-s-equivalent-to-bashrc-or-profile how-do-i-run-a-command-from-history how-do-i-run-a-subcommand-the-backtick-doesn-t-work how-do-i-set-my-prompt how-do-i-set-or-clear-an-environment-variable i-accidentally-entered-a-directory-path-and-fish-changed-directory-what-happened i-m-getting-weird-graphical-glitches-a-staircase-effect-ghost-characters-cursor-in-the-wrong-position i-m-seeing-weird-output-before-each-prompt-when-using-screen-what-s-wrong my-command-pkg-config-gives-its-output-as-a-single-long-string my-command-prints-no-matches-for-wildcard-but-works-in-bash the-open-command-doesn-t-work uninstalling-fish what-is-the-equivalent-to-this-thing-from-bash-or-other-shells where-can-i-find-extra-tools-for-fish why-does-my-prompt-show-a-i why-doesn-t-history-substitution-etc-work why-doesn-t-set-ux-exported-universal-variables-seem-to-work why-won-t-ssh-scp-rsync-connect-properly-when-fish-is-my-login-shell
     set -l interactivepages abbreviations autosuggestions color command-line-editor command-mode configurable-greeting copy-and-paste-kill-ring custom-bindings custom-binds directory-stack editor emacs-mode emacs-mode-commands greeting help history-search id7 insert-mode interactive interactive-use killring multiline multiline-editing navigating-directories pager-color-variables private-mode programmable-prompt programmable-title prompt searchable-command-history shared-bindings shared-binds syntax-highlighting syntax-highlighting-variables tab-completion title variables-color variables-color-pager vi-mode vi-mode-command vi-mode-commands vi-mode-insert vi-mode-visual visual-mode
@@ -161,8 +162,11 @@ function help --description 'Show help for the fish shell'
             set fish_help_page "cmds/$fish_help_item.html"
         case ''
             set fish_help_page "index.html"
+        case $intropages
+            set fish_help_page "index.html$fish_help_item"
         case "*"
-            set fish_help_page "index.html#$fish_help_item"
+            printf (_ "%s: no fish help topic '%s', try 'man %s'\n") help $fish_help_item $fish_help_item
+            return 1
     end
 
     # In Crostini Chrome OS Linux, the default browser opens URLs in Chrome running outside the

From 8a4ed096ed6856c2bf9dde59901f23eaf8d89da0 Mon Sep 17 00:00:00 2001
From: ridiculousfish <rf@fishshell.com>
Date: Sun, 30 Jan 2022 11:29:35 -0800
Subject: [PATCH 183/262] Stop passing check_exit events to match key bindings

check_exit events are generated to give the reader a chance to respond to
commands, or otherwise to return control to the reader loop. Prior to this
change they were being passed to match key bindings. This is useless since
no key binding can match a check_exit event. FLOG noisily complains about
unmatched events. So just don't pass these to mapping_execute.
---
 src/input.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/input.cpp b/src/input.cpp
index 75a9522ba..35ad325b4 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -673,9 +673,6 @@ void inputter_t::mapping_execute_matching_or_generic(const command_handler_t &co
 
     FLOGF(reader, L"no generic found, ignoring char...");
     auto evt = peeker.next();
-    if (evt.is_eof()) {
-        this->push_front(evt);
-    }
     peeker.consume();
 }
 
@@ -750,7 +747,11 @@ char_event_t inputter_t::read_char(const command_handler_t &command_handler) {
             // If we have EOF, we need to immediately quit.
             // There's no need to go through the input functions.
             return evt;
+        } else if (evt.is_check_exit()) {
+            // Allow the reader to check for exit conditions.
+            return evt;
         } else {
+            assert(evt.is_char() && "Should be char event");
             this->push_front(evt);
             mapping_execute_matching_or_generic(command_handler);
             // Regarding allow_commands, we're in a loop, but if a fish command is executed,

From 43e5004b6e98cfca48a0452498e63ea31b08a643 Mon Sep 17 00:00:00 2001
From: ridiculousfish <rf@fishshell.com>
Date: Mon, 31 Jan 2022 21:02:25 -0800
Subject: [PATCH 184/262] readch_timed to block signals

readch_timed is called after reading the escape character \x1b. The escape
char may be a standalone key press or part of an escape sequence; fish
waits for a little bit (per the fish_escape_delay_ms variable) to see if
something else arrives, before treating it as standalone escape-key press.

It may happen that a signal is delivered while fish waits. Prior to this
change we would treat this signal as a "nothing was read" event, causing
escape to be wrongly treated as standalone.

Avoid this by using pselect() with a full signal mask, to ensure this call
completes.
---
 src/input_common.cpp | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/input_common.cpp b/src/input_common.cpp
index d741b96e7..3120363fc 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -2,6 +2,7 @@
 #include "config.h"
 
 #include <errno.h>
+#include <signal.h>
 #include <unistd.h>
 
 #include <cstring>
@@ -10,6 +11,7 @@
 #endif
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/select.h>
 #include <sys/time.h>
 #include <sys/types.h>
 
@@ -223,9 +225,27 @@ maybe_t<char_event_t> input_event_queue_t::readch_timed() {
     if (auto evt = try_pop()) {
         return evt;
     }
-    const uint64_t usec_per_msec = 1000;
-    uint64_t timeout_usec = static_cast<uint64_t>(wait_on_escape_ms) * usec_per_msec;
-    if (fd_readable_set_t::is_fd_readable(in_, timeout_usec)) {
+    // We are not prepared to handle a signal immediately; we only want to know if we get input on
+    // our fd before the timeout. Use pselect to block all signals; we will handle signals
+    // before the next call to getch().
+    sigset_t sigs;
+    sigfillset(&sigs);
+
+    // pselect expects timeouts in nanoseconds.
+    const uint64_t nsec_per_msec = 1000 * 1000;
+    const uint64_t nsec_per_sec = nsec_per_msec * 1000;
+    const uint64_t wait_nsec = wait_on_escape_ms * nsec_per_msec;
+    struct timespec timeout;
+    timeout.tv_sec = (wait_nsec) / nsec_per_sec;
+    timeout.tv_nsec = (wait_nsec) % nsec_per_sec;
+
+    // We have one fd of interest.
+    fd_set fdset;
+    FD_ZERO(&fdset);
+    FD_SET(in_, &fdset);
+
+    int res = pselect(in_ + 1, &fdset, nullptr, nullptr, &timeout, &sigs);
+    if (res > 0) {
         return readch();
     }
     return none();

From 1bdd6293268f88e7e837510eb83ce07744daf207 Mon Sep 17 00:00:00 2001
From: ridiculousfish <rf@fishshell.com>
Date: Sun, 30 Jan 2022 13:15:50 -0800
Subject: [PATCH 185/262] Prevent signals from tearing multi-char bindings

Say the user has a multi-char binding (typically an escape sequence), and a
signal arrives partway through the binding. The signal has an event handler
which enques some readline event, for example, `repaint`. Prior to this
change, the readline event would cause the multi-char binding to fail. This
would cause bits of the escape sequence to be printed to the screen.

Fix this by noticing when a sequence was "interrupted" by a non-char event,
and then rotating a sequence of such interruptions to the front of the
queue.

Fixes #8628
---
 CHANGELOG.rst                  |  1 +
 src/input.cpp                  | 27 +++++++++++-
 src/input_common.cpp           |  9 ++++
 src/input_common.h             |  3 ++
 tests/pexpects/torn_escapes.py | 81 ++++++++++++++++++++++++++++++++++
 5 files changed, 120 insertions(+), 1 deletion(-)
 create mode 100644 tests/pexpects/torn_escapes.py

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ab9830f47..290387d93 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -121,6 +121,7 @@ Interactive improvements
 - The Web-based configuration tool gained a number of improvements, including the ability to set pager colors.
 - The default ``fish_title`` prints a shorter title with shortened $PWD and no more redundant "fish" (:issue:`8641`).
 - Holding down an arrow key won't freeze the terminal with long periods of flashing (:issue:`8610`).
+- Multi-char bindings are no longer interrupted if a signal handler enqueues an event. (:issue:`8628`).
 
 New or improved bindings
 ^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/input.cpp b/src/input.cpp
index 35ad325b4..4ead777f0 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -504,6 +504,14 @@ class event_queue_peeker_t {
         idx_ = 0;
     }
 
+    /// Test if any of our peeked events are readline or check_exit.
+    bool char_sequence_interrupted() const {
+        for (const auto &evt : peeked_) {
+            if (evt.is_readline() || evt.is_check_exit()) return true;
+        }
+        return false;
+    }
+
     /// Reset our index back to 0.
     void restart() { idx_ = 0; }
 
@@ -594,7 +602,9 @@ static bool try_peek_sequence(event_queue_peeker_t *peeker, const wcstring &str)
 }
 
 /// \return the first mapping that matches, walking first over the user's mapping list, then the
-/// preset list. \return null if nothing matches.
+/// preset list.
+/// \return none if nothing matches, or if we may have matched a longer sequence but it was
+/// interrupted by a readline event.
 maybe_t<input_mapping_t> inputter_t::find_mapping(event_queue_peeker_t *peeker) {
     const input_mapping_t *generic = nullptr;
     const auto &vars = parser_->vars();
@@ -627,6 +637,12 @@ maybe_t<input_mapping_t> inputter_t::find_mapping(event_queue_peeker_t *peeker)
         peeker->restart();
     }
 
+    if (peeker->char_sequence_interrupted()) {
+        // We might have matched a longer sequence, but we were interrupted, e.g. by a signal.
+        FLOG(reader, "torn sequence, rearranging events");
+        return none();
+    }
+
     if (escape) {
         // We need to reconsume the escape.
         peeker->next();
@@ -671,6 +687,15 @@ void inputter_t::mapping_execute_matching_or_generic(const command_handler_t &co
     }
     peeker.restart();
 
+    if (peeker.char_sequence_interrupted()) {
+        // This may happen if we received a signal in the middle of an escape sequence or other
+        // multi-char binding. Move these non-char events to the front of the queue, handle them
+        // first, and then later we'll return and try the sequence again. See #8628.
+        peeker.consume();
+        this->promote_interruptions_to_front();
+        return;
+    }
+
     FLOGF(reader, L"no generic found, ignoring char...");
     auto evt = peeker.next();
     peeker.consume();
diff --git a/src/input_common.cpp b/src/input_common.cpp
index 3120363fc..7d5b5ece6 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -255,6 +255,15 @@ void input_event_queue_t::push_back(const char_event_t& ch) { queue_.push_back(c
 
 void input_event_queue_t::push_front(const char_event_t& ch) { queue_.push_front(ch); }
 
+void input_event_queue_t::promote_interruptions_to_front() {
+    // Find the first sequence of non-char events.
+    // EOF is considered a char: we don't want to pull EOF in front of real chars.
+    auto is_char = [](const char_event_t& ch) { return ch.is_char() || ch.is_eof(); };
+    auto first = std::find_if_not(queue_.begin(), queue_.end(), is_char);
+    auto last = std::find_if(first, queue_.end(), is_char);
+    std::rotate(queue_.begin(), first, last);
+}
+
 void input_event_queue_t::prepare_to_select() {}
 void input_event_queue_t::select_interrupted() {}
 input_event_queue_t::~input_event_queue_t() = default;
diff --git a/src/input_common.h b/src/input_common.h
index ea517cd6e..c02621492 100644
--- a/src/input_common.h
+++ b/src/input_common.h
@@ -207,6 +207,9 @@ class input_event_queue_t {
     /// will be the next character returned by readch.
     void push_front(const char_event_t &ch);
 
+    /// Find the first sequence of non-char events, and promote them to the front.
+    void promote_interruptions_to_front();
+
     /// Add multiple characters or readline events to the front of the queue of unread characters.
     /// The order of the provided events is not changed, i.e. they are not inserted in reverse
     /// order.
diff --git a/tests/pexpects/torn_escapes.py b/tests/pexpects/torn_escapes.py
new file mode 100644
index 000000000..b26db8fc7
--- /dev/null
+++ b/tests/pexpects/torn_escapes.py
@@ -0,0 +1,81 @@
+#!/usr/bin/env python3
+import os
+import signal
+from pexpect_helper import SpawnedProc
+
+
+sp = SpawnedProc()
+send, sendline, sleep, expect_prompt, expect_str, expect_re = (
+    sp.send,
+    sp.sendline,
+    sp.sleep,
+    sp.expect_prompt,
+    sp.expect_str,
+    sp.expect_re,
+)
+# Ensure that signals don't tear escape sequences. See #8628.
+expect_prompt()
+
+# Allow for long delays before matching escape.
+sendline(r"set -g fish_escape_delay_ms 2000")
+expect_prompt()
+
+# Set up a handler for SIGUSR1.
+sendline(r"set -g sigusr1_count 0")
+expect_prompt()
+
+sendline(
+    r"""
+    function usr1_handler --on-signal SIGUSR1;
+        set sigusr1_count (math $sigusr1_count + 1);
+        echo Got SIGUSR1 $sigusr1_count;
+        commandline -f repaint;
+    end
+""".strip().replace(
+        "\n", os.linesep
+    )
+)
+expect_prompt()
+
+# Set up a wacky binding with an escape.
+sendline(r"function wacky_handler; echo Wacky Handler; end")
+expect_prompt()
+
+sendline(r"bind abc\edef wacky_handler")
+expect_prompt()
+
+# We can respond to SIGUSR1.
+os.kill(sp.spawn.pid, signal.SIGUSR1)
+expect_str(r"Got SIGUSR1 1")
+sendline(r"")
+expect_prompt()
+
+# Our wacky binding works.
+send("abc\x1bdef")
+expect_str(r"Wacky Handler")
+sendline(r"")
+expect_prompt()
+
+# Now we interleave the sequence with SIGUSR1.
+# What we expect to happen is that the signal is "shuffled to the front" ahead of the key events.
+send("abc")
+sleep(0.05)
+os.kill(sp.spawn.pid, signal.SIGUSR1)
+sleep(0.05)
+send("\x1bdef")
+expect_str(r"Got SIGUSR1 2")
+expect_str(r"Wacky Handler")
+sendline(r"")
+expect_prompt()
+
+# As before but it comes after the ESC.
+# The signal will arrive while we are waiting in getch_timed().
+send("abc\x1b")
+sleep(0.05)
+os.kill(sp.spawn.pid, signal.SIGUSR1)
+sleep(0.05)
+send("def")
+expect_str(r"Got SIGUSR1 3")
+expect_str(r"Wacky Handler")
+sendline(r"")
+expect_prompt()

From 7f31acbf9b677ffcecea917970146de5e57c2dbb Mon Sep 17 00:00:00 2001
From: ridiculousfish <rf@fishshell.com>
Date: Wed, 2 Feb 2022 10:42:30 -0800
Subject: [PATCH 186/262] Prevent fish_title output from triggering a bel

fish outputs the result of fish_title inside an escape sequence, which
happens to be terminated by \a (BEL). It may happen that the initial
output is interrupted; fish then emits the closing BEL and that makes an
annoying beep. Output the fish_title all at once, even if a signal is
delivered (so we don't get "stuck inside" the sequence).

This is related to #8628 in that it's a "torn escape sequence."
---
 src/reader.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index 6bafe2878..98f892645 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1293,11 +1293,13 @@ void reader_write_title(const wcstring &cmd, parser_t &parser, bool reset_cursor
     wcstring_list_t lst;
     (void)exec_subshell(fish_title_command, parser, lst, false /* ignore exit status */);
     if (!lst.empty()) {
-        std::fputws(L"\x1B]0;", stdout);
+        wcstring title_line = L"\x1B]0;";
         for (const auto &i : lst) {
-            std::fputws(i.c_str(), stdout);
+            title_line += i;
         }
-        ignore_result(write(STDOUT_FILENO, "\a", 1));
+        title_line += L"\a";
+        std::string narrow = wcs2string(title_line);
+        ignore_result(write_loop(STDOUT_FILENO, narrow.data(), narrow.size()));
     }
 
     outputter_t::stdoutput().set_color(rgb_color_t::reset(), rgb_color_t::reset());

From 964b7a729a7ea50485b9ce56861f5e922ac26a2a Mon Sep 17 00:00:00 2001
From: Jakub Panek <me@panekj.dev>
Date: Sun, 6 Feb 2022 05:50:38 +0000
Subject: [PATCH 187/262] completions(apk.fish): remove non-existent short
 flags, add prune flag

Signed-off-by: Jakub Panek <me@panekj.dev>
---
 share/completions/apk.fish | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/share/completions/apk.fish b/share/completions/apk.fish
index ce7010e11..6759b237c 100644
--- a/share/completions/apk.fish
+++ b/share/completions/apk.fish
@@ -87,13 +87,13 @@ complete -f -c apk -n "__fish_seen_subcommand_from info" -s R -l depends -d "Lis
 complete -f -c apk -n "__fish_seen_subcommand_from info" -s P -l provides -d "List virtual packages provided"
 complete -f -c apk -n "__fish_seen_subcommand_from info" -s r -l rdepends -d "List reverse dependencies"
 complete -f -c apk -n "__fish_seen_subcommand_from info" -l replaces -d "List packages that PACKAGE might replace"
-complete -f -c apk -n "__fish_seen_subcommand_from info" -s i -l install-if -d "List install_if rule"
-complete -f -c apk -n "__fish_seen_subcommand_from info" -s I -l rinstall-if -d "List packages having install_if referencing PACKAGE"
+complete -f -c apk -n "__fish_seen_subcommand_from info" -l install-if -d "List install_if rule"
+complete -f -c apk -n "__fish_seen_subcommand_from info" -l rinstall-if -d "List packages having install_if referencing PACKAGE"
 complete -f -c apk -n "__fish_seen_subcommand_from info" -s w -l webpage -d "Print the URL for the upstream"
 complete -f -c apk -n "__fish_seen_subcommand_from info" -s s -l size -d "Show installed size"
 complete -f -c apk -n "__fish_seen_subcommand_from info" -s d -l description -d "Print the description"
 complete -f -c apk -n "__fish_seen_subcommand_from info" -l license -d "Print the license"
-complete -f -c apk -n "__fish_seen_subcommand_from info" -s t -l triggers -d "Print active triggers"
+complete -f -c apk -n "__fish_seen_subcommand_from info" -l triggers -d "Print active triggers"
 complete -f -c apk -n "__fish_seen_subcommand_from info" -s a -l all -d "Print all information"
 
 # List options
@@ -119,6 +119,7 @@ complete -f -c apk -n "__fish_seen_subcommand_from upgrade" -s l -l latest -d "S
 complete -f -c apk -n "__fish_seen_subcommand_from upgrade" -l no-self-upgrade -d "Don't do early upgrade of the apk"
 complete -f -c apk -n "__fish_seen_subcommand_from upgrade" -l self-upgrade-only -d "Only do self-upgrade"
 complete -f -c apk -n "__fish_seen_subcommand_from upgrade" -l ignore -d "Ignore the upgrade of PACKAGE"
+complete -f -c apk -n "__fish_seen_subcommand_from upgrade" -l prune -d "Prune the WORLD by removing packages which are no longer available"
 
 # Cache options
 complete -f -c apk -n "__fish_seen_subcommand_from cache" -s u -l upgrade -d "Prefer to upgrade package"

From 6bdb99972d40bb1b6a8c56d161ff766aa1ccc49e Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Mon, 7 Feb 2022 16:50:16 +0100
Subject: [PATCH 188/262] editorconfig: use 80 columns for commit messages, not
 100

Our current style favors < 80 columns in commit messages (or we just don't
use editorconfig here?).
---
 .editorconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index bed92f3e4..5aad22212 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -20,3 +20,6 @@ indent_size = 2
 
 [Dockerfile]
 indent_size = 2
+
+[COMMIT_EDITMSG]
+max_line_length = 80

From 8b9f7dbf45ab3a2b4f08f192dfc0bf7573b5f80d Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 30 Jan 2022 19:19:43 +0100
Subject: [PATCH 189/262] Commit transient edit when history search ends

A history search ends when you move the cursor, but the commandline inserted by
history search is still marked as transient. This means that the next history
search will clear the transient commandline. This means we are dropping an undo
point, for example:

	echo 11
	echo 1
	echo autosuggestion
	echo^P # commandline is "echo 1"
	^A # stop history search
	^P # commandline is "echo 11"
	^Z # Bug: commandline goes back to "echo", but it should be "echo 1"

In the worst case, we are switching from line-search to token-search (see
the attached test case).  Clearing the transient edit means the line is gone
and only the token is left on the command line.
---
 src/reader.cpp                        |  1 +
 tests/checks/tmux-history-search.fish | 14 ++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 tests/checks/tmux-history-search.fish

diff --git a/src/reader.cpp b/src/reader.cpp
index 98f892645..eb612815f 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -4094,6 +4094,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
                     clear_transient_edit();
                 }
                 history_search.reset();
+                command_line_has_transient_edit = false;
             }
 
             rls.last_cmd = readline_cmd;
diff --git a/tests/checks/tmux-history-search.fish b/tests/checks/tmux-history-search.fish
new file mode 100644
index 000000000..877651cbf
--- /dev/null
+++ b/tests/checks/tmux-history-search.fish
@@ -0,0 +1,14 @@
+#RUN: %fish %s
+#REQUIRES: command -v tmux
+
+isolated-tmux-start
+
+isolated-tmux send-keys 'true needle' Enter
+# CHECK: prompt 0> true needle
+tmux-sleep
+isolated-tmux send-keys 'true hay ee hay' Enter
+# CHECK: prompt 1> true hay ee hay
+isolated-tmux send-keys C-p C-a M-f M-f M-f M-.
+# CHECK: prompt 2> true hay needle hay
+tmux-sleep
+isolated-tmux capture-pane -p

From 13edce3671b80c3c9cd82da6d1bcc784f1e1f0f0 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Wed, 15 Dec 2021 17:59:12 +0100
Subject: [PATCH 190/262] share/**.fish: reformat with fish_indent

---
 share/completions/chgrp.fish                  | 42 +++++++++----------
 share/completions/chmod.fish                  | 32 +++++++-------
 share/completions/chown.fish                  | 32 +++++++-------
 share/completions/color.fish                  | 14 +++----
 share/completions/cut.fish                    | 36 ++++++++--------
 share/completions/dscacheutil.fish            |  2 +-
 share/completions/env.fish                    |  2 +-
 share/completions/findstr.fish                | 14 +++----
 share/completions/fish_opt.fish               |  2 +-
 share/completions/opam.fish                   | 22 +++++-----
 share/completions/pabcnetcclear.fish          | 14 +++----
 share/completions/set.fish                    | 32 +++++++-------
 .../functions/__fish_config_interactive.fish  |  2 +-
 13 files changed, 123 insertions(+), 123 deletions(-)

diff --git a/share/completions/chgrp.fish b/share/completions/chgrp.fish
index 39387540e..7e17d6a54 100644
--- a/share/completions/chgrp.fish
+++ b/share/completions/chgrp.fish
@@ -1,24 +1,24 @@
 if chgrp --version &>/dev/null # not unix
-	complete -c chgrp -s c -l changes -d "Output diagnostic for changed files"
-	complete -c chgrp -l dereference -d "Dereference symlinks"
-	complete -c chgrp -s h -l no-dereference -d "Don't dereference symlinks"
-	complete -c chgrp -l from -d "Change from owner/group"
-	complete -c chgrp -s f -l silent -d "Suppress errors"
-	complete -c chgrp -l reference -d "Use same owner/group as file" -r
-	complete -c chgrp -s R -l recursive -d "Operate recursively"
-	complete -c chgrp -s v -l verbose -d "Output diagnostic for every file"
-	complete -c chgrp -l help -d "Display help and exit"
-	complete -c chgrp -l version -d "Display version and exit"
-	complete -c chgrp -d Group -a "(__fish_complete_groups)"
+    complete -c chgrp -s c -l changes -d "Output diagnostic for changed files"
+    complete -c chgrp -l dereference -d "Dereference symlinks"
+    complete -c chgrp -s h -l no-dereference -d "Don't dereference symlinks"
+    complete -c chgrp -l from -d "Change from owner/group"
+    complete -c chgrp -s f -l silent -d "Suppress errors"
+    complete -c chgrp -l reference -d "Use same owner/group as file" -r
+    complete -c chgrp -s R -l recursive -d "Operate recursively"
+    complete -c chgrp -s v -l verbose -d "Output diagnostic for every file"
+    complete -c chgrp -l help -d "Display help and exit"
+    complete -c chgrp -l version -d "Display version and exit"
+    complete -c chgrp -d Group -a "(__fish_complete_groups)"
 else # not Linux
-	complete -c chgrp -s h -d "Don't dereference symlinks"
-	complete -c chgrp -s H -d "Follow specified symlinks with -R"
-	complete -c chgrp -s L -d "Follow all symlinks with -R"
-	complete -c chgrp -s P -d "Follow no symlinks with -R"
-	complete -c chgrp -s f -d "Suppress errors"
-	complete -c chgrp -s n -d "id is numeric; avoid lookup"
-	complete -c chgrp -s R -d "Operate recursively"
-	complete -c chgrp -s v -d "Output filenames"
-	complete -c chgrp -s x -d "Don't traverse fs mountpoints"
-	complete -c chgrp -d Group -a "(__fish_complete_groups)"
+    complete -c chgrp -s h -d "Don't dereference symlinks"
+    complete -c chgrp -s H -d "Follow specified symlinks with -R"
+    complete -c chgrp -s L -d "Follow all symlinks with -R"
+    complete -c chgrp -s P -d "Follow no symlinks with -R"
+    complete -c chgrp -s f -d "Suppress errors"
+    complete -c chgrp -s n -d "id is numeric; avoid lookup"
+    complete -c chgrp -s R -d "Operate recursively"
+    complete -c chgrp -s v -d "Output filenames"
+    complete -c chgrp -s x -d "Don't traverse fs mountpoints"
+    complete -c chgrp -d Group -a "(__fish_complete_groups)"
 end
diff --git a/share/completions/chmod.fish b/share/completions/chmod.fish
index cf3307ce7..74e95299d 100644
--- a/share/completions/chmod.fish
+++ b/share/completions/chmod.fish
@@ -1,19 +1,19 @@
 if chmod --version &>/dev/null # gnu's not unix
-	complete chmod -s c -l changes -d 'Like -v but report only changes'
-	complete chmod -l no-preserve-root -d 'Don\'t treat / special (default)'
-	complete chmod -l preserve-root -d 'Fail to operate recursively on /'
-	complete chmod -s f -l silent -l quiet -d 'Suppress most errors'
-	complete chmod -s v -l verbose -d 'Prints each file processed'
-	complete chmod -l reference -d 'Use RFILEs mode instead of MODE values' -r
-	complete chmod -s R -l recursive -d 'Operate recursively'
-	complete chmod -l help -d 'Display help and exit'
-	complete chmod -l version -d 'Display version and exit'
+    complete chmod -s c -l changes -d 'Like -v but report only changes'
+    complete chmod -l no-preserve-root -d 'Don\'t treat / special (default)'
+    complete chmod -l preserve-root -d 'Fail to operate recursively on /'
+    complete chmod -s f -l silent -l quiet -d 'Suppress most errors'
+    complete chmod -s v -l verbose -d 'Prints each file processed'
+    complete chmod -l reference -d 'Use RFILEs mode instead of MODE values' -r
+    complete chmod -s R -l recursive -d 'Operate recursively'
+    complete chmod -l help -d 'Display help and exit'
+    complete chmod -l version -d 'Display version and exit'
 else # guess it might be unix
-	complete chmod -s f -d 'Suppress errors'
-	complete chmod -s H -d "Follow given symlinks with -R"
-	complete chmod -s h -d "Don't dereference given symlinks"
-	complete chmod -s L -d "Follow all symlinks with -R"
-	complete chmod -s P -d "Follow no symlinks with -R"
-	complete chmod -s R -d 'Operate recursively'
-	complete chmod -s v -d 'Prints each file processed'
+    complete chmod -s f -d 'Suppress errors'
+    complete chmod -s H -d "Follow given symlinks with -R"
+    complete chmod -s h -d "Don't dereference given symlinks"
+    complete chmod -s L -d "Follow all symlinks with -R"
+    complete chmod -s P -d "Follow no symlinks with -R"
+    complete chmod -s R -d 'Operate recursively'
+    complete chmod -s v -d 'Prints each file processed'
 end
diff --git a/share/completions/chown.fish b/share/completions/chown.fish
index 9ca348a70..201d155f5 100644
--- a/share/completions/chown.fish
+++ b/share/completions/chown.fish
@@ -1,21 +1,21 @@
 if chown --version &>/dev/null # gee, and you is not eunichs
-	complete chown -s c -l changes -d "Output diagnostic for changed files"
-	complete chown -l dereference -d "Dereference symbolic links"
-	complete chown -s h -l no-dereference -d "Do not dereference symbolic links"
-	complete chown -l from -d "Change from owner/group"
-	complete chown -s f -l silent -d "Suppress errors"
-	complete chown -l reference -d "Use same owner/group as file" -r
-	complete chown -s R -l recursive -d "Operate recursively"
-	complete chown -s v -l verbose -d "Output diagnostic for every file"
-	complete chown -l help -d "Display help and exit"
-	complete chown -l version -d "Display version and exit"
+    complete chown -s c -l changes -d "Output diagnostic for changed files"
+    complete chown -l dereference -d "Dereference symbolic links"
+    complete chown -s h -l no-dereference -d "Do not dereference symbolic links"
+    complete chown -l from -d "Change from owner/group"
+    complete chown -s f -l silent -d "Suppress errors"
+    complete chown -l reference -d "Use same owner/group as file" -r
+    complete chown -s R -l recursive -d "Operate recursively"
+    complete chown -s v -l verbose -d "Output diagnostic for every file"
+    complete chown -l help -d "Display help and exit"
+    complete chown -l version -d "Display version and exit"
 else
-	complete chown -s R -d 'Operate recursively'
-	complete chown -s f -d "Suppress errors"
-	complete chown -s h -d "Do not dereference symbolic links"
-	complete chown -s n -d "uid/gid is numeric; avoid lookup"
-	complete chown -s v -d "Output filenames as modified"
-	complete chown -s x -d "Don't traverse fs mount points"
+    complete chown -s R -d 'Operate recursively'
+    complete chown -s f -d "Suppress errors"
+    complete chown -s h -d "Do not dereference symbolic links"
+    complete chown -s n -d "uid/gid is numeric; avoid lookup"
+    complete chown -s v -d "Output filenames as modified"
+    complete chown -s x -d "Don't traverse fs mount points"
 end
 
 complete chown -s H -d "Follow given symlinks with -R"
diff --git a/share/completions/color.fish b/share/completions/color.fish
index a8e192fe9..7b4d4185f 100644
--- a/share/completions/color.fish
+++ b/share/completions/color.fish
@@ -1,10 +1,10 @@
 function __color_generate_args --description 'Function to generate args'
-  set --local current_token (commandline --current-token --cut-at-cursor)
-  switch $current_token
-    case '/*'
-      echo -e '/?\tShow help'
-    case '*'
-      echo -e '0\tBlack
+    set --local current_token (commandline --current-token --cut-at-cursor)
+    switch $current_token
+        case '/*'
+            echo -e '/?\tShow help'
+        case '*'
+            echo -e '0\tBlack
 1\tBlue
 2\tGreen
 3\tAqua
@@ -20,7 +20,7 @@ C\tLight red
 D\tLight purple
 E\tLight yellow
 F\tBright white' | awk -F '\t' "{ printf \"$current_token%s\t%s\n\", \$1, \$2 }"
-  end
+    end
 end
 
 complete --command color --no-files --arguments '(__color_generate_args)'
diff --git a/share/completions/cut.fish b/share/completions/cut.fish
index 4e6823a6c..21f23682b 100644
--- a/share/completions/cut.fish
+++ b/share/completions/cut.fish
@@ -1,21 +1,21 @@
 if cut --version &>/dev/null
-	complete -c cut -s b -l bytes -x -d "Select byte positions"
-	complete -c cut -s c -l characters -x -d "Select characters"
-	complete -c cut -s d -l delimiter -x -d "Select field delimiter"
-	complete -c cut -s f -l fields -x -d "Select fields"
-	complete -c cut -s n -d "Don't split multi-byte characters"
-	complete -c cut -l complement -d "complement the set of selected bytes, characters or fields"
-	complete -c cut -s s -l only-delimited -d "Suppress lines without delimiter"
-	complete -c cut -l output-delimiter -x -d "Select output delimiter"
-	complete -c cut -s z -l zero-terminated -d "line delimiter is NUL, not newline"
-	complete -c cut -l help -d "Display help and exit"
-	complete -c cut -l version -d "Display version and exit"
+    complete -c cut -s b -l bytes -x -d "Select byte positions"
+    complete -c cut -s c -l characters -x -d "Select characters"
+    complete -c cut -s d -l delimiter -x -d "Select field delimiter"
+    complete -c cut -s f -l fields -x -d "Select fields"
+    complete -c cut -s n -d "Don't split multi-byte characters"
+    complete -c cut -l complement -d "complement the set of selected bytes, characters or fields"
+    complete -c cut -s s -l only-delimited -d "Suppress lines without delimiter"
+    complete -c cut -l output-delimiter -x -d "Select output delimiter"
+    complete -c cut -s z -l zero-terminated -d "line delimiter is NUL, not newline"
+    complete -c cut -l help -d "Display help and exit"
+    complete -c cut -l version -d "Display version and exit"
 else
-	complete -c cut -s b -x -d "Select byte positions"
-	complete -c cut -s c -x -d "Output character range"
-	complete -c cut -s d -x -d "Delimiter instead of \t to use"
-	complete -c cut -s f -x -d "Select fields"
-	complete -c cut -s n -d "Don't split multi-byte characters"
-	complete -c cut -s s -d "Supress lines without delimiter"
-	complete -c cut -s w -d "Use whitespace as delimiter"
+    complete -c cut -s b -x -d "Select byte positions"
+    complete -c cut -s c -x -d "Output character range"
+    complete -c cut -s d -x -d "Delimiter instead of \t to use"
+    complete -c cut -s f -x -d "Select fields"
+    complete -c cut -s n -d "Don't split multi-byte characters"
+    complete -c cut -s s -d "Supress lines without delimiter"
+    complete -c cut -s w -d "Use whitespace as delimiter"
 end
diff --git a/share/completions/dscacheutil.fish b/share/completions/dscacheutil.fish
index 85819bee2..72462c565 100644
--- a/share/completions/dscacheutil.fish
+++ b/share/completions/dscacheutil.fish
@@ -1,6 +1,6 @@
 # dscacheutil
 complete -c dscacheutil -f -d 'Directory Service cache utility'
-complete -c dscacheutil -s h -d 'lists options' -f  -n '[ (commandline -opc | count) -le 1 ]'
+complete -c dscacheutil -s h -d 'lists options' -f -n '[ (commandline -opc | count) -le 1 ]'
 complete -c dscacheutil -s q -d 'initiate query' -f -x -n '[ (commandline -opc | count) -le 1 ] || contains -- -a (commandline -opc) || contains -- -q (commandline -opc) && [ (commandline -opc | count) -lt 3 ]' -a "
 group\t'name or gid'
 host\t'name or ip address'
diff --git a/share/completions/env.fish b/share/completions/env.fish
index 0225e4adf..087c5d9d5 100644
--- a/share/completions/env.fish
+++ b/share/completions/env.fish
@@ -1,4 +1,4 @@
-if env --version &> /dev/null
+if env --version &>/dev/null
     set -l is_gnu --is-gnu
 end
 
diff --git a/share/completions/findstr.fish b/share/completions/findstr.fish
index 47892995a..c4144e2ef 100644
--- a/share/completions/findstr.fish
+++ b/share/completions/findstr.fish
@@ -1,8 +1,8 @@
 function __findstr_generate_args --description 'Function to generate args'
-  set --local current_token (commandline --current-token --cut-at-cursor)
-  switch $current_token
-    case '/a:*'
-      echo -e '0\tBlack
+    set --local current_token (commandline --current-token --cut-at-cursor)
+    switch $current_token
+        case '/a:*'
+            echo -e '0\tBlack
 1\tBlue
 2\tGreen
 3\tAqua
@@ -18,8 +18,8 @@ C\tLight red
 D\tLight purple
 E\tLight yellow
 F\tBright white' | awk -F '\t' "{ printf \"$current_token%s\t%s\n\", \$1, \$2 }"
-    case '*'
-      echo -e '/b\tMatch at the beginning of the line
+        case '*'
+            echo -e '/b\tMatch at the beginning of the line
 /e\tMatch at the end of the line
 /l\tUse literal strings
 /r\tUse regular expressions
@@ -39,7 +39,7 @@ F\tBright white' | awk -F '\t' "{ printf \"$current_token%s\t%s\n\", \$1, \$2 }"
 /d:\tSpecify the search list of directories
 /a:\tUse color attributes with two hexadecimal digits
 /?\tShow help'
-  end
+    end
 end
 
 complete --command findstr --no-files --arguments '(__findstr_generate_args)'
diff --git a/share/completions/fish_opt.fish b/share/completions/fish_opt.fish
index ef161709e..e2d317ad8 100644
--- a/share/completions/fish_opt.fish
+++ b/share/completions/fish_opt.fish
@@ -8,5 +8,5 @@ complete --command fish_opt --short-option s --long-option short --no-files --re
 complete --command fish_opt --short-option l --long-option long --no-files --require-parameter --description 'Specify long option'
 complete --command fish_opt --long-option longonly --description 'Use only long option'
 complete --command fish_opt --short-option o --long-option optional-val -n $CONDITION --description 'Don\'t require value'
-complete --command fish_opt --short-option r --long-option required-val -n $CONDITION  --description 'Require value'
+complete --command fish_opt --short-option r --long-option required-val -n $CONDITION --description 'Require value'
 complete --command fish_opt --long-option multiple-vals --description 'Store all values'
diff --git a/share/completions/opam.fish b/share/completions/opam.fish
index 1738586bd..f2db2ec79 100644
--- a/share/completions/opam.fish
+++ b/share/completions/opam.fish
@@ -105,17 +105,17 @@ complete -f -c opam -n '__fish_opam_using_command admin' -a stats -d "Compute st
 
 # opam switch
 set -l switchcommands create set remove export import reinstall list list-available show set-base set-description link
-complete -c opam -f -n "__fish_seen_subcommand_from switch; and not __fish_seen_subcommand_from $switchcommands" -a 'create' -d 'Create a new switch, and install the given compiler there'
-complete -c opam -f -n "__fish_seen_subcommand_from switch; and not __fish_seen_subcommand_from $switchcommands" -a 'set' -d 'Set the currently active switch'
-complete -c opam -f -n "__fish_seen_subcommand_from switch; and not __fish_seen_subcommand_from $switchcommands" -a 'remove' -d 'Remove the given switch from disk'
-complete -c opam -n "__fish_seen_subcommand_from switch; and not __fish_seen_subcommand_from $switchcommands" -a 'export' -d 'Save the current switch state to a file'
-complete -c opam -n "__fish_seen_subcommand_from switch; and not __fish_seen_subcommand_from $switchcommands" -a 'import' -d 'Import a saved switch state'
-complete -c opam -f -n "__fish_seen_subcommand_from switch; and not __fish_seen_subcommand_from $switchcommands" -a 'reinstall' -d 'Reinstall the given compiler switch and all its packages'
-complete -c opam -f -n "__fish_seen_subcommand_from switch; and not __fish_seen_subcommand_from $switchcommands" -a 'list' -d 'Lists installed switches'
-complete -c opam -f -n "__fish_seen_subcommand_from switch; and not __fish_seen_subcommand_from $switchcommands" -a 'list-available' -d 'Lists base packages that can be used to create a new switch'
-complete -c opam -f -n "__fish_seen_subcommand_from switch; and not __fish_seen_subcommand_from $switchcommands" -a 'show' -d 'Prints the name of the current switch'
-complete -c opam -f -n "__fish_seen_subcommand_from switch; and not __fish_seen_subcommand_from $switchcommands" -a 'set-base' -d 'Sets the packages forming the immutable base for the selected switch'
-complete -c opam -f -n "__fish_seen_subcommand_from switch; and not __fish_seen_subcommand_from $switchcommands" -a 'link' -d 'Sets a local alias for a given switch'
+complete -c opam -f -n "__fish_seen_subcommand_from switch; and not __fish_seen_subcommand_from $switchcommands" -a create -d 'Create a new switch, and install the given compiler there'
+complete -c opam -f -n "__fish_seen_subcommand_from switch; and not __fish_seen_subcommand_from $switchcommands" -a set -d 'Set the currently active switch'
+complete -c opam -f -n "__fish_seen_subcommand_from switch; and not __fish_seen_subcommand_from $switchcommands" -a remove -d 'Remove the given switch from disk'
+complete -c opam -n "__fish_seen_subcommand_from switch; and not __fish_seen_subcommand_from $switchcommands" -a export -d 'Save the current switch state to a file'
+complete -c opam -n "__fish_seen_subcommand_from switch; and not __fish_seen_subcommand_from $switchcommands" -a import -d 'Import a saved switch state'
+complete -c opam -f -n "__fish_seen_subcommand_from switch; and not __fish_seen_subcommand_from $switchcommands" -a reinstall -d 'Reinstall the given compiler switch and all its packages'
+complete -c opam -f -n "__fish_seen_subcommand_from switch; and not __fish_seen_subcommand_from $switchcommands" -a list -d 'Lists installed switches'
+complete -c opam -f -n "__fish_seen_subcommand_from switch; and not __fish_seen_subcommand_from $switchcommands" -a list-available -d 'Lists base packages that can be used to create a new switch'
+complete -c opam -f -n "__fish_seen_subcommand_from switch; and not __fish_seen_subcommand_from $switchcommands" -a show -d 'Prints the name of the current switch'
+complete -c opam -f -n "__fish_seen_subcommand_from switch; and not __fish_seen_subcommand_from $switchcommands" -a set-base -d 'Sets the packages forming the immutable base for the selected switch'
+complete -c opam -f -n "__fish_seen_subcommand_from switch; and not __fish_seen_subcommand_from $switchcommands" -a link -d 'Sets a local alias for a given switch'
 
 complete -c opam -f -n "__fish_seen_subcommand_from switch; and __fish_seen_subcommand_from set" -a '(opam switch list --short)'
 complete -c opam -f -n "__fish_seen_subcommand_from switch; and __fish_seen_subcommand_from remove" -a '(opam switch list --short)'
diff --git a/share/completions/pabcnetcclear.fish b/share/completions/pabcnetcclear.fish
index 11b1e4e12..2d1af57ea 100644
--- a/share/completions/pabcnetcclear.fish
+++ b/share/completions/pabcnetcclear.fish
@@ -1,20 +1,20 @@
 # Completion for: PascalABC.NET 3.8.1 compiler
 
 function __pabcnetcclear_generate_args --description 'Function to generate args'
-  set --local current_token (commandline --current-token --cut-at-cursor)
-  switch $current_token
-    case '/Debug:*'
-      echo -e $current_token"0\tEnable generation
+    set --local current_token (commandline --current-token --cut-at-cursor)
+    switch $current_token
+        case '/Debug:*'
+            echo -e $current_token"0\tEnable generation
 $current_token"1"\tDisable generation"
-    case '*'
-      echo -e "/Help\tShow help
+        case '*'
+            echo -e "/Help\tShow help
 /H\tShow help
 /?\tShow help
 /Debug\tGenerate a code debug info
 /output\tSpecify an executable name
 /SearchDir\tSpecify a path to search units
 /define\tDefine a symbol"
-  end
+    end
 end
 
 complete --command pabcnetcclear --no-files --arguments '(__pabcnetcclear_generate_args)'
diff --git a/share/completions/set.fish b/share/completions/set.fish
index 1af231f75..87f59547d 100644
--- a/share/completions/set.fish
+++ b/share/completions/set.fish
@@ -51,22 +51,22 @@ end
 
 function __fish_complete_special_vars
     printf "%s\t%s\n" \
-    PATH "list of dirs to look for commands in" \
-    CDPATH "list of dirs under which that cd searches" \
-    FISH_DEBUG "list of enabled debug categories" \
-    FISH_DEBUG_OUTPUT "debug output path" \
-    umask "current file creation mask" \
-    fish_handle_reflow "if fish should repaint prompt when the term resizes" \
-    fish_trace "print cmds as they execute, like set -x" \
-    fish_emoji_width "cols wide fish assumes emoji render as" \
-    fish_key_bindings "name of function that sets binds" \
-    fish_autosuggestion_enabled "turns autosuggestions on or off" \
-    fish_ambiguous_width "affects computed width of east asian chars" \
-    fish_escape_delay_ms "How long fish waits to distinguish escape and alt" \
-    fish_greeting "The message to display at start (also a function)" \
-    fish_history "The session id to store history under" \
-    fish_trace "Enables execution tracing (if set to non-empty value)" \
-    fish_user_paths "A list of dirs to prepend to PATH"
+        PATH "list of dirs to look for commands in" \
+        CDPATH "list of dirs under which that cd searches" \
+        FISH_DEBUG "list of enabled debug categories" \
+        FISH_DEBUG_OUTPUT "debug output path" \
+        umask "current file creation mask" \
+        fish_handle_reflow "if fish should repaint prompt when the term resizes" \
+        fish_trace "print cmds as they execute, like set -x" \
+        fish_emoji_width "cols wide fish assumes emoji render as" \
+        fish_key_bindings "name of function that sets binds" \
+        fish_autosuggestion_enabled "turns autosuggestions on or off" \
+        fish_ambiguous_width "affects computed width of east asian chars" \
+        fish_escape_delay_ms "How long fish waits to distinguish escape and alt" \
+        fish_greeting "The message to display at start (also a function)" \
+        fish_history "The session id to store history under" \
+        fish_trace "Enables execution tracing (if set to non-empty value)" \
+        fish_user_paths "A list of dirs to prepend to PATH"
 end
 
 #
diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index 64cb7b41a..614cd93da 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -28,7 +28,7 @@ function __fish_config_interactive -d "Initializations that should be performed
 
     # If we are starting up for the first time, set various defaults.
     if test $__fish_initialized -lt 3400
-	    # Regular syntax highlighting colors
+        # Regular syntax highlighting colors
         __init_uvar fish_color_normal normal
         __init_uvar fish_color_command blue
         __init_uvar fish_color_param cyan

From 1a0fed280078e83a55baf15ce545fa3d6f11570a Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Mon, 7 Feb 2022 19:02:46 +0100
Subject: [PATCH 191/262] completions/set: fix completion of locales

4b018a760 (set completions: add more special variables, fix colors, 2021-12-13)
changed a global variable to a local, which is no longer visible to this
function. Fix this, so "set LANG <TAB>" works again.
---
 share/completions/set.fish | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/share/completions/set.fish b/share/completions/set.fish
index 87f59547d..f52209f03 100644
--- a/share/completions/set.fish
+++ b/share/completions/set.fish
@@ -2,12 +2,6 @@
 # Completions for the 'set' builtin
 #
 
-#
-# All locale variables used by set completions
-#
-
-set -l __fish_locale_vars LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
-
 #
 # Various helper functions
 #
@@ -36,7 +30,7 @@ function __fish_set_is_locale -d 'Test if We are specifying a locale value for t
     for i in $cmd
         switch $i
 
-            case $__fish_locale_vars
+            case LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
                 return 0
 
             case '-*'

From e8372db781531792932e88247d3d58b8fe4f7385 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Wed, 15 Dec 2021 17:59:12 +0100
Subject: [PATCH 192/262] completions/set: only show foreground/background
 colors if relevant

Cursory experiments reveal that there are only three color options where
the background color is not ignored (though I didn't check all of them).
For these three options, the foreground color is ignored.  Similar for
bold/italics/underline.
Teach set completions to only show the colors that won't be ignored.

Unrelated observation: we write

	-a '--background=(set_color --print-colors)'

instead of

	-l background -a '(set_color --print-colors)'

because we want all colors to show straight away (there are no other
meaningful arguments).
---
 share/completions/set.fish | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/share/completions/set.fish b/share/completions/set.fish
index f52209f03..a88fffe28 100644
--- a/share/completions/set.fish
+++ b/share/completions/set.fish
@@ -6,14 +6,17 @@
 # Various helper functions
 #
 
-function __fish_set_is_color -d 'Test if We are specifying a color value for the prompt'
+function __fish_set_is_color -a foreground background -d 'Test if We are specifying a color value for the prompt'
     set -l cmd (commandline -poc)
     set -e cmd[1]
     for i in $cmd
         switch $i
-
+            case fish_color_search_match fish_color_selection fish_pager_color_selected_background
+                $background
+                return
             case 'fish_color_*' 'fish_pager_color_*'
-                return 0
+                $foreground
+                return
 
             case '-*'
 
@@ -110,13 +113,13 @@ complete -c set -n '__fish_seen_argument -s e -l erase; and __fish_seen_argument
 complete -c set -n '__fish_seen_argument -s e -l erase; and __fish_seen_argument -s l -l local' -f -a "(set -l | string replace ' ' \t'Local Variable: ')"
 
 # Color completions
-complete -c set -n __fish_set_is_color -x -a '(set_color --print-colors)' -d 'text color'
-complete -c set -n __fish_set_is_color -a --background -x -a '(set_color --print-colors)'
-complete -c set -n __fish_set_is_color -a --bold -x
-complete -c set -n __fish_set_is_color -a --dim -x
-complete -c set -n __fish_set_is_color -a --italics -x
-complete -c set -n __fish_set_is_color -a --reverse -x
-complete -c set -n __fish_set_is_color -a --underline -x
+complete -c set -n '__fish_set_is_color true false' -x -a '(set_color --print-colors)' -d 'text color'
+complete -c set -n '__fish_set_is_color false true' -a '--background=(set_color --print-colors)'
+complete -c set -n '__fish_set_is_color true false' -a --bold -x
+complete -c set -n '__fish_set_is_color true false' -a --dim -x
+complete -c set -n '__fish_set_is_color true false' -a --italics -x
+complete -c set -n '__fish_set_is_color true true' -a --reverse -x
+complete -c set -n '__fish_set_is_color true false' -a --underline -x
 
 # Locale completions
 complete -c set -n '__fish_set_is_locale; and not __fish_seen_argument -s e -l erase' -x -a '(command -sq locale; and locale -a)' -d Locale

From 627033f4477e19f9e54c573ff78f39239636c6f7 Mon Sep 17 00:00:00 2001
From: ridiculousfish <rf@fishshell.com>
Date: Mon, 7 Feb 2022 22:17:47 -0800
Subject: [PATCH 193/262] fish_wcswidth_visible to use int instead of size_t

Credit to lilyball for spotting this.
---
 src/wcstringutil.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wcstringutil.cpp b/src/wcstringutil.cpp
index 71800061b..9f2e2dadf 100644
--- a/src/wcstringutil.cpp
+++ b/src/wcstringutil.cpp
@@ -317,7 +317,7 @@ int fish_wcwidth_visible(wchar_t widechar) {
 }
 
 int fish_wcswidth_visible(const wcstring &str) {
-    size_t res = 0;
+    int res = 0;
     for (wchar_t ch : str) {
         if (ch == L'\b') {
             res += -1;

From 2ef12af60efd4422982c7f58f818f920d6752ae6 Mon Sep 17 00:00:00 2001
From: Shay Aviv <shay.aviv@gmail.com>
Date: Fri, 4 Feb 2022 22:44:45 +0200
Subject: [PATCH 194/262] Fix comment parsing inside command substitutions and
 brackets

---
 CHANGELOG.rst           |  1 +
 src/common.cpp          |  7 +++++++
 src/common.h            |  5 +++++
 src/parse_util.cpp      | 12 +++++++++---
 src/tokenizer.cpp       | 13 ++++++++++---
 src/tokenizer.h         |  3 +++
 tests/checks/basic.fish | 17 +++++++++++++++++
 7 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 290387d93..55d4f3f2b 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -93,6 +93,7 @@ Scripting improvements
 - ``abbr -q`` returns the correct exit status when given multiple abbreviation names as arguments (:issue:`8431`).
 - ``command -v`` returns an exit status of 127 instead of 1 if no command was found (:issue:`8547`).
 - ``argparse`` with ``--ignore-unknown`` no longer breaks with multiple unknown options in a short option group (:issue:`8637`).
+- Comments inside command substitutions or brackets now correctly ignore parentheses, quotes, and brackets (:issue:`7866`, :issue:`8022`).
 
 Interactive improvements
 ------------------------
diff --git a/src/common.cpp b/src/common.cpp
index 0d7af786d..ccd8d803d 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -523,6 +523,13 @@ const wchar_t *quote_end(const wchar_t *pos, wchar_t quote) {
     return nullptr;
 }
 
+const wchar_t *comment_end(const wchar_t *pos) {
+    do {
+        pos++;
+    } while (*pos && *pos != L'\n');
+    return pos;
+}
+
 void fish_setlocale() {
     // Use various Unicode symbols if they can be encoded using the current locale, else a simple
     // ASCII char alternative. All of the can_be_encoded() invocations should return the same
diff --git a/src/common.h b/src/common.h
index 5b46e3636..178e339a1 100644
--- a/src/common.h
+++ b/src/common.h
@@ -451,6 +451,11 @@ std::unique_ptr<T> make_unique(Args &&...args) {
 /// \param quote the quote to use, usually pointed to by \c pos.
 const wchar_t *quote_end(const wchar_t *pos, wchar_t quote);
 
+/// This functions returns the end of the comment substring beginning at \c pos.
+///
+/// \param pos the position where the comment starts, including the '#' symbol.
+const wchar_t *comment_end(const wchar_t *pos);
+
 /// This function should be called after calling `setlocale()` to perform fish specific locale
 /// initialization.
 void fish_setlocale();
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index 271bf1c1c..c626804d0 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -90,6 +90,8 @@ size_t parse_util_get_offset(const wcstring &str, int line, long line_offset) {
 static int parse_util_locate_cmdsub(const wchar_t *in, const wchar_t **begin, const wchar_t **end,
                                     bool allow_incomplete, bool *inout_is_quoted) {
     bool escaped = false;
+    bool is_first = true;
+    bool is_token_begin = true;
     bool syntax_error = false;
     int paran_count = 0;
     std::vector<int> quoted_cmdsubs;
@@ -122,6 +124,10 @@ static int parse_util_locate_cmdsub(const wchar_t *in, const wchar_t **begin, co
         if (!escaped) {
             if (*pos == L'\'' || *pos == L'"') {
                 if (!process_opening_quote(*pos)) break;
+            } else if (*pos == L'\\') {
+                escaped = true;
+            } else if (*pos == L'#' && is_token_begin) {
+                pos = comment_end(pos) - 1;
             } else {
                 if (*pos == L'(') {
                     if ((paran_count == 0) && (paran_begin == nullptr)) {
@@ -161,12 +167,12 @@ static int parse_util_locate_cmdsub(const wchar_t *in, const wchar_t **begin, co
                     }
                 }
             }
-        }
-        if (*pos == '\\') {
-            escaped = !escaped;
+            is_token_begin = is_token_delimiter(pos[0], is_first, pos[1]);
         } else {
             escaped = false;
+            is_token_begin = false;
         }
+        is_first = false;
     }
 
     syntax_error |= (paran_count < 0);
diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index 21b93bdb2..861c57f61 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -154,6 +154,7 @@ tok_t tokenizer_t::read_string() {
     int slice_offset = 0;
     const wchar_t *const buff_start = this->token_cursor;
     bool is_first = true;
+    bool is_token_begin = true;
 
     auto process_opening_quote = [&](wchar_t quote) -> const wchar_t * {
         const wchar_t *end = quote_end(this->token_cursor, quote);
@@ -192,6 +193,8 @@ tok_t tokenizer_t::read_string() {
         // has been explicitly ignored (escaped).
         else if (c == L'\\') {
             mode |= tok_modes::char_escape;
+        } else if (c == L'#' && is_token_begin) {
+            this->token_cursor = comment_end(this->token_cursor) - 1;
         } else if (c == L'(') {
             paran_offsets.push_back(this->token_cursor - this->start);
             expecting.push_back(L')');
@@ -278,8 +281,9 @@ tok_t tokenizer_t::read_string() {
         FLOGF(error, msg.c_str(), c, c, int(mode_begin), int(mode));
 #endif
 
-        this->token_cursor++;
+        is_token_begin = is_token_delimiter(this->token_cursor[0], is_first, this->token_cursor[1]);
         is_first = false;
+        this->token_cursor++;
     }
 
     if (!this->accept_unfinished && (mode != tok_modes::regular_text)) {
@@ -540,8 +544,7 @@ maybe_t<tok_t> tokenizer_t::next() {
     while (*this->token_cursor == L'#') {
         // We have a comment, walk over the comment.
         const wchar_t *comment_start = this->token_cursor;
-        while (this->token_cursor[0] != L'\n' && this->token_cursor[0] != L'\0')
-            this->token_cursor++;
+        this->token_cursor = comment_end(this->token_cursor);
         size_t comment_len = this->token_cursor - comment_start;
 
         // If we are going to continue after the comment, skip any trailing newline.
@@ -679,6 +682,10 @@ maybe_t<tok_t> tokenizer_t::next() {
     return result;
 }
 
+bool is_token_delimiter(wchar_t c, bool is_first, maybe_t<wchar_t> next) {
+    return c == L'(' || !tok_is_string_character(c, is_first, next);
+}
+
 wcstring tok_first(const wcstring &str) {
     tokenizer_t t(str.c_str(), 0);
     if (auto token = t.next()) {
diff --git a/src/tokenizer.h b/src/tokenizer.h
index f0504db02..fccff61db 100644
--- a/src/tokenizer.h
+++ b/src/tokenizer.h
@@ -133,6 +133,9 @@ class tokenizer_t : noncopyable_t {
     }
 };
 
+/// Tests if this character can delimit tokens.
+bool is_token_delimiter(wchar_t c, bool is_first, maybe_t<wchar_t> next);
+
 /// Returns only the first token from the specified string. This is a convenience function, used to
 /// retrieve the first token of a string. This can be useful for error messages, etc. On failure,
 /// returns the empty string.
diff --git a/tests/checks/basic.fish b/tests/checks/basic.fish
index 5c8d8e517..3befee0ed 100644
--- a/tests/checks/basic.fish
+++ b/tests/checks/basic.fish
@@ -533,6 +533,23 @@ echo banana
 echo (echo hello\\)
 # CHECK: hello\
 
+# This used to be a parse error - #7866.
+echo (echo foo;#)
+     )
+# CHECK: foo
+echo (echo bar #'
+     )
+# CHECK: bar
+echo (#"
+      echo baz)
+# CHECK: baz
+
+# Make sure we don't match up brackets within comments (#8022).
+$fish -c 'echo f[oo # not valid, no matching ]'
+# CHECKERR: fish: Unexpected end of string, square brackets do not match
+# CHECKERR: echo f[oo # not valid, no matching ]
+# CHECKERR: {{      }}^
+
 # Should fail because $PWD is read-only.
 for PWD in foo bar
     true

From 06c474da2e5483e26113fdaf1926e71c5b27d344 Mon Sep 17 00:00:00 2001
From: Tristan McLain <73560781+T19700@users.noreply.github.com>
Date: Tue, 8 Feb 2022 14:19:03 -0500
Subject: [PATCH 195/262] Shortened quilt definitions (#8667)

* shortened quilt function definitions

* fixed some changes with quilt definitions

Co-authored-by: Tristan McLain <tristan@Tristans-Laptop.localdomain>
---
 share/completions/quilt.fish | 56 ++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/share/completions/quilt.fish b/share/completions/quilt.fish
index b9fc6823e..83544d649 100644
--- a/share/completions/quilt.fish
+++ b/share/completions/quilt.fish
@@ -1,35 +1,35 @@
 # completions for quilt version 0.46 or similar
-complete -c quilt -s h -d "show help"
-complete -c quilt -l version -d "show version"
-complete -c quilt -l quiltrc -r --no-file -d "specify the file to Run Control file to use"
+complete -c quilt -s h -d "Show help"
+complete -c quilt -l version -d "Show version"
+complete -c quilt -l quiltrc -r --no-file -d "Give the config file to use"
 complete -c quilt -l trace -r --no-file -d "Runs the command in bash trace mode (-x). For internal debugging"
 
-complete -c quilt -a add -r -d "Add one or more files to the topmost or named patch"
-complete -c quilt -a annotate -r -d "Print an annotated listing of the specified file"
+complete -c quilt -a add -r -d "Add file(s) to the topmost/named patch"
+complete -c quilt -a annotate -r -d "Print an annotated listing of the given file"
 complete -c quilt -a applied -r -d "Print a list of applied patches"
-complete -c quilt -a delete -r -d "Remove the specified or topmost patch from the series file"
-complete -c quilt -a diff -r -d "Produces a diff of the specified file(s) in the topmost  or  specified patch"
-complete -c quilt -a edit -r -d "Edit the specified file(s) in $EDITOR"
-complete -c quilt -a files -r -d "Print the list of files that the topmost or specified patch changes"
-complete -c quilt -a fold -r -d "Integrate the patch read  from  standard  input  into  the  topmost patch"
-complete -c quilt -a fork -r --no-file -d " Fork the topmost patch"
-complete -c quilt -a graph -r --no-file -d "Generate  a  dot(1) directed graph showing the dependencies between applied patches"
-complete -c quilt -a grep -r --no-file -d "Grep through the source files, recursively, skipping patches and quilt meta-information"
-complete -c quilt -a header -r --no-file -d " Print or change the header of the topmost or specified patch"
+complete -c quilt -a delete -r -d "Remove the topmost/given patch from the series file"
+complete -c quilt -a diff -r -d "Produces a diff of the given file(s) in the topmost/given patch"
+complete -c quilt -a edit -r -d "Edit the given file(s) in $EDITOR"
+complete -c quilt -a files -r -d "Lists files that the topmost/given patch changes"
+complete -c quilt -a fold -r -d "Integrate the patch read from standard input into the topmost patch"
+complete -c quilt -a fork -r --no-file -d "Fork the topmost patch"
+complete -c quilt -a graph -r --no-file -d "Generates a dot directed graph of patch dependencies"
+complete -c quilt -a grep -r --no-file -d "Grep through source files recursively"
+complete -c quilt -a header -r --no-file -d "Print/change the header of the topmost/given patch"
 complete -c quilt -a import -r -d "Import external patches"
-complete -c quilt -a mail -r -d "Create  mail  messages  from all patches in the series file, and either store or send them"
-complete -c quilt -a new -r -d "Create a new patch with the specified file name, and  insert  it after the topmost patch"
-complete -c quilt -a next -r -d "Print  the  name  of  the next patch after the specified or topmost patch in the series file"
-complete -c quilt -a patches -r -d "Print the list of patches that modify the specified file"
-complete -c quilt -a pop -r -d "Remove  patch(es) from the stack of applied  patches"
-complete -c quilt -a previous -r -d "Print the name of the previous patch before the specified or topmost patch in the series file"
+complete -c quilt -a mail -r -d "Create mail messages from patches in the series file, stores/sends them"
+complete -c quilt -a new -r -d "Creates new patch with the given name, inserts it after topmost patch"
+complete -c quilt -a next -r -d "Prints name of patch after the topmost/given patch in the series file"
+complete -c quilt -a patches -r -d "Print the list of patches that modify the given file"
+complete -c quilt -a pop -r -d "Remove patch(es) from the stack of applied patches"
+complete -c quilt -a previous -r -d "Prints name of patch before the topmost/given patch in the series file"
 complete -c quilt -a push -r -d "Apply patch(es) from the series file"
-complete -c quilt -a refresh -r -d "Refreshes the specified patch, or the topmost patch by default"
-complete -c quilt -a remove -r -d "Remove one or more files from the topmost or named patch"
-complete -c quilt -a rename -r -d "Rename the topmost or named patch"
+complete -c quilt -a refresh -r -d "Refresh the given patch, or the topmost patch by default"
+complete -c quilt -a remove -r -d "Remove one or more files from the topmost/named patch"
+complete -c quilt -a rename -r -d "Rename the topmost/named patch"
 complete -c quilt -a series -r --no-file -d "Print the names of all patches in the series file"
-complete -c quilt -a setup -r -d " Initializes a source tree from an rpm spec file or a quilt series file"
-complete -c quilt -a snapshot -r --no-file -d " Take a snapshot of the current working state"
-complete -c quilt -a top -d "Print the name of the topmost patch on the current stack of applied patches"
-complete -c quilt -a unapplied -r -d "Print a list of patches that are not applied, or all patches that follow the specified patch in the series file"
-complete -c quilt -a upgrade -d "Upgrade the meta-data in a working tree from an old version of quilt to the current version"
+complete -c quilt -a setup -r -d "Initializes a source tree from an rpm spec or a quilt series file"
+complete -c quilt -a snapshot -r --no-file -d "Take a snapshot of the current working state"
+complete -c quilt -a top -d "Prints name of the topmost patch in the current stack of applied patches"
+complete -c quilt -a unapplied -r -d "List patches not applied or patches that follow the patch in the series file"
+complete -c quilt -a upgrade -d "Upgrade meta-data in a working tree to the current version of quilt"

From 8d386a27f3c214ff21fc36e87e5e48d2e51f0231 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Mon, 7 Feb 2022 12:49:02 -0600
Subject: [PATCH 196/262] zfs completions: Factor out OpenZFS features and
 support

As of FreeBSD 13 (released April 2021), FreeBSD has rebased its zfs support on
top of the OpenZFS distribution previously used only/chiefly by Linux;
accordingly, it has gained support for some previously Linux-only completions.
This patch changes some completions previously predicated on a Linux ZFS
installation to the presence of an OpenZFS installation. Note that there
continue to be (and probably always will be) separate Linux-only and
FreeBSD-only completions (and not just when it comes to interacting with the
device subsystem, etc).
---
 share/completions/zfs.fish   | 63 ++++++++++++++++++++++++------------
 share/completions/zpool.fish | 60 ++++++++++++++++++++++------------
 2 files changed, 82 insertions(+), 41 deletions(-)

diff --git a/share/completions/zfs.fish b/share/completions/zfs.fish
index 7974a6151..081081783 100644
--- a/share/completions/zfs.fish
+++ b/share/completions/zfs.fish
@@ -1,16 +1,21 @@
-# Fish completions for the OpenZFS zfs command
-# TODO Possible enhancements:
-# - add a test to propose iSCSI and Trusted Extensions completions only when such system is present;
-# - Illumos man pages suggests that it does not support nbmand nor atime mount option, so these properties should be proposed only when available
-# - generally, propose properties only when the current OS and ZFS versions support them;
-# - for the promote command, propose only eligible filesystems;
-# - for the rollback command, propose only the most recent snapshot for each dataset, as it will not accept an intermediary snapshot;
-# - for the release command, complete with existing tags;
-# - for the diff command, complete the destination dataset of the diff;
-# - for the program command, complete the script to be executed
-# - for commands accepting several arguments of different types, propose arguments in the right order: for get, once the ZFS parameters have been given, only propose datasets
+# Fish completions for the ZFS `zfs` command
+#
+# Possible enhancements:
+# - Add a test to propose iSCSI and Trusted Extensions completions only when such system is present;
+# - Illumos man pages suggests that it does not support nbmand nor atime mount option, so these
+#   properties should be proposed only when available;
+# - Generally, propose properties only when the current OS and ZFS versions support them;
+# - For the promote command, propose only eligible filesystems;
+# - For the rollback command, propose only the most recent snapshot for each dataset, as it will not
+#   accept an intermediary snapshot;
+# - For the release command, complete with existing tags;
+# - For the diff command, complete the destination dataset of the diff;
+# - For the program command, complete the script to be executed;
+# - For commands accepting several arguments of different types, propose arguments in the right
+#   order: for get, once the ZFS parameters have been given, only propose datasets.
 
 set -l OS ""
+set -l freebsd_version ""
 switch (uname)
     case Linux
         set OS Linux
@@ -18,6 +23,7 @@ switch (uname)
         set OS macOS
     case FreeBSD
         set OS FreeBSD
+        set freebsd_version (uname -U)
     case SunOS
         set OS SunOS
         # Others?
@@ -25,6 +31,14 @@ switch (uname)
         set OS unknown
 end
 
+# Certain functionality is exclusive to platforms using OpenZFS. This used to be just Linux, but it
+# now includes FreeBSD 13 and above.
+if not type -q __fish_is_openzfs
+    function __fish_is_openzfs --inherit-variable freebsd_version --inherit-variable OS
+        test $OS = Linux || test $OS = FreeBSD -a $freebsd_version -gt 1300000
+    end
+end
+
 # Does the current invocation need a command?
 function __fish_zfs_needs_command
     set -l bookmark ""
@@ -261,7 +275,8 @@ if test $OS = SunOS # This is currently only supported under Illumos, but that w
     complete -c zfs -f -n __fish_zfs_needs_command -a program -d 'Execute a ZFS Channel Program'
 end
 
-# Completions hereafter try to follow the man pages commands order, for maintainability, at the cost of multiple if statements
+# Completions hereafter try to follow the man pages commands order, for maintainability, at the cost
+# of multiple if statements.
 
 # create completions
 complete -c zfs -f -n '__fish_zfs_using_command create' -s p -d 'Create all needed non-existing parent datasets'
@@ -270,16 +285,20 @@ if test $OS = Linux # Only Linux supports the comma-separated format; others nee
 else
     complete -c zfs -x -n '__fish_zfs_using_command create' -s o -d 'Dataset property' -a '(__fish_complete_zfs_rw_properties; __fish_complete_zfs_write_once_properties)'
 end
-# create completions for volumes; as -V is necessary to zfs to recognize a volume creation request, we use it as a condition to propose volume creation completions
-# If -V is typed after -s or -b, zfs should accept it, but fish won't propose -s or -b, but, as these options are for volumes only, it seems reasonable to expect the user to ask for a volume, with -V, before giving its characteristics with -s or -b
+# create completions for volumes; as -V is necessary to zfs to recognize a volume creation request,
+# we use it as a condition to propose volume creation completions.
+# If -V is typed after -s or -b, zfs should accept it, but fish won't propose -s or -b, but, as
+# these options are for volumes only, it seems reasonable to expect the user to ask for a volume,
+# with -V, before giving its characteristics with -s or -b
 complete -c zfs -x -n '__fish_zfs_using_command create' -s V -d 'Volume size'
 complete -c zfs -f -n '__fish_zfs_using_command create; and __fish_contains_opt -s V' -s s -d 'Create a sparse volume'
 complete -c zfs -x -n '__fish_zfs_using_command create; and __fish_contains_opt -s V' -s b -d Blocksize
-# new dataset completions, applicable for both regular datasets and volumes; must start with pool and may optionally
-# be a child of a pre-existing dataset.
+# new dataset completions, applicable for both regular datasets and volumes; must start with pool
+# and may optionally be a child of a pre-existing dataset.
 complete -c zfs -x -n '__fish_zfs_using_command create' -a '(printf "%s/\n" (__fish_print_zfs_filesystems))'
 
-# destroy completions; as the dataset is the last item, we can't know yet if it's a snapshot, a bookmark or something else, so we can't separate snapshot-specific options from others
+# destroy completions; as the dataset is the last item, we can't know yet if it's a snapshot, a
+# bookmark or something else, so we can't separate snapshot-specific options from others.
 complete -c zfs -f -n '__fish_zfs_using_command destroy' -s r -d 'Recursively destroy children'
 complete -c zfs -f -n '__fish_zfs_using_command destroy' -s R -d 'Recursively destroy all dependents'
 complete -c zfs -f -n '__fish_zfs_using_command destroy' -s f -d 'Force unmounting'
@@ -316,14 +335,16 @@ complete -c zfs -x -n '__fish_zfs_using_command clone' -d 'Snapshot to clone' -a
 # promote completions
 complete -c zfs -x -n '__fish_zfs_using_command promote' -d 'Clone to promote' -a '(__fish_print_zfs_filesystems)'
 
-# rename completions; as the dataset is the last item, we can't know yet if it's a snapshot or not, we can't separate snapshot-specific option from others
+# rename completions; as the dataset is the last item, we can't know yet if it's a snapshot or not,
+# we can't separate snapshot-specific option from others.
 complete -c zfs -f -n '__fish_zfs_using_command rename' -s p -d 'Create all needed non-existing parent datasets'
 complete -c zfs -f -n '__fish_zfs_using_command rename' -s r -d 'Recursively rename children snapshots'
-if test $OS = Linux
+if __fish_is_openzfs
     complete -c zfs -f -n '__fish_zfs_using_command rename' -s f -d 'Force unmounting if needed'
-else if test $OS = FreeBSD
+end
+# These FreeBSD completions are in addition to any added via the OpenZFS check above
+if test $OS = FreeBSD
     complete -c zfs -f -n '__fish_zfs_using_command rename' -s u -d 'Do not remount filesystems during rename'
-    complete -c zfs -f -n '__fish_zfs_using_command rename; and __fish_not_contain_opt -s u' -s f -d 'Force unmounting if needed'
 end
 complete -c zfs -x -n '__fish_zfs_using_command rename' -d 'Dataset to rename' -a '(__fish_print_zfs_filesystems; __fish_print_zfs_volumes; __fish_print_zfs_snapshots)'
 
diff --git a/share/completions/zpool.fish b/share/completions/zpool.fish
index 00de7cf55..05b331b85 100644
--- a/share/completions/zpool.fish
+++ b/share/completions/zpool.fish
@@ -1,10 +1,15 @@
-# Fish completions for the OpenZFS zpool command
+# Fish completions for the ZFS `zpool` command
+#
 # Possible improvements:
-# - whenever possible, propose designation of vdevs using their GUID
-# - for eligible commands, with arguments of different types, only propose second type completions after the first have been selected; for instance, only propose pool members for offline command
-# - this has been written mainly from manpages, which are known to be out-of-sync with the real feature set; some discrepancies have been addressed, but it is highly likely that others still lie
+# - Whenever possible, propose designation of vdevs using their GUID.
+# - For eligible commands, with arguments of different types, only propose second type completions
+#   after the first have been selected; for instance, only propose pool members for offline command.
+# - This has been written mainly from manpages, which are known to be out-of-sync with the real
+#   feature set; some discrepancies have been addressed, but it is highly likely that others still
+#   lie.
 
 set -l OS ""
+set -l freebsd_version ""
 switch (uname)
     case Linux
         set OS Linux
@@ -12,6 +17,7 @@ switch (uname)
         set OS macOS
     case FreeBSD
         set OS FreeBSD
+        set freebsd_version (uname -U)
     case SunOS
         set OS SunOS
         # Others?
@@ -19,6 +25,14 @@ switch (uname)
         set OS unknown
 end
 
+# Certain functionality is exclusive to platforms using OpenZFS. This used to be just Linux, but it
+# now includes FreeBSD 13 and above.
+if not type -q __fish_is_openzfs
+    function __fish_is_openzfs --inherit-variable freebsd_version --inherit-variable OS
+        test $OS = Linux || test $OS = FreeBSD -a $freebsd_version -gt 1300000
+    end
+end
+
 # Does the current invocation need a command?
 function __fish_zpool_needs_command
     not __fish_seen_subcommand_from \? add attach clear create destroy detach events get history import iostat labelclear list offline online reguid reopen remove replace scrub set split status upgrade
@@ -53,8 +67,11 @@ function __fish_zpool_list_available_vdevs -V OS
 end
 
 function __fish_zpool_complete_vdevs
-    # As this function is to be called for completions only when necessary, we don't need to verify that it is relevant for the specified command; this is to be decided by calling, or not, the current function for command completions
-    # We can display the physical devices, as they are relevant whereas we are in a vdev definition or not
+    # As this function is to be called for completions only when necessary, we don't need to verify
+    # that it is relevant for the specified command; this is to be decided by calling, or not, the
+    # current function for command completions.
+    # We can display the physical devices, as they are relevant whereas we are in a vdev definition
+    # or not.
     __fish_zpool_list_available_vdevs
     # First, reverse token list to analyze it from the end
     set -l tokens 0
@@ -80,14 +97,17 @@ function __fish_zpool_complete_vdevs
                     __fish_zpool_list_vdev_types
                 end
                 return
-                # Here, we accept any possible zpool command; this way, the developper will not have to augment or reduce the list when adding the current function to or removing it from the completions for the said command
+                # Here, we accept any possible zpool command; this way, the developer will not have
+                # to augment or reduce the list when adding the current function to or removing it
+                # from the completions for the said command.
             case \? add attach clear create destroy detach events get history import iostat labelclear list offline online reguid reopen remove replace scrub set split status upgrade
                 __fish_zpool_list_vdev_types
                 return
             case "" # Au cas où
                 echo "" >/dev/null
             case "-*" "*=*" "*,*"
-                # The token is an option or an option argument; as no option uses a vdev as its argument, we can abandon commandline parsing
+                # The token is an option or an option argument; as no option uses a vdev as its
+                # argument, we can abandon commandline parsing.
                 __fish_zpool_list_vdev_types
                 return
         end
@@ -174,7 +194,7 @@ complete -c zpool -f -n __fish_zpool_needs_command -a clear -d 'Clear devices er
 complete -c zpool -f -n __fish_zpool_needs_command -a create -d 'Create a new storage pool'
 complete -c zpool -f -n __fish_zpool_needs_command -a destroy -d 'Destroy a storage pool'
 complete -c zpool -f -n __fish_zpool_needs_command -a detach -d 'Detach virtual device from a mirroring pool'
-if test $OS = Linux
+if __fish_is_openzfs
     complete -c zpool -f -n __fish_zpool_needs_command -a events -d 'Display pool event log'
 end
 complete -c zpool -f -n __fish_zpool_needs_command -a export -d 'Export a pool'
@@ -199,7 +219,7 @@ complete -c zpool -f -n __fish_zpool_needs_command -a upgrade -d 'List upgradeab
 # add completions
 complete -c zpool -f -n '__fish_zpool_using_command add' -s f -d 'Force use of virtual device'
 complete -c zpool -f -n '__fish_zpool_using_command add' -s n -d 'Dry run: only display resulting configuration'
-if test $OS = Linux
+if __fish_is_openzfs
     complete -c zpool -f -n '__fish_zpool_using_command add' -s g -d 'Display virtual device GUID instead of device name'
     complete -c zpool -f -n '__fish_zpool_using_command add' -s L -d 'Resolve device path symbolic links'
     complete -c zpool -f -n '__fish_zpool_using_command add' -s P -d 'Display device full path'
@@ -210,7 +230,7 @@ complete -c zpool -x -n '__fish_zpool_using_command add; and not __fish_prev_arg
 
 # attach completions
 complete -c zpool -f -n '__fish_zpool_using_command attach' -s f -d 'Force use of virtual device'
-if test $OS = Linux
+if __fish_is_openzfs
     complete -c zpool -x -n '__fish_zpool_using_command attach' -s o -d 'Pool property' -a '(__fish_zpool_list_device_properties)'
 end
 complete -c zpool -x -n '__fish_zpool_using_command attach' -d 'Pool to attach virtual device to' -a '(__fish_complete_zfs_pools)'
@@ -236,7 +256,7 @@ complete -c zpool -x -n '__fish_zpool_using_command create' -s o -d 'Pool proper
 complete -c zpool -x -n '__fish_zpool_using_command create' -s O -d 'Root filesystem property' -a '(__fish_complete_zfs_ro_properties; __fish_complete_zfs_rw_properties; __fish_complete_zfs_write_once_properties)'
 complete -c zpool -r -n '__fish_zpool_using_command create' -s R -d 'Equivalent to "-o cachefile=none,altroot=ROOT"'
 complete -c zpool -x -n '__fish_zpool_using_command create' -s m -d 'Root filesystem mountpoint' -a 'legacy none'
-if test $OS = Linux
+if __fish_is_openzfs
     complete -c zpool -x -n '__fish_zpool_using_command create' -s t -d 'Set a different in-core pool name'
 end
 complete -c zpool -x -n '__fish_zpool_using_command create' -d 'Virtual device to add' -a '(__fish_zpool_complete_vdevs)'
@@ -250,7 +270,7 @@ complete -c zpool -x -n '__fish_zpool_using_command clear' -d 'Pool to detach de
 complete -c zpool -x -n '__fish_zpool_using_command clear' -d 'Physical device to detach' -a '(__fish_zpool_list_used_vdevs)'
 
 # events completions
-if test $OS = Linux
+if __fish_is_openzfs
     complete -c zpool -f -n '__fish_zpool_using_command events' -s v -d 'Print verbose event information'
     complete -c zpool -f -n '__fish_zpool_using_command events' -s H -d 'Print output in a machine-parsable format'
     complete -c zpool -f -n '__fish_zpool_using_command events' -s f -d 'Output appended data as the log grows'
@@ -259,7 +279,7 @@ if test $OS = Linux
 end
 
 # export completions
-if test $OS = Linux
+if __fish_is_openzfs
     complete -c zpool -f -n '__fish_zpool_using_command export' -s a -d 'Export all pools'
 end
 complete -c zpool -f -n '__fish_zpool_using_command export' -s f -d 'Force unmounting of all contained datasets'
@@ -292,7 +312,7 @@ complete -c zpool -f -n '__fish_zpool_using_command import' -s m -d 'Ignore miss
 complete -c zpool -r -n '__fish_zpool_using_command import' -s R -d 'Equivalent to "-o cachefile=none,altroot=ROOT"'
 complete -c zpool -f -n '__fish_zpool_using_command import' -s N -d 'Do not mount contained filesystems'
 complete -c zpool -f -n '__fish_zpool_using_command import; and __fish_contains_opt -s F' -s n -d 'Dry run: only determine if the recovery is possible, without attempting it'
-if test $OS = Linux
+if __fish_is_openzfs
     complete -c zpool -f -n '__fish_zpool_using_command import; and __fish_contains_opt -s F' -s X -d 'Roll back to a previous TXG (hazardous)'
     complete -c zpool -r -n '__fish_zpool_using_command import' -s T -d 'TXG to roll back to (implies -FX)'
     complete -c zpool -f -n '__fish_zpool_using_command import' -s t -d 'Specify, as the last argument, a temporary pool name'
@@ -301,7 +321,7 @@ complete -c zpool -f -n '__fish_zpool_using_command import; and __fish_not_conta
 
 # iostat completions
 complete -c zpool -x -n '__fish_zpool_using_command iostat' -s T -d 'Display a timestamp using specified format'
-if test $OS = Linux
+if __fish_is_openzfs
     complete -c zpool -f -n '__fish_zpool_using_command iostat' -s g -d 'Display virtual device GUID instead of device name'
     complete -c zpool -f -n '__fish_zpool_using_command iostat' -s L -d 'Resolve device path symbolic links'
     complete -c zpool -f -n '__fish_zpool_using_command iostat' -s P -d 'Display device full path'
@@ -316,7 +336,7 @@ complete -c zpool -x -n '__fish_zpool_using_command labelclear' -d 'Device to cl
 
 # list completions
 complete -c zpool -f -n '__fish_zpool_using_command list' -s H -d 'Print output in a machine-parsable format'
-if test $OS = Linux
+if __fish_is_openzfs
     complete -c zpool -f -n '__fish_zpool_using_command list' -s g -d 'Display virtual device GUID instead of device name'
     complete -c zpool -f -n '__fish_zpool_using_command list' -s L -d 'Resolve device path symbolic links'
 end
@@ -348,7 +368,7 @@ complete -c zpool -x -n '__fish_zpool_using_command reopen' -d 'Pool which devic
 
 # replace completions
 complete -c zpool -f -n '__fish_zpool_using_command replace' -s f -d 'Force use of virtual device'
-if test $OS = Linux
+if __fish_is_openzfs
     complete -c zpool -x -n '__fish_zpool_using_command replace' -s o -d 'Pool property' -a '(__fish_zpool_list_device_properties)'
 end
 complete -c zpool -x -n '__fish_zpool_using_command replace' -d 'Pool to replace device' -a '(__fish_complete_zfs_pools)'
@@ -367,7 +387,7 @@ complete -c zpool -x -n '__fish_zpool_using_command set' -d 'Property to set' -a
 complete -c zpool -x -n '__fish_zpool_using_command set' -d 'Pool which property is to be set' -a '(__fish_complete_zfs_pools)'
 
 # split completions
-if test $OS = Linux
+if __fish_is_openzfs
     complete -c zpool -f -n '__fish_zpool_using_command split' -s g -d 'Display virtual device GUID instead of device name'
     complete -c zpool -f -n '__fish_zpool_using_command split' -s L -d 'Resolve device path symbolic links'
     complete -c zpool -f -n '__fish_zpool_using_command split' -s P -d 'Display device full path'
@@ -381,7 +401,7 @@ end
 complete -c zpool -x -n '__fish_zpool_using_command split' -d 'Pool to split' -a '(__fish_complete_zfs_pools)'
 
 # status completions
-if test $OS = Linux
+if __fish_is_openzfs
     complete -c zpool -f -n '__fish_zpool_using_command status' -s g -d 'Display virtual device GUID instead of device name'
     complete -c zpool -f -n '__fish_zpool_using_command status' -s L -d 'Resolve device path symbolic links'
     complete -c zpool -f -n '__fish_zpool_using_command status' -s P -d 'Display device full path'

From 99e0aa3c6494ec14278cc35bce1c4cecb686cdaa Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Mon, 7 Feb 2022 12:56:27 -0600
Subject: [PATCH 197/262] Clarify fish_is_nth_token description

Yes, this does make it longer but it's a very important point.
---
 share/functions/fish_is_nth_token.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/functions/fish_is_nth_token.fish b/share/functions/fish_is_nth_token.fish
index c3f23cf53..907caae71 100644
--- a/share/functions/fish_is_nth_token.fish
+++ b/share/functions/fish_is_nth_token.fish
@@ -1,4 +1,4 @@
-function fish_is_nth_token --description 'Test if current token is on Nth place' --argument-names n
+function fish_is_nth_token --description 'Test if current token is the Nth (ignoring command and switches/flags)' --argument-names n
     set -l tokens (commandline -poc)
     set -l tokens (string replace -r --filter '^([^-].*)' '$1' -- $tokens)
     test (count $tokens) -eq "$n"

From b06a8a2e0c5b7caf20d0eeaad6e460282c618510 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Mon, 7 Feb 2022 13:16:02 -0600
Subject: [PATCH 198/262] Add public function fish_nth_token to mirror
 fish_is_nth_token

Completions may benefit from using these in tandem to dynamically generate
completions predicated on the value of an earlier token in a cleaner fashion.
(Currently, most of called completion helper functions introspect the command
line to get the value of an earlier argument, making them less reusable for
different expressions that need completions of the same type. This way, the
completion can provide the function with the argument value explicitly.)
---
 share/functions/fish_nth_token.fish | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 share/functions/fish_nth_token.fish

diff --git a/share/functions/fish_nth_token.fish b/share/functions/fish_nth_token.fish
new file mode 100644
index 000000000..7df863ae6
--- /dev/null
+++ b/share/functions/fish_nth_token.fish
@@ -0,0 +1,9 @@
+function fish_nth_token --description 'Prints the Nth token (ignoring command and switches/flags)' --argument-names n
+    set -l tokens (commandline -po | string replace -r --filter '^([^-].*)' '$1')
+    # Increment $n by one to account for ignoring the command
+    if test (count $tokens) -ge (math "$n" + 1)
+        echo $tokens[(math $n + 1)]
+    else
+        return 1
+    end
+end

From 5b7dd5e806358a13bdd2a98e1a8d57e40277e023 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Mon, 7 Feb 2022 14:02:16 -0600
Subject: [PATCH 199/262] Fix `zpool attach` completions

The previous behavior vs the current (hopefully ideal) behavior:

* zpool attach [lists pools and devices - should list only pools]
* zpool attach tank [lists pools and devices - should list only devices already
    part of pool "tank"]
* zpool attach tank da1 [lists pools and devices - should list only devices not
    already part of pool "tank" or any pool, depending on -f flag to attach]
---
 share/completions/zpool.fish | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/share/completions/zpool.fish b/share/completions/zpool.fish
index 05b331b85..26c95ec2f 100644
--- a/share/completions/zpool.fish
+++ b/share/completions/zpool.fish
@@ -53,7 +53,7 @@ end
 function __fish_zpool_list_used_vdevs -a pool
     # See discussion and variants discussed at
     # https://github.com/fish-shell/fish-shell/pull/5743#pullrequestreview-217432149
-    zpool list -Hv | string replace -rf "^\t([^\t]+).*" '$1' | string match -rv '^(spare|log|cache|mirror|raidz.?)'
+    zpool list -Hv $pool | string replace -rf "^\t([^\t]+).*" '$1' | string match -rv '^(spare|log|cache|mirror|raidz.?)'
 end
 
 function __fish_zpool_list_available_vdevs -V OS
@@ -71,8 +71,13 @@ function __fish_zpool_complete_vdevs
     # that it is relevant for the specified command; this is to be decided by calling, or not, the
     # current function for command completions.
     # We can display the physical devices, as they are relevant whereas we are in a vdev definition
-    # or not.
+    # or not. Many operations need this list of vdevs winnowed down to some precondition (mostly
+    # "vdevs associated with pool" or "vdevs not associated with pool") but it's not really feasible
+    # to do that here as the situations are highly subcommand-dependent and this function is
+    # structured to operate backwards only analyzing the subcommand at the very end. Long story
+    # short, that vdev filtering will need to happen at the call site, at least currently.
     __fish_zpool_list_available_vdevs
+
     # First, reverse token list to analyze it from the end
     set -l tokens 0
     for i in (commandline -co)[-1..1]
@@ -233,8 +238,17 @@ complete -c zpool -f -n '__fish_zpool_using_command attach' -s f -d 'Force use o
 if __fish_is_openzfs
     complete -c zpool -x -n '__fish_zpool_using_command attach' -s o -d 'Pool property' -a '(__fish_zpool_list_device_properties)'
 end
-complete -c zpool -x -n '__fish_zpool_using_command attach' -d 'Pool to attach virtual device to' -a '(__fish_complete_zfs_pools)'
-complete -c zpool -x -n '__fish_zpool_using_command attach' -d 'Virtual device to operate on' -a '(__fish_zpool_list_available_vdevs)'
+# The ideal behavior for attach is as follows:
+# - zpool attach [should list only pools]
+# - zpool attach <tank> [should list only devices already part of pool]
+# - zpool attach <tank> <da1> [should list only devices not already part of a/the pool]
+complete -c zpool -x -n '__fish_zpool_using_command attach; and __fish_is_nth_token 2' -d 'Pool to attach virtual device to' -a '(__fish_complete_zfs_pools)'
+complete -c zpool -x -n '__fish_zpool_using_command attach; and __fish_is_nth_token 3' -d 'Existing pool device to attach to' -a '(__fish_zpool_list_used_vdevs (fish_nth_token 2))'
+# Generate a list of devices in the system modulo devices already part of an online zpool.
+# These latter can be forcefully added, so we only exclude them if we don't introspect the presence
+# of a `-f` argument to `zpool attach` (but still exclude any devices already part of the same pool
+# that we're attaching to, "obviously").
+complete -c zpool -x -n '__fish_zpool_using_command attach; and __fish_is_nth_token 4' -d 'Device to be attached' -a '(__fish_zpool_list_available_vdevs | string match -vr (__fish_zpool_list_used_vdevs (__fish_seen_argument -s f && fish_nth_token 2) | string escape --style regex | string replace -r \'(.*)\' \'^$1\\\\\\$\' | string join "|"))' # the insane number of backslashes is unfortunate
 
 # clear completions
 if test $OS = FreeBSD

From b3142a29e7de5a67467d4c8cf6fe906e5f6c29ad Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Tue, 8 Feb 2022 14:03:16 -0600
Subject: [PATCH 200/262] Fix `zfs add` completions

---
 share/completions/zpool.fish | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/share/completions/zpool.fish b/share/completions/zpool.fish
index 26c95ec2f..86f630daa 100644
--- a/share/completions/zpool.fish
+++ b/share/completions/zpool.fish
@@ -230,8 +230,11 @@ if __fish_is_openzfs
     complete -c zpool -f -n '__fish_zpool_using_command add' -s P -d 'Display device full path'
     complete -c zpool -x -n '__fish_zpool_using_command add' -s o -d 'Pool property' -a '(__fish_zpool_list_device_properties)'
 end
-complete -c zpool -x -n '__fish_zpool_using_command add; and __fish_prev_arg_in add' -d 'Pool to add virtual devices to' -a '(__fish_complete_zfs_pools)'
-complete -c zpool -x -n '__fish_zpool_using_command add; and not __fish_prev_arg_in add' -d 'Virtual device to add' -a '(__fish_zpool_complete_vdevs)'
+complete -c zpool -x -n '__fish_zpool_using_command add; and __fish_is_nth_token 2' -d 'Pool to add virtual device(s) to' -a '(__fish_complete_zfs_pools)'
+# complete -c zpool -x -n '__fish_zpool_using_command add; and not __fish_prev_arg_in add' -d 'Virtual device to add' -a '(__fish_zpool_complete_vdevs)'
+# Exclude devices already part of this pool, and devices already in any other pool unless
+# `zpool add -f` was used.
+complete -c zpool -x -n '__fish_zpool_using_command add; and not __fish_prev_arg_in add' -k -d 'Virtual device to add' -a '(__fish_zpool_complete_vdevs | string match -vr (__fish_zpool_list_used_vdevs (__fish_seen_argument -s f && fish_nth_token 2) | string escape --style regex | string replace -r \'(.*)\' \'^$1\\\\\\$\' | string join "|"))' # the insane number of backslashes is unfortunate
 
 # attach completions
 complete -c zpool -f -n '__fish_zpool_using_command attach' -s f -d 'Force use of virtual device'

From 497cebab64143b48a971c3747b57843ee50591fc Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Tue, 8 Feb 2022 14:15:50 -0600
Subject: [PATCH 201/262] Changelog: OpenZFS completion improvements

---
 CHANGELOG.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 55d4f3f2b..c704606e9 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -177,6 +177,7 @@ Completions
 
 - Improvements to many completions, especially for ``git`` aliases (:issue:`8129`) and subcommands (:issue:`8134`).
 - Many adjustments to complete correct options for system utilities on BSD and macOS.
+- Unified the OpenZFS-related completions across operating systems and improved the vdev-related completions for all platforms.
 - Add missing completions for the ``-p`` option of ``xbps-query``.
 - The ``fish_is_nth_token`` function, which is particularly useful in completions for identifying the token number within the command line, replaces various internal functions to do the same (:issue:`8008`).
 - When evaluating custom completions, the command line state no longer includes variable overrides (``var=val``). This unbreaks completions that read ``commandline -op``.

From ddc4d8ba9beb8cfa5bce210354fe009e9d068394 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Tue, 8 Feb 2022 14:16:32 -0600
Subject: [PATCH 202/262] Changelog: fish_is_nth_token + fish_nth_token

See re-opened issue #8008 for discussion regarding the name of these functions -
this might need to be revisited pending a decision there.
---
 CHANGELOG.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c704606e9..6504e8e33 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -179,7 +179,7 @@ Completions
 - Many adjustments to complete correct options for system utilities on BSD and macOS.
 - Unified the OpenZFS-related completions across operating systems and improved the vdev-related completions for all platforms.
 - Add missing completions for the ``-p`` option of ``xbps-query``.
-- The ``fish_is_nth_token`` function, which is particularly useful in completions for identifying the token number within the command line, replaces various internal functions to do the same (:issue:`8008`).
+- The ``fish_is_nth_token`` and accompanying ``fish_nth_token`` functions, which are particularly useful in completions for identifying the token number within the command line and replace various internal functions to do the same (:issue:`8008`).
 - When evaluating custom completions, the command line state no longer includes variable overrides (``var=val``). This unbreaks completions that read ``commandline -op``.
 
 Improved terminal support

From 4ea5a8a5c6535f48312928e553343d8764e29cba Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Tue, 8 Feb 2022 14:35:35 -0600
Subject: [PATCH 203/262] CHANGELOG.rst: Add vim text width override

If you have vim set up to recognize `.editorconfig` files, the 80-char limit
from ours causes vim to keep chopping lines. This makes it ignore that limit
when editing `CHANGELOG.rst`
---
 CHANGELOG.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 6504e8e33..15f3ee9ac 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -3350,3 +3350,5 @@ to call ttyname() on OS X.
 
 We’ve got some work to do to be as lean as bash, but we’re on the right
 track.
+
+.. vim: ft=rst : tw=0 :

From 2d9e51b43e8f0dd73a87e12f1abc74f99f8ff5f3 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Tue, 1 Feb 2022 10:58:17 -0800
Subject: [PATCH 204/262] builtin time: Use more familiar time unit
 abbreviations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use ms, μs as opposed to "millis", etc.
---
 src/timer.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/timer.cpp b/src/timer.cpp
index a22e435e3..6f2f0e25f 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -113,13 +113,13 @@ wcstring timer_snapshot_t::print_delta(const timer_snapshot_t &t1, const timer_s
     auto unit_name = [](tunit unit) {
         switch (unit) {
             case tunit::minutes:
-                return "minutes";
+                return L"minutes";
             case tunit::seconds:
-                return "seconds";
+                return L"seconds";
             case tunit::milliseconds:
-                return "milliseconds";
+                return L"milliseconds";
             case tunit::microseconds:
-                return "microseconds";
+                return L"microseconds";
         }
         // GCC does not recognize the exhaustive switch above
         return "";
@@ -128,13 +128,13 @@ wcstring timer_snapshot_t::print_delta(const timer_snapshot_t &t1, const timer_s
     auto unit_short_name = [](tunit unit) {
         switch (unit) {
             case tunit::minutes:
-                return "mins";
+                return L"min";
             case tunit::seconds:
-                return "secs";
+                return L"sec";
             case tunit::milliseconds:
-                return "millis";
+                return L"ms";
             case tunit::microseconds:
-                return "micros";
+                return L"μs";
         }
         // GCC does not recognize the exhaustive switch above
         return "";
@@ -179,14 +179,14 @@ wcstring timer_snapshot_t::print_delta(const timer_snapshot_t &t1, const timer_s
         double child_usr_time = convert(child_usr_micros, child_unit);
         double child_sys_time = convert(child_sys_micros, child_unit);
 
-        int column2_unit_len = std::max(strlen(unit_short_name(wall_unit)),
+        int column2_unit_len = std::max(wcslen(unit_short_name(wall_unit)),
                                         strlen(unit_short_name(cpu_unit)));
         // TODO: improve layout and use standard two char units
         append_format(output,
                       L"\n________________________________________________________"
-                      L"\nExecuted in  %6.2F %-*s    %-*s  %s"
-                      L"\n   usr time  %6.2F %-*s  %6.2F %s  %6.2F %s"
-                      L"\n   sys time  %6.2F %-*s  %6.2F %s  %6.2F %s"
+                      L"\nExecuted in  %6.2F %-*ls    %-*s  %s"
+                      L"\n   usr time  %6.2F %-*ls  %6.2F %ls  %6.2F %ls"
+                      L"\n   sys time  %6.2F %-*ls  %6.2F %ls  %6.2F %ls"
                       L"\n",
                       wall_time, column2_unit_len, unit_short_name(wall_unit),
                       static_cast<int>(strlen(unit_short_name(fish_unit))) + 7, "fish", "external",

From 346ce8081ba8ac4460d4da27abd9fe6701ab7dcb Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Tue, 1 Feb 2022 11:01:08 -0800
Subject: [PATCH 205/262] time: use box drawing characterts for the separator

This spruces up output slightly to render a solid
line instead of a bunch of dashes for the horizontal
rule shown in time output.
---
 src/timer.cpp | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/timer.cpp b/src/timer.cpp
index 6f2f0e25f..1fac5feaf 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -11,6 +11,19 @@
 #include <cstddef>
 #include <ctime>
 
+#if HAVE_CURSES_H
+#include <curses.h>
+#elif HAVE_NCURSES_H
+#include <ncurses.h>
+#elif HAVE_NCURSES_CURSES_H
+#include <ncurses/curses.h>
+#endif
+#if HAVE_TERM_H
+#include <term.h>
+#elif HAVE_NCURSES_TERM_H
+#include <ncurses/term.h>
+#endif
+
 #include "builtin.h"
 #include "common.h"
 #include "exec.h"
@@ -122,7 +135,7 @@ wcstring timer_snapshot_t::print_delta(const timer_snapshot_t &t1, const timer_s
                 return L"microseconds";
         }
         // GCC does not recognize the exhaustive switch above
-        return "";
+        return L"";
     };
 
     auto unit_short_name = [](tunit unit) {
@@ -137,7 +150,7 @@ wcstring timer_snapshot_t::print_delta(const timer_snapshot_t &t1, const timer_s
                 return L"μs";
         }
         // GCC does not recognize the exhaustive switch above
-        return "";
+        return L"";
     };
 
     auto convert = [](int64_t micros, tunit unit) {
@@ -163,10 +176,9 @@ wcstring timer_snapshot_t::print_delta(const timer_snapshot_t &t1, const timer_s
 
     wcstring output;
     if (!verbose) {
-        append_format(output, L"\n_______________________________"
-                              L"\nExecuted in  %6.2F %s"
-                              L"\n   usr time  %6.2F %s"
-                              L"\n   sys time  %6.2F %s"
+        append_format(output, L"\nExecuted in  %6.2F %ls"
+                              L"\n   usr time  %6.2F %ls"
+                              L"\n   sys time  %6.2F %ls"
                               L"\n",
                               wall_time, unit_name(wall_unit),
                               usr_time, unit_name(cpu_unit),
@@ -180,16 +192,16 @@ wcstring timer_snapshot_t::print_delta(const timer_snapshot_t &t1, const timer_s
         double child_sys_time = convert(child_sys_micros, child_unit);
 
         int column2_unit_len = std::max(wcslen(unit_short_name(wall_unit)),
-                                        strlen(unit_short_name(cpu_unit)));
-        // TODO: improve layout and use standard two char units
+                                        wcslen(unit_short_name(cpu_unit)));
+        // TODO: improve layout
         append_format(output,
-                      L"\n________________________________________________________"
+                      L"%s%s%s"
                       L"\nExecuted in  %6.2F %-*ls    %-*s  %s"
                       L"\n   usr time  %6.2F %-*ls  %6.2F %ls  %6.2F %ls"
-                      L"\n   sys time  %6.2F %-*ls  %6.2F %ls  %6.2F %ls"
-                      L"\n",
+                      L"\n   sys time  %6.2F %-*ls  %6.2F %ls  %6.2F %ls",
+                      enter_alt_charset_mode, std::string(45, 'q').c_str(), exit_alt_charset_mode,
                       wall_time, column2_unit_len, unit_short_name(wall_unit),
-                      static_cast<int>(strlen(unit_short_name(fish_unit))) + 7, "fish", "external",
+                      static_cast<int>(wcslen(unit_short_name(fish_unit))) + 7, "fish", "external",
                       usr_time, column2_unit_len, unit_short_name(cpu_unit), fish_usr_time,
                       unit_short_name(fish_unit), child_usr_time, unit_short_name(child_unit),
                       sys_time, column2_unit_len, unit_short_name(cpu_unit), fish_sys_time,

From e0c8e1cd704accf7d6694d9270f7efb38356cfcb Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Tue, 1 Feb 2022 19:04:22 -0800
Subject: [PATCH 206/262] iothread: Remove most of a comment

Remove the narrative here that can set a reader up for confusion.

https://github.com/fish-shell/fish-shell/commit/018e51c9354211e65a7b166c2dc79572339152a5
---
 src/iothread.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/iothread.cpp b/src/iothread.cpp
index 684feb815..fd4bdb044 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -25,10 +25,7 @@
 #include "global_safety.h"
 #include "wutil.h"
 
-// We just define a thread limit of 1024.
-// On all systems I've seen the limit is higher,
-// but on some (like linux with glibc) the setting for _POSIX_THREAD_THREADS_MAX is 64,
-// which is too low, even tho the system can handle more than 64 threads.
+/// We just define a thread limit of 1024.
 #define IO_MAX_THREADS 1024
 
 // iothread has a thread pool. Sometimes there's no work to do, but extant threads wait around for a

From 63bfab9975a9023adbd22a18a60b6ad0ca48a0c1 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Tue, 8 Feb 2022 16:41:11 -0800
Subject: [PATCH 207/262] Start threads detached.

---
 src/iothread.cpp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/iothread.cpp b/src/iothread.cpp
index fd4bdb044..429522fa7 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -353,14 +353,21 @@ bool make_detached_pthread(void *(*func)(void *), void *param) {
     // Spawn a thread. If this fails, it means there's already a bunch of threads; it is very
     // unlikely that they are all on the verge of exiting, so one is likely to be ready to handle
     // extant requests. So we can ignore failure with some confidence.
-    pthread_t thread = 0;
-    int err = pthread_create(&thread, nullptr, func, param);
+    pthread_t thread;
+    pthread_attr_t thread_attr;
+    DIE_ON_FAILURE(pthread_attr_init(&thread_attr));
+
+    int err = pthread_attr_setdetachstate(&thread_attr, PTHREAD_CREATE_DETACHED);
     if (err == 0) {
-        // Success, return the thread.
-        FLOGF(iothread, "pthread %p spawned", (intptr_t)thread);
-        DIE_ON_FAILURE(pthread_detach(thread));
+        err = pthread_create(&thread, &thread_attr, func, param);
+        if (err == 0) {
+            FLOGF(iothread, "pthread %d spawned", thread);
+            pthread_attr_destroy(&thread_attr);
+        } else {
+            perror("pthread_create");
+        }
     } else {
-        perror("pthread_create");
+        perror("pthread_attr_setdetachstate");
     }
     // Restore our sigmask.
     DIE_ON_FAILURE(pthread_sigmask(SIG_SETMASK, &saved_set, nullptr));

From d1d9f147ec4cc82e0319da0ede642976e117034c Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Tue, 8 Feb 2022 16:57:01 -0800
Subject: [PATCH 208/262] Update tests for `time` output.

---
 src/fish_tests.cpp     | 13 ++++++-------
 tests/checks/time.fish | 28 ++++++++++++++--------------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 646cfcdac..226dcb362 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -6619,18 +6619,17 @@ static void test_timer_format() {
     t2.cpu_children.ru_stime.tv_usec = 500;
     t2.wall += std::chrono::microseconds(500);
     auto expected =
-        LR"(
-________________________________________________________
-Executed in  500.00 micros    fish         external
-   usr time    1.00 secs      1.00 secs    1.00 millis
-   sys time    1.00 secs      1.00 secs    0.50 millis
-)";  //        (a)            (b)            (c)
+        L"\x1b(0qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq\x1b(B\n"
+"Executed in  500.00 μs     fish        external\n"
+"   usr time    1.00 sec    1.00 sec    1.00 ms\n"
+"   sys time    1.00 sec    1.00 sec    0.50 ms";
+  //        (a)            (b)            (c)
      // (a) remaining columns should align even if there are different units
      // (b) carry to the next unit when it would overflow %6.2F
      // (c) carry to the next unit when the larger one exceeds 1000
     std::wstring actual = timer_snapshot_t::print_delta(t1, t2, true);
     if (actual != expected) {
-        err(L"Failed to format timer snapshot\nExpected: %ls\nActual:%ls\n", expected,
+        err(L"Failed to format timer snapshot\nExpected:\n %ls\nActual:\n %ls\n", expected,
             actual.c_str());
     }
     setlocale(LC_NUMERIC, saved_locale);
diff --git a/tests/checks/time.fish b/tests/checks/time.fish
index 0eb469be7..7923dce6f 100644
--- a/tests/checks/time.fish
+++ b/tests/checks/time.fish
@@ -3,37 +3,37 @@ time sleep 0
 
 # These are a tad awkward because it picks the correct unit and adapts whitespace.
 # The idea is that it's a table.
-#CHECKERR: ________________________________________________________
-#CHECKERR: Executed in {{[\d,.\s]*}} {{millis|micros|secs}} {{\s*}}fish {{\s*}}external
-#CHECKERR: usr time {{[\d,.\s]*}} {{millis|micros|secs}} {{[\d,.\s]*}} {{millis|micros|secs}} {{[\d,.\s]*}} {{millis|micros|secs}}
-#CHECKERR: sys time {{[\d,.\s]*}} {{millis|micros|secs}} {{[\d,.\s]*}} {{millis|micros|secs}} {{[\d,.\s]*}} {{millis|micros|secs}}
+#CHECKERR: {{.*}}
+#CHECKERR: Executed in {{[\d,.\s]*}} {{ms|μs|sec}} {{\s*}}fish {{\s*}}external
+#CHECKERR: usr time {{[\d,.\s]*}} {{ms|μs|sec}} {{[\d,.\s]*}} {{ms|μs|sec}} {{[\d,.\s]*}} {{ms|μs|sec}}
+#CHECKERR: sys time {{[\d,.\s]*}} {{ms|μs|sec}} {{[\d,.\s]*}} {{ms|μs|sec}} {{[\d,.\s]*}} {{ms|μs|sec}}
 time for i in (seq 1 2)
     echo banana
 end
 
 #CHECK: banana
 #CHECK: banana
-#CHECKERR: ________________________________________________________
-#CHECKERR: Executed in {{[\d,.\s]*}} {{millis|micros|secs}} {{\s*}}fish {{\s*}}external
-#CHECKERR: usr time {{[\d,.\s]*}} {{millis|micros|secs}} {{[\d,.\s]*}} {{millis|micros|secs}} {{[\d,.\s]*}} {{millis|micros|secs}}
-#CHECKERR: sys time {{[\d,.\s]*}} {{millis|micros|secs}} {{[\d,.\s]*}} {{millis|micros|secs}} {{[\d,.\s]*}} {{millis|micros|secs}}
+#CHECKERR: {{.*}}
+#CHECKERR: Executed in {{[\d,.\s]*}} {{ms|μs|sec}} {{\s*}}fish {{\s*}}external
+#CHECKERR: usr time {{[\d,.\s]*}} {{ms|μs|sec}} {{[\d,.\s]*}} {{ms|μs|sec}} {{[\d,.\s]*}} {{ms|μs|sec}}
+#CHECKERR: sys time {{[\d,.\s]*}} {{ms|μs|sec}} {{[\d,.\s]*}} {{ms|μs|sec}} {{[\d,.\s]*}} {{ms|μs|sec}}
 
 # Make sure we're not double-parsing
 time echo 'foo -s   bar'
 #CHECK: foo -s   bar
-#CHECKERR: ________________________________________________________
-#CHECKERR: Executed in {{[\d,.\s]*}} {{millis|micros|secs}} {{\s*}}fish {{\s*}}external
-#CHECKERR: usr time {{[\d,.\s]*}} {{millis|micros|secs}} {{[\d,.\s]*}} {{millis|micros|secs}} {{[\d,.\s]*}} {{millis|micros|secs}}
-#CHECKERR: sys time {{[\d,.\s]*}} {{millis|micros|secs}} {{[\d,.\s]*}} {{millis|micros|secs}} {{[\d,.\s]*}} {{millis|micros|secs}}
+#CHECKERR: {{.*}}
+#CHECKERR: Executed in {{[\d,.\s]*}} {{ms|μs|sec}} {{\s*}}fish {{\s*}}external
+#CHECKERR: usr time {{[\d,.\s]*}} {{ms|μs|sec}} {{[\d,.\s]*}} {{ms|μs|sec}} {{[\d,.\s]*}} {{ms|μs|sec}}
+#CHECKERR: sys time {{[\d,.\s]*}} {{ms|μs|sec}} {{[\d,.\s]*}} {{ms|μs|sec}} {{[\d,.\s]*}} {{ms|μs|sec}}
 
 true && time a=b not builtin true | true
-#CHECKERR: ___{{.*}}
+#CHECKERR: {{.*}}
 #CHECKERR: {{.*}}
 #CHECKERR: {{.*}}
 #CHECKERR: {{.*}}
 
 not time true
-#CHECKERR: ___{{.*}}
+#CHECKERR: {{.*}}
 #CHECKERR: {{.*}}
 #CHECKERR: {{.*}}
 #CHECKERR: {{.*}}

From 9e0f74eb6c04b435d1007b313ac863729daeff81 Mon Sep 17 00:00:00 2001
From: Nadav Zingerman <7372858+nzig@users.noreply.github.com>
Date: Sat, 15 Jan 2022 16:57:29 +0200
Subject: [PATCH 209/262] Add --escape option to `complete -C`

An example use case is an external completion pager:

    bind \cg "commandline -rt (complete -C --escape|fzf|cut -d\t -f1)\ "

Fixes #3469
---
 CHANGELOG.rst              |  1 +
 doc_src/cmds/complete.rst  |  4 +++-
 src/builtins/complete.cpp  | 20 ++++++++++++++++----
 tests/checks/complete.fish |  2 ++
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 15f3ee9ac..df110c5e2 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -94,6 +94,7 @@ Scripting improvements
 - ``command -v`` returns an exit status of 127 instead of 1 if no command was found (:issue:`8547`).
 - ``argparse`` with ``--ignore-unknown`` no longer breaks with multiple unknown options in a short option group (:issue:`8637`).
 - Comments inside command substitutions or brackets now correctly ignore parentheses, quotes, and brackets (:issue:`7866`, :issue:`8022`).
+- ``complete -C`` supports a new ``--escape`` option, which turns on escaping in returned completion strings (:issue:`3469`).
 
 Interactive improvements
 ------------------------
diff --git a/doc_src/cmds/complete.rst b/doc_src/cmds/complete.rst
index 8cd617ef3..ba495e322 100644
--- a/doc_src/cmds/complete.rst
+++ b/doc_src/cmds/complete.rst
@@ -9,7 +9,7 @@ Synopsis
 .. synopsis::
 
     complete ((-c | --command) | (-p | --path)) COMMAND [OPTIONS] 
-    complete ((-C | --do-complete)) STRING
+    complete ((-C | --do-complete)) [STRING] [--escape] 
 
 Description
 -----------
@@ -49,6 +49,8 @@ the fish manual.
 
 - ``-C STRING`` or ``--do-complete=STRING`` makes complete try to find all possible completions for the specified string. If there is no STRING, the current commandline is used instead.
 
+- When using ``-C``, specify ``--escape`` to escape special characters in completions.
+
 Command specific tab-completions in ``fish`` are based on the notion of options and arguments. An option is a parameter which begins with a hyphen, such as ``-h``, ``-help`` or ``--help``. Arguments are parameters that do not begin with a hyphen. Fish recognizes three styles of options, the same styles as the GNU getopt library. These styles are:
 
 - Short options, like ``-a``. Short options are a single character long, are preceded by a single hyphen and can be grouped together (like ``-la``, which is equivalent to ``-l -a``). Option arguments may be specified by appending the option with the value (``-w32``), or, if ``--require-parameter`` is given, in the following parameter (``-w 32``).
diff --git a/src/builtins/complete.cpp b/src/builtins/complete.cpp
index 5d527ea72..b3e606937 100644
--- a/src/builtins/complete.cpp
+++ b/src/builtins/complete.cpp
@@ -122,6 +122,10 @@ static void builtin_complete_print(const wcstring &cmd, io_streams_t &streams, p
     }
 }
 
+/// Values used for long-only options.
+enum {
+    opt_escape = 1,
+};
 /// The complete builtin. Used for specifying programmable tab-completions. Calls the functions in
 // complete.cpp for any heavy lifting.
 maybe_t<int> builtin_complete(parser_t &parser, io_streams_t &streams, const wchar_t **argv) {
@@ -139,6 +143,7 @@ maybe_t<int> builtin_complete(parser_t &parser, io_streams_t &streams, const wch
     wcstring_list_t path;
     wcstring_list_t wrap_targets;
     bool preserve_order = false;
+    bool unescape_output = true;
 
     static const wchar_t *const short_options = L":a:c:p:s:l:o:d:fFrxeuAn:C::w:hk";
     static const struct woption long_options[] = {
@@ -162,6 +167,7 @@ maybe_t<int> builtin_complete(parser_t &parser, io_streams_t &streams, const wch
         {L"do-complete", optional_argument, nullptr, 'C'},
         {L"help", no_argument, nullptr, 'h'},
         {L"keep-order", no_argument, nullptr, 'k'},
+        {L"escape", no_argument, nullptr, opt_escape},
         {nullptr, 0, nullptr, 0}};
 
     int opt;
@@ -272,6 +278,10 @@ maybe_t<int> builtin_complete(parser_t &parser, io_streams_t &streams, const wch
                 if (have_do_complete_param) do_complete_param = w.woptarg;
                 break;
             }
+            case opt_escape: {
+                unescape_output = false;
+                break;
+            }
             case 'h': {
                 builtin_print_help(parser, streams, cmd);
                 return STATUS_CMD_OK;
@@ -388,10 +398,12 @@ maybe_t<int> builtin_complete(parser_t &parser, io_streams_t &streams, const wch
                     faux_cmdline_with_completion.resize(faux_cmdline_with_completion.size() - 1);
                 }
 
-                // The input data is meant to be something like you would have on the command
-                // line, e.g. includes backslashes. The output should be raw, i.e. unescaped. So
-                // we need to unescape the command line. See #1127.
-                unescape_string_in_place(&faux_cmdline_with_completion, UNESCAPE_DEFAULT);
+                if (unescape_output) {
+                    // The input data is meant to be something like you would have on the command
+                    // line, e.g. includes backslashes. The output should be raw, i.e. unescaped. So
+                    // we need to unescape the command line. See #1127.
+                    unescape_string_in_place(&faux_cmdline_with_completion, UNESCAPE_DEFAULT);
+                }
                 streams.out.append(faux_cmdline_with_completion);
 
                 // Append any description.
diff --git a/tests/checks/complete.fish b/tests/checks/complete.fish
index 118f5bc0a..30be47359 100644
--- a/tests/checks/complete.fish
+++ b/tests/checks/complete.fish
@@ -9,6 +9,8 @@ complete -c complete_test_alpha3 --no-files -w 'complete_test_alpha2 extra2'
 
 complete -C'complete_test_alpha1 arg1 '
 # CHECK: complete_test_alpha1 arg1
+complete --escape -C'complete_test_alpha1 arg1 '
+# CHECK: complete_test_alpha1\ arg1\
 complete -C'complete_test_alpha2 arg2 '
 # CHECK: complete_test_alpha1 extra1 arg2
 complete -C'complete_test_alpha3 arg3 '

From 210e7a9cc989d18fc4b62a0328451cef39770fbc Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Wed, 9 Feb 2022 08:52:52 +0100
Subject: [PATCH 210/262] Correct error on when complete -C is used without
 argument

The new --escape option means that -C is not necessarily the last option;
We have this scenario where we produce a bogus error

    $ fish -c 'complete -C --escape'
    complete: --escape: option requires an argument

--escape doesn't take arguments, so let the error message say -C.
---
 src/builtins/complete.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/builtins/complete.cpp b/src/builtins/complete.cpp
index b3e606937..a25b90438 100644
--- a/src/builtins/complete.cpp
+++ b/src/builtins/complete.cpp
@@ -357,7 +357,7 @@ maybe_t<int> builtin_complete(parser_t &parser, io_streams_t &streams, const wch
             if (!state.initialized) {
                 // This corresponds to using 'complete -C' in non-interactive mode.
                 // See #2361    .
-                builtin_missing_argument(parser, streams, cmd, argv[w.woptind - 1]);
+                builtin_missing_argument(parser, streams, cmd, L"-C");
                 return STATUS_INVALID_ARGS;
             }
             do_complete_param = std::move(state.text);

From 6c81e2a627d7102f873bfa08ba2875df2e76c1e5 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 9 Feb 2022 14:19:08 -0600
Subject: [PATCH 211/262] zfs: Complete values for all properties

This patch adds completions for the values of properties, emitted once the
current token matches the name of a zfs property in full, for the various places
where such a property can be assigned.

e.g.

zfs set canmoun<TAB> continues to only provide "canmount" as a completion, but
zfs set canmount<TAB> will provide a list of all valid values for the property.

The existing code made an attempt to complete the values for the specific case
of `zfs set PROP=` but I could never get it to work for me under FreeBSD, so I
presume it was Linux-specific. This patch should be cross-platform and extends
the completions to anywhere where a property may be set.
---
 share/completions/zfs.fish | 103 +++++++++++++++++++++++++++++++++----
 1 file changed, 92 insertions(+), 11 deletions(-)

diff --git a/share/completions/zfs.fish b/share/completions/zfs.fish
index 081081783..f4f80b048 100644
--- a/share/completions/zfs.fish
+++ b/share/completions/zfs.fish
@@ -104,6 +104,87 @@ function __fish_zfs_list_groupspace_types
     echo -e "all\tBoth types"
 end
 
+function __fish_zfs_complete_property_values -a name
+    # To make updates easier, instead of using a switch/case here we just copy-and-paste the lines
+    # from zfsprops(8) directly, and then parse them when the function is called.
+
+    set all_options "
+    aclinherit=discard|noallow|restricted|passthrough|passthrough-x
+    aclmode=discard|groupmask|passthrough|restricted
+    acltype=off|nfsv4|posix
+    atime=on|off
+    canmount=on|off|noauto
+    checksum=on|off|fletcher2|fletcher4|sha256|noparity|sha512|skein|edonr
+    compression=on|off|gzip|gzip-N|lz4|lzjb|zle|zstd|zstd-N|zstd-fast|zstd-fast-N
+    context=none|SELinux_User:SElinux_Role:Selinux_Type:Sensitivity_Level
+    fscontext=none|SELinux_User:SElinux_Role:Selinux_Type:Sensitivity_Level
+    defcontext=none|SELinux_User:SElinux_Role:Selinux_Type:Sensitivity_Level
+    rootcontext=none|SELinux_User:SElinux_Role:Selinux_Type:Sensitivity_Level
+    copies=1|2|3
+    devices=on|off
+    dedup=off|on|verify|sha256[,verify]|sha512[,verify]|skein[,verify]|edonr,verify
+    dnodesize=legacy|auto|1k|2k|4k|8k|16k
+    encryption=off|on|aes-128-ccm|aes-192-ccm|aes-256-ccm|aes-128-gcm|aes-192-gcm|aes-256-gcm
+    keyformat=raw|hex|passphrase
+    keylocation=prompt|file://</absolute/file/path>
+    pbkdf2iters=iterations
+    exec=on|off
+    filesystem_limit=count|none
+    special_small_blocks=size
+    mountpoint=path|none|legacy
+    nbmand=on|off
+    overlay=on|off
+    primarycache=all|none|metadata
+    quota=size|none
+    snapshot_limit=count|none
+    recordsize=size
+    readonly=on|off
+    redundant_metadata=all|most
+    refquota=size|none
+    refreservation=size|none|auto
+    relatime=on|off
+    reservation=size|none
+    secondarycache=all|none|metadata
+    setuid=on|off
+    sharesmb=on|off|opts
+    sharenfs=on|off|opts
+    logbias=latency|throughput
+    snapdev=hidden|visible
+    snapdir=hidden|visible
+    sync=standard|always|disabled
+    version=N|current
+    volsize=size
+    volmode=default | full | geom | dev | none
+    vscan=on|off
+    xattr=on|off|sa
+    jailed=off | on
+    casesensitivity=sensitive|insensitive|mixed
+    normalization=none|formC|formD|formKC|formKD
+    utf8only=on|off
+"
+    # Convert the list above into an array of strings
+    set all_options (string split \n -- $all_options | string trim)
+
+    # Make sure the name doesn't already have a trailing = (depending on the context)
+    set name (string match -r '^[^=]+' -- $name)
+    # Extract the values "value1|value2" from the long list of "key=value1|value2"
+    set options (string match "$name=*" -- $all_options | string split =)[2]
+    # echo o1: (string escape -- $options)
+    # Put each possible value on its own line and account for formatting disparities
+    set options (string replace -a '|' \n -- $options | string trim)
+    # echo o2: (string escape -- $options)
+    # Remove open-ended options (size, count, path)
+    set options (string match -rv '^(size|count|iterations|path)$|\<.*?\>' -- $options)
+    # echo o3: (string escape -- $options)
+    # Expand optionally comma-separated arguments (e.g. skein[,verify] => skein\nskein,verify)
+    set options (string replace -r "(.*)\[,(.*?)\]" '$1\n$1,$2' -- $options)
+    # echo o4: (string escape -- $options)
+
+    if set -q options[1]
+        printf "$name=%s\n" $options
+    end
+end
+
 # Generate a list of possible values from the man page.
 # NB: This includes "hints" like "size" or "opts" which may be useful or unwanted. *shrug*
 if type -q man && type -q col
@@ -282,9 +363,8 @@ end
 complete -c zfs -f -n '__fish_zfs_using_command create' -s p -d 'Create all needed non-existing parent datasets'
 if test $OS = Linux # Only Linux supports the comma-separated format; others need multiple -o calls
     complete -c zfs -x -n '__fish_zfs_using_command create' -s o -d 'Dataset property' -a '(__fish_append , (__fish_complete_zfs_rw_properties; __fish_complete_zfs_write_once_properties))'
-else
-    complete -c zfs -x -n '__fish_zfs_using_command create' -s o -d 'Dataset property' -a '(__fish_complete_zfs_rw_properties; __fish_complete_zfs_write_once_properties)'
 end
+complete -c zfs -x -n '__fish_zfs_using_command create' -s o -d 'Dataset property' -a '(__fish_complete_zfs_rw_properties; __fish_complete_zfs_write_once_properties; __fish_zfs_complete_property_values (commandline -t))'
 # create completions for volumes; as -V is necessary to zfs to recognize a volume creation request,
 # we use it as a condition to propose volume creation completions.
 # If -V is typed after -s or -b, zfs should accept it, but fish won't propose -s or -b, but, as
@@ -312,9 +392,8 @@ complete -c zfs -x -n '__fish_zfs_using_command destroy' -d 'Dataset to destroy'
 complete -c zfs -f -n '__fish_zfs_using_command snapshot; or __fish_zfs_using_command snap' -s r -d 'Recursively snapshot children'
 if test $OS = Linux # Only Linux supports the comma-separated format; others need multiple -o calls
     complete -c zfs -x -n '__fish_zfs_using_command snapshot; or __fish_zfs_using_command snap' -s o -d 'Snapshot property' -a '(__fish_append , (__fish_complete_zfs_rw_properties; __fish_complete_zfs_write_once_properties))'
-else
-    complete -c zfs -x -n '__fish_zfs_using_command snapshot; or __fish_zfs_using_command snap' -s o -d 'Snapshot property' -a '(__fish_complete_zfs_rw_properties; __fish_complete_zfs_write_once_properties)'
 end
+complete -c zfs -x -n '__fish_zfs_using_command snapshot; or __fish_zfs_using_command snap' -s o -d 'Snapshot property' -a '(__fish_complete_zfs_rw_properties; __fish_complete_zfs_write_once_properties; __fish_zfs_complete_property_values (commandline -t))'
 complete -c zfs -x -n '__fish_zfs_using_command snapshot; or __fish_zfs_using_command snap' -d 'Dataset to snapshot' -a '(__fish_print_zfs_filesystems; __fish_print_zfs_volumes)'
 
 # rollback completions
@@ -327,9 +406,8 @@ complete -c zfs -x -n '__fish_zfs_using_command rollback' -d 'Snapshot to roll b
 complete -c zfs -f -n '__fish_zfs_using_command clone' -s p -d 'Create all needed non-existing parent datasets'
 if test $OS = Linux # Only Linux supports the comma-separated format; others need multiple -o calls
     complete -c zfs -x -n '__fish_zfs_using_command clone' -s o -d 'Clone property' -a '(__fish_append , (__fish_complete_zfs_rw_properties; __fish_complete_zfs_write_once_properties))'
-else
-    complete -c zfs -x -n '__fish_zfs_using_command clone' -s o -d 'Clone property' -a '(__fish_complete_zfs_rw_properties; __fish_complete_zfs_write_once_properties)'
 end
+complete -c zfs -x -n '__fish_zfs_using_command clone' -s o -d 'Clone property' -a '(__fish_complete_zfs_rw_properties; __fish_complete_zfs_write_once_properties; __fish_zfs_complete_property_values (commandline -t))'
 complete -c zfs -x -n '__fish_zfs_using_command clone' -d 'Snapshot to clone' -a '(__fish_print_zfs_snapshots --force)'
 
 # promote completions
@@ -359,11 +437,11 @@ complete -c zfs -x -n '__fish_zfs_using_command list; and __fish_not_contain_opt
 complete -c zfs -x -n '__fish_zfs_using_command list' -s t -d 'Dataset type' -a '(__fish_zfs_list_dataset_types)'
 complete -c zfs -x -n '__fish_zfs_using_command list' -d 'Dataset whose properties to list' -a '(__fish_print_zfs_filesystems; __fish_print_zfs_volumes; __fish_print_zfs_snapshots)'
 
-# set completions
-complete -c zfs -x -n '__fish_zfs_using_command set' -d 'Property to set' -a '(__fish_complete_zfs_rw_properties)'
-complete -c zfs -x -n '__fish_zfs_using_command set; and string match -q -r "zfs set \S+ " (commandline -c)' -d 'Dataset whose property to set' -a '(__fish_print_zfs_filesystems; __fish_print_zfs_volumes; __fish_print_zfs_snapshots)'
+# set completions (zfs set PROP VALUE POOL/DATASET)
+complete -c zfs -x -n '__fish_zfs_using_command set; and __fish_is_nth_token 2' -d 'Property to set' -a '(__fish_complete_zfs_rw_properties)'
+complete -c zfs -x -n '__fish_zfs_using_command set; and __fish_is_nth_token 3' -d 'Dataset whose property to set' -a '(__fish_print_zfs_filesystems; __fish_print_zfs_volumes; __fish_print_zfs_snapshots)'
 # set property value completions
-complete -c zfs -x -n '__fish_zfs_using_command set; and string match -qe = -- (commandline -t)' -a '(__fish_zfs_property_options (commandline -t | string match -r "[^=]+"))'
+complete -c zfs -x -n '__fish_zfs_using_command set; and __fish_is_nth_token 2' -a '(__fish_zfs_complete_property_values (fish_nth_token 2))'
 
 # get completions
 complete -c zfs -f -n '__fish_zfs_using_command get' -s r -d 'Operate recursively on datasets'
@@ -402,7 +480,10 @@ complete -c zfs -f -n '__fish_zfs_using_command userspace; or __fish_zfs_using_c
 complete -c zfs -x -n '__fish_zfs_using_command userspace; or __fish_zfs_using_command groupspace' -d 'Dataset whose space usage to get' -a '(__fish_print_zfs_filesystems; __fish_print_zfs_snapshots)'
 
 # mount completions
-complete -c zfs -x -n '__fish_zfs_using_command mount' -s o -d 'Temporary mount point property' -a '(__fish_append , (__fish_complete_zfs_mountpoint_properties))'
+if test $OS = Linux
+    complete -c zfs -x -n '__fish_zfs_using_command mount' -s o -d 'Temporary mount point property' -a '(__fish_append , (__fish_complete_zfs_mountpoint_properties))'
+end
+complete -c zfs -x -n '__fish_zfs_using_command mount' -s o -d 'Temporary mount point property' -a '(__fish_complete_zfs_mountpoint_properties; __fish_zfs_complete_property_values (commandline -t))'
 complete -c zfs -f -n '__fish_zfs_using_command mount' -s v -d 'Report progress'
 complete -c zfs -f -n '__fish_zfs_using_command mount' -s a -d 'Mount all available ZFS filesystems'
 if contains -- $OS Linux SunOS

From 920e89e2acd788d5d858de0458d78acbcbd89d46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marius=20M=C3=BCller?=
 <49639740+MarJMue@users.noreply.github.com>
Date: Wed, 9 Feb 2022 11:31:50 +0100
Subject: [PATCH 212/262] Extend dnf completions

to include syntax for the dnf-plugin system-upgrade
---
 share/completions/dnf.fish | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/share/completions/dnf.fish b/share/completions/dnf.fish
index aaae9d742..2f5bd879c 100644
--- a/share/completions/dnf.fish
+++ b/share/completions/dnf.fish
@@ -160,6 +160,22 @@ complete -c dnf -n "__fish_seen_subcommand_from module; and __fish_seen_subcomma
 complete -c dnf -n "__fish_seen_subcommand_from module" -xa info -d "Print module information"
 complete -c dnf -n "__fish_seen_subcommand_from module; and __fish_seen_subcommand_from info" -l profile -d "Print module profiles information"
 
+# Offline-distrosync
+complete -c dnf -n __fish_use_subcommand -xa offline-distrosync -d "Synchronizes packages to match the latest"
+complete -c dnf -n "__fish_seen_subcommand_from offline-distrosync" -xa download -d "Download updates for offline upgrade"
+complete -c dnf -n "__fish_seen_subcommand_from offline-distrosync" -xa clean -d "Remove cached packages"
+complete -c dnf -n "__fish_seen_subcommand_from offline-distrosync" -xa reboot -d "Reboot and install packages"
+complete -c dnf -n "__fish_seen_subcommand_from offline-distrosync" -xa upgrade -d "Install cached packages without reboot"
+complete -c dnf -n "__fish_seen_subcommand_from offline-distrosync" -xa log -d "Show logs of upgrade attempts"
+
+# Offline-upgrade
+complete -c dnf -n __fish_use_subcommand -xa offline-upgrade -d "Prepare offline upgrade of the system"
+complete -c dnf -n "__fish_seen_subcommand_from offline-upgrade" -xa download -d "Download updates for offline upgrade"
+complete -c dnf -n "__fish_seen_subcommand_from offline-upgrade" -xa clean -d "Remove cached packages"
+complete -c dnf -n "__fish_seen_subcommand_from offline-upgrade" -xa reboot -d "Reboot and install packages"
+complete -c dnf -n "__fish_seen_subcommand_from offline-upgrade" -xa upgrade -d "Install cached packages without reboot"
+complete -c dnf -n "__fish_seen_subcommand_from offline-upgrade" -xa log -d "Show logs of upgrade attempts"
+
 # Provides
 complete -c dnf -n __fish_use_subcommand -xa provides -d "Finds packages providing the given command"
 
@@ -217,6 +233,14 @@ complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l alldeps
 complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l exactdeps
 complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l srpm
 
+# System-upgrade
+complete -c dnf -n __fish_use_subcommand -xa system-upgrade -d "Prepare major version upgrade of the system"
+complete -c dnf -n "__fish_seen_subcommand_from system-upgrade" -xa download -d "Download updates for offline upgrade"
+complete -c dnf -n "__fish_seen_subcommand_from system-upgrade" -xa clean -d "Remove cached packages"
+complete -c dnf -n "__fish_seen_subcommand_from system-upgrade" -xa reboot -d "Reboot and install packages"
+complete -c dnf -n "__fish_seen_subcommand_from system-upgrade" -xa upgrade -d "Install cached packages without reboot"
+complete -c dnf -n "__fish_seen_subcommand_from system-upgrade" -xa log -d "Show logs of upgrade attempts"
+
 # Query options
 complete -c dnf -n "__fish_seen_subcommand_from repoquery" -s i -l info -d "Show detailed information about the package"
 complete -c dnf -n "__fish_seen_subcommand_from repoquery" -s l -l list -d "Show the list of files in the package"

From 2164d40b73a54a6e8c9af9428d060c2058a36c3e Mon Sep 17 00:00:00 2001
From: Pierrick Guillaume <34305318+Fymyte@users.noreply.github.com>
Date: Fri, 11 Feb 2022 15:56:14 +0100
Subject: [PATCH 213/262] Allow better completion for git submodules (#8716)

* Allow better completion for git submodules

* Add change for git completion in changelog

* Fix git submodule absobgitdirs description
---
 CHANGELOG.rst              |  2 +-
 share/completions/git.fish | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index df110c5e2..b210bd15a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -176,7 +176,7 @@ Completions
   -  Windows' ``color`` (:issue:`8483`), ``attrib``, ``attributes``, ``choice``, ``clean``, ``cleanmgr``, ``cmd``, ``cmdkey``, ``comp``, ``forfiles``, ``powershell``, ``reg``, ``schtasks``, ``setx`` (:issue:`8486`)
   - ``zef`` (:issue:`8114`)
 
-- Improvements to many completions, especially for ``git`` aliases (:issue:`8129`) and subcommands (:issue:`8134`).
+- Improvements to many completions, especially for ``git`` aliases (:issue:`8129`), subcommands (:issue:`8134`) and submodules (:issue:`8716`).
 - Many adjustments to complete correct options for system utilities on BSD and macOS.
 - Unified the OpenZFS-related completions across operating systems and improved the vdev-related completions for all platforms.
 - Add missing completions for the ``-p`` option of ``xbps-query``.
diff --git a/share/completions/git.fish b/share/completions/git.fish
index 4d45aea1e..0bc9ea412 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -58,6 +58,11 @@ function __fish_git_branches
         | string replace -r '^refs/remotes/(.*)$' '$1\tRemote Branch'
 end
 
+function __fish_git_submodules
+    __fish_git submodule 2>/dev/null \
+        | string replace -r '^.[^ ]+ ([^ ]+).*$' '$1'
+end
+
 function __fish_git_local_branches
     __fish_git for-each-ref --format='%(refname:strip=2)' refs/heads/ 2>/dev/null \
         | string replace -rf '.*' '$0\tLocal Branch'
@@ -1955,15 +1960,19 @@ complete -f -c git -n '__fish_git_using_command format-patch' -l no-numbered -s
 
 
 ## git submodule
-set -l submodulecommands add status init update summary foreach sync
+set -l submodulecommands add status init deinit update set-branch set-url summary foreach sync absorbgitdirs
 complete -f -c git -n __fish_git_needs_command -a submodule -d 'Initialize, update or inspect submodules'
 complete -f -c git -n "__fish_git_using_command submodule; and not __fish_seen_subcommand_from $submodulecommands" -a add -d 'Add a submodule'
 complete -f -c git -n "__fish_git_using_command submodule; and not __fish_seen_subcommand_from $submodulecommands" -a status -d 'Show submodule status'
 complete -f -c git -n "__fish_git_using_command submodule; and not __fish_seen_subcommand_from $submodulecommands" -a init -d 'Initialize all submodules'
+complete -f -c git -n "__fish_git_using_command submodule; and not __fish_seen_subcommand_from $submodulecommands" -a deinit -d 'Unregister the given submodules'
 complete -f -c git -n "__fish_git_using_command submodule; and not __fish_seen_subcommand_from $submodulecommands" -a update -d 'Update all submodules'
+complete -x -c git -n "__fish_git_using_command submodule; and not __fish_seen_subcommand_from $submodulecommands" -a set-branch -d 'Sets the default remote tracking branch for the submodule'
+complete -f -c git -n "__fish_git_using_command submodule; and not __fish_seen_subcommand_from $submodulecommands" -a set-url -d 'Sets the URL of the specified submodule'
 complete -f -c git -n "__fish_git_using_command submodule; and not __fish_seen_subcommand_from $submodulecommands" -a summary -d 'Show commit summary'
 complete -f -c git -n "__fish_git_using_command submodule; and not __fish_seen_subcommand_from $submodulecommands" -a foreach -d 'Run command on each submodule'
 complete -f -c git -n "__fish_git_using_command submodule; and not __fish_seen_subcommand_from $submodulecommands" -a sync -d 'Sync submodules\' URL with .gitmodules'
+complete -f -c git -n "__fish_git_using_command submodule; and not __fish_seen_subcommand_from $submodulecommands" -a absorbgitdirs -d 'Move submodule\'s git directory to current .git/module directory'
 complete -f -c git -n "__fish_git_using_command submodule; and not __fish_seen_subcommand_from $submodulecommands" -s q -l quiet -d "Only print error messages"
 complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subcommand_from update' -l init -d "Initialize all submodules"
 complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subcommand_from update' -l checkout -d "Checkout the superproject's commit on a detached HEAD in the submodule"
@@ -1974,7 +1983,12 @@ complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subco
 complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subcommand_from update' -l force -d "Discard local changes when switching to a different commit & always run checkout"
 complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subcommand_from add' -l force -d "Also add ignored submodule path"
 complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subcommand_from deinit' -l force -d "Remove even with local changes"
+complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subcommand_from deinit' -l all -d "Remove all submodules"
+complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subcommand_from deinit; and not contains -- -- (commandline -opc)' -a '(__fish_git_submodules)' -d Submodule
+complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subcommand_from set-branch' -s b -l branch -d "Specify the branch to use"
+complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subcommand_from set-branch' -s d -l default -d "Use default branch of the submodule"
 complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subcommand_from status summary' -l cached -d "Use the commit stored in the index"
+complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subcommand_from status; and not contains -- -- (commandline -opc)' -a '(__fish_git_submodules)' -d Submodule
 complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subcommand_from summary' -l files -d "Compare the commit in the index with submodule HEAD"
 complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subcommand_from foreach update status' -l recursive -d "Traverse submodules recursively"
 complete -f -c git -n '__fish_git_using_command submodule; and __fish_seen_subcommand_from foreach' -a "(__fish_complete_subcommand --fcs-skip=3)"

From 133e359d70df055bd717ad88b7fe9bd5b3a5d5d0 Mon Sep 17 00:00:00 2001
From: ridiculousfish <rf@fishshell.com>
Date: Sat, 12 Feb 2022 11:41:03 -0800
Subject: [PATCH 214/262] Add a test that stdin is always handed-off as
 blocking

No functional change here, just closing a gap in our coverage.
---
 src/fish_test_helper.cpp            | 18 +++++++++++++
 tests/pexpects/stdin_nonblocking.py | 39 +++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 tests/pexpects/stdin_nonblocking.py

diff --git a/src/fish_test_helper.cpp b/src/fish_test_helper.cpp
index af9ca427b..d8da3f6cc 100644
--- a/src/fish_test_helper.cpp
+++ b/src/fish_test_helper.cpp
@@ -156,6 +156,22 @@ static void sigkill_self() {
     abort();
 }
 
+static void stdin_make_nonblocking() {
+    const int fd = STDIN_FILENO;
+    // Catch SIGCONT so pause() wakes us up.
+    signal(SIGCONT, [](int) {});
+
+    for (;;) {
+        int flags = fcntl(fd, F_GETFL, 0);
+        fprintf(stdout, "stdin was %sblocking\n", (flags & O_NONBLOCK) ? "non" : "");
+        if (fcntl(fd, F_SETFL, flags | O_NONBLOCK)) {
+            perror("fcntl");
+            exit(EXIT_FAILURE);
+        }
+        pause();
+    }
+}
+
 static void show_help();
 
 /// A thing that fish_test_helper can do.
@@ -188,6 +204,8 @@ static fth_command_t s_commands[] = {
      "Print to stdout the name(s) of ignored signals"},
     {"print_stop_cont", print_stop_cont, "Print when we get SIGTSTP and SIGCONT, exiting on input"},
     {"sigkill_self", sigkill_self, "Send SIGKILL to self"},
+    {"stdin_make_nonblocking", stdin_make_nonblocking,
+     "Print if stdin is blocking and then make it nonblocking"},
     {"help", show_help, "Print list of fish_test_helper commands"},
 };
 
diff --git a/tests/pexpects/stdin_nonblocking.py b/tests/pexpects/stdin_nonblocking.py
new file mode 100644
index 000000000..fac8744a2
--- /dev/null
+++ b/tests/pexpects/stdin_nonblocking.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env python3
+# Verify that stdin is properly set to blocking even if a job tweaks it.
+from pexpect_helper import SpawnedProc
+import sys
+import signal
+import time
+import os
+
+sp = SpawnedProc()
+send, sendline, expect_prompt, expect_str, sleep = (
+    sp.send,
+    sp.sendline,
+    sp.expect_prompt,
+    sp.expect_str,
+    sp.sleep,
+)
+
+# Launch fish_test_helper.
+expect_prompt()
+exe_path = os.environ.get("fish_test_helper")
+sendline(exe_path + " stdin_make_nonblocking")
+
+expect_str("stdin was blocking")
+sleep(0.1)
+
+send("\x1A")  # ctrl-Z
+expect_prompt("has stopped")
+
+# We don't "restore" non-blocking state when continuing a stopped job.
+sleep(0.1)
+sendline("fg")
+expect_str("stdin was blocking")
+
+# Kill the job and do it again.
+send("\x03")  # ctrl-c
+expect_prompt("")
+sendline(exe_path + " stdin_make_nonblocking")
+expect_str("stdin was blocking")
+send("\x03")  # ctrl-c

From a7102f179b1c5d1e361b9d6119d17e10dff0d3e7 Mon Sep 17 00:00:00 2001
From: ridiculousfish <rf@fishshell.com>
Date: Sat, 12 Feb 2022 11:47:02 -0800
Subject: [PATCH 215/262] stdin_nonblocking.py test to not leave background
 processes

fish_test_helper was sometimes left running.
---
 tests/pexpects/stdin_nonblocking.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/pexpects/stdin_nonblocking.py b/tests/pexpects/stdin_nonblocking.py
index fac8744a2..d1f6a0eeb 100644
--- a/tests/pexpects/stdin_nonblocking.py
+++ b/tests/pexpects/stdin_nonblocking.py
@@ -33,7 +33,8 @@ expect_str("stdin was blocking")
 
 # Kill the job and do it again.
 send("\x03")  # ctrl-c
-expect_prompt("")
+expect_prompt()
 sendline(exe_path + " stdin_make_nonblocking")
 expect_str("stdin was blocking")
 send("\x03")  # ctrl-c
+expect_prompt()

From 47b0d0c2935d12a880553ff59060aa5d59914d32 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Wed, 9 Feb 2022 09:46:07 +0100
Subject: [PATCH 216/262] Make __fish_is_nth_token and __fish_nth_token private
 again

Their names are not perfect, so let's keep them as internal functions,
until we figure out how/if we want to expose this.

This reverts 0445126c2 (Undunder __fish_is_nth_token, 2021-06-29) (but I
did it without "git revert").

Closes #8008
---
 CHANGELOG.rst                                 |  1 -
 po/de.po                                      |  2 +-
 po/en.po                                      |  2 +-
 po/fr.po                                      |  2 +-
 po/pl.po                                      |  2 +-
 po/pt_BR.po                                   |  2 +-
 po/sv.po                                      |  4 +-
 po/zh_CN.po                                   |  2 +-
 share/completions/aws.fish                    |  2 +-
 share/completions/bower.fish                  |  2 +-
 share/completions/camcontrol.fish             |  2 +-
 share/completions/cygport.fish                | 46 +++++------
 share/completions/duply.fish                  | 32 ++++----
 share/completions/git.fish                    |  2 +-
 share/completions/meson.fish                  |  2 +-
 share/completions/python.fish                 |  4 +-
 share/completions/python2.fish                |  4 +-
 share/completions/python3.fish                |  4 +-
 share/completions/rustup.fish                 |  2 +-
 share/completions/s3cmd.fish                  | 82 +++++++++----------
 share/completions/service.fish                | 10 +--
 share/completions/set.fish                    | 48 +++++------
 share/completions/ttx.fish                    |  2 +-
 share/completions/udevadm.fish                |  4 +-
 share/completions/unzip.fish                  |  4 +-
 share/completions/vips.fish                   |  2 +-
 share/completions/xdg-mime.fish               |  4 +-
 share/completions/xinput.fish                 |  4 +-
 share/completions/xsv.fish                    | 42 +++++-----
 share/completions/yadm.fish                   |  2 +-
 share/completions/zpool.fish                  |  6 +-
 share/functions/__fish_is_first_token.fish    |  2 +-
 share/functions/__fish_is_nth_token.fish      |  6 +-
 share/functions/__fish_is_token_n.fish        |  2 +-
 ...h_nth_token.fish => __fish_nth_token.fish} |  2 +-
 share/functions/fish_is_nth_token.fish        |  5 --
 36 files changed, 171 insertions(+), 175 deletions(-)
 rename share/functions/{fish_nth_token.fish => __fish_nth_token.fish} (68%)
 delete mode 100644 share/functions/fish_is_nth_token.fish

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b210bd15a..a5cb7fb14 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -180,7 +180,6 @@ Completions
 - Many adjustments to complete correct options for system utilities on BSD and macOS.
 - Unified the OpenZFS-related completions across operating systems and improved the vdev-related completions for all platforms.
 - Add missing completions for the ``-p`` option of ``xbps-query``.
-- The ``fish_is_nth_token`` and accompanying ``fish_nth_token`` functions, which are particularly useful in completions for identifying the token number within the command line and replace various internal functions to do the same (:issue:`8008`).
 - When evaluating custom completions, the command line state no longer includes variable overrides (``var=val``). This unbreaks completions that read ``commandline -op``.
 
 Improved terminal support
diff --git a/po/de.po b/po/de.po
index 45a8bb607..0e0e736cf 100644
--- a/po/de.po
+++ b/po/de.po
@@ -62163,7 +62163,7 @@ msgstr ""
 msgid "Check if the current directory is a git repository"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/fish_is_nth_token.fish:1
+#: /tmp/fish/implicit/share/functions/__fish_is_nth_token.fish:1
 msgid "Test if current token is on Nth place"
 msgstr ""
 
diff --git a/po/en.po b/po/en.po
index 6ada1dd44..c2f61173a 100644
--- a/po/en.po
+++ b/po/en.po
@@ -62165,7 +62165,7 @@ msgstr ""
 msgid "Check if the current directory is a git repository"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/fish_is_nth_token.fish:1
+#: /tmp/fish/implicit/share/functions/__fish_is_nth_token.fish:1
 msgid "Test if current token is on Nth place"
 msgstr "Test if current token is on Nth place"
 
diff --git a/po/fr.po b/po/fr.po
index 4841f42f6..37dd038b7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -64769,7 +64769,7 @@ msgstr ""
 msgid "Check if the current directory is a git repository"
 msgstr "Vérifier si le dossier actuel est un dépôt git"
 
-#: /tmp/fish/implicit/share/functions/fish_is_nth_token.fish:1
+#: /tmp/fish/implicit/share/functions/__fish_is_nth_token.fish:1
 msgid "Test if current token is on Nth place"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 599d45115..3ed209305 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -61940,7 +61940,7 @@ msgstr ""
 msgid "Check if the current directory is a git repository"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/fish_is_nth_token.fish:1
+#: /tmp/fish/implicit/share/functions/__fish_is_nth_token.fish:1
 msgid "Test if current token is on Nth place"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a7bb47975..4f5fd2d87 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -87073,7 +87073,7 @@ msgstr ""
 msgid "Check if the current directory is a git repository"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/fish_is_nth_token.fish:1
+#: /tmp/fish/implicit/share/functions/__fish_is_nth_token.fish:1
 msgid "Test if current token is on Nth place"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index d74a60035..7d7d67a97 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -57723,8 +57723,8 @@ msgstr ""
 msgid "Check if the current directory is a git repository"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/fish_is_nth_token.fish:1
-#: share/functions/fish_is_nth_token.fish:1
+#: /tmp/fish/implicit/share/functions/__fish_is_nth_token.fish:1
+#: share/functions/__fish_is_nth_token.fish:1
 msgid "Test if current token is on Nth place"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index df0a02dd5..8109f8c89 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -61916,7 +61916,7 @@ msgstr ""
 msgid "Check if the current directory is a git repository"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/fish_is_nth_token.fish:1
+#: /tmp/fish/implicit/share/functions/__fish_is_nth_token.fish:1
 msgid "Test if current token is on Nth place"
 msgstr ""
 
diff --git a/share/completions/aws.fish b/share/completions/aws.fish
index f14013d35..c63f831d1 100644
--- a/share/completions/aws.fish
+++ b/share/completions/aws.fish
@@ -270,4 +270,4 @@ set -l aws_services \
     workspaces \
     xray
 
-complete -c aws -n "fish_is_nth_token 1" -xa "$aws_services"
+complete -c aws -n "__fish_is_nth_token 1" -xa "$aws_services"
diff --git a/share/completions/bower.fish b/share/completions/bower.fish
index b0dfa841f..d3a95ef8c 100644
--- a/share/completions/bower.fish
+++ b/share/completions/bower.fish
@@ -64,7 +64,7 @@ for k,v in data["dependencies"].items(): print(k + "\t" + v[:18])' <bower.json 2
     jq -r '.dependencies | to_entries[] | .key' bower.json
 end
 
-complete -c bower -n "fish_is_nth_token 1" -x -a '(__bower_cmds)'
+complete -c bower -n "__fish_is_nth_token 1" -x -a '(__bower_cmds)'
 complete -c bower -n __fish_should_complete_switches -x -a '(__bower_args)'
 complete -c bower -n "__fish_seen_subcommand_from install" -x -a '(__bower_matching_pkgs)'
 complete -c bower -n "__fish_seen_subcommand_from uninstall" -x -a '(__bower_list_installed)'
diff --git a/share/completions/camcontrol.fish b/share/completions/camcontrol.fish
index 6d01dc834..a772c196a 100644
--- a/share/completions/camcontrol.fish
+++ b/share/completions/camcontrol.fish
@@ -2,4 +2,4 @@
 
 set -l commands aam apm attrib cmd debug defects devlist eject epc format fwdownload help hpa identify idle inquiry load modepage negotiate opcodes periphlist persist readcap reportluns reprobe rescan reset sanitize security sleep smpcmd smpmaninfo smppc smpphylist smprg standby start stop tags timestamp tur zone
 
-complete -c camcontrol -n "fish_is_nth_token 1" -xa "$commands"
+complete -c camcontrol -n "__fish_is_nth_token 1" -xa "$commands"
diff --git a/share/completions/cygport.fish b/share/completions/cygport.fish
index 7dd60dba8..5ca10b351 100644
--- a/share/completions/cygport.fish
+++ b/share/completions/cygport.fish
@@ -5,28 +5,28 @@ complete -c cygport -s 8 -l 64 -d "Build for 64-bit Cygwin"
 complete -c cygport -l debug -d "Enable debugging messages"
 
 # Cygport file
-complete -c cygport -n "fish_is_nth_token 1" -f -a '*.cygport' -d "Cygport file"
+complete -c cygport -n "__fish_is_nth_token 1" -f -a '*.cygport' -d "Cygport file"
 
 # Commands
-complete -c cygport -n 'not fish_is_nth_token 1' -f -a 'downloadall fetchall wgetall getall' -d "Download all sources"
-complete -c cygport -n 'not fish_is_nth_token 1' -f -a 'download fetch wget get' -d "Download missing sources"
-complete -c cygport -n 'not fish_is_nth_token 1' -f -a 'prep unpack' -d "Prepare source directory"
-complete -c cygport -n 'not fish_is_nth_token 1' -f -a 'compile build make' -d "Build software"
-complete -c cygport -n 'not fish_is_nth_token 1' -f -a 'check test' -d "Run test suite"
-complete -c cygport -n 'not fish_is_nth_token 1' -f -a 'inst install' -d "Install into DESTDIR and run post-installation steps"
-complete -c cygport -n 'not fish_is_nth_token 1' -f -a postinst -d "Run post-installation steps"
-complete -c cygport -n 'not fish_is_nth_token 1' -f -a list -d "List package files"
-complete -c cygport -n 'not fish_is_nth_token 1' -f -a 'listdebug listdbg' -d "List debug package files"
-complete -c cygport -n 'not fish_is_nth_token 1' -f -a dep -d "Show dependencies"
-complete -c cygport -n 'not fish_is_nth_token 1' -f -a info -d "Show packaging info"
-complete -c cygport -n 'not fish_is_nth_token 1' -f -a 'homepage web www' -d "Show project homepage URL"
-complete -c cygport -n 'not fish_is_nth_token 1' -f -a 'package-test pkg-test' -d "Create packages, marked as test"
-complete -c cygport -n 'not fish_is_nth_token 1' -f -a 'package pkg' -d "Create packages"
-complete -c cygport -n 'not fish_is_nth_token 1' -f -a 'diff mkdiff mkpatch' -d "Create source patches"
-complete -c cygport -n 'not fish_is_nth_token 1' -f -a 'upload up' -d "Upload finished packages"
-complete -c cygport -n 'not fish_is_nth_token 1' -f -a stage -d "Upload packages without marking !ready"
-complete -c cygport -n 'not fish_is_nth_token 1' -f -a announce -d "Send announcement email"
-complete -c cygport -n 'not fish_is_nth_token 1' -f -a 'clean finish' -d "Delete working directory"
-complete -c cygport -n 'not fish_is_nth_token 1' -f -a 'almostall all' -d "Same as prep build inst pkg"
-complete -c cygport -n 'not fish_is_nth_token 1' -f -a help -d "Show help"
-complete -c cygport -n 'not fish_is_nth_token 1' -f -a version -d "Show version"
+complete -c cygport -n 'not __fish_is_nth_token 1' -f -a 'downloadall fetchall wgetall getall' -d "Download all sources"
+complete -c cygport -n 'not __fish_is_nth_token 1' -f -a 'download fetch wget get' -d "Download missing sources"
+complete -c cygport -n 'not __fish_is_nth_token 1' -f -a 'prep unpack' -d "Prepare source directory"
+complete -c cygport -n 'not __fish_is_nth_token 1' -f -a 'compile build make' -d "Build software"
+complete -c cygport -n 'not __fish_is_nth_token 1' -f -a 'check test' -d "Run test suite"
+complete -c cygport -n 'not __fish_is_nth_token 1' -f -a 'inst install' -d "Install into DESTDIR and run post-installation steps"
+complete -c cygport -n 'not __fish_is_nth_token 1' -f -a postinst -d "Run post-installation steps"
+complete -c cygport -n 'not __fish_is_nth_token 1' -f -a list -d "List package files"
+complete -c cygport -n 'not __fish_is_nth_token 1' -f -a 'listdebug listdbg' -d "List debug package files"
+complete -c cygport -n 'not __fish_is_nth_token 1' -f -a dep -d "Show dependencies"
+complete -c cygport -n 'not __fish_is_nth_token 1' -f -a info -d "Show packaging info"
+complete -c cygport -n 'not __fish_is_nth_token 1' -f -a 'homepage web www' -d "Show project homepage URL"
+complete -c cygport -n 'not __fish_is_nth_token 1' -f -a 'package-test pkg-test' -d "Create packages, marked as test"
+complete -c cygport -n 'not __fish_is_nth_token 1' -f -a 'package pkg' -d "Create packages"
+complete -c cygport -n 'not __fish_is_nth_token 1' -f -a 'diff mkdiff mkpatch' -d "Create source patches"
+complete -c cygport -n 'not __fish_is_nth_token 1' -f -a 'upload up' -d "Upload finished packages"
+complete -c cygport -n 'not __fish_is_nth_token 1' -f -a stage -d "Upload packages without marking !ready"
+complete -c cygport -n 'not __fish_is_nth_token 1' -f -a announce -d "Send announcement email"
+complete -c cygport -n 'not __fish_is_nth_token 1' -f -a 'clean finish' -d "Delete working directory"
+complete -c cygport -n 'not __fish_is_nth_token 1' -f -a 'almostall all' -d "Same as prep build inst pkg"
+complete -c cygport -n 'not __fish_is_nth_token 1' -f -a help -d "Show help"
+complete -c cygport -n 'not __fish_is_nth_token 1' -f -a version -d "Show version"
diff --git a/share/completions/duply.fish b/share/completions/duply.fish
index 81c894d64..97495e0cf 100644
--- a/share/completions/duply.fish
+++ b/share/completions/duply.fish
@@ -1,24 +1,24 @@
 
 # First parameter is the profile name, or 'usage'
-complete -c duply -f -n "fish_is_nth_token 1" -a '(set -l files /etc/duply/* ~/.duply/*; string replace -r ".*/" "" --  $files)' -d Profile
+complete -c duply -f -n "__fish_is_nth_token 1" -a '(set -l files /etc/duply/* ~/.duply/*; string replace -r ".*/" "" --  $files)' -d Profile
 complete --command duply --no-files --arguments usage -d 'Get usage help text'
 
 # Second parameter is a duply command
-complete --command duply --no-files --condition 'not fish_is_nth_token 1' --arguments create -d 'Creates a configuration profile'
-complete --command duply --no-files --condition 'not fish_is_nth_token 1' --arguments backup -d 'Backup with pre/post script execution'
-complete --command duply --no-files --condition 'not fish_is_nth_token 1' --arguments bkp -d 'Backup without executing pre/post scripts'
-complete --command duply --no-files --condition 'not fish_is_nth_token 1' --arguments pre -d 'Execute <profile>/pre script'
-complete --command duply --no-files --condition 'not fish_is_nth_token 1' --arguments post -d 'Execute <profile>/post script'
-complete --command duply --no-files --condition 'not fish_is_nth_token 1' --arguments full -d 'Force full backup'
-complete --command duply --no-files --condition 'not fish_is_nth_token 1' --arguments incr -d 'Force incremental backup'
-complete --command duply --no-files --condition 'not fish_is_nth_token 1' --arguments list -d 'List all files in backup (as it was at <age>, default: now)'
-complete --command duply --no-files --condition 'not fish_is_nth_token 1' --arguments status -d 'Prints backup sets and chains currently in repository'
-complete --command duply --no-files --condition 'not fish_is_nth_token 1' --arguments verify -d 'List files changed since latest backup'
-complete --command duply --no-files --condition 'not fish_is_nth_token 1' --arguments purge -d 'Shows outdated backup archives [--force, delete these files]'
-complete --command duply --no-files --condition 'not fish_is_nth_token 1' --arguments purge-full -d 'Shows outdated backups [--force, delete these files]'
-complete --command duply --no-files --condition 'not fish_is_nth_token 1' --arguments cleanup -d 'Shows broken backup archives [--force, delete these files]'
-complete --command duply --no-files --condition 'not fish_is_nth_token 1' --arguments restore -d 'Restore the backup to <target_path> [as it was at <age>]'
-complete --command duply --no-files --condition 'not fish_is_nth_token 1' --arguments fetch -d 'Restore single file/folder from backup [as it was at <age>]'
+complete --command duply --no-files --condition 'not __fish_is_nth_token 1' --arguments create -d 'Creates a configuration profile'
+complete --command duply --no-files --condition 'not __fish_is_nth_token 1' --arguments backup -d 'Backup with pre/post script execution'
+complete --command duply --no-files --condition 'not __fish_is_nth_token 1' --arguments bkp -d 'Backup without executing pre/post scripts'
+complete --command duply --no-files --condition 'not __fish_is_nth_token 1' --arguments pre -d 'Execute <profile>/pre script'
+complete --command duply --no-files --condition 'not __fish_is_nth_token 1' --arguments post -d 'Execute <profile>/post script'
+complete --command duply --no-files --condition 'not __fish_is_nth_token 1' --arguments full -d 'Force full backup'
+complete --command duply --no-files --condition 'not __fish_is_nth_token 1' --arguments incr -d 'Force incremental backup'
+complete --command duply --no-files --condition 'not __fish_is_nth_token 1' --arguments list -d 'List all files in backup (as it was at <age>, default: now)'
+complete --command duply --no-files --condition 'not __fish_is_nth_token 1' --arguments status -d 'Prints backup sets and chains currently in repository'
+complete --command duply --no-files --condition 'not __fish_is_nth_token 1' --arguments verify -d 'List files changed since latest backup'
+complete --command duply --no-files --condition 'not __fish_is_nth_token 1' --arguments purge -d 'Shows outdated backup archives [--force, delete these files]'
+complete --command duply --no-files --condition 'not __fish_is_nth_token 1' --arguments purge-full -d 'Shows outdated backups [--force, delete these files]'
+complete --command duply --no-files --condition 'not __fish_is_nth_token 1' --arguments cleanup -d 'Shows broken backup archives [--force, delete these files]'
+complete --command duply --no-files --condition 'not __fish_is_nth_token 1' --arguments restore -d 'Restore the backup to <target_path> [as it was at <age>]'
+complete --command duply --no-files --condition 'not __fish_is_nth_token 1' --arguments fetch -d 'Restore single file/folder from backup [as it was at <age>]'
 
 # Options
 complete --command duply --no-files --long-option force -d 'Really execute the commands: purge, purge-full, cleanup'
diff --git a/share/completions/git.fish b/share/completions/git.fish
index 0bc9ea412..0fa768d4f 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -2104,7 +2104,7 @@ complete -F -c git -n '__fish_git_using_command config' -l blob -d 'Read config
 
 # If no argument is specified, it's as if --get was used
 # Use -k with `__fish_git_config_keys` so that user defined values are shown first
-complete -c git -n '__fish_git_using_command config; and fish_is_nth_token 2' -kfa '(__fish_git_config_keys)'
+complete -c git -n '__fish_git_using_command config; and __fish_is_nth_token 2' -kfa '(__fish_git_config_keys)'
 complete -f -c git -n '__fish_git_using_command config' -l get -d 'Get config with name' -kra '(__fish_git_config_keys)'
 complete -f -c git -n '__fish_git_using_command config' -l get-all -d 'Get all values matching key' -ka '(__fish_git_config_keys)'
 complete -f -c git -n '__fish_git_using_command config' -l get-urlmatch -d 'Get value specific for the section url' -r
diff --git a/share/completions/meson.fish b/share/completions/meson.fish
index abce460d2..9a3fe94de 100644
--- a/share/completions/meson.fish
+++ b/share/completions/meson.fish
@@ -49,4 +49,4 @@ complete -c meson -l cross-file -r -d "File describing cross-compilation environ
 complete -c meson -l wrap-mode -xa 'WrapMode.{default,nofallback,nodownload,forcefallback}' -d "Special wrap mode to use"
 
 # final parameter
-complete -c meson -n "fish_is_nth_token 1" -xa '(__fish_complete_directories)'
+complete -c meson -n "__fish_is_nth_token 1" -xa '(__fish_complete_directories)'
diff --git a/share/completions/python.fish b/share/completions/python.fish
index d0d0fbb1a..f97f1fd14 100644
--- a/share/completions/python.fish
+++ b/share/completions/python.fish
@@ -16,8 +16,8 @@ complete -c python -o vv -d "Even more verbose mode"
 complete -c python -s V -l version -d "Display version and exit"
 complete -c python -s W -x -d "Warning control" -a "ignore default all module once error"
 complete -c python -s x -d 'Skip first line of source, allowing use of non-Unix forms of #!cmd'
-complete -c python -f -n "fish_is_nth_token 1" -k -a "(__fish_complete_suffix .py)"
-complete -c python -f -n "fish_is_nth_token 1" -a - -d 'Read program from stdin'
+complete -c python -f -n "__fish_is_nth_token 1" -k -a "(__fish_complete_suffix .py)"
+complete -c python -f -n "__fish_is_nth_token 1" -a - -d 'Read program from stdin'
 
 # Version-specific completions
 # We have to detect this at runtime because pyenv etc can change
diff --git a/share/completions/python2.fish b/share/completions/python2.fish
index d4047915b..bdfc25bc2 100644
--- a/share/completions/python2.fish
+++ b/share/completions/python2.fish
@@ -13,8 +13,8 @@ complete -c python2 -s v -d "Verbose mode"
 complete -c python2 -s V -d "Display version and exit"
 complete -c python2 -s W -x -d "Warning control" -a "ignore default all module once error"
 complete -c python2 -s x -d 'Skip first line of source, allowing use of non-Unix forms of #!cmd'
-complete -c python2 -f -n "fish_is_nth_token 1" -k -a "(__fish_complete_suffix .py)"
-complete -c python2 -f -n "fish_is_nth_token 1" -a - -d 'Read program from stdin'
+complete -c python2 -f -n "__fish_is_nth_token 1" -k -a "(__fish_complete_suffix .py)"
+complete -c python2 -f -n "__fish_is_nth_token 1" -a - -d 'Read program from stdin'
 complete -c python2 -s 3 -d 'Warn about Python 3.x incompatibilities that 2to3 cannot trivially fix'
 complete -c python2 -s t -d "Warn on mixed tabs and spaces"
 complete -c python2 -s Q -x -a "old new warn warnall" -d "Division control"
diff --git a/share/completions/python3.fish b/share/completions/python3.fish
index 5b4447df5..27664ff45 100644
--- a/share/completions/python3.fish
+++ b/share/completions/python3.fish
@@ -13,8 +13,8 @@ complete -c python3 -s v -d "Verbose mode"
 complete -c python3 -s V -l version -d "Display version and exit"
 complete -c python3 -s W -x -d "Warning control" -a "ignore default all module once error"
 complete -c python3 -s x -d 'Skip first line of source, allowing use of non-Unix forms of #!cmd'
-complete -c python3 -n "fish_is_nth_token 1" -k -fa "(__fish_complete_suffix .py)"
-complete -c python3 -f -n "fish_is_nth_token 1" -a - -d 'Read program from stdin'
+complete -c python3 -n "__fish_is_nth_token 1" -k -fa "(__fish_complete_suffix .py)"
+complete -c python3 -f -n "__fish_is_nth_token 1" -a - -d 'Read program from stdin'
 complete -c python3 -s q -d 'Don\'t print version and copyright messages on interactive startup'
 complete -c python3 -s X -x -d 'Set implementation-specific option' -a 'faulthandler showrefcount tracemalloc showalloccount importtime dev utf8 pycache_prefex=PATH:'
 complete -c python3 -s b -d 'Issue warnings for possible misuse of `bytes` with `str`'
diff --git a/share/completions/rustup.fish b/share/completions/rustup.fish
index 66ae416fe..5653350a1 100644
--- a/share/completions/rustup.fish
+++ b/share/completions/rustup.fish
@@ -230,7 +230,7 @@ complete -c rustup -n __fish_should_complete_switches -s v -l verbose
 complete -c rustup -n __fish_should_complete_switches -s h -l help
 complete -c rustup -n __fish_should_complete_switches -s V -l version
 
-complete -c rustup -n "fish_is_nth_token 1" -xa "$subcmds"
+complete -c rustup -n "__fish_is_nth_token 1" -xa "$subcmds"
 
 complete -c rustup -n "__fish_prev_arg_in default" -xa "$__rustup_toolchains_short $__rustup_toolchains"
 complete -c rustup -n "__fish_prev_arg_in toolchain" -xa "add install list remove uninstall link help"
diff --git a/share/completions/s3cmd.fish b/share/completions/s3cmd.fish
index 5283ed9cb..3c316725b 100644
--- a/share/completions/s3cmd.fish
+++ b/share/completions/s3cmd.fish
@@ -13,49 +13,49 @@ complete -c s3cmd -f -n __s3cmd_is_valid_remote_path -a "(s3cmd ls (commandline
 complete -c s3cmd -f -n __s3cmd_is_remote_path
 
 # Suppress file completions for initial command
-complete -c s3cmd -n "fish_is_nth_token 1" -f
+complete -c s3cmd -n "__fish_is_nth_token 1" -f
 
 # Available commands
-complete -c s3cmd -n "fish_is_nth_token 1" -a mb -d 'Make bucket'
-complete -c s3cmd -n "fish_is_nth_token 1" -a rb -d 'Remove bucket'
-complete -c s3cmd -n "fish_is_nth_token 1" -a ls -d 'List objects or buckets'
-complete -c s3cmd -n "fish_is_nth_token 1" -a la -d 'List all object in all buckets'
-complete -c s3cmd -n "fish_is_nth_token 1" -a put -d 'Put file into bucket'
-complete -c s3cmd -n "fish_is_nth_token 1" -a get -d 'Get file from bucket'
-complete -c s3cmd -n "fish_is_nth_token 1" -a del -d 'Delete file from bucket'
-complete -c s3cmd -n "fish_is_nth_token 1" -a rm -d 'Delete file from bucket (alias for del)'
-complete -c s3cmd -n "fish_is_nth_token 1" -a restore -d 'Restore file from Glacier storage'
-complete -c s3cmd -n "fish_is_nth_token 1" -a sync -d 'Synchronize a directory tree to S3'
-complete -c s3cmd -n "fish_is_nth_token 1" -a du -d 'Disk usage by buckets'
-complete -c s3cmd -n "fish_is_nth_token 1" -a info -d 'Get various information about Buckets or Files'
-complete -c s3cmd -n "fish_is_nth_token 1" -a cp -d 'Copy object'
-complete -c s3cmd -n "fish_is_nth_token 1" -a modify -d 'Modify object metadata'
-complete -c s3cmd -n "fish_is_nth_token 1" -a mv -d 'Move object'
-complete -c s3cmd -n "fish_is_nth_token 1" -a setacl -d 'Modify Access control list for Bucket or Files'
-complete -c s3cmd -n "fish_is_nth_token 1" -a setpolicy -d 'Modify Bucket Policy'
-complete -c s3cmd -n "fish_is_nth_token 1" -a delpolicy -d 'Delete Bucket Policy'
-complete -c s3cmd -n "fish_is_nth_token 1" -a setcors -d 'Modify Bucket CORS'
-complete -c s3cmd -n "fish_is_nth_token 1" -a delcors -d 'Delete Bucket CORS'
-complete -c s3cmd -n "fish_is_nth_token 1" -a payer -d 'Modify Bucket Requester Pays policy'
-complete -c s3cmd -n "fish_is_nth_token 1" -a multipart -d 'Show multipart uploads'
-complete -c s3cmd -n "fish_is_nth_token 1" -a abortmp -d 'Abort a multipart upload'
-complete -c s3cmd -n "fish_is_nth_token 1" -a listmp -d 'List parts of a multipart upload'
-complete -c s3cmd -n "fish_is_nth_token 1" -a accesslog -d 'Enable/disable bucket access logging'
-complete -c s3cmd -n "fish_is_nth_token 1" -a sign -d 'Sign arbitrary string using the secret key'
-complete -c s3cmd -n "fish_is_nth_token 1" -a signurl -d 'Sign an S3 URL to provide limited public access with expiry'
-complete -c s3cmd -n "fish_is_nth_token 1" -a fixbucket -d 'Fix invalid file names in a bucket'
-complete -c s3cmd -n "fish_is_nth_token 1" -a ws-create -d 'Create Website from bucket'
-complete -c s3cmd -n "fish_is_nth_token 1" -a ws-delete -d 'Delete Website'
-complete -c s3cmd -n "fish_is_nth_token 1" -a ws-info -d 'Info about Website'
-complete -c s3cmd -n "fish_is_nth_token 1" -a expire -d 'Set or delete expiration rule for the bucket'
-complete -c s3cmd -n "fish_is_nth_token 1" -a setlifecycle -d 'Upload a lifecycle policy for the bucket'
-complete -c s3cmd -n "fish_is_nth_token 1" -a dellifecycle -d 'Remove a lifecycle policy for the bucket'
-complete -c s3cmd -n "fish_is_nth_token 1" -a cflist -d 'List CloudFront distribution points'
-complete -c s3cmd -n "fish_is_nth_token 1" -a cfinfo -d 'Display CloudFront distribution point parameters'
-complete -c s3cmd -n "fish_is_nth_token 1" -a cfcreate -d 'Create CloudFront distribution point'
-complete -c s3cmd -n "fish_is_nth_token 1" -a cfdelete -d 'Delete CloudFront distribution point'
-complete -c s3cmd -n "fish_is_nth_token 1" -a cfmodify -d 'Change CloudFront distribution point parameters'
-complete -c s3cmd -n "fish_is_nth_token 1" -a cfinvalinfo -d 'Display CloudFront invalidation request(s) status'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a mb -d 'Make bucket'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a rb -d 'Remove bucket'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a ls -d 'List objects or buckets'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a la -d 'List all object in all buckets'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a put -d 'Put file into bucket'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a get -d 'Get file from bucket'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a del -d 'Delete file from bucket'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a rm -d 'Delete file from bucket (alias for del)'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a restore -d 'Restore file from Glacier storage'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a sync -d 'Synchronize a directory tree to S3'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a du -d 'Disk usage by buckets'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a info -d 'Get various information about Buckets or Files'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a cp -d 'Copy object'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a modify -d 'Modify object metadata'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a mv -d 'Move object'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a setacl -d 'Modify Access control list for Bucket or Files'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a setpolicy -d 'Modify Bucket Policy'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a delpolicy -d 'Delete Bucket Policy'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a setcors -d 'Modify Bucket CORS'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a delcors -d 'Delete Bucket CORS'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a payer -d 'Modify Bucket Requester Pays policy'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a multipart -d 'Show multipart uploads'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a abortmp -d 'Abort a multipart upload'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a listmp -d 'List parts of a multipart upload'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a accesslog -d 'Enable/disable bucket access logging'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a sign -d 'Sign arbitrary string using the secret key'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a signurl -d 'Sign an S3 URL to provide limited public access with expiry'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a fixbucket -d 'Fix invalid file names in a bucket'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a ws-create -d 'Create Website from bucket'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a ws-delete -d 'Delete Website'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a ws-info -d 'Info about Website'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a expire -d 'Set or delete expiration rule for the bucket'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a setlifecycle -d 'Upload a lifecycle policy for the bucket'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a dellifecycle -d 'Remove a lifecycle policy for the bucket'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a cflist -d 'List CloudFront distribution points'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a cfinfo -d 'Display CloudFront distribution point parameters'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a cfcreate -d 'Create CloudFront distribution point'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a cfdelete -d 'Delete CloudFront distribution point'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a cfmodify -d 'Change CloudFront distribution point parameters'
+complete -c s3cmd -n "__fish_is_nth_token 1" -a cfinvalinfo -d 'Display CloudFront invalidation request(s) status'
 
 # Created against s3cmd version 2.0
 complete -c s3cmd -s h -l help -d 'Show help and exit'
diff --git a/share/completions/service.fish b/share/completions/service.fish
index 0a8ccec5c..b043388f1 100644
--- a/share/completions/service.fish
+++ b/share/completions/service.fish
@@ -1,16 +1,16 @@
 # First argument is the names of the service, i.e. a file in /etc/init.d
-complete -c service -n "fish_is_nth_token 1" -xa "(__fish_print_service_names)" -d Service
+complete -c service -n "__fish_is_nth_token 1" -xa "(__fish_print_service_names)" -d Service
 
 # as found in __fish_print_service_names.fish
 if test -d /run/systemd/system # Systemd systems
-    complete -c service -n 'not fish_is_nth_token 1' -xa "start stop restart status enable disable"
+    complete -c service -n 'not __fish_is_nth_token 1' -xa "start stop restart status enable disable"
 else if type -f rc-service 2>/dev/null # OpenRC (Gentoo)
-    complete -c service -n 'not fish_is_nth_token 1' -xa "start stop restart"
+    complete -c service -n 'not __fish_is_nth_token 1' -xa "start stop restart"
 else if test -d /etc/init.d # SysV on Debian and other linuxen
-    complete -c service -n 'not fish_is_nth_token 1' -xa "start stop --full-restart"
+    complete -c service -n 'not __fish_is_nth_token 1' -xa "start stop --full-restart"
 else # FreeBSD
     # Use the output of `service -v foo` to retrieve the list of service-specific verbs
-    complete -c service -n 'not fish_is_nth_token 1' -xa "(__fish_complete_freebsd_service_actions)"
+    complete -c service -n 'not __fish_is_nth_token 1' -xa "(__fish_complete_freebsd_service_actions)"
 end
 
 function __fish_complete_freebsd_service_actions
diff --git a/share/completions/set.fish b/share/completions/set.fish
index a88fffe28..f7b24800f 100644
--- a/share/completions/set.fish
+++ b/share/completions/set.fish
@@ -71,37 +71,37 @@ end
 #
 
 # Regular switches, set only accepts these before the variable name,
-# so we need to test using "fish_is_nth_token 1"
+# so we need to test using "__fish_is_nth_token 1"
 
-complete -c set -n "fish_is_nth_token 1" -s e -l erase -d "Erase variable"
-complete -c set -n "fish_is_nth_token 1" -s x -l export -d "Export variable to subprocess"
-complete -c set -n "fish_is_nth_token 1" -s u -l unexport -d "Do not export variable to subprocess"
-complete -c set -n "fish_is_nth_token 1" -s f -l function -d "Make variable function-scoped"
-complete -c set -n "fish_is_nth_token 1" -s g -l global -d "Make variable scope global"
-complete -c set -n "fish_is_nth_token 1" -s l -l local -d "Make variable scope local"
-complete -c set -n "fish_is_nth_token 1" -s L -l long -d 'Do not truncate long lines'
-complete -c set -n "fish_is_nth_token 1" -s U -l universal -d "Share variable persistently across sessions"
-complete -c set -n "fish_is_nth_token 1" -s q -l query -d "Test if variable is defined"
-complete -c set -n "fish_is_nth_token 1" -s h -l help -d "Display help and exit"
-complete -c set -n "fish_is_nth_token 1" -s n -l names -d "List the names of the variables, but not their value"
-complete -c set -n "fish_is_nth_token 1" -s a -l append -d "Append value to a list"
-complete -c set -n "fish_is_nth_token 1" -s p -l prepend -d "Prepend value to a list"
-complete -c set -n "fish_is_nth_token 1" -s S -l show -d "Show variable"
-complete -c set -n "fish_is_nth_token 1" -l path -d "Make variable as a path variable"
-complete -c set -n "fish_is_nth_token 1" -l unpath -d "Make variable not as a path variable"
+complete -c set -n "__fish_is_nth_token 1" -s e -l erase -d "Erase variable"
+complete -c set -n "__fish_is_nth_token 1" -s x -l export -d "Export variable to subprocess"
+complete -c set -n "__fish_is_nth_token 1" -s u -l unexport -d "Do not export variable to subprocess"
+complete -c set -n "__fish_is_nth_token 1" -s f -l function -d "Make variable function-scoped"
+complete -c set -n "__fish_is_nth_token 1" -s g -l global -d "Make variable scope global"
+complete -c set -n "__fish_is_nth_token 1" -s l -l local -d "Make variable scope local"
+complete -c set -n "__fish_is_nth_token 1" -s L -l long -d 'Do not truncate long lines'
+complete -c set -n "__fish_is_nth_token 1" -s U -l universal -d "Share variable persistently across sessions"
+complete -c set -n "__fish_is_nth_token 1" -s q -l query -d "Test if variable is defined"
+complete -c set -n "__fish_is_nth_token 1" -s h -l help -d "Display help and exit"
+complete -c set -n "__fish_is_nth_token 1" -s n -l names -d "List the names of the variables, but not their value"
+complete -c set -n "__fish_is_nth_token 1" -s a -l append -d "Append value to a list"
+complete -c set -n "__fish_is_nth_token 1" -s p -l prepend -d "Prepend value to a list"
+complete -c set -n "__fish_is_nth_token 1" -s S -l show -d "Show variable"
+complete -c set -n "__fish_is_nth_token 1" -l path -d "Make variable as a path variable"
+complete -c set -n "__fish_is_nth_token 1" -l unpath -d "Make variable not as a path variable"
 
 #TODO: add CPP code to generate list of read-only variables and exclude them from the following completions
 
 # Complete using preexisting variable names
-complete -c set -n 'fish_is_nth_token 1; and not __fish_seen_argument -s e -l erase; and not __fish_seen_argument -s l -s g -s U -l local -l global -l universal' -x -a "(set -l | string match -rv '^__' | string replace ' ' \t'Local Variable: ')"
-complete -c set -n 'fish_is_nth_token 1; and not __fish_seen_argument -s e -l erase; and not __fish_seen_argument -s l -s g -s U -l local -l global -l universal' -x -a "(set -g | string match -rv '^__' | string replace ' ' \t'Global Variable: ')"
-complete -c set -n 'fish_is_nth_token 1; and not __fish_seen_argument -s e -l erase; and not __fish_seen_argument -s l -s g -s U -l local -l global -l universal' -x -a "(set -U | string match -rv '^__' | string replace ' ' \t'Universal Variable: ')"
+complete -c set -n '__fish_is_nth_token 1; and not __fish_seen_argument -s e -l erase; and not __fish_seen_argument -s l -s g -s U -l local -l global -l universal' -x -a "(set -l | string match -rv '^__' | string replace ' ' \t'Local Variable: ')"
+complete -c set -n '__fish_is_nth_token 1; and not __fish_seen_argument -s e -l erase; and not __fish_seen_argument -s l -s g -s U -l local -l global -l universal' -x -a "(set -g | string match -rv '^__' | string replace ' ' \t'Global Variable: ')"
+complete -c set -n '__fish_is_nth_token 1; and not __fish_seen_argument -s e -l erase; and not __fish_seen_argument -s l -s g -s U -l local -l global -l universal' -x -a "(set -U | string match -rv '^__' | string replace ' ' \t'Universal Variable: ')"
 # Complete some fish configuration variables even if they aren't set.
-complete -c set -n 'fish_is_nth_token 1; and not __fish_seen_argument -s e -l erase' -x -a "(__fish_complete_special_vars)"
+complete -c set -n '__fish_is_nth_token 1; and not __fish_seen_argument -s e -l erase' -x -a "(__fish_complete_special_vars)"
 # Complete scope-specific variables
-complete -c set -n 'fish_is_nth_token 1; and __fish_seen_argument -s l -l local' -x -a "(set -l | string replace ' ' \t'Local Variable: ')"
-complete -c set -n 'fish_is_nth_token 1; and __fish_seen_argument -s g -l global' -x -a "(set -g | string replace ' ' \t'Global Variable: ')"
-complete -c set -n 'fish_is_nth_token 1; and __fish_seen_argument -s U -l universal' -x -a "(set -U | string replace ' ' \t'Universal Variable: ')"
+complete -c set -n '__fish_is_nth_token 1; and __fish_seen_argument -s l -l local' -x -a "(set -l | string replace ' ' \t'Local Variable: ')"
+complete -c set -n '__fish_is_nth_token 1; and __fish_seen_argument -s g -l global' -x -a "(set -g | string replace ' ' \t'Global Variable: ')"
+complete -c set -n '__fish_is_nth_token 1; and __fish_seen_argument -s U -l universal' -x -a "(set -U | string replace ' ' \t'Universal Variable: ')"
 
 # Complete using preexisting variable names for `set --erase`
 complete -c set -n '__fish_seen_argument -s e -l erase; and not __fish_seen_argument -s l -s U -s g -l local -l global -l Universal' -f -a "(set -g | string replace ' ' \tGlobal\ Variable:\ )"
diff --git a/share/completions/ttx.fish b/share/completions/ttx.fish
index 85a709992..1c52ef373 100644
--- a/share/completions/ttx.fish
+++ b/share/completions/ttx.fish
@@ -9,7 +9,7 @@ set -l line_endings LF CR CRLF
 set -l woff_fmts woff woff2
 
 complete -f -c ttx -k -a '(__fish_complete_suffix .otf; __fish_complete_suffix .ttf; __fish_complete_suffix .ttx; __fish_complete_suffix .ttc)'
-complete -c ttx -f -n "fish_is_nth_token 1" -k -a '(__fish_complete_suffix .otf; __fish_complete_suffix .ttf; __fish_complete_suffix .ttx)'
+complete -c ttx -f -n "__fish_is_nth_token 1" -k -a '(__fish_complete_suffix .otf; __fish_complete_suffix .ttf; __fish_complete_suffix .ttx)'
 
 # General options
 complete -c ttx -f -s h -d'Show help message'
diff --git a/share/completions/udevadm.fish b/share/completions/udevadm.fish
index 15449a425..1253c6101 100644
--- a/share/completions/udevadm.fish
+++ b/share/completions/udevadm.fish
@@ -1,5 +1,5 @@
 set -l commands info trigger settle control monitor test test-builtin
-complete -c udevadm -n "fish_is_nth_token 1" -xa "$commands"
+complete -c udevadm -n "__fish_is_nth_token 1" -xa "$commands"
 
 complete -c udevadm -s h -l help -d "Show help"
 complete -c udevadm -s V -l version -d "Show version info"
@@ -59,4 +59,4 @@ complete -c udevadm -n '__fish_seen_subcommand_from test' -s a -l action -d "Set
 complete -c udevadm -n '__fish_seen_subcommand_from test' -s N -l resolve-names -d "When to resolve names" -xa "early late never"
 
 # udevadm test-builtin
-complete -c udevadm -n '__fish_seen_subcommand_from test-builtin; and fish_is_nth_token 2' -xa "blkid\t'Filesystem and partition probing' btrfs\t'btrfs volume management' hwdb\t'Hardware database' input_id\t'Input device properties' keyboard\t'Keybord scan code to key mapping' kmod\t'Kernel module loader' net_id\t'Network device properties' net_setup_link\t'Configure network link' path_id\t'Compose persistent device path' usb_id\t'USB device properties' uaccess\t'Manage device node user ACL'"
+complete -c udevadm -n '__fish_seen_subcommand_from test-builtin; and __fish_is_nth_token 2' -xa "blkid\t'Filesystem and partition probing' btrfs\t'btrfs volume management' hwdb\t'Hardware database' input_id\t'Input device properties' keyboard\t'Keybord scan code to key mapping' kmod\t'Kernel module loader' net_id\t'Network device properties' net_setup_link\t'Configure network link' path_id\t'Compose persistent device path' usb_id\t'USB device properties' uaccess\t'Manage device node user ACL'"
diff --git a/share/completions/unzip.fish b/share/completions/unzip.fish
index fe513b87c..080ed29f8 100644
--- a/share/completions/unzip.fish
+++ b/share/completions/unzip.fish
@@ -28,7 +28,7 @@ complete -c unzip -s M -d "pipe through `more` pager"
 if unzip -v 2>/dev/null | string match -eq Debian
 
     # the first non-switch argument should be the zipfile
-    complete -c unzip -n "fish_is_nth_token 1" -k -xa '(
+    complete -c unzip -n "__fish_is_nth_token 1" -k -xa '(
         __fish_complete_suffix .zip
         __fish_complete_suffix .jar
         __fish_complete_suffix .aar
@@ -36,7 +36,7 @@ if unzip -v 2>/dev/null | string match -eq Debian
 
     # Files thereafter are either files to include or exclude from the operation
     set -l zipfile
-    complete -c unzip -n 'not fish_is_nth_token 1' -xa '(unzip -l (eval set zipfile (__fish_first_token); echo $zipfile) | string replace -r --filter ".*:\S+\s+(.*)" "\$1")'
+    complete -c unzip -n 'not __fish_is_nth_token 1' -xa '(unzip -l (eval set zipfile (__fish_first_token); echo $zipfile) | string replace -r --filter ".*:\S+\s+(.*)" "\$1")'
 
 else
 
diff --git a/share/completions/vips.fish b/share/completions/vips.fish
index da22df748..58d8e0dea 100644
--- a/share/completions/vips.fish
+++ b/share/completions/vips.fish
@@ -18,7 +18,7 @@ complete -c vips -l vips-config -d 'Print libvips config'
 complete -c vips -l vips-pipe-read-limit -d 'Pipe read limit (bytes)'
 
 # Operations
-complete -c vips -n "fish_is_nth_token 1" -xa "(__fish_vips_ops)"
+complete -c vips -n "__fish_is_nth_token 1" -xa "(__fish_vips_ops)"
 
 function __fish_vips_ops
     vips -l | string match -rv _base | string replace -rf '^\s*\S+ \((.+?)\), +(\S.*?)(?:\s*[,(].*)?$' '$1\t$2'
diff --git a/share/completions/xdg-mime.fish b/share/completions/xdg-mime.fish
index c80d2846f..6e1f1f3db 100644
--- a/share/completions/xdg-mime.fish
+++ b/share/completions/xdg-mime.fish
@@ -15,8 +15,8 @@ complete -c xdg-mime -d 'Query default application for type' -n 'contains_seq qu
 complete -c xdg-mime -d 'Query file\'s filetype' -n 'contains_seq query filetype -- (commandline -cop)' -r
 
 # complete xdg-mime default
-complete -c xdg-mime -d 'Choose application' -n '__fish_seen_subcommand_from default; and fish_is_nth_token 3' -xa '(__fish_print_xdg_desktop_file_ids)'
-complete -c xdg-mime -d Mimetype -n '__fish_seen_subcommand_from default; and fish_is_nth_token 4' -xa '(__fish_print_xdg_mimetypes)'
+complete -c xdg-mime -d 'Choose application' -n '__fish_seen_subcommand_from default; and __fish_is_nth_token 3' -xa '(__fish_print_xdg_desktop_file_ids)'
+complete -c xdg-mime -d Mimetype -n '__fish_seen_subcommand_from default; and __fish_is_nth_token 4' -xa '(__fish_print_xdg_mimetypes)'
 
 # complete xdg-mime install
 complete -c xdg-mime -d 'Add filetype description' -n 'contains_seq xdg-mime install -- (commandline -cop)' -r
diff --git a/share/completions/xinput.fish b/share/completions/xinput.fish
index c86445c24..6f8df0274 100644
--- a/share/completions/xinput.fish
+++ b/share/completions/xinput.fish
@@ -28,5 +28,5 @@ function __fish_xinput_nth_token
 end
 
 complete -c xinput -f -n "not __fish_seen_subcommand_from $cmds" -a "$cmds"
-complete -c xinput -f -n "fish_is_nth_token 2; and __fish_seen_subcommand_from list get-feedbacks set-pointer set-mode set-ptr-feedback set-integer-feedback set-button-map query-state list-props set-int-prop set-float-prop set-prop watch-props" -a "(__fish_xinput_devices)"
-complete -c xinput -f -n "__fish_seen_subcommand_from list set-int-prop set-float-prop set-prop watch-props; and not fish_is_nth_token 2" -xa "(__fish_xinput_device_props (__fish_xinput_nth_token 2))"
+complete -c xinput -f -n "__fish_is_nth_token 2; and __fish_seen_subcommand_from list get-feedbacks set-pointer set-mode set-ptr-feedback set-integer-feedback set-button-map query-state list-props set-int-prop set-float-prop set-prop watch-props" -a "(__fish_xinput_devices)"
+complete -c xinput -f -n "__fish_seen_subcommand_from list set-int-prop set-float-prop set-prop watch-props; and not __fish_is_nth_token 2" -xa "(__fish_xinput_device_props (__fish_xinput_nth_token 2))"
diff --git a/share/completions/xsv.fish b/share/completions/xsv.fish
index a68a3e5eb..edb28fd54 100644
--- a/share/completions/xsv.fish
+++ b/share/completions/xsv.fish
@@ -1,26 +1,26 @@
-complete -c xsv -n "fish_is_nth_token 1" -xa cat -d 'Concatenate by row or column'
-complete -c xsv -n "fish_is_nth_token 1" -xa count -d 'Count records'
-complete -c xsv -n "fish_is_nth_token 1" -xa fixlengths -d 'Makes all records have same length'
-complete -c xsv -n "fish_is_nth_token 1" -xa flatten -d 'Show one field per line'
-complete -c xsv -n "fish_is_nth_token 1" -xa fmt -d 'Format CSV output (change field delimiter)'
-complete -c xsv -n "fish_is_nth_token 1" -xa frequency -d 'Show frequency tables'
-complete -c xsv -n "fish_is_nth_token 1" -xa headers -d 'Show header names'
-complete -c xsv -n "fish_is_nth_token 1" -xa help -d 'Show this usage message.'
-complete -c xsv -n "fish_is_nth_token 1" -xa index -d 'Create CSV index for faster access'
-complete -c xsv -n "fish_is_nth_token 1" -xa input -d 'Read CSV data with special quoting rules'
-complete -c xsv -n "fish_is_nth_token 1" -xa join -d 'Join CSV files'
-complete -c xsv -n "fish_is_nth_token 1" -xa sample -d 'Randomly sample CSV data'
-complete -c xsv -n "fish_is_nth_token 1" -xa search -d 'Search CSV data with regexes'
-complete -c xsv -n "fish_is_nth_token 1" -xa select -d 'Select columns from CSV'
-complete -c xsv -n "fish_is_nth_token 1" -xa slice -d 'Slice records from CSV'
-complete -c xsv -n "fish_is_nth_token 1" -xa sort -d 'Sort CSV data'
-complete -c xsv -n "fish_is_nth_token 1" -xa split -d 'Split CSV data into many files'
-complete -c xsv -n "fish_is_nth_token 1" -xa stats -d 'Compute basic statistics'
-complete -c xsv -n "fish_is_nth_token 1" -xa table -d 'Align CSV data into columns'
+complete -c xsv -n "__fish_is_nth_token 1" -xa cat -d 'Concatenate by row or column'
+complete -c xsv -n "__fish_is_nth_token 1" -xa count -d 'Count records'
+complete -c xsv -n "__fish_is_nth_token 1" -xa fixlengths -d 'Makes all records have same length'
+complete -c xsv -n "__fish_is_nth_token 1" -xa flatten -d 'Show one field per line'
+complete -c xsv -n "__fish_is_nth_token 1" -xa fmt -d 'Format CSV output (change field delimiter)'
+complete -c xsv -n "__fish_is_nth_token 1" -xa frequency -d 'Show frequency tables'
+complete -c xsv -n "__fish_is_nth_token 1" -xa headers -d 'Show header names'
+complete -c xsv -n "__fish_is_nth_token 1" -xa help -d 'Show this usage message.'
+complete -c xsv -n "__fish_is_nth_token 1" -xa index -d 'Create CSV index for faster access'
+complete -c xsv -n "__fish_is_nth_token 1" -xa input -d 'Read CSV data with special quoting rules'
+complete -c xsv -n "__fish_is_nth_token 1" -xa join -d 'Join CSV files'
+complete -c xsv -n "__fish_is_nth_token 1" -xa sample -d 'Randomly sample CSV data'
+complete -c xsv -n "__fish_is_nth_token 1" -xa search -d 'Search CSV data with regexes'
+complete -c xsv -n "__fish_is_nth_token 1" -xa select -d 'Select columns from CSV'
+complete -c xsv -n "__fish_is_nth_token 1" -xa slice -d 'Slice records from CSV'
+complete -c xsv -n "__fish_is_nth_token 1" -xa sort -d 'Sort CSV data'
+complete -c xsv -n "__fish_is_nth_token 1" -xa split -d 'Split CSV data into many files'
+complete -c xsv -n "__fish_is_nth_token 1" -xa stats -d 'Compute basic statistics'
+complete -c xsv -n "__fish_is_nth_token 1" -xa table -d 'Align CSV data into columns'
 
 # with a subcommand
-complete -c xsv -n 'not fish_is_nth_token 1' -k -xa '(__fish_complete_suffix .csv)'
-complete -c xsv -n 'not fish_is_nth_token 1' -s h -l help -d 'Display help for this xsv command'
+complete -c xsv -n 'not __fish_is_nth_token 1' -k -xa '(__fish_complete_suffix .csv)'
+complete -c xsv -n 'not __fish_is_nth_token 1' -s h -l help -d 'Display help for this xsv command'
 
 # without a subcommand
 complete -c xsv -s h -l help -d 'Display xsv help'
diff --git a/share/completions/yadm.fish b/share/completions/yadm.fish
index 7a6d07ce8..1f7e2dc79 100644
--- a/share/completions/yadm.fish
+++ b/share/completions/yadm.fish
@@ -128,4 +128,4 @@ complete -f -c yadm -n "__fish_yadm_using_command config" -l unset -a '(__fish_y
 complete -f -c yadm -n "__fish_yadm_using_command config" -l unset-all -a '(__fish_yadm_config_keys)' -d 'Remove matching variables'
 
 # If no argument is specified for `config`, it's as if --get was used
-complete -f -c yadm -n "__fish_yadm_using_command config; and fish_is_nth_token 3" -a '(__fish_yadm_config_keys)'
+complete -f -c yadm -n "__fish_yadm_using_command config; and __fish_is_nth_token 3" -a '(__fish_yadm_config_keys)'
diff --git a/share/completions/zpool.fish b/share/completions/zpool.fish
index 86f630daa..f20fa3972 100644
--- a/share/completions/zpool.fish
+++ b/share/completions/zpool.fish
@@ -234,7 +234,7 @@ complete -c zpool -x -n '__fish_zpool_using_command add; and __fish_is_nth_token
 # complete -c zpool -x -n '__fish_zpool_using_command add; and not __fish_prev_arg_in add' -d 'Virtual device to add' -a '(__fish_zpool_complete_vdevs)'
 # Exclude devices already part of this pool, and devices already in any other pool unless
 # `zpool add -f` was used.
-complete -c zpool -x -n '__fish_zpool_using_command add; and not __fish_prev_arg_in add' -k -d 'Virtual device to add' -a '(__fish_zpool_complete_vdevs | string match -vr (__fish_zpool_list_used_vdevs (__fish_seen_argument -s f && fish_nth_token 2) | string escape --style regex | string replace -r \'(.*)\' \'^$1\\\\\\$\' | string join "|"))' # the insane number of backslashes is unfortunate
+complete -c zpool -x -n '__fish_zpool_using_command add; and not __fish_prev_arg_in add' -k -d 'Virtual device to add' -a '(__fish_zpool_complete_vdevs | string match -vr (__fish_zpool_list_used_vdevs (__fish_seen_argument -s f && __fish_nth_token 2) | string escape --style regex | string replace -r \'(.*)\' \'^$1\\\\\\$\' | string join "|"))' # the insane number of backslashes is unfortunate
 
 # attach completions
 complete -c zpool -f -n '__fish_zpool_using_command attach' -s f -d 'Force use of virtual device'
@@ -246,12 +246,12 @@ end
 # - zpool attach <tank> [should list only devices already part of pool]
 # - zpool attach <tank> <da1> [should list only devices not already part of a/the pool]
 complete -c zpool -x -n '__fish_zpool_using_command attach; and __fish_is_nth_token 2' -d 'Pool to attach virtual device to' -a '(__fish_complete_zfs_pools)'
-complete -c zpool -x -n '__fish_zpool_using_command attach; and __fish_is_nth_token 3' -d 'Existing pool device to attach to' -a '(__fish_zpool_list_used_vdevs (fish_nth_token 2))'
+complete -c zpool -x -n '__fish_zpool_using_command attach; and __fish_is_nth_token 3' -d 'Existing pool device to attach to' -a '(__fish_zpool_list_used_vdevs (__fish_nth_token 2))'
 # Generate a list of devices in the system modulo devices already part of an online zpool.
 # These latter can be forcefully added, so we only exclude them if we don't introspect the presence
 # of a `-f` argument to `zpool attach` (but still exclude any devices already part of the same pool
 # that we're attaching to, "obviously").
-complete -c zpool -x -n '__fish_zpool_using_command attach; and __fish_is_nth_token 4' -d 'Device to be attached' -a '(__fish_zpool_list_available_vdevs | string match -vr (__fish_zpool_list_used_vdevs (__fish_seen_argument -s f && fish_nth_token 2) | string escape --style regex | string replace -r \'(.*)\' \'^$1\\\\\\$\' | string join "|"))' # the insane number of backslashes is unfortunate
+complete -c zpool -x -n '__fish_zpool_using_command attach; and __fish_is_nth_token 4' -d 'Device to be attached' -a '(__fish_zpool_list_available_vdevs | string match -vr (__fish_zpool_list_used_vdevs (__fish_seen_argument -s f && __fish_nth_token 2) | string escape --style regex | string replace -r \'(.*)\' \'^$1\\\\\\$\' | string join "|"))' # the insane number of backslashes is unfortunate
 
 # clear completions
 if test $OS = FreeBSD
diff --git a/share/functions/__fish_is_first_token.fish b/share/functions/__fish_is_first_token.fish
index 8f5e4b83f..9e11e3829 100644
--- a/share/functions/__fish_is_first_token.fish
+++ b/share/functions/__fish_is_first_token.fish
@@ -1,4 +1,4 @@
 
 function __fish_is_first_token -d 'Test if no non-switch argument has been specified yet'
-    fish_is_nth_token 1
+    __fish_is_nth_token 1
 end
diff --git a/share/functions/__fish_is_nth_token.fish b/share/functions/__fish_is_nth_token.fish
index 4f4464fa1..2f3a535e2 100644
--- a/share/functions/__fish_is_nth_token.fish
+++ b/share/functions/__fish_is_nth_token.fish
@@ -1,3 +1,5 @@
-function __fish_is_nth_token --description 'Test if current token is on Nth place' --argument-names n
-    fish_is_nth_token $n
+function __fish_is_nth_token --description 'Test if current token is the Nth (ignoring command and switches/flags)' --argument-names n
+    set -l tokens (commandline -poc)
+    set -l tokens (string replace -r --filter '^([^-].*)' '$1' -- $tokens)
+    test (count $tokens) -eq "$n"
 end
diff --git a/share/functions/__fish_is_token_n.fish b/share/functions/__fish_is_token_n.fish
index 7e3deb51d..5dbcdfda7 100644
--- a/share/functions/__fish_is_token_n.fish
+++ b/share/functions/__fish_is_token_n.fish
@@ -1,3 +1,3 @@
 function __fish_is_token_n --description 'Test if current token is on Nth place' --argument-names n
-    fish_is_nth_token $n
+    __fish_is_nth_token $n
 end
diff --git a/share/functions/fish_nth_token.fish b/share/functions/__fish_nth_token.fish
similarity index 68%
rename from share/functions/fish_nth_token.fish
rename to share/functions/__fish_nth_token.fish
index 7df863ae6..597bb15ee 100644
--- a/share/functions/fish_nth_token.fish
+++ b/share/functions/__fish_nth_token.fish
@@ -1,4 +1,4 @@
-function fish_nth_token --description 'Prints the Nth token (ignoring command and switches/flags)' --argument-names n
+function __fish_nth_token --description 'Prints the Nth token (ignoring command and switches/flags)' --argument-names n
     set -l tokens (commandline -po | string replace -r --filter '^([^-].*)' '$1')
     # Increment $n by one to account for ignoring the command
     if test (count $tokens) -ge (math "$n" + 1)
diff --git a/share/functions/fish_is_nth_token.fish b/share/functions/fish_is_nth_token.fish
deleted file mode 100644
index 907caae71..000000000
--- a/share/functions/fish_is_nth_token.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-function fish_is_nth_token --description 'Test if current token is the Nth (ignoring command and switches/flags)' --argument-names n
-    set -l tokens (commandline -poc)
-    set -l tokens (string replace -r --filter '^([^-].*)' '$1' -- $tokens)
-    test (count $tokens) -eq "$n"
-end

From 707c7a7f1e90a1e2d1bb78eee3c2242f8b8734ea Mon Sep 17 00:00:00 2001
From: "Kevin F. Konrad" <kevinkonrad@ymail.com>
Date: Sun, 13 Feb 2022 14:35:37 +0100
Subject: [PATCH 217/262] replace helm completions with autogenerated script

Helm 3 provides an autogenerated completion since version 3.4.0.

The previous implementation is replaced by this because it was specific to the
now-deprecated helm 2.

The completions appear to be fully featured including descriptions and
completion for dynamic arguments such as namespaces and releases.
---
 CHANGELOG.rst               |   1 +
 share/completions/helm.fish | 288 +-----------------------------------
 2 files changed, 2 insertions(+), 287 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index a5cb7fb14..7972199fd 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -181,6 +181,7 @@ Completions
 - Unified the OpenZFS-related completions across operating systems and improved the vdev-related completions for all platforms.
 - Add missing completions for the ``-p`` option of ``xbps-query``.
 - When evaluating custom completions, the command line state no longer includes variable overrides (``var=val``). This unbreaks completions that read ``commandline -op``.
+- Replace completions for helm version 2 with helm 3-compatible completions.
 
 Improved terminal support
 ^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/share/completions/helm.fish b/share/completions/helm.fish
index 90e009a64..4d6f7977b 100644
--- a/share/completions/helm.fish
+++ b/share/completions/helm.fish
@@ -1,287 +1 @@
-# helm - is a tool for managing Kubernetes charts. Charts are packages
-# of pre-configured Kubernetes resources.
-# See: https://github.com/kubernetes/helm
-
-function __helm_using_command
-    set -l cmd (commandline -poc)
-    set -l found
-
-    test (count $cmd) -gt (count $argv)
-    or return 1
-
-    set -e cmd[1]
-
-    for i in $argv
-        contains -- $i $cmd
-        and set found $found $i
-    end
-
-    test "$argv" = "$found"
-end
-
-function __helm_seen_any_subcommand_from -a cmd
-    __fish_seen_subcommand_from (__helm_subcommands $cmd | string replace -r '\t.*$' '')
-end
-
-function __helm_subcommands -a cmd
-    switch $cmd
-        case ''
-            echo create\t'Create a new chart with the given name'
-            echo delete\t'Delete the release from Kubernetes'
-            echo dependency\t"Manage a chart's dependencies"
-            echo fetch\t'Download a chart from a repository'
-            echo get\t'Download a named release'
-            echo history\t'Fetch release history'
-            echo home\t'Display the location of HELM_HOME'
-            echo init\t'Initialize Helm on both client and server'
-            echo inspect\t'Inspect a chart'
-            echo install\t'Install a chart archive'
-            echo lint\t'Examine a chart for possible issues'
-            echo list\t'List releases'
-            echo package\t'Package a chart directory into a chart archive'
-            echo repo\t'Operate on chart repositories'
-            echo rollback\t'Roll back a release to a previous revision'
-            echo search\t'Search for a keyword in charts'
-            echo serve\t'Start a local http web server'
-            echo status\t'Display the status of the named release'
-            echo upgrade\t'Upgrade a release'
-            echo verify\t'Verify that a chart has been signed and is valid'
-            echo version\t'Print the client/server version information'
-        case dependency
-            echo build\t'Rebuild the charts/ directory'
-            echo list\t'List the dependencies for the given chart'
-            echo update\t'Update charts/'
-        case get
-            echo hooks\t'Download all hooks for a named release'
-            echo manifest\t'Download the manifest for a named release'
-            echo values\t'Download the values file for a named release'
-        case inspect
-            echo chart\t'Show inspect chart'
-            echo values\t'Show inspect values'
-        case repo
-            echo add\t'Add a chart repository'
-            echo index\t'Generate an index file'
-            echo list\t'List chart repositories'
-            echo remove\t'Remove a chart repository'
-            echo update\t'Update information on available charts'
-    end
-end
-
-function __helm_kube_contexts
-    kubectl config get-contexts -o name 2>/dev/null
-end
-
-function __helm_kube_namespaces
-    kubectl get namespaces -o name | string replace namespace/ ''
-end
-
-function __helm_releases
-    helm ls --short 2>/dev/null
-end
-
-function __helm_release_completions
-    helm ls 2>/dev/null | awk 'NR >= 2 { print $1"\tRelease of "$NF  }'
-end
-
-function __helm_release_revisions
-    set -l cmd (commandline -poc)
-
-    for pair in (helm ls | awk 'NR >= 2 { print $1" "$2 }')
-        echo $pair | read -l release revision
-
-        if contains $release $cmd
-            seq 1 $revision
-            return
-        end
-    end
-end
-
-function __helm_repositories
-    helm repo list | awk 'NR >= 2 { print $1 }'
-end
-
-function __helm_charts
-    helm search | awk 'NR >= 2 && !/^local\// { print $1 }'
-end
-
-function __helm_chart_versions
-    set -l cmd (commandline -poc)
-
-    for pair in (helm search -l | awk 'NR >= 2 { print $1" "$2 }')
-        echo $pair | read -l chart version
-
-        if contains $chart $cmd
-            echo $version
-        end
-    end
-end
-
-#
-# Global Flags
-#
-complete -c helm -l debug -f -d 'Enable verbose output'
-complete -c helm -l home -r -d 'Location of your Helm config'
-complete -c helm -l host -x -d 'Address of tiller'
-complete -c helm -l kube-context -x -a '(__helm_kube_contexts)' -d 'Name of the kubeconfig context to use'
-complete -c helm -s h -l help -f -d 'More information about a command'
-
-#
-# Commands
-#
-
-# helm [command]
-complete -c helm -n 'not __helm_seen_any_subcommand_from ""' -x -a '(__helm_subcommands "")'
-
-# helm create NAME [flags]
-complete -c helm -n '__helm_using_command create' -s p -l starter -x -d 'The named Helm starter scaffold'
-
-# helm delete [flags] RELEASE [...]
-complete -c helm -n '__helm_using_command delete' -f -a '(__helm_release_completions)' -d Release
-
-complete -c helm -n '__helm_using_command delete' -l dry-run -f -d 'Simulate a delete'
-complete -c helm -n '__helm_using_command delete' -l no-hooks -f -d 'Prevent hooks from running during deletion'
-complete -c helm -n '__helm_using_command delete' -l purge -f -d 'Remove the release from the store'
-
-# helm dependency [command]
-complete -c helm -n '__helm_using_command dependency; and not __helm_seen_any_subcommand_from dependency' -x -a '(__helm_subcommands dependency)'
-
-# helm dependency build [flags] CHART
-complete -c helm -n '__helm_using_command dependency build' -l keyring -r -d 'Keyring containing public keys'
-complete -c helm -n '__helm_using_command dependency build' -l verify -f -d 'Verify the packages against signatures'
-
-# helm dependency update [flags] CHART
-complete -c helm -n '__helm_using_command dependency update' -l keyring -r -d 'Keyring containing public keys'
-complete -c helm -n '__helm_using_command dependency update' -l verify -f -d 'Verify the packages against signatures'
-
-# helm fetch [flags] [chart URL | repo/chartname] [...]
-complete -c helm -n '__helm_using_command fetch; and not __fish_seen_subcommand_from (__helm_charts)' -f -a '(__helm_charts)' -d Chart
-
-complete -c helm -n '__helm_using_command fetch' -s d -l destination -r -d 'Location to write the chart'
-complete -c helm -n '__helm_using_command fetch' -l keyring -r -d 'Keyring containing public keys'
-complete -c helm -n '__helm_using_command fetch' -l prov -f -d 'Fetch the provenance file'
-complete -c helm -n '__helm_using_command fetch' -l untar -f -d 'Will untar the chart after downloading it'
-complete -c helm -n '__helm_using_command fetch --untar' -l untardir -r -d 'Directory into which the chart is expanded'
-complete -c helm -n '__helm_using_command fetch' -l verify -f -d 'Verify the package against its signature'
-complete -c helm -n '__helm_using_command fetch' -l version -x -a '(__helm_chart_versions)' -d 'Chart version'
-
-# helm get [command]
-complete -c helm -n '__helm_using_command get; and not __helm_seen_any_subcommand_from get' -f -a '(__helm_subcommands get)'
-
-# helm get [flags] RELEASE
-complete -c helm -n '__helm_using_command get' -f -a '(__helm_release_completions)' -d Release
-
-complete -c helm -n '__helm_using_command get' -l revision -x -a '(__helm_release_revisions)' -d Revision
-
-# helm get values [flags] RELEASE
-complete -c helm -n '__helm_using_command get values' -s a -l all -f -d 'Dump all (computed) values'
-
-# helm history [flags] RELEASE
-complete -c helm -n '__helm_using_command history' -f -a '(__helm_release_completions)' -d Release
-
-complete -c helm -n '__helm_using_command history' -l max -x -d 'Maximum number of revision to include in history'
-
-# helm init [flags]
-complete -c helm -n '__helm_using_command init' -l canary-image -f -d 'Use the canary tiller image'
-complete -c helm -n '__helm_using_command init' -s c -l client-only -f -d 'Do not install tiller'
-complete -c helm -n '__helm_using_command init' -l dry-run -f -d 'Do not install local or remote'
-complete -c helm -n '__helm_using_command init' -s i -l tiller-image -x -d 'Override tiller image'
-
-# helm inspect [command]
-complete -c helm -n '__helm_using_command inspect; and not __helm_seen_any_subcommand_from inspect' -f -a '(__helm_subcommands inspect)'
-
-# helm inspect [CHART] [flags]
-complete -c helm -n '__helm_using_command inspect; and not __fish_seen_subcommand_from (__helm_charts)' -a '(__helm_charts)' -d Chart
-
-complete -c helm -n '__helm_using_command inspect' -l keyring -r -d 'Keyring containing public verification keys'
-complete -c helm -n '__helm_using_command inspect' -l verify -f -d 'Verify the provenance data for this chart'
-complete -c helm -n '__helm_using_command inspect' -l version -x -a '(__helm_chart_versions)' -d 'Chart version'
-
-# helm install [CHART] [flags]
-complete -c helm -n '__helm_using_command install; and not __fish_seen_subcommand_from (__helm_charts)' -a '(__helm_charts)' -d Chart
-
-complete -c helm -n '__helm_using_command install' -l dry-run -f -d 'Simulate an install'
-complete -c helm -n '__helm_using_command install' -l keyring -r -d 'Keyring containing public verification keys'
-complete -c helm -n '__helm_using_command install' -s n -l name -x -d 'Release name'
-complete -c helm -n '__helm_using_command install' -l name-template -r -d 'Specify template used to name the release'
-complete -c helm -n '__helm_using_command install' -l namespace -x -a '(__helm_kube_namespaces)' -d Namespace
-complete -c helm -n '__helm_using_command install' -l no-hooks -f -d 'Prevent hooks from running during install'
-complete -c helm -n '__helm_using_command install' -l replace -f -d 'Re-use the given name if already used'
-complete -c helm -n '__helm_using_command install' -l set -x -d 'Set values on the command line'
-complete -c helm -n '__helm_using_command install' -s f -l values -r -d 'Specify values in a YAML file'
-complete -c helm -n '__helm_using_command install' -l verify -f -d 'Verify the package before installing it'
-complete -c helm -n '__helm_using_command install' -l version -x -a '(__helm_chart_versions)' -d 'Chart version'
-
-# helm lint [flags] PATH
-complete -c helm -n '__helm_using_command lint' -l strict -f -d 'Fail on lint warnings'
-
-# helm list [flags] [FILTER]
-complete -c helm -n '__helm_using_command list' -l all -f -d 'Show all releases'
-complete -c helm -n '__helm_using_command list' -s d -l date -f -d 'Sort by release date'
-complete -c helm -n '__helm_using_command list' -l deleted -f -d 'Show deleted releases'
-complete -c helm -n '__helm_using_command list' -l deleting -f -d 'Show releases that are currently being deleted'
-complete -c helm -n '__helm_using_command list' -l deployed -f -d 'Show deployed releases'
-complete -c helm -n '__helm_using_command list' -l failed -f -d 'Show failed releases'
-complete -c helm -n '__helm_using_command list' -s m -l max -x -d 'Maximum number of releases to fetch'
-complete -c helm -n '__helm_using_command list' -s o -l offset -x -a '(__helm_release_completions)' -d 'Next release name in the list'
-complete -c helm -n '__helm_using_command list' -s r -l reverse -f -d 'Reverse the sort order'
-complete -c helm -n '__helm_using_command list' -s q -l short -f -d 'Output short listing format'
-
-# helm package [flags] [CHART_PATH] [...]
-complete -c helm -n '__helm_using_command package' -l key -x -d 'Name of the key to use when signing'
-complete -c helm -n '__helm_using_command package' -l keyring -r -d 'Keyring containing public keys'
-complete -c helm -n '__helm_using_command package' -l save -f -d 'Save packaged chart to local chart repository'
-complete -c helm -n '__helm_using_command package' -l sign -f -d 'Use a PGP private key to sign this package'
-
-# helm repo [command]
-complete -c helm -n '__helm_using_command repo; and not __helm_seen_any_subcommand_from repo' -f -a '(__helm_subcommands repo)'
-
-# helm repo add [flags] [NAME] [URL]
-complete -c helm -n '__helm_using_command repo add' -l no-update -f -d 'Raise error if repo is already registered'
-
-# helm repo index [flags] [DIR]
-complete -c helm -n '__helm_using_command repo index' -l merge -x -d 'Merge the generated index into the given index'
-complete -c helm -n '__helm_using_command repo index' -l url -x -d 'URL of chart repository'
-
-# helm repo remove [flags] [NAME]
-complete -c helm -n '__helm_using_command repo remove' -f -a '(__helm_repositories)' -d Repository
-
-# helm rollback [RELEASE] [REVISION] [flags]
-complete -c helm -n '__helm_using_command rollback; and not __fish_seen_subcommand_from (__helm_releases)' -f -a '(__helm_release_completions)' -d Release
-complete -c helm -n '__helm_using_command rollback' -f -a '(__helm_release_revisions)' -d Revision
-
-complete -c helm -n '__helm_using_command rollback' -l dry-run -f -d 'Simulate a rollback'
-complete -c helm -n '__helm_using_command rollback' -l no-hooks -f -d 'Prevent hooks from running during rollback'
-
-# helm search [keyword] [flags]
-complete -c helm -n '__helm_using_command search' -s r -l regexp -f -d 'Use regular expressions for searching'
-complete -c helm -n '__helm_using_command search' -s l -l versions -f -d 'Show the long listing'
-
-# helm serve [flags]
-complete -c helm -n '__helm_using_command serve' -l address -x -d 'Address to listen on'
-complete -c helm -n '__helm_using_command serve' -l repo-path -r -d 'Path from which to serve charts'
-
-# helm status [flags] RELEASE
-complete -c helm -n '__helm_using_command status' -f -a '(__helm_release_completions)' -d Release
-
-complete -c helm -n '__helm_using_command status' -l revision -x -a '(__helm_release_revisions)' -d Revision
-
-# helm upgrade [RELEASE] [CHART] [flags]
-complete -c helm -n '__helm_using_command upgrade; and not __fish_seen_subcommand_from (__helm_releases)' -f -a '(__helm_release_completions)' -d Release
-complete -c helm -n '__helm_using_command upgrade; and __fish_seen_subcommand_from (__helm_releases); and not __fish_seen_subcommand_from (__helm_charts)' -a '(__helm_charts)' -d Chart
-
-complete -c helm -n '__helm_using_command upgrade' -l dry-run -f -d 'Simulate an upgrade'
-complete -c helm -n '__helm_using_command upgrade' -s i -l install -f -d "Run an install if the release don't exists"
-complete -c helm -n '__helm_using_command upgrade' -l keyring -r -d 'Keyring containing public keys'
-complete -c helm -n '__helm_using_command upgrade' -l namespace -x -a '(__helm_kube_namespaces)' -d Namespace
-complete -c helm -n '__helm_using_command upgrade' -l no-hooks -f -d 'Disable pre/post upgrade hooks'
-complete -c helm -n '__helm_using_command upgrade' -l set -x -d 'Set values on the command line'
-complete -c helm -n '__helm_using_command upgrade' -s f -l values -r -d 'Specify values in a YAML file'
-complete -c helm -n '__helm_using_command upgrade' -l verify -f -d 'Verify the provenance of the chart before upgrading'
-complete -c helm -n '__helm_using_command upgrade' -l version -x -a '(__helm_chart_versions)' -d 'Chart version'
-
-# helm verify [flags] PATH
-complete -c helm -n '__helm_using_command verify' -l keyring -r -d 'Keyring containing public keys'
-
-# helm version [flags]
-complete -c helm -n '__helm_using_command version' -s c -l client -f -d 'Show the client version'
-complete -c helm -n '__helm_using_command version' -s s -l server -f -d 'Show the server version'
+helm completion fish | source

From 34f4be1149eb3b475bd3b242727f27791f49a68c Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 14 Feb 2022 22:17:31 +0100
Subject: [PATCH 218/262] Update widecharwidth

This updates widechar_width.h to one generated from
15e782aa3df9dfef436516f66f745a90b421329.

The change here is a rationalization of doublewide vs widened-in-9.

Many emoji have been moved to widened-in-9 because we now use the
correct version (this uses the *emoji* version, and emoji version 3.0
corresponds to Unicode 9).
---
 src/widecharwidth/widechar_width.h | 163 +++++++++++++++--------------
 1 file changed, 84 insertions(+), 79 deletions(-)

diff --git a/src/widecharwidth/widechar_width.h b/src/widecharwidth/widechar_width.h
index cc849745a..b1a1f43ef 100644
--- a/src/widecharwidth/widechar_width.h
+++ b/src/widecharwidth/widechar_width.h
@@ -1,5 +1,5 @@
 /**
- * widechar_width.h, generated on 2022-01-01.
+ * widechar_width.h, generated on 2022-02-14.
  * See https://github.com/ridiculousfish/widecharwidth/
  *
  * SHA1 file hashes:
@@ -387,40 +387,7 @@ static const struct widechar_range widechar_combiningletters_table[] = {
 /* Width 2 characters. */
 static const struct widechar_range widechar_doublewide_table[] = {
     {0x01100, 0x0115F},
-    {0x0231A, 0x0231B},
     {0x02329, 0x0232A},
-    {0x023E9, 0x023EC},
-    {0x023F0, 0x023F0},
-    {0x023F3, 0x023F3},
-    {0x025FD, 0x025FE},
-    {0x02614, 0x02615},
-    {0x02648, 0x02653},
-    {0x0267F, 0x0267F},
-    {0x02693, 0x02693},
-    {0x026A1, 0x026A1},
-    {0x026AA, 0x026AB},
-    {0x026BD, 0x026BE},
-    {0x026C4, 0x026C5},
-    {0x026CE, 0x026CE},
-    {0x026D4, 0x026D4},
-    {0x026EA, 0x026EA},
-    {0x026F2, 0x026F3},
-    {0x026F5, 0x026F5},
-    {0x026FA, 0x026FA},
-    {0x026FD, 0x026FD},
-    {0x02705, 0x02705},
-    {0x0270A, 0x0270B},
-    {0x02728, 0x02728},
-    {0x0274C, 0x0274C},
-    {0x0274E, 0x0274E},
-    {0x02753, 0x02755},
-    {0x02757, 0x02757},
-    {0x02795, 0x02797},
-    {0x027B0, 0x027B0},
-    {0x027BF, 0x027BF},
-    {0x02B1B, 0x02B1C},
-    {0x02B50, 0x02B50},
-    {0x02B55, 0x02B55},
     {0x02E80, 0x02E99},
     {0x02E9B, 0x02EF3},
     {0x02F00, 0x02FD5},
@@ -457,46 +424,29 @@ static const struct widechar_range widechar_doublewide_table[] = {
     {0x1B150, 0x1B152},
     {0x1B164, 0x1B167},
     {0x1B170, 0x1B2FB},
-    {0x1F004, 0x1F004},
-    {0x1F0CF, 0x1F0CF},
-    {0x1F18E, 0x1F18E},
-    {0x1F191, 0x1F19A},
-    {0x1F200, 0x1F202},
-    {0x1F210, 0x1F23B},
+    {0x1F200, 0x1F200},
+    {0x1F202, 0x1F202},
+    {0x1F210, 0x1F219},
+    {0x1F21B, 0x1F22E},
+    {0x1F230, 0x1F231},
+    {0x1F237, 0x1F237},
+    {0x1F23B, 0x1F23B},
     {0x1F240, 0x1F248},
-    {0x1F250, 0x1F251},
     {0x1F260, 0x1F265},
-    {0x1F300, 0x1F320},
-    {0x1F32D, 0x1F335},
-    {0x1F337, 0x1F37C},
-    {0x1F37E, 0x1F393},
-    {0x1F3A0, 0x1F3CA},
-    {0x1F3CF, 0x1F3D3},
-    {0x1F3E0, 0x1F3F0},
-    {0x1F3F4, 0x1F3F4},
-    {0x1F3F8, 0x1F43E},
-    {0x1F440, 0x1F440},
-    {0x1F442, 0x1F4FC},
-    {0x1F4FF, 0x1F53D},
-    {0x1F54B, 0x1F54E},
-    {0x1F550, 0x1F567},
-    {0x1F595, 0x1F596},
-    {0x1F5FB, 0x1F64F},
-    {0x1F680, 0x1F6C5},
-    {0x1F6CC, 0x1F6CC},
-    {0x1F6D0, 0x1F6D0},
+    {0x1F57A, 0x1F57A},
+    {0x1F5A4, 0x1F5A4},
+    {0x1F6D1, 0x1F6D2},
     {0x1F6D5, 0x1F6D7},
     {0x1F6DD, 0x1F6DF},
-    {0x1F6EB, 0x1F6EC},
-    {0x1F6F9, 0x1F6FC},
+    {0x1F6F4, 0x1F6FC},
     {0x1F7E0, 0x1F7EB},
     {0x1F7F0, 0x1F7F0},
-    {0x1F90C, 0x1F918},
-    {0x1F93F, 0x1F93F},
-    {0x1F94D, 0x1F94F},
-    {0x1F96C, 0x1F984},
-    {0x1F998, 0x1F9CF},
-    {0x1F9E7, 0x1F9FF},
+    {0x1F90C, 0x1F90F},
+    {0x1F919, 0x1F93A},
+    {0x1F93C, 0x1F945},
+    {0x1F947, 0x1F97F},
+    {0x1F985, 0x1F9BF},
+    {0x1F9C1, 0x1F9FF},
     {0x1FA70, 0x1FA74},
     {0x1FA78, 0x1FA7C},
     {0x1FA80, 0x1FA86},
@@ -1437,17 +1387,72 @@ static const struct widechar_range widechar_nonchar_table[] = {
 
 /* Characters that were widened from width 1 to 2 in Unicode 9. */
 static const struct widechar_range widechar_widened_table[] = {
-    {0x1F57A, 0x1F57A},
-    {0x1F5A4, 0x1F5A4},
-    {0x1F6D1, 0x1F6D2},
-    {0x1F6F4, 0x1F6F8},
-    {0x1F919, 0x1F93A},
-    {0x1F93C, 0x1F93E},
-    {0x1F940, 0x1F945},
-    {0x1F947, 0x1F94C},
-    {0x1F950, 0x1F96B},
-    {0x1F985, 0x1F997},
-    {0x1F9D0, 0x1F9E6}
+    {0x0231A, 0x0231B},
+    {0x023E9, 0x023EC},
+    {0x023F0, 0x023F0},
+    {0x023F3, 0x023F3},
+    {0x025FD, 0x025FE},
+    {0x02614, 0x02615},
+    {0x02648, 0x02653},
+    {0x0267F, 0x0267F},
+    {0x02693, 0x02693},
+    {0x026A1, 0x026A1},
+    {0x026AA, 0x026AB},
+    {0x026BD, 0x026BE},
+    {0x026C4, 0x026C5},
+    {0x026CE, 0x026CE},
+    {0x026D4, 0x026D4},
+    {0x026EA, 0x026EA},
+    {0x026F2, 0x026F3},
+    {0x026F5, 0x026F5},
+    {0x026FA, 0x026FA},
+    {0x026FD, 0x026FD},
+    {0x02705, 0x02705},
+    {0x0270A, 0x0270B},
+    {0x02728, 0x02728},
+    {0x0274C, 0x0274C},
+    {0x0274E, 0x0274E},
+    {0x02753, 0x02755},
+    {0x02757, 0x02757},
+    {0x02795, 0x02797},
+    {0x027B0, 0x027B0},
+    {0x027BF, 0x027BF},
+    {0x02B1B, 0x02B1C},
+    {0x02B50, 0x02B50},
+    {0x02B55, 0x02B55},
+    {0x1F004, 0x1F004},
+    {0x1F0CF, 0x1F0CF},
+    {0x1F18E, 0x1F18E},
+    {0x1F191, 0x1F19A},
+    {0x1F201, 0x1F201},
+    {0x1F21A, 0x1F21A},
+    {0x1F22F, 0x1F22F},
+    {0x1F232, 0x1F236},
+    {0x1F238, 0x1F23A},
+    {0x1F250, 0x1F251},
+    {0x1F300, 0x1F320},
+    {0x1F32D, 0x1F335},
+    {0x1F337, 0x1F37C},
+    {0x1F37E, 0x1F393},
+    {0x1F3A0, 0x1F3CA},
+    {0x1F3CF, 0x1F3D3},
+    {0x1F3E0, 0x1F3F0},
+    {0x1F3F4, 0x1F3F4},
+    {0x1F3F8, 0x1F43E},
+    {0x1F440, 0x1F440},
+    {0x1F442, 0x1F4FC},
+    {0x1F4FF, 0x1F53D},
+    {0x1F54B, 0x1F54E},
+    {0x1F550, 0x1F567},
+    {0x1F595, 0x1F596},
+    {0x1F5FB, 0x1F64F},
+    {0x1F680, 0x1F6C5},
+    {0x1F6CC, 0x1F6CC},
+    {0x1F6D0, 0x1F6D0},
+    {0x1F6EB, 0x1F6EC},
+    {0x1F910, 0x1F918},
+    {0x1F980, 0x1F984},
+    {0x1F9C0, 0x1F9C0}
 };
 
 template<typename Collection>

From b48d8188b9446cb43f31a0191d059f001d186a22 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 14 Feb 2022 22:31:30 +0100
Subject: [PATCH 219/262] Change our test emoji

The emoji we used wasn't actually widened-in-9, so we now switch to
one that does.
---
 tests/checks/string.fish | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/checks/string.fish b/tests/checks/string.fish
index 8aaa400dd..7ffe2d427 100644
--- a/tests/checks/string.fish
+++ b/tests/checks/string.fish
@@ -93,11 +93,11 @@ string length --visible (set_color red)abc
 begin
     set -l fish_emoji_width 2
     # This should print the emoji width
-    string length --visible . 🥁
+    string length --visible . \U2693
     # CHECK: 1
     # CHECK: 2
     set -l fish_emoji_width 1
-    string length --visible . 🥁
+    string length --visible . \U2693
     # CHECK: 1
     # CHECK: 1
 end

From d1600211e5e1e6f61085159373432562f53973b9 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Mon, 14 Feb 2022 16:18:16 -0800
Subject: [PATCH 220/262] Docs: Posix -> POSIX

---
 doc_src/design.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc_src/design.rst b/doc_src/design.rst
index 8fcc7edb9..885fa3d9e 100644
--- a/doc_src/design.rst
+++ b/doc_src/design.rst
@@ -9,7 +9,7 @@ This is a description of the design principles that have been used to design fis
 
 2. Fish should be user friendly, but not at the expense of expressiveness. Most tradeoffs between power and ease of use can be avoided with careful design.
 
-3. Whenever possible without breaking the above goals, fish should follow the Posix syntax.
+3. Whenever possible without breaking the above goals, fish should follow POSIX.
 
 To achieve these high-level goals, the fish design relies on a number of more specific design principles. These are presented below, together with a rationale and a few examples for each.
 

From 9d6b8266f452103c247f824b8c16704ea1fb0571 Mon Sep 17 00:00:00 2001
From: Jose Riha <jose1711@gmail.com>
Date: Tue, 15 Feb 2022 09:34:25 +0100
Subject: [PATCH 221/262] Fix typo (fist -> first)

---
 po/pt_BR.po                 | 6 +-----
 share/completions/uniq.fish | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4f5fd2d87..0ccafeb70 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -18,7 +18,7 @@ msgstr ""
 "Project-Id-Version: fish 1.21.8\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-11-13 10:00-0300\n"
-"PO-Revision-Date: 2015-10-11 20:35-0300\n"
+"PO-Revision-Date: 2022-02-15 13:24+0100\n"
 "Last-Translator: Fábio Nogueira <deb-user-ba@ubuntu.com>\n"
 "Language-Team: Português Brasileiro <>\n"
 "Language: pt_BR\n"
@@ -73519,10 +73519,6 @@ msgstr ""
 msgid "Precede each output line with count of its occurrence"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/uniq.fish:14
-msgid "Avoid comparing fist N characters"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/uniq.fish:16
 msgid "Case insensitive comparision"
 msgstr ""
diff --git a/share/completions/uniq.fish b/share/completions/uniq.fish
index 7693c9517..71d657da2 100644
--- a/share/completions/uniq.fish
+++ b/share/completions/uniq.fish
@@ -17,7 +17,7 @@ else # BSD
     complete -c uniq -s c -d 'Precede each output line with count of its occurrence'
     complete -c uniq -s d -d 'Only print duplicates'
     complete -c uniq -s f -d 'Avoid comparing first N fields' -x
-    complete -c uniq -s s -d 'Avoid comparing fist N characters' -x
+    complete -c uniq -s s -d 'Avoid comparing first N characters' -x
     complete -c uniq -s u -d 'Only print unique lines'
     complete -c uniq -s i -d 'Case insensitive comparision'
 end

From 1b7a43877bfa4a01f2f49e9ef46cad9a8649d801 Mon Sep 17 00:00:00 2001
From: Spenser Black <spenserblack01@gmail.com>
Date: Tue, 15 Feb 2022 14:35:56 -0500
Subject: [PATCH 222/262] Disabled line length limit in `share/`

Many of the lines in `share/functions` and `share/completions` violate the max
line length, and it can be annoying to try to maintain consistency while
fighting against the editor trying to wrap lines.
---
 .editorconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index 5aad22212..a5c417ee6 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -21,5 +21,8 @@ indent_size = 2
 [Dockerfile]
 indent_size = 2
 
+[share/{completions,functions}/**.fish]
+max_line_length = none
+
 [COMMIT_EDITMSG]
 max_line_length = 80

From d0667e9e88a29ec8e884e01819012ddd5d52724b Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 16 Feb 2022 15:07:06 +0100
Subject: [PATCH 223/262] disco prompt: Use $hostname

---
 share/tools/web_config/sample_prompts/disco.fish | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/share/tools/web_config/sample_prompts/disco.fish b/share/tools/web_config/sample_prompts/disco.fish
index 769c9700c..a9fe94764 100644
--- a/share/tools/web_config/sample_prompts/disco.fish
+++ b/share/tools/web_config/sample_prompts/disco.fish
@@ -47,8 +47,7 @@ function fish_prompt
                 command -sq systemd-detect-virt
                 and systemd-detect-virt -q
             end
-            set -l host (hostname)
-            set prompt_host $usercolor$USER$normal@(set_color $fish_color_host)$host$normal":"
+            set prompt_host $usercolor$USER$normal@(set_color $fish_color_host)$hostname$normal":"
         end
     end
 

From d485ed3d87cd843f72e7a85e7725cb9d6aa17ea0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Zaj=C4=85czkowski?=
 <148013+szpak@users.noreply.github.com>
Date: Wed, 16 Feb 2022 00:06:08 +0100
Subject: [PATCH 224/262] Add gnome-extensions completion

---
 share/completions/gnome-extensions.fish | 80 +++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 share/completions/gnome-extensions.fish

diff --git a/share/completions/gnome-extensions.fish b/share/completions/gnome-extensions.fish
new file mode 100644
index 000000000..fcddf3390
--- /dev/null
+++ b/share/completions/gnome-extensions.fish
@@ -0,0 +1,80 @@
+# Fish completion for gnome-extensions
+
+function __fish_gnome-extensions_complete_all_extensions
+  gnome-extensions list
+end
+
+function __fish_gnome-extensions_complete_enabled_extensions
+  gnome-extensions list --enabled
+end
+
+function __fish_gnome-extensions_complete_disabled_extensions
+  gnome-extensions list --disabled
+end
+
+function __fish_gnome-extensions_complete_enabled_extensions_with_preferences
+  gnome-extensions list --enabled --prefs | sort
+end
+
+function __fish_gnome-extensions_complete_disabled_extensions_with_preferences
+  gnome-extensions list --disabled --prefs | sort
+end
+
+set -l commands_with_quiet enable disable reset uninstall list info show prefs create pack install
+set -l commands help version $commands_with_quiet
+set -l commands_without_help version $commands_with_quiet
+
+complete -f -c gnome-extensions
+
+complete -c gnome-extensions -n "not __fish_seen_subcommand_from $commands" -a "help" -d "Print help"
+complete -c gnome-extensions -n "not __fish_seen_subcommand_from $commands" -a "version" -d "Print version"
+complete -c gnome-extensions -n "not __fish_seen_subcommand_from $commands" -a "enable" -d "Enable extension"
+complete -c gnome-extensions -n "not __fish_seen_subcommand_from $commands" -a "disable" -d "Disable extension"
+complete -c gnome-extensions -n "not __fish_seen_subcommand_from $commands" -a "reset" -d "Reset extension"
+complete -c gnome-extensions -n "not __fish_seen_subcommand_from $commands" -a "uninstall" -d "Uninstall extension"
+complete -c gnome-extensions -n "not __fish_seen_subcommand_from $commands" -a "list" -d "List extensions"
+complete -c gnome-extensions -n "not __fish_seen_subcommand_from $commands" -a "info show" -d "Show extension info"
+complete -c gnome-extensions -n "not __fish_seen_subcommand_from $commands" -a "prefs" -d "Open extension preferences"
+complete -c gnome-extensions -n "not __fish_seen_subcommand_from $commands" -a "create" -d "Create extension"
+complete -c gnome-extensions -n "not __fish_seen_subcommand_from $commands" -a "pack" -d "Package extension"
+complete -c gnome-extensions -n "not __fish_seen_subcommand_from $commands" -a "install" -d "Install extension bundle"
+
+complete -c gnome-extensions -n "__fish_seen_subcommand_from help && not __fish_seen_subcommand_from $commands_without_help" -a "$commands"
+complete -c gnome-extensions -n "__fish_seen_subcommand_from enable && not __fish_seen_subcommand_from (__fish_gnome-extensions_complete_disabled_extensions)" -a "(__fish_gnome-extensions_complete_disabled_extensions)"
+complete -c gnome-extensions -n "__fish_seen_subcommand_from disable && not __fish_seen_subcommand_from (__fish_gnome-extensions_complete_enabled_extensions)" -a "(__fish_gnome-extensions_complete_enabled_extensions)"
+complete -c gnome-extensions -n "__fish_seen_subcommand_from reset && not __fish_seen_subcommand_from (__fish_gnome-extensions_complete_all_extensions)" -a "(__fish_gnome-extensions_complete_all_extensions)"
+complete -c gnome-extensions -n "__fish_seen_subcommand_from uninstall && not __fish_seen_subcommand_from (__fish_gnome-extensions_complete_all_extensions)" -a "(__fish_gnome-extensions_complete_all_extensions)"
+
+complete -c gnome-extensions -n "__fish_seen_subcommand_from list" -l user -d "Show user-installed extensions"
+complete -c gnome-extensions -n "__fish_seen_subcommand_from list" -l system -d "Show system-installed extensions"
+complete -c gnome-extensions -n "__fish_seen_subcommand_from list" -l enabled -d "Show enabled extensions"
+complete -c gnome-extensions -n "__fish_seen_subcommand_from list" -l disabled -d "Show disabled extensions"
+complete -c gnome-extensions -n "__fish_seen_subcommand_from list" -l prefs -d "Show extensions with preferences"
+complete -c gnome-extensions -n "__fish_seen_subcommand_from list" -l updates -d "Show extensions with updates"
+complete -c gnome-extensions -n "__fish_seen_subcommand_from list" -s d -l details -d "Print extension details"
+
+complete -c gnome-extensions -n "__fish_seen_subcommand_from info show && not __fish_seen_subcommand_from (__fish_gnome-extensions_complete_enabled_extensions)" -a "(__fish_gnome-extensions_complete_enabled_extensions)" -d "Enabled"
+complete -c gnome-extensions -n "__fish_seen_subcommand_from info show && not __fish_seen_subcommand_from (__fish_gnome-extensions_complete_disabled_extensions)" -a "(__fish_gnome-extensions_complete_disabled_extensions)" -d "Disabled"
+
+complete --keep-order -c gnome-extensions -n "__fish_seen_subcommand_from prefs && not __fish_seen_subcommand_from (__fish_gnome-extensions_complete_disabled_extensions_with_preferences) (__fish_gnome-extensions_complete_enabled_extensions_with_preferences)" -a "(__fish_gnome-extensions_complete_disabled_extensions_with_preferences)" -d "Disabled"
+complete --keep-order -c gnome-extensions -n "__fish_seen_subcommand_from prefs && not __fish_seen_subcommand_from (__fish_gnome-extensions_complete_disabled_extensions_with_preferences) (__fish_gnome-extensions_complete_enabled_extensions_with_preferences)" -a "(__fish_gnome-extensions_complete_enabled_extensions_with_preferences)" -d "Enabled"
+
+complete -x -c gnome-extensions -n "__fish_seen_subcommand_from create && not __fish_seen_argument -l uuid" -l uuid -d "The unique identifier of the new extension"
+complete -x -c gnome-extensions -n "__fish_seen_subcommand_from create && not __fish_seen_argument -l name" -l name -d "The user-visible name of the new extension"
+complete -x -c gnome-extensions -n "__fish_seen_subcommand_from create && not __fish_seen_argument -l description" -l description -d "A short description of what the extension does"
+complete -x -c gnome-extensions -n "__fish_seen_subcommand_from create && not __fish_seen_argument -l template" -l template -d "The template to use for the new extension"
+complete -c gnome-extensions -n "__fish_seen_subcommand_from create && not __fish_seen_argument -s i -l interactive" -s i -l interactive -d "Enter extension information interactively"
+
+complete -x -c gnome-extensions -n "__fish_seen_subcommand_from pack && not __fish_seen_argument -l extra-source" -l extra-source -d "Additional source to include in the bundle"
+complete -x -c gnome-extensions -n "__fish_seen_subcommand_from pack && not __fish_seen_argument -l schema" -l schema -d "A GSettings schema that should be included"
+complete -x -c gnome-extensions -n "__fish_seen_subcommand_from pack && not __fish_seen_argument -l podir" -l podir -d "The directory where translations are found"
+complete -x -c gnome-extensions -n "__fish_seen_subcommand_from pack && not __fish_seen_argument -l gettext-domain" -l gettext-domain -d "The gettext domain to use for translations"
+complete -c gnome-extensions -n "__fish_seen_subcommand_from pack && not __fish_seen_argument -s f -l force" -s f -l force -d "Overwrite an existing pack"
+complete -c gnome-extensions -n "__fish_seen_subcommand_from pack && not __fish_seen_argument -s o -l out-dir" -s o -l out-dir -d "The directory where the pack should be created"
+complete -c gnome-extensions -n "__fish_seen_subcommand_from pack" -a "(__fish_complete_directories)" -d "Source directory"
+
+complete -c gnome-extensions -n "__fish_seen_subcommand_from install && not __fish_seen_argument -s f" -s f -l force -d "Overwrite an existing extension"
+complete -F -c gnome-extensions -n "__fish_seen_subcommand_from install" -d "Extension bundle"
+
+complete -c gnome-extensions -n "__fish_seen_subcommand_from $commands_with_quiet" -s q -l quiet -d "Do not print error messages"
+

From 5af1e6444160de6a1cc63fffe25037cbde93198e Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 18 Feb 2022 15:30:23 +0100
Subject: [PATCH 225/262] Explain the issues of setting fish as login shell

Also stop explaining this in three places. In particular this removes
an FAQ entry.

Fixes #8078
---
 doc_src/faq.rst                               | 18 -------------
 doc_src/index.rst                             | 23 ++++++++++++++---
 .../python_docs_theme/static/pydoctheme.css   |  2 +-
 doc_src/tutorial.rst                          | 25 +------------------
 4 files changed, 21 insertions(+), 47 deletions(-)

diff --git a/doc_src/faq.rst b/doc_src/faq.rst
index 6b31d03fb..1fbe536a0 100644
--- a/doc_src/faq.rst
+++ b/doc_src/faq.rst
@@ -343,24 +343,6 @@ This also means that a few things are unsupportable:
 - Non-monospace fonts - there is *no way* for fish to figure out what width a specific character has as it has no influence on the terminal's font rendering.
 - Different widths for multiple ambiguous width characters - there is no way for fish to know which width you assign to each character.
 
-How do I make fish my default shell?
-------------------------------------
-If you installed fish manually (e.g. by compiling it, not by using a package manager), you first need to add fish to the list of shells by executing the following command (assuming you installed fish in /usr/local)::
-
-    echo /usr/local/bin/fish | sudo tee -a /etc/shells
-
-
-If you installed a prepackaged version of fish, the package manager should have already done this for you.
-
-In order to change your default shell, type::
-
-    chsh -s /usr/local/bin/fish
-
-
-You may need to adjust the above path to e.g. ``/usr/bin/fish``. Use the command ``which fish`` if you are unsure of where fish is installed.
-
-Unfortunately, there is no way to make the changes take effect at once. You will need to log out and back in again.
-
 .. _faq-uninstalling:
 
 Uninstalling fish
diff --git a/doc_src/index.rst b/doc_src/index.rst
index e61f74746..9232f215f 100644
--- a/doc_src/index.rst
+++ b/doc_src/index.rst
@@ -56,15 +56,30 @@ Once fish has been installed, open a terminal. If fish is not the default shell:
 
     > exit
 
+.. _default-shell:
+
 Default Shell
 -------------
 
-To make fish your default shell:
+There are multiple ways to switch to fish (or any other shell) as your default.
 
-- Add the line ``/usr/local/bin/fish`` to ``/etc/shells``.
-- Change your default shell with ``chsh -s /usr/local/bin/fish``.
+The simpler is to set your terminal to start fish. See its configuration and set the program to start to ``/usr/local/bin/fish`` (if that's where fish is installed - substitute another location as appropriate).
 
-For detailed instructions see :ref:`Switching to fish <switching-to-fish>`.
+The more involved and complete way is to set fish as your login shell. To do that, you need to:
+
+1. Add the shell to ``/etc/shells`` with::
+
+    > echo /usr/local/bin/fish | sudo tee -a /etc/shells
+
+2. Change your default shell with::
+
+    > chsh -s /usr/local/bin/fish
+
+Again, substitute the path to fish for /usr/local/bin/fish - see ``command -s fish`` inside fish. To change it back to another shell, just substitute ``/usr/local/bin/fish`` with ``/bin/bash``, ``/bin/tcsh`` or ``/bin/zsh`` as appropriate in the steps above.
+
+.. warning::
+
+   Setting fish as your login shell may have issues, because some operating systems (including a bunch of linux distributions) only do some of their configuration in shell startup files like /etc/profile. So you could notice e.g. $PATH being wrong, and you would have to redo that setup.
 
 Uninstalling
 ------------
diff --git a/doc_src/python_docs_theme/static/pydoctheme.css b/doc_src/python_docs_theme/static/pydoctheme.css
index 8cc9cb8b1..f34217dad 100644
--- a/doc_src/python_docs_theme/static/pydoctheme.css
+++ b/doc_src/python_docs_theme/static/pydoctheme.css
@@ -111,7 +111,7 @@ div.documentwrapper {
     float: none;
 }
 
-div.document, div.body {
+div.document, div.body, div.warning {
     background-color: inherit;
     color: inherit;
 }
diff --git a/doc_src/tutorial.rst b/doc_src/tutorial.rst
index 4fdc05718..cbab7ed55 100644
--- a/doc_src/tutorial.rst
+++ b/doc_src/tutorial.rst
@@ -29,7 +29,7 @@ which means you are all set up and can start using fish::
 
 This prompt that you see above is the fish default prompt: it shows your username, hostname, and working directory.
 - to change this prompt see :ref:`how to change your prompt <prompt>`
-- to switch to fish permanently see :ref:`switch your default shell to fish <switching-to-fish>`.
+- to switch to fish permanently see :ref:`Default Shell <default-shell>`.
 
 From now on, we'll pretend your prompt is just a ``>`` to save space.
 
@@ -765,29 +765,6 @@ Now in another shell::
     vim
 
 
-.. _switching-to-fish:
-
-Switching to fish?
-------------------
-
-If you wish to use fish (or any other shell) as your default shell,
-you need to enter your new shell's executable in two places.
-
-Add the shell to ``/etc/shells`` with::
-
-    > echo /usr/local/bin/fish | sudo tee -a /etc/shells
-
-
-Change your default shell with::
-
-    > chsh -s /usr/local/bin/fish
-
-This assumes you installed fish to /usr/local/bin, which is the default location when you've compiled it yourself. If you installed it with a package manager, the usual location is /usr/bin/fish, but package managers typically already add it to /etc/shells. Just substitute the correct location.
-
-(To change it back to another shell, just substitute ``/usr/local/bin/fish``
-with ``/bin/bash``, ``/bin/tcsh`` or ``/bin/zsh`` as appropriate in the steps above.)
-
-
 Ready for more?
 ---------------
 

From 63d7386a36aa3a0fe40ef0fe0c1c1f1c1e9b73e5 Mon Sep 17 00:00:00 2001
From: Spenser Black <spenserblack01@gmail.com>
Date: Wed, 9 Feb 2022 11:40:45 -0500
Subject: [PATCH 226/262] completions/gpg: list only secret for gpg options
 that manage secret keys

Some GPG options work only with private keys but our completions suggest all
keys.  Modify `__fish_complete_gpg_user_id and __fish_complete_gpg_key_id`
to take an optional argument for the "key type" to override `--list-keys`
with like `--list-secret-keys` for the appropriate options.

Closes #8712
---
 share/functions/__fish_complete_gpg.fish         | 10 +++++-----
 share/functions/__fish_complete_gpg_key_id.fish  |  8 +++++---
 share/functions/__fish_complete_gpg_user_id.fish |  5 +++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/share/functions/__fish_complete_gpg.fish b/share/functions/__fish_complete_gpg.fish
index 82a83f14a..76dc15521 100644
--- a/share/functions/__fish_complete_gpg.fish
+++ b/share/functions/__fish_complete_gpg.fish
@@ -47,7 +47,7 @@ function __fish_complete_gpg -d "Internal function for gpg completion code dedup
         complete -c $__fish_complete_gpg_command -l skip-hidden-recipients -d "During decryption, skip all anonymous recipients"
         complete -c $__fish_complete_gpg_command -l tofu-default-policy -xa "auto good unknown bad ask" -d "Set the default TOFU policy"
         complete -c $__fish_complete_gpg_command -l tofu-policy -xa "auto good unknown bad ask" -d "Set the default TOFU policy for the specified keys"
-        complete -c $__fish_complete_gpg_command -l try-secret-key -xa "(__fish_complete_gpg_key_id $__fish_complete_gpg_command)" -d "Specify keys to be used for trial decryption"
+        complete -c $__fish_complete_gpg_command -l try-secret-key -xa "(__fish_complete_gpg_key_id $__fish_complete_gpg_command --list-secret-keys)" -d "Specify keys to be used for trial decryption"
 
         complete -c $__fish_complete_gpg_command -l with-icao-spelling -d "Print the ICAO spelling of the fingerprint in addition to the hex digits"
         complete -c $__fish_complete_gpg_command -l with-key-origin -d "Include the locally held information on the origin and last update of a key in a key listing"
@@ -101,7 +101,7 @@ function __fish_complete_gpg -d "Internal function for gpg completion code dedup
 
     complete -c $__fish_complete_gpg_command -s k -l list-keys -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "List all keys from the public keyrings, or just the ones given on the command line"
     complete -c $__fish_complete_gpg_command -l list-public-keys -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "List all keys from the public keyrings, or just the ones given on the command line"
-    complete -c $__fish_complete_gpg_command -s K -l list-secret-keys -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "List all keys from the secret keyrings, or just the ones given on the command line"
+    complete -c $__fish_complete_gpg_command -s K -l list-secret-keys -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command --list-secret-keys)" -d "List all keys from the secret keyrings, or just the ones given on the command line"
     complete -c $__fish_complete_gpg_command -l list-sigs -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Same as --list-keys, but the signatures are listed too"
 
     complete -c $__fish_complete_gpg_command -l check-sigs -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Same as --list-keys, but the signatures are listed and verified"
@@ -116,9 +116,9 @@ function __fish_complete_gpg -d "Internal function for gpg completion code dedup
     complete -c $__fish_complete_gpg_command -l lsign-key -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Sign a public key with your secret key but mark it as non exportable"
 
     complete -c $__fish_complete_gpg_command -l delete-key -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Remove key from the public keyring"
-    complete -c $__fish_complete_gpg_command -l delete-secret-key -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Remove key from the secret and public keyring"
+    complete -c $__fish_complete_gpg_command -l delete-secret-key -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command --list-secret-keys)" -d "Remove key from the secret and public keyring"
     complete -c $__fish_complete_gpg_command -l delete-keys -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Remove key from the public keyring"
-    complete -c $__fish_complete_gpg_command -l delete-secret-keys -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Remove key from the secret and public keyring"
+    complete -c $__fish_complete_gpg_command -l delete-secret-keys -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command --list-secret-keys)" -d "Remove key from the secret and public keyring"
     complete -c $__fish_complete_gpg_command -l delete-secret-and-public-key -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Same as --delete-key, but if a secret key exists, it will be removed first"
 
     complete -c $__fish_complete_gpg_command -l gen-revoke -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Generate a revocation certificate for the complete key"
@@ -127,7 +127,7 @@ function __fish_complete_gpg -d "Internal function for gpg completion code dedup
     complete -c $__fish_complete_gpg_command -l export -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d 'Export all or the given keys from all keyrings'
     complete -c $__fish_complete_gpg_command -l export-ssh-key -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d 'Export all or the given keys in OpenSSH format'
     complete -c $__fish_complete_gpg_command -l send-keys -xa "(__fish_complete_gpg_key_id $__fish_complete_gpg_command)" -d "Same as --export but sends the keys to a keyserver"
-    complete -c $__fish_complete_gpg_command -l export-secret-keys -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Same as --export, but exports the secret keys instead"
+    complete -c $__fish_complete_gpg_command -l export-secret-keys -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command --list-secret-keys)" -d "Same as --export, but exports the secret keys instead"
     complete -c $__fish_complete_gpg_command -l export-secret-subkeys -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Same as --export, but exports the secret keys instead"
 
     complete -c $__fish_complete_gpg_command -l import -d 'Import/merge keys'
diff --git a/share/functions/__fish_complete_gpg_key_id.fish b/share/functions/__fish_complete_gpg_key_id.fish
index 1993053ff..084601a82 100644
--- a/share/functions/__fish_complete_gpg_key_id.fish
+++ b/share/functions/__fish_complete_gpg_key_id.fish
@@ -1,16 +1,18 @@
 # Helper function for contextual autocompletion of GPG key ids
 
-function __fish_complete_gpg_key_id -d 'Complete using gpg key ids' -a __fish_complete_gpg_command
+function __fish_complete_gpg_key_id -d 'Complete using gpg key ids' -a __fish_complete_gpg_command list_arg
     # Use user id as description
     set -l keyid
-    $__fish_complete_gpg_command --list-keys --with-colons | while read -l garbage
+    set -q list_arg[1]; or set list_arg --list-keys
+    $__fish_complete_gpg_command $list_arg --with-colons | while read -l garbage
         switch $garbage
             case "uid*"
                 # Extract user ids (note: gpg escapes colons as '\x3a')
                 set -l __uid (string split ":" -- $garbage)
                 set -l uid (string replace -a '\x3a' ':' -- $__uid[10])
                 printf "%s\t%s\n" $keyid $uid
-            case "pub*"
+            # NOTE key is preceded by "sec" instead of "pub" when listing secret keys
+            case "pub*" "sec*"
                 # Extract key fingerprints (no subkeys)
                 set -l __pub (string split ":" -- $garbage)
                 set keyid $__pub[5]
diff --git a/share/functions/__fish_complete_gpg_user_id.fish b/share/functions/__fish_complete_gpg_user_id.fish
index 449b72f9f..b43e6c5fd 100644
--- a/share/functions/__fish_complete_gpg_user_id.fish
+++ b/share/functions/__fish_complete_gpg_user_id.fish
@@ -1,11 +1,12 @@
 # Helper function for contextual autocompletion of gpg user ids
 
-function __fish_complete_gpg_user_id -d "Complete using gpg user ids" -a __fish_complete_gpg_command
+function __fish_complete_gpg_user_id -d "Complete using gpg user ids" -a __fish_complete_gpg_command list_arg
     # gpg doesn't seem to like it when you use the whole key name as a
     # completion, so we skip the <EMAIL> part and use it as a description.
     # It also replaces \x3a from gpg's output with colons.
     #
     # TODO: I tried with <EMAIL> and it worked, this was possibly fixed in gpg.
     # Regardless, it's probably nicer as a description.
-    $__fish_complete_gpg_command --list-keys --with-colon | string split -a -f 10 : | string replace '\x3a' : | string replace -r '(.*) <(.*)>' '$1\t$2'
+    set -q list_arg[1]; or set list_arg --list-keys
+    $__fish_complete_gpg_command $list_arg --with-colon | string split -a -f 10 : | string replace '\x3a' : | string replace -r '(.*) <(.*)>' '$1\t$2'
 end

From 2f5edfd617942a848bfc476eb54771e29df98e77 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sat, 19 Feb 2022 14:10:47 +0100
Subject: [PATCH 227/262] Call pthread_attr_destroy even if pthread_create
 failed

As suggested in
https://github.com/fish-shell/fish-shell/commit/63bfab9975a9023adbd22a18a60b6ad0ca48a0c1#commitcomment-66542462

Also, check for errors.
---
 src/iothread.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/iothread.cpp b/src/iothread.cpp
index 429522fa7..1ba046627 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -362,10 +362,14 @@ bool make_detached_pthread(void *(*func)(void *), void *param) {
         err = pthread_create(&thread, &thread_attr, func, param);
         if (err == 0) {
             FLOGF(iothread, "pthread %d spawned", thread);
-            pthread_attr_destroy(&thread_attr);
         } else {
             perror("pthread_create");
         }
+        int err2 = pthread_attr_destroy(&thread_attr);
+        if (err2 != 0) {
+            perror("pthread_attr_destroy");
+            err = err2;
+        }
     } else {
         perror("pthread_attr_setdetachstate");
     }

From e0bc944d5c580fc39e9a3f159ef80caa3823dc16 Mon Sep 17 00:00:00 2001
From: exploide <me@exploide.net>
Date: Wed, 16 Feb 2022 19:41:16 +0100
Subject: [PATCH 228/262] added kubectl completion

---
 share/completions/kubectl.fish | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 share/completions/kubectl.fish

diff --git a/share/completions/kubectl.fish b/share/completions/kubectl.fish
new file mode 100644
index 000000000..75ae15557
--- /dev/null
+++ b/share/completions/kubectl.fish
@@ -0,0 +1 @@
+kubectl completion fish | source

From 6fcb6f77be8e5d6cdcc1447cbf5383db7394400a Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 21 Feb 2022 22:43:36 +0100
Subject: [PATCH 229/262] Revert changes to time formatting

This reverts commits:

2d9e51b43e8f0dd73a87e12f1abc74f99f8ff5f3
d1d9f147ec4cc82e0319da0ede642976e117034c
346ce8081ba8ac4460d4da27abd9fe6701ab7dcb

The box drawing because it's entangled with the rest and we don't
currently use this anywhere I know of. Nor was it gated on terminfo,
so it could have broken things, for subjectively little gain.

Fixes #8727.
---
 src/fish_tests.cpp     | 13 +++++-----
 src/timer.cpp          | 57 ++++++++++++++++--------------------------
 tests/checks/time.fish | 28 ++++++++++-----------
 3 files changed, 43 insertions(+), 55 deletions(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 226dcb362..646cfcdac 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -6619,17 +6619,18 @@ static void test_timer_format() {
     t2.cpu_children.ru_stime.tv_usec = 500;
     t2.wall += std::chrono::microseconds(500);
     auto expected =
-        L"\x1b(0qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq\x1b(B\n"
-"Executed in  500.00 μs     fish        external\n"
-"   usr time    1.00 sec    1.00 sec    1.00 ms\n"
-"   sys time    1.00 sec    1.00 sec    0.50 ms";
-  //        (a)            (b)            (c)
+        LR"(
+________________________________________________________
+Executed in  500.00 micros    fish         external
+   usr time    1.00 secs      1.00 secs    1.00 millis
+   sys time    1.00 secs      1.00 secs    0.50 millis
+)";  //        (a)            (b)            (c)
      // (a) remaining columns should align even if there are different units
      // (b) carry to the next unit when it would overflow %6.2F
      // (c) carry to the next unit when the larger one exceeds 1000
     std::wstring actual = timer_snapshot_t::print_delta(t1, t2, true);
     if (actual != expected) {
-        err(L"Failed to format timer snapshot\nExpected:\n %ls\nActual:\n %ls\n", expected,
+        err(L"Failed to format timer snapshot\nExpected: %ls\nActual:%ls\n", expected,
             actual.c_str());
     }
     setlocale(LC_NUMERIC, saved_locale);
diff --git a/src/timer.cpp b/src/timer.cpp
index 1fac5feaf..3906afc52 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -11,19 +11,6 @@
 #include <cstddef>
 #include <ctime>
 
-#if HAVE_CURSES_H
-#include <curses.h>
-#elif HAVE_NCURSES_H
-#include <ncurses.h>
-#elif HAVE_NCURSES_CURSES_H
-#include <ncurses/curses.h>
-#endif
-#if HAVE_TERM_H
-#include <term.h>
-#elif HAVE_NCURSES_TERM_H
-#include <ncurses/term.h>
-#endif
-
 #include "builtin.h"
 #include "common.h"
 #include "exec.h"
@@ -126,31 +113,31 @@ wcstring timer_snapshot_t::print_delta(const timer_snapshot_t &t1, const timer_s
     auto unit_name = [](tunit unit) {
         switch (unit) {
             case tunit::minutes:
-                return L"minutes";
+                return "minutes";
             case tunit::seconds:
-                return L"seconds";
+                return "seconds";
             case tunit::milliseconds:
-                return L"milliseconds";
+                return "milliseconds";
             case tunit::microseconds:
-                return L"microseconds";
+                return "microseconds";
         }
         // GCC does not recognize the exhaustive switch above
-        return L"";
+        return "";
     };
 
     auto unit_short_name = [](tunit unit) {
         switch (unit) {
             case tunit::minutes:
-                return L"min";
+                return "mins";
             case tunit::seconds:
-                return L"sec";
+                return "secs";
             case tunit::milliseconds:
-                return L"ms";
+                return "millis";
             case tunit::microseconds:
-                return L"μs";
+                return "micros";
         }
         // GCC does not recognize the exhaustive switch above
-        return L"";
+        return "";
     };
 
     auto convert = [](int64_t micros, tunit unit) {
@@ -176,9 +163,10 @@ wcstring timer_snapshot_t::print_delta(const timer_snapshot_t &t1, const timer_s
 
     wcstring output;
     if (!verbose) {
-        append_format(output, L"\nExecuted in  %6.2F %ls"
-                              L"\n   usr time  %6.2F %ls"
-                              L"\n   sys time  %6.2F %ls"
+        append_format(output, L"\n_______________________________"
+                              L"\nExecuted in  %6.2F %s"
+                              L"\n   usr time  %6.2F %s"
+                              L"\n   sys time  %6.2F %s"
                               L"\n",
                               wall_time, unit_name(wall_unit),
                               usr_time, unit_name(cpu_unit),
@@ -191,17 +179,16 @@ wcstring timer_snapshot_t::print_delta(const timer_snapshot_t &t1, const timer_s
         double child_usr_time = convert(child_usr_micros, child_unit);
         double child_sys_time = convert(child_sys_micros, child_unit);
 
-        int column2_unit_len = std::max(wcslen(unit_short_name(wall_unit)),
-                                        wcslen(unit_short_name(cpu_unit)));
-        // TODO: improve layout
+        int column2_unit_len = std::max(strlen(unit_short_name(wall_unit)),
+                                        strlen(unit_short_name(cpu_unit)));
         append_format(output,
-                      L"%s%s%s"
-                      L"\nExecuted in  %6.2F %-*ls    %-*s  %s"
-                      L"\n   usr time  %6.2F %-*ls  %6.2F %ls  %6.2F %ls"
-                      L"\n   sys time  %6.2F %-*ls  %6.2F %ls  %6.2F %ls",
-                      enter_alt_charset_mode, std::string(45, 'q').c_str(), exit_alt_charset_mode,
+                      L"\n________________________________________________________"
+                      L"\nExecuted in  %6.2F %-*s    %-*s  %s"
+                      L"\n   usr time  %6.2F %-*s  %6.2F %s  %6.2F %s"
+                      L"\n   sys time  %6.2F %-*s  %6.2F %s  %6.2F %s"
+                      L"\n",
                       wall_time, column2_unit_len, unit_short_name(wall_unit),
-                      static_cast<int>(wcslen(unit_short_name(fish_unit))) + 7, "fish", "external",
+                      static_cast<int>(strlen(unit_short_name(fish_unit))) + 7, "fish", "external",
                       usr_time, column2_unit_len, unit_short_name(cpu_unit), fish_usr_time,
                       unit_short_name(fish_unit), child_usr_time, unit_short_name(child_unit),
                       sys_time, column2_unit_len, unit_short_name(cpu_unit), fish_sys_time,
diff --git a/tests/checks/time.fish b/tests/checks/time.fish
index 7923dce6f..0eb469be7 100644
--- a/tests/checks/time.fish
+++ b/tests/checks/time.fish
@@ -3,37 +3,37 @@ time sleep 0
 
 # These are a tad awkward because it picks the correct unit and adapts whitespace.
 # The idea is that it's a table.
-#CHECKERR: {{.*}}
-#CHECKERR: Executed in {{[\d,.\s]*}} {{ms|μs|sec}} {{\s*}}fish {{\s*}}external
-#CHECKERR: usr time {{[\d,.\s]*}} {{ms|μs|sec}} {{[\d,.\s]*}} {{ms|μs|sec}} {{[\d,.\s]*}} {{ms|μs|sec}}
-#CHECKERR: sys time {{[\d,.\s]*}} {{ms|μs|sec}} {{[\d,.\s]*}} {{ms|μs|sec}} {{[\d,.\s]*}} {{ms|μs|sec}}
+#CHECKERR: ________________________________________________________
+#CHECKERR: Executed in {{[\d,.\s]*}} {{millis|micros|secs}} {{\s*}}fish {{\s*}}external
+#CHECKERR: usr time {{[\d,.\s]*}} {{millis|micros|secs}} {{[\d,.\s]*}} {{millis|micros|secs}} {{[\d,.\s]*}} {{millis|micros|secs}}
+#CHECKERR: sys time {{[\d,.\s]*}} {{millis|micros|secs}} {{[\d,.\s]*}} {{millis|micros|secs}} {{[\d,.\s]*}} {{millis|micros|secs}}
 time for i in (seq 1 2)
     echo banana
 end
 
 #CHECK: banana
 #CHECK: banana
-#CHECKERR: {{.*}}
-#CHECKERR: Executed in {{[\d,.\s]*}} {{ms|μs|sec}} {{\s*}}fish {{\s*}}external
-#CHECKERR: usr time {{[\d,.\s]*}} {{ms|μs|sec}} {{[\d,.\s]*}} {{ms|μs|sec}} {{[\d,.\s]*}} {{ms|μs|sec}}
-#CHECKERR: sys time {{[\d,.\s]*}} {{ms|μs|sec}} {{[\d,.\s]*}} {{ms|μs|sec}} {{[\d,.\s]*}} {{ms|μs|sec}}
+#CHECKERR: ________________________________________________________
+#CHECKERR: Executed in {{[\d,.\s]*}} {{millis|micros|secs}} {{\s*}}fish {{\s*}}external
+#CHECKERR: usr time {{[\d,.\s]*}} {{millis|micros|secs}} {{[\d,.\s]*}} {{millis|micros|secs}} {{[\d,.\s]*}} {{millis|micros|secs}}
+#CHECKERR: sys time {{[\d,.\s]*}} {{millis|micros|secs}} {{[\d,.\s]*}} {{millis|micros|secs}} {{[\d,.\s]*}} {{millis|micros|secs}}
 
 # Make sure we're not double-parsing
 time echo 'foo -s   bar'
 #CHECK: foo -s   bar
-#CHECKERR: {{.*}}
-#CHECKERR: Executed in {{[\d,.\s]*}} {{ms|μs|sec}} {{\s*}}fish {{\s*}}external
-#CHECKERR: usr time {{[\d,.\s]*}} {{ms|μs|sec}} {{[\d,.\s]*}} {{ms|μs|sec}} {{[\d,.\s]*}} {{ms|μs|sec}}
-#CHECKERR: sys time {{[\d,.\s]*}} {{ms|μs|sec}} {{[\d,.\s]*}} {{ms|μs|sec}} {{[\d,.\s]*}} {{ms|μs|sec}}
+#CHECKERR: ________________________________________________________
+#CHECKERR: Executed in {{[\d,.\s]*}} {{millis|micros|secs}} {{\s*}}fish {{\s*}}external
+#CHECKERR: usr time {{[\d,.\s]*}} {{millis|micros|secs}} {{[\d,.\s]*}} {{millis|micros|secs}} {{[\d,.\s]*}} {{millis|micros|secs}}
+#CHECKERR: sys time {{[\d,.\s]*}} {{millis|micros|secs}} {{[\d,.\s]*}} {{millis|micros|secs}} {{[\d,.\s]*}} {{millis|micros|secs}}
 
 true && time a=b not builtin true | true
-#CHECKERR: {{.*}}
+#CHECKERR: ___{{.*}}
 #CHECKERR: {{.*}}
 #CHECKERR: {{.*}}
 #CHECKERR: {{.*}}
 
 not time true
-#CHECKERR: {{.*}}
+#CHECKERR: ___{{.*}}
 #CHECKERR: {{.*}}
 #CHECKERR: {{.*}}
 #CHECKERR: {{.*}}

From 05ac24006e2ec1102b280bbd2ac1c264ddac2409 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 24 Feb 2022 18:01:25 +0100
Subject: [PATCH 230/262] Doc theme: Rationalize line-height/margin

Now all based on multiples of 1em.
---
 .../python_docs_theme/static/pydoctheme.css   | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/doc_src/python_docs_theme/static/pydoctheme.css b/doc_src/python_docs_theme/static/pydoctheme.css
index f34217dad..3cdd8e9c4 100644
--- a/doc_src/python_docs_theme/static/pydoctheme.css
+++ b/doc_src/python_docs_theme/static/pydoctheme.css
@@ -32,7 +32,7 @@ div#fmain {
     background-color: #EEEEFA;
     border-radius: 14px;
     position: relative;
-    margin: 15px auto 15px;
+    margin: 1em auto 1em;
     box-shadow: 0 0 5px 1px #333;
     width: 85%;
     /* This is super-cheesy, but 1270px is the maximum width of the sidebar, the content and the margins */
@@ -83,7 +83,7 @@ form.inline-search input[type="submit"] {
 div.sphinxsidebar {
     border-right: 1px solid #ccc;
     border-radius: 0px;
-    line-height: 150%;
+    line-height: 1em;
     font-size: smaller;
     margin-left: 0;
     float: left;
@@ -136,8 +136,8 @@ div.sphinxsidebarwrapper > ul > li > ul > li {
     margin-bottom: 0.4em;
 }
 
-ul li.toctree-l1 {
-    line-height: 170%;
+ul li, div.body li {
+    line-height: 2em;
 }
 
 form.inline-search input,
@@ -159,7 +159,7 @@ div.body {
 }
 
 div.body p {
-    line-height: 170%;
+    line-height: 2em;
 }
 
 div.body h1, div.body h2, div.body h3, div.body h4, div.body h5, div.body h6 {
@@ -255,7 +255,7 @@ tt, code, pre, dl > dt span ~ em, #synopsis p, #synopsis code {
 }
 
 #synopsis .line {
-    line-height: 150%;
+    line-height: 1em;
 }
 
 pre, div[class*="highlight-"] {
@@ -279,8 +279,8 @@ table.docutils {
     border: 1px solid #ddd;
     min-width: 20%;
     border-radius: 3px;
-    margin-top: 10px;
-    margin-bottom: 10px;
+    margin-top: 1em;
+    margin-bottom: 1em;
     /* Make table scrollable on overflow */
     display: block;
     overflow: auto;
@@ -310,7 +310,7 @@ table.footnote, table.footnote td {
 }
 
 div.footer {
-    line-height: 150%;
+    line-height: 1em;
     margin-top: -2em;
     text-align: right;
     width: auto;
@@ -333,12 +333,20 @@ div.footer {
     font-size: 12pt;
 }
 
+dl {
+    margin-bottom: 1em;
+}
+
 dl.envvar, dl.describe {
     font-size: 11pt;
-    font-weight: normal !important;
+    font-weight: normal;
 
 }
 
+div.sphinxsidebar ul {
+    margin: 1em 10px 1em 10px;
+}
+
 /* On screens that are less than 700px wide remove anything non-essential
    - the sidebar, the gradient background, ... */
 @media screen and (max-width: 700px) {

From 615ea22387b4336b5ee28b58d119c5efe392b775 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 24 Feb 2022 18:11:52 +0100
Subject: [PATCH 231/262] Doc theme: Use code font for in-line commands as well

This makes them stand out a bit more
---
 doc_src/python_docs_theme/static/pydoctheme.css | 2 +-
 doc_src/python_docs_theme/static/pygments.css   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc_src/python_docs_theme/static/pydoctheme.css b/doc_src/python_docs_theme/static/pydoctheme.css
index 3cdd8e9c4..1fa5c172b 100644
--- a/doc_src/python_docs_theme/static/pydoctheme.css
+++ b/doc_src/python_docs_theme/static/pydoctheme.css
@@ -235,7 +235,7 @@ code {
     padding-right: 5px;
 }
 
-tt, code, pre, dl > dt span ~ em, #synopsis p, #synopsis code {
+tt, code, pre, dl > dt span ~ em, #synopsis p, #synopsis code, .command {
     /* Pick a monospace font.
        ui-monospace is the monospace version of system-ui - the system's monospace font.
        Unfortunately it's barely supported anywhere (at time of writing only Safari does!),
diff --git a/doc_src/python_docs_theme/static/pygments.css b/doc_src/python_docs_theme/static/pygments.css
index 2da95380a..d657ce377 100644
--- a/doc_src/python_docs_theme/static/pygments.css
+++ b/doc_src/python_docs_theme/static/pygments.css
@@ -67,7 +67,6 @@
         --contrast: #FFFFFF;
     }
     .highlight .k { color: #507a97; font-weight: bold } /* Keyword */
-    .highlight .nf { color: #009fe7 } /* Name.Function */
     .highlight .nf { color: #008fd7 } /* Name.Function */
     .highlight .nb { color: #209a87 } /* Name.Builtin */
     .highlight .s2 { color: #9ce781 } /* Literal.String.Double */

From 0614f507ffc280aa9dd737f1c6e4f18f6646cb78 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 25 Feb 2022 18:12:21 +0100
Subject: [PATCH 232/262] Webconfig: Make colorscheme samples nicer to read

This makes the container fit the content, otherwise we'd be cutting
off the "> quack &" part of the first line.

Also while we're here increase the line-height a bit to give it more
breathing room, and increase the font size juuust a smidge.

Reduce margins and increase padding to make it less cramped.
---
 share/tools/web_config/fishconfig.css | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/share/tools/web_config/fishconfig.css b/share/tools/web_config/fishconfig.css
index ecf440cd5..edbb3b700 100644
--- a/share/tools/web_config/fishconfig.css
+++ b/share/tools/web_config/fishconfig.css
@@ -390,11 +390,11 @@ body {
 }
 
 .colorpicker_text_sample_tight {
-    font-size: 10pt;
-    line-height: 1.2em;
-    margin: 0px 6px;
-    max-width: 220px;
-    padding: 5px;
+    font-size: 11pt;
+    line-height: 1.5em;
+    margin: 0;
+    width: fit-content;
+    padding: 1em;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: clip;

From 68f099d804b4ade4200fe5728be05c6f0bdff506 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 25 Feb 2022 18:27:17 +0100
Subject: [PATCH 233/262] Webconfig: Go to small-screen mode earlier

Since the color previews are now wider, we had quite a wide range
where there would only be one. Remove the border around the content
earlier so windows with 1000px width still get two previews in a row.

(making the text shorter would also be an option here)
---
 share/tools/web_config/fishconfig.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/tools/web_config/fishconfig.css b/share/tools/web_config/fishconfig.css
index edbb3b700..e1afc50f7 100644
--- a/share/tools/web_config/fishconfig.css
+++ b/share/tools/web_config/fishconfig.css
@@ -622,7 +622,7 @@ img.delete_icon {
     cursor: default;
 }
 
-@media screen and (max-width: 800px) {
+@media screen and (max-width: 1000px) {
     /* On small screens remove the margins to leave more for the actual content */
     body {
         width: 100%;

From 75553917902f49b7aa8a3b34b8f6b8ad61ad45aa Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 27 Feb 2022 18:00:09 +0100
Subject: [PATCH 234/262] Make a bit wider with less padding

---
 doc_src/python_docs_theme/static/pydoctheme.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc_src/python_docs_theme/static/pydoctheme.css b/doc_src/python_docs_theme/static/pydoctheme.css
index 1fa5c172b..2f629ac48 100644
--- a/doc_src/python_docs_theme/static/pydoctheme.css
+++ b/doc_src/python_docs_theme/static/pydoctheme.css
@@ -28,13 +28,13 @@ body {
 
 div#fmain {
     color: #222;
-    padding: 10px 40px 10px;
+    padding: 1em 2em;
     background-color: #EEEEFA;
     border-radius: 14px;
     position: relative;
     margin: 1em auto 1em;
     box-shadow: 0 0 5px 1px #333;
-    width: 85%;
+    width: 90%;
     /* This is super-cheesy, but 1270px is the maximum width of the sidebar, the content and the margins */
     max-width: 1270px;
 }

From c0be74c55a6a0a4d7161e1a82ff804ccdf4443d2 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@sourcefrog.net>
Date: Sun, 27 Feb 2022 12:09:27 -0800
Subject: [PATCH 235/262] Better documentation of forward-char and friends

This makes it match the code in reader.cpp, and explains why the default
binding of `right` accepts the complete line.

Closes #8748
---
 doc_src/cmds/bind.rst | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/doc_src/cmds/bind.rst b/doc_src/cmds/bind.rst
index 9de9ed5ca..c20fe30af 100644
--- a/doc_src/cmds/bind.rst
+++ b/doc_src/cmds/bind.rst
@@ -89,10 +89,11 @@ The following special input functions are available:
     only execute the next function if the previous succeeded (note: only some functions report success)
 
 ``accept-autosuggestion``
-    accept the current autosuggestion completely
+    accept the current autosuggestion
 
 ``backward-char``
-    moves one character to the left
+    move one character to the left.
+    If the completion pager is active, select the previous completion instead.
 
 ``backward-bigword``
     move one whitespace-delimited word to the left
@@ -179,13 +180,15 @@ The following special input functions are available:
     move one whitespace-delimited word to the right
 
 ``forward-char``
-    move one character to the right
+    move one character to the right; or if at the end of the commandline, accept the current autosuggestion.
+    If the completion pager is active, select the next completion instead.
 
 ``forward-single-char``
-    move one character to the right; if an autosuggestion is available, only take a single char from it
+    move one character to the right; or if at the end of the commandline, accept a single char from the current autosuggestion.
 
 ``forward-word``
-    move one word to the right
+    move one word to the right; or if at the end of the commandline, accept one word
+    from the current autosuggestion.
 
 ``history-search-backward``
     search the history for the previous match
@@ -230,7 +233,8 @@ The following special input functions are available:
     move the next word to the killring
 
 ``nextd-or-forward-word``
-    if the commandline is empty, then move forward in the directory history, otherwise move one word to the right
+    if the commandline is empty, then move forward in the directory history, otherwise move one word to the right;
+    or if at the end of the commandline, accept one word from the current autosuggestion.
 
 ``or``
     only execute the next function if the previous succeeded (note: only some functions report success)

From 02c34a30eb2abbd9a2fcacd0763a6d4ea69ade47 Mon Sep 17 00:00:00 2001
From: lelgenio <lelgenio@disroot.org>
Date: Fri, 18 Feb 2022 00:00:12 -0300
Subject: [PATCH 236/262] completions/sv.fish: update completion for sv, a part
 of runit.

This should fix finding the correct active svdir in most cases.

Search for services in the following order:

$SVDIR                      - User defined override
/run/runit/runsvdir/current - Value patched in by Void[1]
/run/runit/service          - Value patched in by Artix[2]
/etc/service                - Value patched in by Debian[3]
/services                   - Default value for runit[4]

Also don't use /etc for searching since it is not guaranteed that there
is an instance of runsvdir running in that directory.

Finally return quietly if there is no svdir.

[1] https://github.com/void-linux/void-packages/blob/75403cef76a93199456befdcb8884fbac39adbb3/srcpkgs/runit/template#L29
[2] https://gitea.artixlinux.org/packagesR/runit/src/commit/c9d691ce864e5be6735025fc51c6d72fdb5aabb0/x86_64/core/PKGBUILD#L9
[3] https://sources.debian.org/src/runit/2.1.2-41/debian/patches/0001-default-directory-for-services-on-Debian-is-etc-servi.diff/
[4] hard-coded in sv.c

Closes #8738
---
 share/completions/sv.fish | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/share/completions/sv.fish b/share/completions/sv.fish
index c3c7fe26e..cc1f32460 100644
--- a/share/completions/sv.fish
+++ b/share/completions/sv.fish
@@ -10,15 +10,24 @@ set -l commands \
     shutdown force-stop force-reload force-restart force-shutdown \
     try-restart check
 
-
 function __fish_complete_sv_list_services
-    for dir in $SVDIR /run/runit/service/ /etc/runit/current /etc/runit/runsvdir/
-        test -d $dir
-        and break
+    set -l svdir
+    for candidate_svdir in \
+        "$SVDIR" \
+        /run/runit/runsvdir/current \
+        /run/runit/service \
+        /etc/services \
+        /services
+        if test -d $candidate_svdir
+            set svdir $candidate_svdir
+            break
+        end
     end
-    set -l services (string match -r '[^/]*$' $dir/*)
-    set -l out (sv status $services 2>/dev/null)
-    and string replace -r "^(\w+: )(.*?):" '$2\t$1$2:' $out
+    set -q svdir[1]; or return
+    set -l services (command ls $svdir)
+    set -l sv_status (sv status $services 2>/dev/null |
+                      string replace -ar ';.*$' '')
+    and string replace -r "^(\w+: )(.*?):" '$2\t$1' $sv_status
     or printf "%s\n" $services
 end
 

From f284cdce5bf81bbe60f8406cc3c49862e84ad7aa Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 3 Mar 2022 12:12:04 +0100
Subject: [PATCH 237/262] Make byte/unicode escapes with no digits a tokenizer
 error

This is the simple fix - if we have no valid digit, we have nothing to
return. So instead of returning a NULL, we return an error.

This is already the case for invalid octal escapes (like `\777`).

Fixes #8545
---
 src/common.cpp          |  4 +++-
 tests/checks/basic.fish | 10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/common.cpp b/src/common.cpp
index ccd8d803d..38313c6c2 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -1219,6 +1219,8 @@ maybe_t<size_t> read_unquoted_escape(const wchar_t *input, wcstring *result, boo
             for (size_t i = 0; i < chars; i++) {
                 long d = convert_digit(input[in_pos], base);
                 if (d < 0) {
+                    // If we have no digit, this is a tokenizer error.
+                    if (i == 0) errored = true;
                     break;
                 }
 
@@ -1226,7 +1228,7 @@ maybe_t<size_t> read_unquoted_escape(const wchar_t *input, wcstring *result, boo
                 in_pos++;
             }
 
-            if (res <= max_val) {
+            if (!errored && res <= max_val) {
                 result_char_or_none =
                     static_cast<wchar_t>((byte_literal ? ENCODE_DIRECT_BASE : 0) + res);
             } else {
diff --git a/tests/checks/basic.fish b/tests/checks/basic.fish
index 3befee0ed..cfade8f88 100644
--- a/tests/checks/basic.fish
+++ b/tests/checks/basic.fish
@@ -558,3 +558,13 @@ end
 # CHECKERR: for PWD in foo bar
 # CHECKERR: ^
 # XXX FIXME carat should point at PWD
+
+$fish -c 'echo \xtest'
+# CHECKERR: fish: Invalid token '\xtest'
+# CHECKERR: echo \xtest
+# CHECKERR: ^
+
+$fish -c 'echo \utest'
+# CHECKERR: fish: Invalid token '\utest'
+# CHECKERR: echo \utest
+# CHECKERR: ^

From 6c846cc256949af00580683b393a0f3ce79c72b1 Mon Sep 17 00:00:00 2001
From: Ilan Cosman <ilancosman@gmail.com>
Date: Fri, 18 Feb 2022 13:26:26 -0800
Subject: [PATCH 238/262] Changelog for 3.4

---
 CHANGELOG.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7972199fd..da1d25f81 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,7 +2,7 @@ fish 3.4.0 (released ???)
 =========================
 
 ..
-   Ignore for 3.4.0 changelog: 1363 3625 3954 6477 7602 8059 8077 8079 8084 8096 8118 8127 8128 8130 8137 8139 8146 8151 8153 8161 8170 8176 8183 8184 8191 8192 8195 8202 8204 8205 8206 8219 8221 8222 8224 8227 8228 8229 8230 8231 8235 8236 8237 8238 8239 8241 8243 8249 8252 8253 8256 8257 8260 8268 8270 8271 8277 8280 8285 8287 8289 8295 8299 8305 8306 8308 8310 8311 8314 8321 8323 8326 8327 8334 8335 8337 8338 8344 8353 8358 8365 8367 8368 8380 8381 8385 8391 8394 8403 8406 8409 8410 8419 8429 8430 8433 8438 8439 8441 8444 8446 8449 8456 8457 8471 8472 8476 8477 8478 8479 8480 8487 8492 8495 8497 8500 8511 8518 8521 8522 8526 8527 8528 8548 8549 8559 8575 8584 8587 8588 8570 8591 8596 8597 8601 8608 8612 8613 8614 8615 8621 8623 8625 8626 8630 8633 8636 8639 8643 8647 8650 8651 8652 8654 8655 8656 8658 8660 8661 8662 8665 8672 8675 8676 8686
+   Ignore for 3.4.0 changelog: 1363 2876 3625 3954 6477 7357 7602 8008 8059 8077 8079 8084 8096 8118 8127 8128 8130 8137 8139 8146 8151 8153 8161 8170 8176 8183 8184 8191 8192 8195 8202 8204 8205 8206 8219 8221 8222 8224 8227 8228 8229 8230 8231 8235 8236 8237 8238 8239 8241 8243 8249 8252 8253 8256 8257 8260 8268 8270 8271 8277 8280 8285 8287 8289 8295 8299 8305 8306 8308 8310 8311 8314 8321 8323 8326 8327 8334 8335 8337 8338 8344 8353 8358 8365 8367 8368 8380 8381 8385 8391 8394 8403 8406 8409 8410 8419 8429 8430 8433 8438 8439 8441 8444 8446 8449 8456 8457 8471 8472 8476 8477 8478 8479 8480 8487 8492 8495 8497 8500 8511 8518 8521 8522 8526 8527 8528 8548 8549 8559 8575 8584 8587 8588 8570 8591 8596 8597 8601 8608 8612 8613 8614 8615 8621 8623 8625 8626 8630 8633 8636 8639 8643 8645 8647 8650 8651 8652 8653 8654 8655 8656 8658 8660 8661 8662 8665 8667 8672 8675 8676 8686 8700 8710 8729 8731
 
 
 Notable improvements and fixes
@@ -93,7 +93,7 @@ Scripting improvements
 - ``abbr -q`` returns the correct exit status when given multiple abbreviation names as arguments (:issue:`8431`).
 - ``command -v`` returns an exit status of 127 instead of 1 if no command was found (:issue:`8547`).
 - ``argparse`` with ``--ignore-unknown`` no longer breaks with multiple unknown options in a short option group (:issue:`8637`).
-- Comments inside command substitutions or brackets now correctly ignore parentheses, quotes, and brackets (:issue:`7866`, :issue:`8022`).
+- Comments inside command substitutions or brackets now correctly ignore parentheses, quotes, and brackets (:issue:`7866`, :issue:`8022`, :issue:`8695`).
 - ``complete -C`` supports a new ``--escape`` option, which turns on escaping in returned completion strings (:issue:`3469`).
 
 Interactive improvements
@@ -160,7 +160,7 @@ Completions
   - ``istioctl`` (:issue:`8343`)
   - ``kmutil``
   - ``matlab`` (:issue:`8505`)
-  - ``mono`` (:issue:`8415`) and related tools ``csharp``, ``gacutil``, ``gendarme``, ``ikdasm``, ``ilasm``, ``mkbundle``, ``monodis``, ``monop``, ``sqlsharp`` and ``xsp``.
+  - ``mono`` (:issue:`8415`, :issue:`8452`) and related tools ``csharp``, ``gacutil``, ``gendarme``, ``ikdasm``, ``ilasm``, ``mkbundle``, ``monodis``, ``monop``, ``sqlsharp`` and ``xsp``.
   -  Angular's ``ng`` (:issue:`8111`)
   - ``nodeenv`` (:issue:`8533`)
   - ``octave`` (:issue:`8505`)
@@ -181,7 +181,7 @@ Completions
 - Unified the OpenZFS-related completions across operating systems and improved the vdev-related completions for all platforms.
 - Add missing completions for the ``-p`` option of ``xbps-query``.
 - When evaluating custom completions, the command line state no longer includes variable overrides (``var=val``). This unbreaks completions that read ``commandline -op``.
-- Replace completions for helm version 2 with helm 3-compatible completions.
+- Replace completions for helm version 2 with helm 3-compatible completions (:issue:`8724`).
 
 Improved terminal support
 ^^^^^^^^^^^^^^^^^^^^^^^^^

From 456359f78df7c860764e86a601e8fbb7d0afc234 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 3 Mar 2022 12:20:03 +0100
Subject: [PATCH 239/262] CHANGELOGGE

---
 CHANGELOG.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index da1d25f81..1975ae162 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -95,6 +95,7 @@ Scripting improvements
 - ``argparse`` with ``--ignore-unknown`` no longer breaks with multiple unknown options in a short option group (:issue:`8637`).
 - Comments inside command substitutions or brackets now correctly ignore parentheses, quotes, and brackets (:issue:`7866`, :issue:`8022`, :issue:`8695`).
 - ``complete -C`` supports a new ``--escape`` option, which turns on escaping in returned completion strings (:issue:`3469`).
+- Invalid byte or unicode escapes like ``\Utest`` or ``\xNotHex`` are now a tokenizer error instead of causing the token to be truncated (:issue:`8545`).
 
 Interactive improvements
 ------------------------

From c1900ed41cc1afe4b710f6194e95604a81363b3c Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 5 Mar 2022 18:36:26 +0100
Subject: [PATCH 240/262] Disable history race test on Github Actions

Same as ever: Flaky test, makes reviews more annoying. It should be
fixed, but until that happens it's better not to have it fail in
unrelated PRs.
---
 src/fish_tests.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 646cfcdac..94221bf12 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -4387,6 +4387,14 @@ void history_tests_t::test_history_races() {
         return;
     }
 
+    // This fails too often on Github Actions,
+    // leading to a bunch of spurious test failures on unrelated PRs.
+    // For now it's better to disable it.
+    // TODO: Figure out *why* it does that and fix it.
+    if (getenv("CI")) {
+        return;
+    }
+
     say(L"Testing history race conditions");
 
     // It appears TSAN and ASAN's allocators do not release their locks properly in atfork, so

From 1da25fd916557e109e3f1fdd81c5b0f82154c6e9 Mon Sep 17 00:00:00 2001
From: Missu <mizzunet@protonmail.com>
Date: Sat, 5 Mar 2022 19:49:21 +0000
Subject: [PATCH 241/262] Add completion for `rc-status` (#8757)

`rc-status` is part of OpenRC
---
 share/completions/rc-status.fish | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 share/completions/rc-status.fish

diff --git a/share/completions/rc-status.fish b/share/completions/rc-status.fish
new file mode 100644
index 000000000..9471e651c
--- /dev/null
+++ b/share/completions/rc-status.fish
@@ -0,0 +1,20 @@
+set -l levels '(set -l p /etc/runlevels/*; string replace /etc/runlevels "" $p)'
+
+#disable file listing
+complete -f rc-status
+complete -c rc-status -n "test (__fish_number_of_cmd_args_wo_opts) = 1" \
+    -xa "$levels"
+
+complete -c rc-status -s h -l help -d 'Display the help output'
+complete -c rc-status -s a -l all -d 'Show services from all run levels'
+complete -c rc-status -s f -l format -d 'format status to be parsable'
+complete -c rc-status -s l -l list -d 'Show list of run levels'
+complete -c rc-status -s r -l runlevel -d 'Show the name of the current runlevel'
+complete -c rc-status -s m -l manual -d 'Show manually started services'
+complete -c rc-status -s s -l servicelist 'Show service list'
+complete -c rc-status -s S -l supervised 'Show supervised services'
+complete -c rc-status -s u -l unused 'Show services not assigned to any runlevel'
+complete -c rc-status -s v -l version 'Display software version'
+complete -c rc-status -s q -l quiet 'Run quietly'
+complete -c rc-status -s C -l nocolor 'Disable color output'
+complete -c rc-status -s V -l version 'Display software version'

From ff882d8326ca48efae1b4079b07894bfa0c36cb5 Mon Sep 17 00:00:00 2001
From: Missu <mizzunet@protonmail.com>
Date: Sat, 5 Mar 2022 17:03:54 +0000
Subject: [PATCH 242/262] Add `asd` completion

This is `anything-sync-daemon`
---
 share/completions/asd.fish | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 share/completions/asd.fish

diff --git a/share/completions/asd.fish b/share/completions/asd.fish
new file mode 100644
index 000000000..959bb71ac
--- /dev/null
+++ b/share/completions/asd.fish
@@ -0,0 +1,3 @@
+complete -f asd
+complete -c asd -n "test (__fish_number_of_cmd_args_wo_opts) = 1" \
+    -a "sync unsync resync"

From 68ef336683c7b63c63913f91c61b0bc82a3e4dc6 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 5 Mar 2022 20:50:38 +0100
Subject: [PATCH 243/262] Logging changes

---
 CHANGELOG.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 1975ae162..5ca875519 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -145,6 +145,7 @@ Completions
 
   - Apple's ``shortcuts``
   - ``argparse`` (:issue:`8434`)
+  - ``asd`` (:issue:`8759`)
   - ``az`` (:issue:`8141`)
   - ``black`` (:issue:`8123`)
   - ``clasp`` (:issue:`8373`)
@@ -168,6 +169,7 @@ Completions
   - ``pabcnet_clear`` (:issue:`8421`)
   - ``qmk`` (:issue:`8180`)
   - ``rakudo`` (:issue:`8113`)
+  - ``rc-status`` (:issue:`8757`)
   - ``roswell`` (:issue:`8330`)
   - ``sbcl`` (:issue:`8330`)
   - ``starship`` (:issue:`8520`)

From 7b01b4d3080cad2132da8758921d2e582361d9c2 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 6 Mar 2022 13:14:22 +0100
Subject: [PATCH 244/262] fish_title: Show hostname if connected via ssh

See #8641
---
 share/functions/fish_title.fish | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/share/functions/fish_title.fish b/share/functions/fish_title.fish
index b509b54ee..aa73ac6f4 100644
--- a/share/functions/fish_title.fish
+++ b/share/functions/fish_title.fish
@@ -1,17 +1,21 @@
 function fish_title
     # emacs' "term" is basically the only term that can't handle it.
     if not set -q INSIDE_EMACS; or string match -vq '*,term:*' -- $INSIDE_EMACS
+        # If we're connected via ssh, we print the hostname.
+        set -l ssh
+        set -q SSH_TTY
+        and set ssh "[$(prompt_hostname | string sub -l 10)]"
         # An override for the current command is passed as the first parameter.
         # This is used by `fg` to show the true process name, among others.
         if set -q argv[1]
-            echo -- (string sub -l 20 -- $argv[1]) (prompt_pwd -d 1 -D 0)
+            echo -- $ssh (string sub -l 20 -- $argv[1]) (prompt_pwd -d 1 -D 0)
         else
             # Don't print "fish" because it's redundant
             set -l command (status current-command)
             if test "$command" = fish
                 set command
             end
-            echo -- (string sub -l 20 -- $command) (prompt_pwd -d 1 -D 1)
+            echo -- $ssh (string sub -l 20 -- $command) (prompt_pwd -d 1 -D 1)
         end
     end
 end

From 2d545c651d76ffad5469f309528697724f192c84 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 6 Mar 2022 13:15:03 +0100
Subject: [PATCH 245/262] fish_title: Make directory shortening consistent

I have no idea why this kept one component in the one case and none in
the other.

Because we already aggressively shorten the command, we can keep the directory.
---
 share/functions/fish_title.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/functions/fish_title.fish b/share/functions/fish_title.fish
index aa73ac6f4..91519b90f 100644
--- a/share/functions/fish_title.fish
+++ b/share/functions/fish_title.fish
@@ -8,7 +8,7 @@ function fish_title
         # An override for the current command is passed as the first parameter.
         # This is used by `fg` to show the true process name, among others.
         if set -q argv[1]
-            echo -- $ssh (string sub -l 20 -- $argv[1]) (prompt_pwd -d 1 -D 0)
+            echo -- $ssh (string sub -l 20 -- $argv[1]) (prompt_pwd -d 1 -D 1)
         else
             # Don't print "fish" because it's redundant
             set -l command (status current-command)

From 959e17faced671344f4d6879039d055439ffa687 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 6 Mar 2022 13:19:29 +0100
Subject: [PATCH 246/262] Update title documentation

This included "the default", which was no longer true.

Also there's no need to keep explaining things are "new" if they were
added in fish 2.2.0.
---
 doc_src/interactive.rst | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/doc_src/interactive.rst b/doc_src/interactive.rst
index 88ad3b515..c2bc31573 100644
--- a/doc_src/interactive.rst
+++ b/doc_src/interactive.rst
@@ -200,23 +200,20 @@ This is an alternative to aliases, and has the advantage that you see the actual
 Programmable title
 ------------------
 
-When using most virtual terminals, it is possible to set the message displayed in the titlebar of the terminal window. This can be done automatically in fish by defining the :ref:`fish_title <cmd-fish_title>` function. The :ref:`fish_title <cmd-fish_title>` function is executed before and after a new command is executed or put into the foreground and the output is used as a titlebar message. The :ref:`status current-command <cmd-status>` builtin will always return the name of the job to be put into the foreground (or ``fish`` if control is returning to the shell) when the :ref:`fish_prompt <cmd-fish_prompt>` function is called. The first argument to fish_title will contain the most recently executed foreground command as a string, starting with fish 2.2.
+When using most virtual terminals, it is possible to set the message displayed in the titlebar of the terminal window. This can be done automatically in fish by defining the :ref:`fish_title <cmd-fish_title>` function. The :ref:`fish_title <cmd-fish_title>` function is executed before and after a new command is executed or put into the foreground and the output is used as a titlebar message. The :ref:`status current-command <cmd-status>` builtin will always return the name of the job to be put into the foreground (or ``fish`` if control is returning to the shell) when the :ref:`fish_prompt <cmd-fish_prompt>` function is called. The first argument to fish_title will contain the most recently executed foreground command as a string.
+
+The default fish title shows the hostname if connected via ssh, the currently running command (unless it is fish) and the current working directory. All of this is shortened to not make the tab too wide.
 
 Examples:
-The default fish title is::
 
+To show the last command and working directory in the title::
 
     function fish_title
-        echo (status current-command) ' '
+        # `prompt_pwd` shortens the title. This helps prevent tabs from becoming very wide.
+        echo $argv[1] (prompt_pwd)
         pwd
     end
 
-To show the last command in the title::
-
-    function fish_title
-        echo $argv[1]
-    end
-
 .. _prompt:
 
 Programmable prompt

From 3941ded193d211fb48b9cac4c208722557efe1ef Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 10 Mar 2022 15:14:16 +0100
Subject: [PATCH 247/262] completions/rustup: Remove errant `complete -c`

This was an oversight in 7fb3880b9644130c257bc5e7ced84a993df0e340, and would have spewed the existing rustup completions if this file was sourced twice (which probably won't happen given autoloading, to be fair).
---
 share/completions/rustup.fish | 2 --
 1 file changed, 2 deletions(-)

diff --git a/share/completions/rustup.fish b/share/completions/rustup.fish
index 5653350a1..217ad8ca1 100644
--- a/share/completions/rustup.fish
+++ b/share/completions/rustup.fish
@@ -1,5 +1,3 @@
-complete -c rustup
-
 set -l subcmds \
     show \
     update \

From 895039ea5acd618997ff61056d74972dff98bbf6 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Thu, 10 Mar 2022 23:41:38 +0800
Subject: [PATCH 248/262] CHANGELOG: work on 3.4.0

---
 CHANGELOG.rst | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 5ca875519..0d590bc7f 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,8 +2,7 @@ fish 3.4.0 (released ???)
 =========================
 
 ..
-   Ignore for 3.4.0 changelog: 1363 2876 3625 3954 6477 7357 7602 8008 8059 8077 8079 8084 8096 8118 8127 8128 8130 8137 8139 8146 8151 8153 8161 8170 8176 8183 8184 8191 8192 8195 8202 8204 8205 8206 8219 8221 8222 8224 8227 8228 8229 8230 8231 8235 8236 8237 8238 8239 8241 8243 8249 8252 8253 8256 8257 8260 8268 8270 8271 8277 8280 8285 8287 8289 8295 8299 8305 8306 8308 8310 8311 8314 8321 8323 8326 8327 8334 8335 8337 8338 8344 8353 8358 8365 8367 8368 8380 8381 8385 8391 8394 8403 8406 8409 8410 8419 8429 8430 8433 8438 8439 8441 8444 8446 8449 8456 8457 8471 8472 8476 8477 8478 8479 8480 8487 8492 8495 8497 8500 8511 8518 8521 8522 8526 8527 8528 8548 8549 8559 8575 8584 8587 8588 8570 8591 8596 8597 8601 8608 8612 8613 8614 8615 8621 8623 8625 8626 8630 8633 8636 8639 8643 8645 8647 8650 8651 8652 8653 8654 8655 8656 8658 8660 8661 8662 8665 8667 8672 8675 8676 8686 8700 8710 8729 8731
-
+   Ignore for 3.4.0 changelog: 1363 2876 3625 3954 6477 7357 7602 8008 8059 8077 8079 8084 8096 8118 8127 8128 8130 8137 8139 8146 8151 8153 8161 8170 8176 8183 8184 8191 8192 8195 8202 8204 8205 8206 8219 8221 8222 8224 8227 8228 8229 8230 8231 8235 8236 8237 8238 8239 8241 8243 8249 8252 8253 8256 8257 8260 8268 8270 8271 8277 8280 8285 8287 8289 8295 8299 8305 8306 8308 8310 8311 8314 8321 8323 8326 8327 8334 8335 8337 8338 8344 8353 8358 8365 8367 8368 8380 8381 8385 8391 8394 8403 8406 8409 8410 8419 8429 8430 8433 8438 8439 8441 8444 8446 8449 8456 8457 8471 8472 8476 8477 8478 8479 8480 8487 8492 8495 8497 8500 8511 8518 8521 8522 8526 8527 8528 8548 8549 8559 8575 8584 8587 8588 8570 8591 8596 8597 8601 8608 8612 8613 8614 8615 8621 8623 8625 8626 8630 8633 8636 8639 8643 8645 8647 8650 8651 8652 8653 8654 8655 8656 8658 8660 8661 8662 8665 8667 8672 8675 8676 8686 8700 8710 8724 8729 8731 8738
 
 Notable improvements and fixes
 ------------------------------
@@ -162,7 +161,7 @@ Completions
   - ``istioctl`` (:issue:`8343`)
   - ``kmutil``
   - ``matlab`` (:issue:`8505`)
-  - ``mono`` (:issue:`8415`, :issue:`8452`) and related tools ``csharp``, ``gacutil``, ``gendarme``, ``ikdasm``, ``ilasm``, ``mkbundle``, ``monodis``, ``monop``, ``sqlsharp`` and ``xsp``.
+  - ``mono`` (:issue:`8415`) and related tools ``csharp``, ``gacutil``, ``gendarme``, ``ikdasm``, ``ilasm``, ``mkbundle``, ``monodis``, ``monop``, ``sqlsharp`` and ``xsp`` (:issue:`8452`)
   -  Angular's ``ng`` (:issue:`8111`)
   - ``nodeenv`` (:issue:`8533`)
   - ``octave`` (:issue:`8505`)
@@ -181,10 +180,7 @@ Completions
 
 - Improvements to many completions, especially for ``git`` aliases (:issue:`8129`), subcommands (:issue:`8134`) and submodules (:issue:`8716`).
 - Many adjustments to complete correct options for system utilities on BSD and macOS.
-- Unified the OpenZFS-related completions across operating systems and improved the vdev-related completions for all platforms.
-- Add missing completions for the ``-p`` option of ``xbps-query``.
 - When evaluating custom completions, the command line state no longer includes variable overrides (``var=val``). This unbreaks completions that read ``commandline -op``.
-- Replace completions for helm version 2 with helm 3-compatible completions (:issue:`8724`).
 
 Improved terminal support
 ^^^^^^^^^^^^^^^^^^^^^^^^^

From cf85bf9be309f29564cfb474b6211c11484796ba Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 10 Mar 2022 18:26:45 +0100
Subject: [PATCH 249/262] Let function-scoped variables be queried

This uses the same logic we use to create the variables to find them -
go through the scopes, the topmost local scope *is* function-scope.

Fixes #8684
---
 src/env.cpp           | 20 ++++++++++++++++++++
 tests/checks/set.fish | 23 +++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/src/env.cpp b/src/env.cpp
index ce586e3d2..49fc2c75a 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -600,6 +600,7 @@ class env_scoped_impl_t : public environment_t, noncopyable_t {
     // query.
     maybe_t<env_var_t> try_get_computed(const wcstring &key) const;
     maybe_t<env_var_t> try_get_local(const wcstring &key) const;
+    maybe_t<env_var_t> try_get_function(const wcstring &key) const;
     maybe_t<env_var_t> try_get_global(const wcstring &key) const;
     maybe_t<env_var_t> try_get_universal(const wcstring &key) const;
 
@@ -772,6 +773,22 @@ maybe_t<env_var_t> env_scoped_impl_t::try_get_local(const wcstring &key) const {
     return entry; // this is either the entry or none() from find_entry
 }
 
+maybe_t<env_var_t> env_scoped_impl_t::try_get_function(const wcstring &key) const {
+    maybe_t<env_var_t> entry;
+    auto node = locals_;
+    while (node->next) {
+        node = node->next;
+        // The first node that introduces a new scope is ours.
+        // If this doesn't happen, we go on until we've reached the
+        // topmost local scope.
+        if (node->new_scope) break;
+    }
+    for (auto cur = node; cur; cur=cur->next) {
+        if ((entry = cur->find_entry(key))) break;
+    }
+    return entry; // this is either the entry or none() from find_entry
+}
+
 maybe_t<env_var_t> env_scoped_impl_t::try_get_global(const wcstring &key) const {
     return globals_->find_entry(key);
 }
@@ -792,6 +809,9 @@ maybe_t<env_var_t> env_scoped_impl_t::get(const wcstring &key, env_mode_flags_t
     if (!result && query.local) {
         result = try_get_local(key);
     }
+    if (!result && query.function) {
+        result = try_get_function(key);
+    }
     if (!result && query.global) {
         result = try_get_global(key);
     }
diff --git a/tests/checks/set.fish b/tests/checks/set.fish
index 31f82b3d5..65cb9b1f5 100644
--- a/tests/checks/set.fish
+++ b/tests/checks/set.fish
@@ -868,6 +868,29 @@ end
 
 erase-funcvar
 
+set -f foo
+set -l banana
+set -g global
+begin
+    set -qf foo
+    and echo foo is function scoped
+    # CHECK: foo is function scoped
+
+    set -l localvar414
+    set -qf localvar414
+    or echo localvar414 is not function scoped
+    # CHECK: localvar414 is not function scoped
+
+    set -qf banana
+    and echo banana is function scoped
+    # CHECK: banana is function scoped
+
+    set -l global
+    set -qf global
+    or echo global is not function scoped
+    # CHECK: global is not function scoped
+end
+
 set --query $this_is_not_set
 echo $status
 # CHECK: 255

From e23e52a8e9ac7041a5ef9008f1b4621965403ce7 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Fri, 11 Mar 2022 23:56:20 +0800
Subject: [PATCH 250/262] docs: standardise on definition lists for options

Harmonizes the option listing including formatting in a similar manner to the
synopsis of each entry.
---
 doc_src/cmds/alias.rst           |  6 +-
 doc_src/cmds/argparse.rst        | 24 +++++---
 doc_src/cmds/block.rst           |  8 +--
 doc_src/cmds/builtin.rst         |  9 +--
 doc_src/cmds/complete.rst        | 50 ++++++++++------
 doc_src/cmds/contains.rst        |  3 +-
 doc_src/cmds/dirs.rst            |  5 +-
 doc_src/cmds/echo.rst            | 12 ++--
 doc_src/cmds/fish_add_path.rst   | 31 +++++++---
 doc_src/cmds/fish_indent.rst     | 27 ++++++---
 doc_src/cmds/fish_key_reader.rst | 12 ++--
 doc_src/cmds/fish_opt.rst        | 21 ++++---
 doc_src/cmds/funced.rst          |  9 ++-
 doc_src/cmds/function.rst        | 36 +++++++-----
 doc_src/cmds/functions.rst       | 37 +++++++-----
 doc_src/cmds/history.rst         | 45 ++++++++++-----
 doc_src/cmds/jobs.rst            | 17 ++++--
 doc_src/cmds/prompt_pwd.rst      | 11 +++-
 doc_src/cmds/psub.rst            |  9 ++-
 doc_src/cmds/pwd.rst             |  6 +-
 doc_src/cmds/realpath.rst        |  3 +-
 doc_src/cmds/set.rst             | 46 +++++++++------
 doc_src/cmds/set_color.rst       | 31 +++++++---
 doc_src/cmds/status.rst          | 58 ++++++++++++-------
 doc_src/cmds/test.rst            | 98 +++++++++++++++++++++-----------
 doc_src/cmds/trap.rst            | 12 ++--
 doc_src/cmds/type.rst            | 21 ++++---
 doc_src/cmds/ulimit.rst          | 43 +++++++++-----
 doc_src/cmds/umask.rst           |  9 ++-
 doc_src/cmds/wait.rst            | 11 ++--
 30 files changed, 470 insertions(+), 240 deletions(-)

diff --git a/doc_src/cmds/alias.rst b/doc_src/cmds/alias.rst
index 29d5c239a..9478ad610 100644
--- a/doc_src/cmds/alias.rst
+++ b/doc_src/cmds/alias.rst
@@ -27,9 +27,11 @@ You cannot create an alias to a function with the same name. Note that spaces ne
 
 The following options are available:
 
-- **-h** or **--help** displays help about using this command.
+**-h** or **--help**
+    Displays help about using this command.
 
-- **-s** or **--save** Automatically save the function created by the alias into your fish configuration directory using :ref:`funcsave <cmd-funcsave>`.
+**-s** or **--save**
+    Saves the function created by the alias into your fish configuration directory using :ref:`funcsave <cmd-funcsave>`.
 
 Example
 -------
diff --git a/doc_src/cmds/argparse.rst b/doc_src/cmds/argparse.rst
index 29216c034..13fc25a13 100644
--- a/doc_src/cmds/argparse.rst
+++ b/doc_src/cmds/argparse.rst
@@ -25,22 +25,28 @@ The variables will be set with local scope (i.e., as if the script had done ``se
 Options
 -------
 
-The following ``argparse`` options are available. They must appear before all OPTION_SPECs:
+The following ``argparse`` options are available. They must appear before all *OPTION_SPEC*\ s:
 
 **-n** or **--name**
-    the command name for use in error messages. By default the current function name will be used, or ``argparse`` if run outside of a function.
+    The command name for use in error messages. By default the current function name will be used, or ``argparse`` if run outside of a function.
 
-**-x** or **--exclusive** should be followed by a comma separated list of short or long options that are mutually exclusive. You can use this more than once to define multiple sets of mutually exclusive options.
+**-x** or **--exclusive** *OPTIONS*
+    A comma separated list of options that are mutually exclusive. You can use this more than once to define multiple sets of mutually exclusive options.
 
-- **-N** or **--min-args** is followed by an integer that defines the minimum number of acceptable non-option arguments. The default is zero.
+**-N** or **--min-args** *NUMBER*
+    The minimum number of acceptable non-option arguments. The default is zero.
 
-- **-X** or **--max-args** is followed by an integer that defines the maximum number of acceptable non-option arguments. The default is infinity.
+**-X** or **--max-args** *NUMBER*
+    The maximum number of acceptable non-option arguments. The default is infinity.
 
-- **-i** or **--ignore-unknown** ignores unknown options, keeping them and their arguments in $argv instead.
+**-i** or **--ignore-unknown**
+    Ignores unknown options, keeping them and their arguments in $argv instead.
 
-- **-s** or **--stop-nonopt** causes scanning the arguments to stop as soon as the first non-option argument is seen. Among other things, this is useful to implement subcommands that have their own options.
+**-s** or **--stop-nonopt**
+    Causes scanning the arguments to stop as soon as the first non-option argument is seen. Among other things, this is useful to implement subcommands that have their own options.
 
-- **-h** or **--help** displays help about using this command.
+**-h** or **--help**
+    Displays help about using this command.
 
 .. _cmd-argparse-usage:
 
@@ -159,7 +165,7 @@ Fish ships with a ``_validate_int`` function that accepts a ``--min`` and ``--ma
 Example OPTION_SPECs
 --------------------
 
-Some OPTION_SPEC examples:
+Some *OPTION_SPEC* examples:
 
 - ``h/help`` means that both ``-h`` and ``--help`` are valid. The flag is a boolean and can be used more than once. If either flag is used then ``_flag_h`` and ``_flag_help`` will be set to the count of how many times either flag was seen.
 
diff --git a/doc_src/cmds/block.rst b/doc_src/cmds/block.rst
index 521d05dbc..3844da99c 100644
--- a/doc_src/cmds/block.rst
+++ b/doc_src/cmds/block.rst
@@ -21,16 +21,16 @@ The block can be removed. Any events which triggered while the block was in plac
 
 Event blocks should not be confused with code blocks, which are created with ``begin``, ``if``, ``while`` or ``for``
 
-The following parameters are available:
+The following options are available:
 
 **-l** or **--local**
-    Release the block automatically at the end of the current innermost code block scope
+    Release the block automatically at the end of the current innermost code block scope.
 
 **-g** or **--global**
-    Never automatically release the lock
+    Never automatically release the lock.
 
 **-e** or **--erase**
-    Release global block
+    Release global block.
 
 Example
 -------
diff --git a/doc_src/cmds/builtin.rst b/doc_src/cmds/builtin.rst
index dd443ce71..8c39b4966 100644
--- a/doc_src/cmds/builtin.rst
+++ b/doc_src/cmds/builtin.rst
@@ -16,12 +16,13 @@ Description
 
 ``builtin`` forces the shell to use a builtin command, rather than a function or program.
 
-The following parameters are available:
+The following options are available:
 
 **-n** or **--names**
-    List the names of all defined builtins
-**-q** or **--query**
-    Tests if any of the specified builtin(s) exist
+    Lists the names of all defined builtins.
+
+**-q** or **--query** *BUILTIN*
+    Tests if any of the specified builtins exist.
 
 Example
 -------
diff --git a/doc_src/cmds/complete.rst b/doc_src/cmds/complete.rst
index ba495e322..53a9434ee 100644
--- a/doc_src/cmds/complete.rst
+++ b/doc_src/cmds/complete.rst
@@ -19,37 +19,55 @@ Description
 For an introduction to writing your own completions, see :ref:`Writing your own completions <completion-own>` in
 the fish manual.
 
-- ``-c COMMAND`` or ``--command COMMAND`` specifies that ``COMMAND`` is the name of the command. If there is no ``-c`` or ``-p``, one non-option argument will be used as the command.
+The following options are available:
 
-- ``-p COMMAND`` or ``--path COMMAND`` specifies that ``COMMAND`` is the absolute path of the command (optionally containing wildcards).
+**-c** or **--command** *COMMAND*
+    Specifies that *COMMAND* is the name of the command. If there is no **-c** or **-p**, one non-option argument will be used as the command.
 
-- ``-e`` or ``--erase`` deletes the specified completion.
+**-p** or **--path** *COMMAND*
+    Specifies that *COMMAND* is the absolute path of the command (optionally containing wildcards).
 
-- ``-s SHORT_OPTION`` or ``--short-option=SHORT_OPTION`` adds a short option to the completions list.
+**-e** or **--erase**
+    Deletes the specified completion.
 
-- ``-l LONG_OPTION`` or ``--long-option=LONG_OPTION`` adds a GNU style long option to the completions list.
+**-s** or **--short-option** *SHORT_OPTION*
+    Adds a short option to the completions list.
 
-- ``-o LONG_OPTION`` or ``--old-option=LONG_OPTION`` adds an old style long option to the completions list (See below for details).
+**-l** or **--long-option** *LONG_OPTION*
+    Adds a GNU style long option to the completions list.
 
-- ``-a ARGUMENTS`` or ``--arguments=ARGUMENTS`` adds the specified option arguments to the completions list.
+**-o** or **--old-option** *LONG_OPTION*
+    Adds an old style long option to the completions list (see below for details).
 
-- ``-k`` or ``--keep-order`` keeps the order of ``ARGUMENTS`` instead of sorting alphabetically. Multiple ``complete`` calls with ``-k`` result in arguments of the later ones displayed first.
+**-a** or **--arguments** *ARGUMENTS*
+    Adds the specified option arguments to the completions list.
 
-- ``-f`` or ``--no-files`` says that this completion may not be followed by a filename.
+**-k** or **--keep-order**
+    Keeps the order of *ARGUMENTS* instead of sorting alphabetically. Multiple ``complete`` calls with **-k** result in arguments of the later ones displayed first.
 
-- ``-F`` or ``--force-files`` says that this completion may be followed by a filename, even if another applicable ``complete`` specified ``--no-files``.
+**-f** or **--no-files**
+    This completion may not be followed by a filename.
 
-- ``-r`` or ``--require-parameter`` says that this completion must have an option argument, i.e. may not be followed by another option.
+**-F** or **--force-files**
+    This completion may be followed by a filename, even if another applicable ``complete`` specified **--no-files**.
 
-- ``-x`` or ``--exclusive`` is short for ``-r`` and ``-f``.
+**-r** or **--require-parameter**
+    This completion must have an option argument, i.e. may not be followed by another option.
 
-- ``-w WRAPPED_COMMAND`` or ``--wraps=WRAPPED_COMMAND`` causes the specified command to inherit completions from the wrapped command (See below for details).
+**-x** or **--exclusive**
+    Short for **-r** and **-f**.
 
-- ``-n CONDITION`` or ``--condition CONDITION`` specifies that this completion should only be used if the CONDITION (a shell command) returns 0. This makes it possible to specify completions that should only be used in some cases.
+**-w** or **--wraps** *WRAPPED_COMMAND*
+    Causes the specified command to inherit completions from *WRAPPED_COMMAND* (see below for details).
 
-- ``-C STRING`` or ``--do-complete=STRING`` makes complete try to find all possible completions for the specified string. If there is no STRING, the current commandline is used instead.
+**-n** or **--condition** *CONDITION*
+    This completion should only be used if the *CONDITION* (a shell command) returns 0. This makes it possible to specify completions that should only be used in some cases.
 
-- When using ``-C``, specify ``--escape`` to escape special characters in completions.
+**-C** or **--do-complete** *STRING*
+    Makes ``complete`` try to find all possible completions for the specified string. If there is no *STRING*, the current commandline is used instead.
+
+**--escape**
+    When used with ``-C``, escape special characters in completions.
 
 Command specific tab-completions in ``fish`` are based on the notion of options and arguments. An option is a parameter which begins with a hyphen, such as ``-h``, ``-help`` or ``--help``. Arguments are parameters that do not begin with a hyphen. Fish recognizes three styles of options, the same styles as the GNU getopt library. These styles are:
 
diff --git a/doc_src/cmds/contains.rst b/doc_src/cmds/contains.rst
index 8a59ec982..9929a729c 100644
--- a/doc_src/cmds/contains.rst
+++ b/doc_src/cmds/contains.rst
@@ -18,7 +18,8 @@ If so, ``contains`` exits with code 0; if not, it exits with code 1.
 
 The following options are available:
 
-- **-i** or **--index** print the word index
+**-i** or **--index**
+    Print the index (number of the element in the set) of the first matching element.
 
 Note that ``contains`` interprets all arguments starting with a **-** as an option to ``contains``, until an **--** argument is reached.
 
diff --git a/doc_src/cmds/dirs.rst b/doc_src/cmds/dirs.rst
index 613ec96e9..13b1c4bcb 100644
--- a/doc_src/cmds/dirs.rst
+++ b/doc_src/cmds/dirs.rst
@@ -15,7 +15,10 @@ Description
 
 ``dirs`` prints the current :ref:`directory stack <directory-stack>`, as created by :ref:`pushd <cmd-pushd>` and modified by :ref:`popd <cmd-popd>`.
 
-With "-c", it clears the directory stack instead.
+The following options are available:
+
+**-c**:
+    Clear the directory stack instead of printing it.
 
 ``dirs`` does not accept any parameters.
 
diff --git a/doc_src/cmds/echo.rst b/doc_src/cmds/echo.rst
index f8bf8bd24..d6143bf1f 100644
--- a/doc_src/cmds/echo.rst
+++ b/doc_src/cmds/echo.rst
@@ -17,13 +17,17 @@ Description
 
 The following options are available:
 
-- ``-n``, Do not output a newline
+- **-n**
+    Do not output a newline.
 
-- ``-s``, Do not separate arguments with spaces
+**-s**
+    Do not separate arguments with spaces.
 
-- ``-E``, Disable interpretation of backslash escapes (default)
+**-E**
+    Disable interpretation of backslash escapes (default).
 
-- ``-e``, Enable interpretation of backslash escapes
+**-e**
+    Enable interpretation of backslash escapes.
 
 Unlike other shells, this echo accepts ``--`` to signal the end of the options.
 
diff --git a/doc_src/cmds/fish_add_path.rst b/doc_src/cmds/fish_add_path.rst
index a8b19b18e..c6c907cc5 100644
--- a/doc_src/cmds/fish_add_path.rst
+++ b/doc_src/cmds/fish_add_path.rst
@@ -31,14 +31,29 @@ If a component is not an existing directory, ``fish_add_path`` ignores it.
 Options
 -------
 
-- ``-a`` or ``--append`` causes the components to be added to the *end* of the variable
-- ``-p`` or ``--prepend`` causes the components to be added to the *front* of the variable (this is the default)
-- ``-g`` or ``--global`` means to use a global $fish_user_paths
-- ``-U`` or ``--universal`` means to use a universal $fish_user_paths - this is the default if it doesn't already exist
-- ``-P`` or ``--path`` means to use $PATH directly
-- ``-m`` or ``--move`` means to move already existing components to the place they would be added - by default they would be left in place and not added again
-- ``-v`` or ``--verbose`` means to print the :ref:`set <cmd-set>` command used
-- ``-n`` or ``--dry-run`` means to print the ``set`` command that would be used without executing it
+**-a** or **--append**
+    Add components to the *end* of the variable.
+
+**-p** or **--prepend**
+    Add components to the *front* of the variable (this is the default).
+
+**-g** or **--global**
+    Use a global :envvar:`fish_user_paths`.
+
+**-U** or **--universal**
+    Use a universal :envvar:`fish_user_paths` - this is the default if it doesn't already exist.
+
+**-P** or **--path**
+    Manipulate :envvar:`PATH` directly.
+
+**-m** or **--move**
+    Move already-existing components to the place they would be added - by default they would be left in place and not added again.
+
+**-v** or **--verbose**
+    Print the :ref:`set <cmd-set>` command used.
+
+**-n** or **--dry-run**
+    Print the ``set`` command that would be used without executing it.
 
 If ``--move`` is used, it may of course lead to the path swapping order, so you should be careful doing that in config.fish.
 
diff --git a/doc_src/cmds/fish_indent.rst b/doc_src/cmds/fish_indent.rst
index bab448292..ca0849a50 100644
--- a/doc_src/cmds/fish_indent.rst
+++ b/doc_src/cmds/fish_indent.rst
@@ -19,20 +19,29 @@ Description
 
 The following options are available:
 
-- ``-w`` or ``--write`` indents a specified file and immediately writes to that file.
+**-w** or **--write**
+    Indents a specified file and immediately writes to that file.
 
-- ``-i`` or ``--no-indent`` do not indent commands; only reformat to one job per line.
+**-i** or **--no-indent**
+    Do not indent commands; only reformat to one job per line.
 
-- ``-c`` or ``--check`` do not indent, only return 0 if the code is already indented as fish_indent would, the number of failed files otherwise. Also print the failed filenames if not reading from stdin.
+**-c** or **--check**
+    Do not indent, only return 0 if the code is already indented as fish_indent would, the number of failed files otherwise. Also print the failed filenames if not reading from standard input.
 
-- ``-v`` or ``--version`` displays the current fish version and then exits.
+**-v** or **--version**
+    Displays the current :program:`fish` version and then exits.
 
-- ``--ansi`` colorizes the output using ANSI escape sequences, appropriate for the current $TERM, using the colors defined in the environment (such as ``$fish_color_command``).
+**--ansi**
+    Colorizes the output using ANSI escape sequences, appropriate for the current :envvar:`TERM`, using the colors defined in the environment (such as :envvar:`fish_color_command`).
 
-- ``--html`` outputs HTML, which supports syntax highlighting if the appropriate CSS is defined. The CSS class names are the same as the variable names, such as ``fish_color_command``.
+**--html**
+    Outputs HTML, which supports syntax highlighting if the appropriate CSS is defined. The CSS class names are the same as the variable names, such as ``fish_color_command``.
 
-- ``-d`` or ``--debug=DEBUG_CATEGORIES`` enable debug output and specify a pattern for matching debug categories. See :ref:`Debugging <debugging-fish>` in :ref:`fish <cmd-fish>` (1) for details.
+**-d** or **--debug=DEBUG_CATEGORIES**
+    Enable debug output and specify a pattern for matching debug categories. See :ref:`Debugging <debugging-fish>` in :ref:`fish <cmd-fish>` (1) for details.
 
-- ``-o`` or ``--debug-output=DEBUG_FILE`` specify a file path to receive the debug output, including categories and ``fish_trace``. The default is stderr.
+**-o** or **--debug-output=DEBUG_FILE**
+    Specify a file path to receive the debug output, including categories and ``fish_trace``. The default is standard error.
 
-- ``--dump-parse-tree`` dumps information about the parsed statements to stderr. This is likely to be of interest only to people working on the fish source code.
+**--dump-parse-tree**
+    Dumps information about the parsed statements to standard error. This is likely to be of interest only to people working on the fish source code.
diff --git a/doc_src/cmds/fish_key_reader.rst b/doc_src/cmds/fish_key_reader.rst
index ed26554a7..d703f3e3b 100644
--- a/doc_src/cmds/fish_key_reader.rst
+++ b/doc_src/cmds/fish_key_reader.rst
@@ -19,13 +19,17 @@ If the character sequence matches a special key name (see ``bind --key-names``),
 
 The following options are available:
 
-- ``-c`` or ``--continuous`` begins a session where multiple key sequences can be inspected. By default the program exits after capturing a single key sequence.
+**-c** or **--continuous**
+    Begins a session where multiple key sequences can be inspected. By default the program exits after capturing a single key sequence.
 
-- ``-V`` or ``--verbose`` tells fish_key_reader to output timing information and explain the sequence in more detail.
+**-V** or **--verbose**
+    Tells fish_key_reader to output timing information and explain the sequence in more detail.
 
-- ``-h`` or ``--help`` prints usage information.
+**-h** or **--help**
+    Displays help about using this command.
 
-- ``-v`` or ``--version`` prints fish_key_reader's version and exits.
+**-v** or **--version**
+    Displays the current :program:`fish` version and then exits.
 
 Usage Notes
 -----------
diff --git a/doc_src/cmds/fish_opt.rst b/doc_src/cmds/fish_opt.rst
index 80867648c..fa63b7bea 100644
--- a/doc_src/cmds/fish_opt.rst
+++ b/doc_src/cmds/fish_opt.rst
@@ -18,19 +18,26 @@ This command provides a way to produce option specifications suitable for use wi
 
 The following ``argparse`` options are available:
 
-- ``-s`` or ``--short`` takes a single letter that is used as the short flag in the option being defined. This option is mandatory.
+**-s** or **--short**
+    Takes a single letter that is used as the short flag in the option being defined. This option is mandatory.
 
-- ``-l`` or ``--long`` takes a string that is used as the long flag in the option being defined. This option is optional and has no default. If no long flag is defined then only the short flag will be allowed when parsing arguments using the option spec.
+**-l** or **--long**
+    Takes a string that is used as the long flag in the option being defined. This option is optional and has no default. If no long flag is defined then only the short flag will be allowed when parsing arguments using the option specification.
 
-- ``--long-only`` means the option spec being defined will only allow the long flag name to be used. The short flag name must still be defined (i.e., ``--short`` must be specified) but it cannot be used when parsing args using this option spec.
+**--long-only**
+    The option being defined will only allow the long flag name to be used. The short flag name must still be defined (i.e., **--short** must be specified) but it cannot be used when parsing arguments using this option specification.
 
-- ``-o`` or ``--optional-val`` means the option being defined can take a value but it is optional rather than required. If the option is seen more than once when parsing arguments only the last value seen is saved. This means the resulting flag variable created by ``argparse`` will zero elements if no value was given with the option else it will have exactly one element.
+**-o** or **--optional-val**
+    Tthe option being defined can take a value, but it is optional rather than required. If the option is seen more than once when parsing arguments, only the last value seen is saved. This means the resulting flag variable created by ``argparse`` will zero elements if no value was given with the option else it will have exactly one element.
 
-- ``-r`` or ``--required-val`` means the option being defined requires a value. If the option is seen more than once when parsing arguments only the last value seen is saved. This means the resulting flag variable created by ``argparse`` will have exactly one element.
+**-r** or **--required-val**
+    The option being defined requires a value. If the option is seen more than once when parsing arguments, only the last value seen is saved. This means the resulting flag variable created by ``argparse`` will have exactly one element.
 
-- ``--multiple-vals`` means the option being defined requires a value each time it is seen. Each instance is stored. This means the resulting flag variable created by ``argparse`` will have one element for each instance of this option in the args.
+**--multiple-vals**
+    The option being defined requires a value each time it is seen. Each instance is stored. This means the resulting flag variable created by ``argparse`` will have one element for each instance of this option in the arguments.
 
-- ``-h`` or ``--help`` displays help about using this command.
+**-h** or **--help**
+    Displays help about using this command.
 
 Examples
 --------
diff --git a/doc_src/cmds/funced.rst b/doc_src/cmds/funced.rst
index 596baf4e8..581e53063 100644
--- a/doc_src/cmds/funced.rst
+++ b/doc_src/cmds/funced.rst
@@ -21,11 +21,14 @@ If the ``$VISUAL`` environment variable is set, it will be used as the program t
 
 If there is no function called *NAME*, a new function will be created with the specified name.
 
-- ``-e command`` or ``--editor command`` Open the function body inside the text editor given by the command (for example, ``-e vi``). The special command ``fish`` will use the built-in editor (same as specifying ``-i``).
+**-e command** or **--editor command**
+    Open the function body inside the text editor given by the command (for example, **-e vi**). The special command ``fish`` will use the built-in editor (same as specifying **-i**).
 
-- ``-i`` or ``--interactive`` Force opening the function body in the built-in editor even if ``$VISUAL`` or ``$EDITOR`` is defined.
+**-i** or **--interactive**
+    Force opening the function body in the built-in editor even if ``$VISUAL`` or ``$EDITOR`` is defined.
 
-- ``-s`` or ``--save`` Automatically save the function after successfully editing it.
+**-s** or **--save**
+    Automatically save the function after successfully editing it.
 
 Example
 -------
diff --git a/doc_src/cmds/function.rst b/doc_src/cmds/function.rst
index abb3ba33c..a9d137398 100644
--- a/doc_src/cmds/function.rst
+++ b/doc_src/cmds/function.rst
@@ -20,29 +20,37 @@ A function is a list of commands that will be executed when the name of the func
 
 The following options are available:
 
-- ``-a NAMES`` or ``--argument-names NAMES`` assigns the value of successive command-line arguments to the names given in NAMES.
+**-a** *NAMES* or **--argument-names** *NAMES*
+    Assigns the value of successive command-line arguments to the names given in *NAMES*.
 
-- ``-d DESCRIPTION`` or ``--description=DESCRIPTION`` is a description of what the function does, suitable as a completion description.
+**-d** *DESCRIPTION* or **--description** *DESCRIPTION*
+    A description of what the function does, suitable as a completion description.
 
-- ``-w WRAPPED_COMMAND`` or ``--wraps=WRAPPED_COMMAND`` causes the function to inherit completions from the given wrapped command. See the documentation for :ref:`complete <cmd-complete>` for more information.
+**-w** *WRAPPED_COMMAND* or **--wraps** *WRAPPED_COMMAND*
+    Inherit completions from the given *WRAPPED_COMMAND*. See the documentation for :ref:`complete <cmd-complete>` for more information.
 
-- ``-e`` or ``--on-event EVENT_NAME`` tells fish to run this function when the specified named event is emitted. Fish internally generates named events e.g. when showing the prompt.
+**-e** *EVENT_NAME* or **--on-event** *EVENT_NAME*
+    Run this function when the specified named event is emitted. Fish internally generates named events, for example,when showing the prompt. Custom events can be emitted using the :ref:`emit <cmd-emit>` command.
 
-- ``-v`` or ``--on-variable VARIABLE_NAME`` tells fish to run this function when the variable VARIABLE_NAME changes value. Note that fish makes no guarantees on any particular timing or even that the function will be run for every single ``set``. Rather it will be run when the variable has been set at least once, possibly skipping some values or being run when the variable has been set to the same value (except for universal variables set in other shells - only changes in the value will be picked up for those).
+**-v** *VARIABLE_NAME* or **--on-variable** *VARIABLE_NAME*
+    Run this function when the variable *VARIABLE_NAME* changes value. Note that :program:`fish`` makes no guarantees on any particular timing or even that the function will be run for every single ``set``. Rather it will be run when the variable has been set at least once, possibly skipping some values or being run when the variable has been set to the same value (except for universal variables set in other shells - only changes in the value will be picked up for those).
 
-- ``-j PID`` or ``--on-job-exit PID`` tells fish to run this function when the job containing a child process with the given PID exits. Instead of PID, the string 'caller' can be specified. This is only legal when in a command substitution, and will result in the handler being triggered by the exit of the job which created this command substitution.
+**-j** *PID* or **--on-job-exit** *PID*
+    Run this function when the job containing a child process with the given process identifier *PID* exits. Instead of a PID, the string 'caller' can be specified. This is only allowed when in a command substitution, and will result in the handler being triggered by the exit of the job which created this command substitution.
 
-- ``-p PID`` or ``--on-process-exit PID`` tells fish to run this function when the fish child process
-  with process ID PID exits. Instead of a PID, for backward compatibility,
-  "``%self``" can be specified as an alias for ``$fish_pid``, and the function will be run when the
-  current fish instance exits.
+**-p** *PID* or **--on-process-exit** *PID*
+    Run this function when the fish child process with process ID PID exits. Instead of a PID, for backward compatibility, "``%self``" can be specified as an alias for ``$fish_pid``, and the function will be run when the current fish instance exits.
 
-- ``-s`` or ``--on-signal SIGSPEC`` tells fish to run this function when the signal ``SIGSPEC`` is delivered. ``SIGSPEC`` can be a signal number, or the signal name, such as ``SIGHUP`` (or just ``HUP``). Note that the signal must have been delivered to fish; for example, :kbd:`Ctrl-C` sends ``SIGINT`` to the foreground process group, which will not be fish if you are running another command at the time.
+**-s** *SIGSPEC* or **--on-signal** *SIGSPEC*
+    Run this function when the signal ``SIGSPEC`` is delivered. ``SIGSPEC`` can be a signal number, or the signal name, such as ``SIGHUP`` (or just ``HUP``). Note that the signal must have been delivered to :program:`fish`; for example, :kbd:`Ctrl-C` sends ``SIGINT`` to the foreground process group, which will not be :program:`fish` if you are running another command at the time.
 
-- ``-S`` or ``--no-scope-shadowing`` allows the function to access the variables of calling functions. Normally, any variables inside the function that have the same name as variables from the calling function are "shadowed", and their contents are independent of the calling function.
-  It's important to note that this does not capture referenced variables or the scope at the time of function declaration! At this time, fish does not have any concept of closures, and variable lifetimes are never extended. In other words, by using ``--no-scope-shadowing`` the scope of the function each time it is run is shared with the scope it was *called* from rather than the scope it was *defined* in.
+**-S** or **--no-scope-shadowing**
+    Allows the function to access the variables of calling functions. Normally, any variables inside the function that have the same name as variables from the calling function are "shadowed", and their contents are independent of the calling function.
 
-- ``-V`` or ``--inherit-variable NAME`` snapshots the value of the variable ``NAME`` and defines a local variable with that same name and value when the function is defined. This is similar to a closure in other languages like Python but a bit different. Note the word "snapshot" in the first sentence. If you change the value of the variable after defining the function, even if you do so in the same scope (typically another function) the new value will not be used by the function you just created using this option. See the ``function notify`` example below for how this might be used.
+    It's important to note that this does not capture referenced variables or the scope at the time of function declaration! At this time, fish does not have any concept of closures, and variable lifetimes are never extended. In other words, by using **--no-scope-shadowing** the scope of the function each time it is run is shared with the scope it was *called* from rather than the scope it was *defined* in.
+
+**-V** or **--inherit-variable NAME**
+    Snapshots the value of the variable ``NAME`` and defines a local variable with that same name and value when the function is defined. This is similar to a closure in other languages like Python but a bit different. Note the word "snapshot" in the first sentence. If you change the value of the variable after defining the function, even if you do so in the same scope (typically another function) the new value will not be used by the function you just created using this option. See the ``function notify`` example below for how this might be used.
 
 If the user enters any additional arguments after the function, they are inserted into the environment :ref:`variable list <variables-lists>` ``$argv``. If the ``--argument-names`` option is provided, the arguments are also assigned to names specified in that option.
 
diff --git a/doc_src/cmds/functions.rst b/doc_src/cmds/functions.rst
index cdd0da710..860e9ed8d 100644
--- a/doc_src/cmds/functions.rst
+++ b/doc_src/cmds/functions.rst
@@ -21,35 +21,46 @@ Description
 
 The following options are available:
 
-- ``-a`` or ``--all`` lists all functions, even those whose name starts with an underscore.
+**-a** or **--all**
+    Lists all functions, even those whose name starts with an underscore.
 
-- ``-c OLDNAME NEWNAME`` or ``--copy OLDNAME NEWNAME`` creates a new function named NEWNAME, using the definition of the OLDNAME function.
+**-c** or **--copy** *OLDNAME* *NEWNAME*
+    Creates a new function named *NEWNAME*, using the definition of the *OLDNAME* function.
 
-- ``-d DESCRIPTION`` or ``--description=DESCRIPTION`` changes the description of this function.
+**-d** or **--description** *DESCRIPTION*
+    Changes the description of this function.
 
-- ``-e`` or ``--erase`` causes the specified functions to be erased. This also means that it is prevented from autoloading in the current session. Use :ref:`funcsave <cmd-funcsave>` to remove the saved copy.
+**-e** or **--erase**
+    Causes the specified functions to be erased. This also means that it is prevented from autoloading in the current session. Use :ref:`funcsave <cmd-funcsave>` to remove the saved copy.
 
-- ``-D`` or ``--details`` reports the path name where the specified function is defined or could be autoloaded, ``stdin`` if the function was defined interactively or on the command line or by reading stdin, ``-`` if the function was created via :ref:`source <cmd-source>`, and ``n/a`` if the function isn't available. (Functions created via :ref:`alias <cmd-alias>` will return ``-``, because ``alias`` uses ``source`` internally.) If the ``--verbose`` option is also specified then five lines are written:
+**-D** or **--details**
+    Reports the path name where the specified function is defined or could be autoloaded, ``stdin`` if the function was defined interactively or on the command line or by reading standard input, **-** if the function was created via :ref:`source <cmd-source>`, and ``n/a`` if the function isn't available. (Functions created via :ref:`alias <cmd-alias>` will return **-**, because ``alias`` uses ``source`` internally.) If the **--verbose** option is also specified then five lines are written:
 
     - the pathname as already described,
     - ``autoloaded``, ``not-autoloaded`` or ``n/a``,
     - the line number within the file or zero if not applicable,
-    - ``scope-shadowing`` if the function shadows the vars in the calling function (the normal case if it wasn't defined with ``--no-scope-shadowing``), else ``no-scope-shadowing``, or ``n/a`` if the function isn't defined,
+    - ``scope-shadowing`` if the function shadows the vars in the calling function (the normal case if it wasn't defined with **--no-scope-shadowing**), else ``no-scope-shadowing``, or ``n/a`` if the function isn't defined,
     - the function description minimally escaped so it is a single line, or ``n/a`` if the function isn't defined or has no description.
 
-You should not assume that only five lines will be written since we may add additional information to the output in the future.
+    You should not assume that only five lines will be written since we may add additional information to the output in the future.
 
-- ``--no-details`` turns off function path reporting, so just the definition will be printed.
+**--no-details**
+    Turns off function path reporting, so just the definition will be printed.
 
-- ``-n`` or ``--names`` lists the names of all defined functions.
+**-n** or **--names**
+    Lists the names of all defined functions.
 
-- ``-q`` or ``--query`` tests if the specified functions exist.
+**-q** or **--query**
+    Tests if the specified functions exist.
 
-- ``-v`` or ``--verbose`` will make some output more verbose.
+**-v** or **--verbose**
+    Make some output more verbose.
 
-- ``-H`` or ``--handlers`` will show all event handlers.
+**-H** or **--handlers**
+    Show all event handlers.
 
-- ``-t`` or ``--handlers-type TYPE`` will show all event handlers matching the given type
+**-t** or **--handlers-type** *TYPE*
+    Show all event handlers matching the given *TYPE*.
 
 The default behavior of ``functions``, when called with no arguments, is to print the names of all defined functions. Unless the ``-a`` option is given, no functions starting with underscores are included in the output.
 
diff --git a/doc_src/cmds/history.rst b/doc_src/cmds/history.rst
index 725d0e0ac..959d8ce30 100644
--- a/doc_src/cmds/history.rst
+++ b/doc_src/cmds/history.rst
@@ -25,39 +25,54 @@ Description
 
 The following operations (sub-commands) are available:
 
-- **search** returns history items matching the search string. If no search string is provided it returns all history items. This is the default operation if no other operation is specified. You only have to explicitly say ``history search`` if you wish to search for one of the subcommands. The ``--contains`` search option will be used if you don't specify a different search option. Entries are ordered newest to oldest unless you use the ``--reverse`` flag. If stdout is attached to a tty the output will be piped through your pager by the history function. The history builtin simply writes the results to stdout.
+**search**
+    Returns history items matching the search string. If no search string is provided it returns all history items. This is the default operation if no other operation is specified. You only have to explicitly say ``history search`` if you wish to search for one of the subcommands. The ``--contains`` search option will be used if you don't specify a different search option. Entries are ordered newest to oldest unless you use the ``--reverse`` flag. If stdout is attached to a tty the output will be piped through your pager by the history function. The history builtin simply writes the results to stdout.
 
-- **delete** deletes history items. The ``--contains`` search option will be used if you don't specify a different search option. If you don't specify ``--exact`` a prompt will be displayed before any items are deleted asking you which entries are to be deleted. You can enter the word "all" to delete all matching entries. You can enter a single ID (the number in square brackets) to delete just that single entry. You can enter more than one ID separated by a space to delete multiple entries. Just press [enter] to not delete anything. Note that the interactive delete behavior is a feature of the history function. The history builtin only supports ``--exact --case-sensitive`` deletion.
+**delete**
+    Deletes history items. The ``--contains`` search option will be used if you don't specify a different search option. If you don't specify ``--exact`` a prompt will be displayed before any items are deleted asking you which entries are to be deleted. You can enter the word "all" to delete all matching entries. You can enter a single ID (the number in square brackets) to delete just that single entry. You can enter more than one ID separated by a space to delete multiple entries. Just press [enter] to not delete anything. Note that the interactive delete behavior is a feature of the history function. The history builtin only supports ``--exact --case-sensitive`` deletion.
 
-- **merge** immediately incorporates history changes from other sessions. Ordinarily ``fish`` ignores history changes from sessions started after the current one. This command applies those changes immediately.
+**merge**
+    Immediately incorporates history changes from other sessions. Ordinarily ``fish`` ignores history changes from sessions started after the current one. This command applies those changes immediately.
 
-- **save** immediately writes all changes to the history file. The shell automatically saves the history file; this option is provided for internal use and should not normally need to be used by the user.
+**save**
+    Immediately writes all changes to the history file. The shell automatically saves the history file; this option is provided for internal use and should not normally need to be used by the user.
 
-- **clear** clears the history file. A prompt is displayed before the history is erased asking you to confirm you really want to clear all history unless ``builtin history`` is used.
+**clear**
+    Clears the history file. A prompt is displayed before the history is erased asking you to confirm you really want to clear all history unless ``builtin history`` is used.
 
-- **clear-session** clears the history file from all activity of the current session. Note: If ``history merge`` or ``builtin history merge`` is run in a session only the history after this will be erased.
+**clear-session**
+    Clears the history file from all activity of the current session. Note: If ``history merge`` or ``builtin history merge`` is run in a session, only the history after this will be erased.
 
 The following options are available:
 
 These flags can appear before or immediately after one of the sub-commands listed above.
 
-- **-C** or **--case-sensitive** does a case-sensitive search. The default is case-insensitive. Note that prior to fish 2.4.0 the default was case-sensitive.
+**-C** or **--case-sensitive**
+    Does a case-sensitive search. The default is case-insensitive. Note that prior to fish 2.4.0 the default was case-sensitive.
 
-- **-c** or **--contains** searches or deletes items in the history that contain the specified text string. This is the default for the **--search** flag. This is not currently supported by the **delete** subcommand.
+**-c** or **--contains**
+    Searches items in the history that contain the specified text string. This is the default for the **--search** flag. This is not currently supported by the **delete** subcommand.
 
-- **-e** or **--exact** searches or deletes items in the history that exactly match the specified text string. This is the default for the **delete** subcommand. Note that the match is case-insensitive by default. If you really want an exact match, including letter case, you must use the **-C** or **--case-sensitive** flag.
+**-e** or **--exact**
+    Searches or deletes items in the history that exactly match the specified text string. This is the default for the **delete** subcommand. Note that the match is case-insensitive by default. If you really want an exact match, including letter case, you must use the **-C** or **--case-sensitive** flag.
 
-- **-p** or **--prefix** searches or deletes items in the history that begin with the specified text string. This is not currently supported by the **--delete** flag.
+**-p** or **--prefix**
+    Searches items in the history that begin with the specified text string. This is not currently supported by the **delete** subcommand.
 
-- **-t** or **--show-time** prepends each history entry with the date and time the entry was recorded. By default it uses the strftime format ``# %c%n``. You can specify another format; e.g., ``--show-time="%Y-%m-%d %H:%M:%S "`` or ``--show-time="%a%I%p"``. The short option, **-t**, doesn't accept a strftime format string; it only uses the default format. Any strftime format is allowed, including ``%s`` to get the raw UNIX seconds since the epoch.
+**-t** or **--show-time**
+    Prepends each history entry with the date and time the entry was recorded. By default it uses the strftime format ``# %c%n``. You can specify another format; e.g., ``--show-time="%Y-%m-%d %H:%M:%S "`` or ``--show-time="%a%I%p"``. The short option, **-t**, doesn't accept a strftime format string; it only uses the default format. Any strftime format is allowed, including ``%s`` to get the raw UNIX seconds since the epoch.
 
-- **-z** or **--null** causes history entries written by the search operations to be terminated by a NUL character rather than a newline. This allows the output to be processed by ``read -z`` to correctly handle multiline history entries.
+**-z** or **--null**
+    Causes history entries written by the search operations to be terminated by a NUL character rather than a newline. This allows the output to be processed by ``read -z`` to correctly handle multiline history entries.
 
-- ``-<number>`` ``-n <number>`` or ``--max=<number>`` limits the matched history items to the first "n" matching entries. This is only valid for ``history search``.
+**-**\*NUMBER* **-n** *NUMBER* or **--max** *NUMBER*
+    Limits the matched history items to the first *NUMBER* matching entries. This is only valid for ``history search``.
 
-- **-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.
+**-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.
 
-- **-h** or **--help** display help for this command.
+**-h** or **--help**
+    Displays help for this command.
 
 Example
 -------
diff --git a/doc_src/cmds/jobs.rst b/doc_src/cmds/jobs.rst
index f84dd592c..55c36a99a 100644
--- a/doc_src/cmds/jobs.rst
+++ b/doc_src/cmds/jobs.rst
@@ -16,17 +16,22 @@ Description
 
 ``jobs`` prints a list of the currently running :ref:`jobs <syntax-job-control>` and their status.
 
-jobs accepts the following switches:
+``jobs`` accepts the following options:
 
-- ``-c`` or ``--command`` prints the command name for each process in jobs.
+**-c** or **--command**
+    Prints the command name for each process in jobs.
 
-- ``-g`` or ``--group`` only prints the group ID of each job.
+**-g** or **--group**
+    Only prints the group ID of each job.
 
-- ``-l`` or ``--last`` prints only the last job to be started.
+**-l** or **--last**
+    Prints only the last job to be started.
 
-- ``-p`` or ``--pid`` prints the process ID for each process in all jobs.
+**-p** or **--pid**
+    Prints the process ID for each process in all jobs.
 
-- ``-q`` or ``--query`` prints no output for evaluation of jobs by exit status only. For compatibility with old fish versions this is also ``--quiet`` (but this is deprecated).
+**-q** or **--query**
+    Prints no output for evaluation of jobs by exit status only. For compatibility with old fish versions this is also **--quiet** (but this is deprecated).
 
 On systems that supports this feature, jobs will print the CPU usage of each job since the last command was executed. The CPU usage is expressed as a percentage of full CPU activity. Note that on multiprocessor systems, the total activity may be more than 100\%.
 
diff --git a/doc_src/cmds/prompt_pwd.rst b/doc_src/cmds/prompt_pwd.rst
index 47a5a7fd9..e63a1a4db 100644
--- a/doc_src/cmds/prompt_pwd.rst
+++ b/doc_src/cmds/prompt_pwd.rst
@@ -24,9 +24,14 @@ If any positional arguments are given, prompt_pwd shortens them instead of $PWD.
 Options
 -------
 
-- ``-h`` or ``--help`` displays the help and exits
-- ``-d`` or ``--dir-length=MAX`` causes the components to be shortened to MAX characters each. This overrides $fish_prompt_pwd_dir_length.
-- ``-D`` or ``--full-length-dirs=NUM`` keeps NUM components (counted from the right) as full length without shortening. This overrides $fish_prompt_pwd_full_dirs.
+**-d** or **--dir-length** *MAX*
+    Causes the components to be shortened to *MAX* characters each. This overrides :envvar:`fish_prompt_pwd_dir_length`.
+
+**-D** or **--full-length-dirs** *NUM*
+    Keeps *NUM* components (counted from the right) as full length without shortening. This overrides :envvar:`fish_prompt_pwd_full_dirs`.
+
+**-h** or **--help**
+    Displays help about using this command.
 
 Examples
 --------
diff --git a/doc_src/cmds/psub.rst b/doc_src/cmds/psub.rst
index bf0be47d1..b59d81377 100644
--- a/doc_src/cmds/psub.rst
+++ b/doc_src/cmds/psub.rst
@@ -17,11 +17,14 @@ Some shells (e.g., ksh, bash) feature a syntax that is a mix between command sub
 
 The following options are available:
 
-- ``-f`` or ``--file`` will cause psub to use a regular file instead of a named pipe to communicate with the calling process. This will cause ``psub`` to be significantly slower when large amounts of data are involved, but has the advantage that the reading process can seek in the stream. This is the default.
+**-f** or **--file**
+    Use a regular file instead of a named pipe to communicate with the calling process. This will cause ``psub`` to be significantly slower when large amounts of data are involved, but has the advantage that the reading process can seek in the stream. This is the default.
 
-- ``-F`` or ``--fifo`` will cause psub to use a named pipe rather than a file. You should only use this if the command produces no more than 8 KiB of output. The limit on the amount of data a FIFO can buffer varies with the OS but is typically 8 KiB, 16 KiB or 64 KiB. If you use this option and the command on the left of the psub pipeline produces more output a deadlock is likely to occur.
+**-F** or **--fifo**
+    Use a named pipe rather than a file. You should only use this if the command produces no more than 8 KiB of output. The limit on the amount of data a FIFO can buffer varies with the OS but is typically 8 KiB, 16 KiB or 64 KiB. If you use this option and the command on the left of the psub pipeline produces more output a deadlock is likely to occur.
 
-- ``-s`` or ``--suffix`` will append SUFFIX to the filename.
+**-s** or **--suffix** *SUFFIX*
+    Append SUFFIX to the filename.
 
 Example
 -------
diff --git a/doc_src/cmds/pwd.rst b/doc_src/cmds/pwd.rst
index 52fc3e107..d8a392f87 100644
--- a/doc_src/cmds/pwd.rst
+++ b/doc_src/cmds/pwd.rst
@@ -25,9 +25,11 @@ Description
 
 The following options are available:
 
-- ``-L`` or ``--logical`` Output the logical working directory, without resolving symlinks (default behavior).
+**-L** or **--logical**
+    Output the logical working directory, without resolving symlinks (default behavior).
 
-- ``-P`` or ``--physical`` Output the physical working directory, with symlinks resolved.
+**-P** or **--physical**
+    Output the physical working directory, with symlinks resolved.
 
 See Also
 --------
diff --git a/doc_src/cmds/realpath.rst b/doc_src/cmds/realpath.rst
index 92a624781..c4bd18dfc 100644
--- a/doc_src/cmds/realpath.rst
+++ b/doc_src/cmds/realpath.rst
@@ -27,4 +27,5 @@ If a :command:`realpath` command exists, that will be preferred.
 
 The following options are available:
 
-- ``-s`` or ``--no-symlinks``: Don't resolve symlinks, only make paths absolute, squash multiple slashes and remove trailing slashes.
+**-s** or **--no-symlinks**
+    Don't resolve symlinks, only make paths absolute, squash multiple slashes and remove trailing slashes.
diff --git a/doc_src/cmds/set.rst b/doc_src/cmds/set.rst
index 256275a41..7a8741272 100644
--- a/doc_src/cmds/set.rst
+++ b/doc_src/cmds/set.rst
@@ -33,40 +33,54 @@ With ``--show``, ``set`` will describe the given variable names, explaining how
 
 The following options control variable scope:
 
-- ``-f`` or ``--function`` scopes the variable to the currently executing function. It is erased when the function ends.
+**-f** or **--function**
+    Scopes the variable to the currently executing function. It is erased when the function ends.
 
-- ``-l`` or ``--local`` scopes the variable to the currently executing block. It is erased when the block ends. Outside of a block, this is the same as ``--function``.
+**-l** or **--local**
+    Scopes the variable to the currently executing block. It is erased when the block ends. Outside of a block, this is the same as **--function**.
 
-- ``-g`` or ``--global`` causes the specified shell variable to be given a global scope. Global variables don't disappear and are available to all functions running in the same shell. They can even be modified.
+**-g** or **--global**
+    Causes the specified shell variable to be given a global scope. Global variables don't disappear and are available to all functions running in the same shell. They can even be modified.
 
-- ``-U`` or ``--universal`` causes the specified shell variable to be given a universal scope. If this option is supplied, the variable will be shared between all the current user's fish instances on the current computer, and will be preserved across restarts of the shell.
+**-U** or **--universal**
+    Causes the specified shell variable to be given a universal scope. If this option is supplied, the variable will be shared between all the current user's fish instances on the current computer, and will be preserved across restarts of the shell.
 
 These options control additional variable options:
 
-- ``-x`` or ``--export`` causes the specified shell variable to be exported to child processes (making it an "environment variable")
+**-x** or **--export**
+    Causes the specified shell variable to be exported to child processes (making it an "environment variable")
 
-- ``-u`` or ``--unexport`` causes the specified shell variable to NOT be exported to child processes
+**-u** or **--unexport**
+    Causes the specified shell variable to NOT be exported to child processes
 
-- ``--path`` causes the specified variable to be treated as a path variable, meaning it will automatically be split on colons, and joined using colons when quoted (``echo "$PATH"``) or exported.
+**--path**
+    Causes the specified variable to be treated as a :ref:`path variable <variables-path>`, meaning it will automatically be split on colons, and joined using colons when quoted (``echo "$PATH"``) or exported.
 
-- ``--unpath`` causes the specified variable to not be treated as a path variable. Variables with a name ending in "PATH" are automatically path variables, so this can be used to treat such a variable normally.
+**--unpath**
+    Causes the specified variable to not be treated as a :ref:`path variable <variables-path>`. Variables with a name ending in "PATH" are automatically path variables, so this can be used to treat such a variable normally.
 
 The following other options are available:
 
-- ``-a`` or ``--append`` causes the values to be appended to the current set of values for the variable. This can be used with ``--prepend`` to both append and prepend at the same time. This cannot be used when assigning to a variable slice.
+**-a** or **--append**
+    Causes the values to be appended to the current set of values for the variable. This can be used with **--prepend** to both append and prepend at the same time. This cannot be used when assigning to a variable slice.
 
-- ``-p`` or ``--prepend`` causes the values to be prepended to the current set of values for the variable. This can be used with ``--append`` to both append and prepend at the same time. This cannot be used when assigning to a variable slice.
+**-p** or **--prepend**
+    Causes the values to be prepended to the current set of values for the variable. This can be used with **--append** to both append and prepend at the same time. This cannot be used when assigning to a variable slice.
 
-- ``-e`` or ``--erase`` causes the specified shell variables to be erased
+**-e** or **--erase**
+    Causes the specified shell variables to be erased
 
-- ``-q`` or ``--query`` test if the specified variable names are defined. Does not output anything, but the builtins exit status is the number of variables specified that were not defined, up to a maximum of 255. If no variable was given, it also returns 255.
+**-q** or **--query**
+    Test if the specified variable names are defined. Does not output anything, but the builtins exit status is the number of variables specified that were not defined, up to a maximum of 255. If no variable was given, it also returns 255.
 
-- ``-n`` or ``--names``: List only the names of all defined variables, not their value. The names are guaranteed to be sorted.
+**-n** or **--names**
+    List only the names of all defined variables, not their value. The names are guaranteed to be sorted.
 
-- ``-S`` or ``--show`` shows information about the given variables. If no variable names are given then all variables are shown in sorted order. It shows the scopes the given variables are set in, along with the values in each and whether or not it is exported. No other flags can be used with this option.
-
-- ``-L`` or ``--long`` do not abbreviate long values when printing set variables
+**-S** or **--show**
+    Shows information about the given variables. If no variable names are given then all variables are shown in sorted order. It shows the scopes the given variables are set in, along with the values in each and whether or not it is exported. No other flags can be used with this option.
 
+**-L** or **--long**
+    Do not abbreviate long values when printing set variables.
 
 If a variable is set to more than one value, the variable will be a list with the specified elements. If a variable is set to zero elements, it will become a list with zero elements.
 
diff --git a/doc_src/cmds/set_color.rst b/doc_src/cmds/set_color.rst
index 6c3bde437..23f142912 100644
--- a/doc_src/cmds/set_color.rst
+++ b/doc_src/cmds/set_color.rst
@@ -26,17 +26,30 @@ An RGB value with three or six hex digits, such as A0FF33 or f2f can be used. ``
 
 A second color may be given as a desired fallback color. e.g. ``set_color 124212 brblue`` will instruct set_color to use *brblue* if a terminal is not capable of the exact shade of grey desired. This is very useful when an 8 or 16 color terminal might otherwise not use a color.
 
-The following *OPTIONS* are available:
+The following options are available:
 
-- ``-b``, ``--background`` *COLOR* sets the background color.
-- ``-c``, ``--print-colors`` prints a list of the 16 named colors.
-- ``-o``, ``--bold`` sets bold mode.
-- ``-d``, ``--dim`` sets dim mode.
-- ``-i``, ``--italics`` sets italics mode.
-- ``-r``, ``--reverse`` sets reverse mode.
-- ``-u``, ``--underline`` sets underlined mode.
+**-b** or **--background** *COLOR*
+    Sets the background color.
 
-Using the *normal* keyword will reset foreground, background, and all formatting back to default.
+**-c** or **--print-colors**
+    Prints a list of the 16 named colors.
+
+**-o** or **--bold**
+    Sets bold mode.
+
+**-d** or **--dim**
+    Sets dim mode.
+
+**-i** or **--italics**
+    Sets italics mode.
+
+**-r** or **--reverse**
+    Sets reverse mode.
+
+**-u** or **--underline**
+    Sets underlined mode.
+
+Using the **normal** keyword will reset foreground, background, and all formatting back to default.
 
 Notes
 -----
diff --git a/doc_src/cmds/status.rst b/doc_src/cmds/status.rst
index 670e2ba93..f6d7a6ada 100644
--- a/doc_src/cmds/status.rst
+++ b/doc_src/cmds/status.rst
@@ -36,44 +36,62 @@ With no arguments, ``status`` displays a summary of the current login and job co
 
 The following operations (sub-commands) are available:
 
-- ``is-command-substitution`` returns 0 if fish is currently executing a command substitution. Also ``-c`` or ``--is-command-substitution``.
+**is-command-substitution**, **-c** or **--is-command-substitution**
+    Returns 0 if fish is currently executing a command substitution.
 
-- ``is-block`` returns 0 if fish is currently executing a block of code. Also ``-b`` or ``--is-block``.
+**is-block**, **-b** or **--is-block**
+    Returns 0 if fish is currently executing a block of code.
 
-- ``is-breakpoint`` returns 0 if fish is currently showing a prompt in the context of a ``breakpoint`` command. See also the ``fish_breakpoint_prompt`` function.
+**is-breakpoint**
+    Returns 0 if fish is currently showing a prompt in the context of a :ref:`breakpoint <cmd-breakpoint>` command. See also the :ref:`fish_breakpoint_prompt <cmd-fish_breakpoint_prompt>` function.
 
-- ``is-interactive`` returns 0 if fish is interactive - that is, connected to a keyboard. Also ``-i`` or ``--is-interactive``.
+**is-interactive**, **-i** or **--is-interactive**
+    Returns 0 if fish is interactive - that is, connected to a keyboard.
 
-- ``is-login`` returns 0 if fish is a login shell - that is, if fish should perform login tasks such as setting up the PATH. Also ``-l`` or ``--is-login``.
+**is-login**, **-l** or **--is-login**
+    Returns 0 if fish is a login shell - that is, if fish should perform login tasks such as setting up :envvar:`PATH`.
 
-- ``is-full-job-control`` returns 0 if full job control is enabled. Also ``--is-full-job-control`` (no short flag).
+**is-full-job-control** or **--is-full-job-control**
+    Returns 0 if full job control is enabled.
 
-- ``is-interactive-job-control`` returns 0 if interactive job control is enabled. Also, ``--is-interactive-job-control`` (no short flag).
+**is-interactive-job-control** or **--is-interactive-job-control**
+    Returns 0 if interactive job control is enabled.
 
-- ``is-no-job-control`` returns 0 if no job control is enabled. Also ``--is-no-job-control`` (no short flag).
+**is-no-job-control** or **--is-no-job-control**
+    Returns 0 if no job control is enabled.
 
-- ``current-command`` prints the name of the currently-running function or command, like the deprecated ``_`` variable.
+**current-command**
+    Prints the name of the currently-running function or command, like the deprecated :envvar:`_` variable.
 
-- ``filename`` prints the filename of the currently-running script. Also ``current-filename``, ``-f`` or ``--current-filename``. If the current script was called via a symlink, this will return the symlink. If the current script was received by piping into ``source``, then this will return ``-``.
+**filename**, **current-filename**, **-f** or **--current-filename**
+    Prints the filename of the currently-running script. If the current script was called via a symlink, this will return the symlink. If the current script was received by piping into :ref:`source <cmd-source>`, then this will return ``-``.
 
-- ``basename`` prints just the filename of the running script, without any path-components before.
+**basename**
+    Prints just the filename of the running script, without any path components before.
 
-- ``dirname`` prints just the path to the running script, without the actual filename itself. This can be relative to $PWD (including just "."), depending on how the script was called. This is the same as passing the ``filename`` to ``dirname(3)``. It's useful if you want to use other files in the current script's directory or similar.
+**dirname**
+    Prints just the path to the running script, without the actual filename itself. This can be relative to :envvar:`PWD` (including just "."), depending on how the script was called. This is the same as passing the filename to ``dirname(3)``. It's useful if you want to use other files in the current script's directory or similar.
 
-- ``fish-path`` prints the absolute path to the currently executing instance of fish.
+**fish-path**
+    Prints the absolute path to the currently executing instance of fish.
 
-- ``function`` prints the name of the currently called function if able, when missing displays "Not a
-  function" (or equivalent translated string). Also ``current-function``.
+**function** or **current-function**
+    Prints the name of the currently called function if able, when missing displays "Not a function" (or equivalent translated string).
 
-- ``line-number`` prints the line number of the currently running script. Also ``current-line-number``, ``-n`` or ``--current-line-number``.
+**line-number**, **current-line-number**, **-n** or **--current-line-number**
+    Prints the line number of the currently running script.
 
-- ``stack-trace`` prints a stack trace of all function calls on the call stack. Also ``print-stack-trace``, ``-t`` or ``--print-stack-trace``.
+**stack-trace**, **print-stack-trace**, **-t** or **--print-stack-trace**
+    Prints a stack trace of all function calls on the call stack.
 
-- ``job-control CONTROL_TYPE`` sets the job control type, which can be ``none``, ``full``, or ``interactive``. Also ``-j CONTROL_TYPE`` or ``--job-control CONTROL_TYPE``.
+**job-control**, **-j** or **--job-control** *CONTROL_TYPE*
+    Sets the job control type to *CONTROL_TYPE*, which can be **none**, **full**, or **interactive**.
 
-- ``features`` lists all available feature flags.
+**features**
+    Lists all available feature flags.
 
-- ``test-feature FEATURE`` returns 0 when FEATURE is enabled, 1 if it is disabled, and 2 if it is not recognized.
+**test-feature** *FEATURE*
+    Returns 0 when FEATURE is enabled, 1 if it is disabled, and 2 if it is not recognized.
 
 Notes
 -----
diff --git a/doc_src/cmds/test.rst b/doc_src/cmds/test.rst
index 10ff53472..eb09db5e8 100644
--- a/doc_src/cmds/test.rst
+++ b/doc_src/cmds/test.rst
@@ -32,84 +32,116 @@ When using a variable as an argument for a test operator you should almost alway
 Operators for files and directories
 -----------------------------------
 
-- ``-b FILE`` returns true if ``FILE`` is a block device.
+**-b** *FILE*
+     Returns true if *FILE* is a block device.
 
-- ``-c FILE`` returns true if ``FILE`` is a character device.
+**-c** *FILE*
+     Returns true if *FILE* is a character device.
 
-- ``-d FILE`` returns true if ``FILE`` is a directory.
+**-d** *FILE*
+     Returns true if *FILE* is a directory.
 
-- ``-e FILE`` returns true if ``FILE`` exists.
+**-e** *FILE*
+     Returns true if *FILE* exists.
 
-- ``-f FILE`` returns true if ``FILE`` is a regular file.
+**-f** *FILE*
+     Returns true if *FILE* is a regular file.
 
-- ``-g FILE`` returns true if ``FILE`` has the set-group-ID bit set.
+**-g** *FILE*
+     Returns true if *FILE* has the set-group-ID bit set.
 
-- ``-G FILE`` returns true if ``FILE`` exists and has the same group ID as the current user.
+**-G** *FILE*
+     Returns true if *FILE* exists and has the same group ID as the current user.
 
-- ``-k FILE`` returns true if ``FILE`` has the sticky bit set. If the OS does not support the concept it returns false. See https://en.wikipedia.org/wiki/Sticky_bit.
+**-k** *FILE*
+     Returns true if *FILE* has the sticky bit set. If the OS does not support the concept it returns false. See https://en.wikipedia.org/wiki/Sticky_bit.
 
-- ``-L FILE`` returns true if ``FILE`` is a symbolic link.
+**-L** *FILE*
+     Returns true if *FILE* is a symbolic link.
 
-- ``-O FILE`` returns true if ``FILE`` exists and is owned by the current user.
+**-O** *FILE*
+     Returns true if *FILE* exists and is owned by the current user.
 
-- ``-p FILE`` returns true if ``FILE`` is a named pipe.
+**-p** *FILE*
+     Returns true if *FILE* is a named pipe.
 
-- ``-r FILE`` returns true if ``FILE`` is marked as readable.
+**-r** *FILE*
+     Returns true if *FILE* is marked as readable.
 
-- ``-s FILE`` returns true if the size of ``FILE`` is greater than zero.
+**-s** *FILE*
+     Returns true if the size of *FILE* is greater than zero.
 
-- ``-S FILE`` returns true if ``FILE`` is a socket.
+**-S** *FILE*
+     Returns true if *FILE* is a socket.
 
-- ``-t FD`` returns true if the file descriptor ``FD`` is a terminal (TTY).
+**-t** *FD*
+     Returns true if the file descriptor *FD* is a terminal (TTY).
 
-- ``-u FILE`` returns true if ``FILE`` has the set-user-ID bit set.
+**-u** *FILE*
+     Returns true if *FILE* has the set-user-ID bit set.
 
-- ``-w FILE`` returns true if ``FILE`` is marked as writable; note that this does not check if the filesystem is read-only.
+**-w** *FILE*
+     Returns true if *FILE* is marked as writable; note that this does not check if the filesystem is read-only.
 
-- ``-x FILE`` returns true if ``FILE`` is marked as executable.
+**-x** *FILE*
+     Returns true if *FILE* is marked as executable.
 
 Operators for text strings
 --------------------------
 
-- ``STRING1 = STRING2`` returns true if the strings ``STRING1`` and ``STRING2`` are identical.
+*STRING1* **=** *STRING2*
+     Returns true if the strings *STRING1* and *STRING2* are identical.
 
-- ``STRING1 != STRING2`` returns true if the strings ``STRING1`` and ``STRING2`` are not identical.
+*STRING1* **!=** *STRING2*
+     Returns true if the strings *STRING1* and *STRING2* are not identical.
 
-- ``-n STRING`` returns true if the length of ``STRING`` is non-zero.
+**-n** *STRING*
+     Returns true if the length of *STRING* is non-zero.
 
-- ``-z STRING`` returns true if the length of ``STRING`` is zero.
+**-z** *STRING*
+     Returns true if the length of *STRING* is zero.
 
 Operators to compare and examine numbers
 ----------------------------------------
 
-- ``NUM1 -eq NUM2`` returns true if ``NUM1`` and ``NUM2`` are numerically equal.
+*NUM1* **-eq** *NUM2*
+     Returns true if *NUM1* and *NUM2* are numerically equal.
 
-- ``NUM1 -ne NUM2`` returns true if ``NUM1`` and ``NUM2`` are not numerically equal.
+*NUM1* **-ne** *NUM2*
+     Returns true if *NUM1* and *NUM2* are not numerically equal.
 
-- ``NUM1 -gt NUM2`` returns true if ``NUM1`` is greater than ``NUM2``.
+*NUM1* **-gt** *NUM2*
+     Returns true if *NUM1* is greater than *NUM2*.
 
-- ``NUM1 -ge NUM2`` returns true if ``NUM1`` is greater than or equal to ``NUM2``.
+*NUM1* **-ge** *NUM2*
+     Returns true if *NUM1* is greater than or equal to *NUM2*.
 
-- ``NUM1 -lt NUM2`` returns true if ``NUM1`` is less than ``NUM2``.
+*NUM1* **-lt** *NUM2*
+     Returns true if *NUM1* is less than *NUM2*.
 
-- ``NUM1 -le NUM2`` returns true if ``NUM1`` is less than or equal to ``NUM2``.
+*NUM1* **-le** *NUM2*
+     Returns true if *NUM1* is less than or equal to *NUM2*.
 
 Both integers and floating point numbers are supported.
 
 Operators to combine expressions
 --------------------------------
 
-- ``COND1 -a COND2`` returns true if both ``COND1`` and ``COND2`` are true.
+*COND1* **-a** *COND2*
+     Returns true if both *COND1* and *COND2* are true.
 
-- ``COND1 -o COND2`` returns true if either ``COND1`` or ``COND2`` are true.
+*COND1* **-o** *COND2*
+     Returns true if either *COND1* or *COND2* are true.
 
-Expressions can be inverted using the ``!`` operator:
+Expressions can be inverted using the **!** operator:
 
-- ``! EXPRESSION`` returns true if ``EXPRESSION`` is false, and false if ``EXPRESSION`` is true.
+**!** *EXPRESSION*
+     Returns true if *EXPRESSION* is false, and false if *EXPRESSION* is true.
 
 Expressions can be grouped using parentheses.
 
-- ``( EXPRESSION )`` returns the value of ``EXPRESSION``.
+**(** *EXPRESSION* **)**
+     Returns the value of *EXPRESSION*.
 
  Note that parentheses will usually require escaping with ``\(`` to avoid being interpreted as a command substitution.
 
diff --git a/doc_src/cmds/trap.rst b/doc_src/cmds/trap.rst
index ae08e231a..85fbcfff5 100644
--- a/doc_src/cmds/trap.rst
+++ b/doc_src/cmds/trap.rst
@@ -17,13 +17,17 @@ Description
 
 The following parameters are available:
 
-- ``ARG`` is the command to be executed on signal delivery.
+*ARG*
+    Command to be executed on signal delivery.
 
-- ``REASON`` is the name of the event to trap. For example, a signal like ``INT`` or ``SIGINT``, or the special symbol ``EXIT``.
+*REASON*
+    Name of the event to trap. For example, a signal like ``INT`` or ``SIGINT``, or the special symbol ``EXIT``.
 
-- ``-l`` or ``--list-signals`` prints a list of signal names.
+**-l** or **--list-signals**
+    Prints a list of signal names.
 
-- ``-p`` or ``--print`` prints all defined signal handlers.
+**-p** or **--print**
+    Prints all defined signal handlers.
 
 If ``ARG`` and ``REASON`` are both specified, ``ARG`` is the command to be executed when the event specified by ``REASON`` occurs (e.g., the signal is delivered).
 
diff --git a/doc_src/cmds/type.rst b/doc_src/cmds/type.rst
index 9d971f274..6172b1607 100644
--- a/doc_src/cmds/type.rst
+++ b/doc_src/cmds/type.rst
@@ -17,19 +17,26 @@ With no options, :command:`type` indicates how each ``NAME`` would be interprete
 
 The following options are available:
 
-- ``-a`` or ``--all`` prints all of possible definitions of the specified names.
+**-a** or **--all**
+    Prints all of possible definitions of the specified names.
 
-- ``-s`` or ``--short`` suppresses function expansion when used with no options or with ``-a``/``--all``.
+**-s** or **--short**
+    Suppresses function expansion when used with no options or with **-a**/**--all**.
 
-- ``-f`` or ``--no-functions`` suppresses function and builtin lookup.
+**-f** or **--no-functions**
+    Suppresses function and builtin lookup.
 
-- ``-t`` or ``--type`` prints ``function``, ``builtin``, or ``file`` if ``NAME`` is a shell function, builtin, or disk file, respectively.
+**-t** or **--type**
+    Prints ``function``, ``builtin``, or ``file`` if *NAME* is a shell function, builtin, or disk file, respectively.
 
-- ``-p`` or ``--path`` prints the path to ``NAME`` if ``NAME`` resolves to an executable file in :envvar:`PATH`, the path to the script containing the definition of the function ``NAME`` if ``NAME`` resolves to a function loaded from a file on disk (i.e. not interactively defined at the prompt), or nothing otherwise.
+**-p** or **--path**
+    Prints the path to *NAME* if *NAME* resolves to an executable file in :envvar:`PATH`, the path to the script containing the definition of the function *NAME* if *NAME* resolves to a function loaded from a file on disk (i.e. not interactively defined at the prompt), or nothing otherwise.
 
-- ``-P`` or ``--force-path`` returns the path to the executable file ``NAME``, presuming ``NAME`` is found in the :envvar:`PATH` environment variable, or nothing otherwise. ``--force-path`` explicitly resolves only the path to executable files in  :envvar:`PATH`, regardless of whether ``$NAME`` is shadowed by a function or builtin with the same name.
+**-P** or **--force-path**
+    Returns the path to the executable file *NAME*, presuming *NAME* is found in the :envvar:`PATH` environment variable, or nothing otherwise. **--force-path** explicitly resolves only the path to executable files in  :envvar:`PATH`, regardless of whether *NAME* is shadowed by a function or builtin with the same name.
 
-- ``-q`` or ``--query`` suppresses all output; this is useful when testing the exit status. For compatibility with old fish versions this is also ``--quiet``.
+**-q** or **--query**
+    Suppresses all output; this is useful when testing the exit status. For compatibility with old fish versions this is also **--quiet**.
 
 The ``-q``, ``-p``, ``-t`` and ``-P`` flags (and their long flag aliases) are mutually exclusive. Only one can be specified at a time.
 
diff --git a/doc_src/cmds/ulimit.rst b/doc_src/cmds/ulimit.rst
index bce1c4731..ce7a34cf4 100644
--- a/doc_src/cmds/ulimit.rst
+++ b/doc_src/cmds/ulimit.rst
@@ -18,43 +18,56 @@ Description
 
 Use one of the following switches to specify which resource limit to set or report:
 
-- ``-c`` or ``--core-size``: the maximum size of core files created. By setting this limit to zero, core dumps can be disabled.
+**-c** or **--core-size**
+    The maximum size of core files created. By setting this limit to zero, core dumps can be disabled.
 
-- ``-d`` or ``--data-size``: the maximum size of a process' data segment.
+**-d** or **--data-size**
+    The maximum size of a process' data segment.
 
-- ``-f`` or ``--file-size``: the maximum size of files created by the shell.
+**-f** or **--file-size**
+    The maximum size of files created by the shell.
 
-- ``-l`` or ``--lock-size``: the maximum size that may be locked into memory.
+**-l** or **--lock-size**
+    The maximum size that may be locked into memory.
 
-- ``-m`` or ``--resident-set-size``: the maximum resident set size.
+**-m** or **--resident-set-size**
+    The maximum resident set size.
 
-- ``-n`` or ``--file-descriptor-count``: the maximum number of open file descriptors (most systems do not allow this value to be set).
+**-n** or **--file-descriptor-count**
+    The maximum number of open file descriptors (most systems do not allow this value to be set).
 
-- ``-s`` or ``--stack-size``: the maximum stack size.
+**-s** or **--stack-size**
+    The maximum stack size.
 
-- ``-t`` or ``--cpu-time``: the maximum amount of CPU time in seconds.
+**-t** or **--cpu-time**
+    The maximum amount of CPU time in seconds.
 
-- ``-u`` or ``--process-count``: the maximum number of processes available to a single user.
+**-u** or **--process-count**
+    The maximum number of processes available to a single user.
 
-- ``-v`` or ``--virtual-memory-size`` The maximum amount of virtual memory available to the shell.
+**-v** or **--virtual-memory-size**
+    The maximum amount of virtual memory available to the shell.
 
 Note that not all these limits are available in all operating systems.
 
 The value of limit can be a number in the unit specified for the resource or one of the special values ``hard``, ``soft``, or ``unlimited``, which stand for the current hard limit, the current soft limit, and no limit, respectively.
 
-If limit is given, it is the new value of the specified resource. If no option is given, then ``-f`` is assumed. Values are in kilobytes, except for ``-t``, which is in seconds and ``-n`` and ``-u``, which are unscaled values. The exit status is 0 unless an invalid option or argument is supplied, or an error occurs while setting a new limit.
+If limit is given, it is the new value of the specified resource. If no option is given, then **-f** is assumed. Values are in kilobytes, except for **-t**, which is in seconds and **-n** and **-u**, which are unscaled values. The exit status is 0 unless an invalid option or argument is supplied, or an error occurs while setting a new limit.
 
 ``ulimit`` also accepts the following switches that determine what type of limit to set:
 
-- ``-H`` or ``--hard`` sets hard resource limit
+**-H** or **--hard**
+    Sets hard resource limit.
 
-- ``-S`` or ``--soft`` sets soft resource limit
+**-S** or **--soft**
+    Sets soft resource limit.
 
-A hard limit can only be decreased. Once it is set it cannot be increased; a soft limit may be increased up to the value of the hard limit. If neither ``-H`` nor ``-S`` is specified, both the soft and hard limits are updated when assigning a new limit value, and the soft limit is used when reporting the current value.
+A hard limit can only be decreased. Once it is set it cannot be increased; a soft limit may be increased up to the value of the hard limit. If neither **-H** nor **-S** is specified, both the soft and hard limits are updated when assigning a new limit value, and the soft limit is used when reporting the current value.
 
 The following additional options are also understood by ``ulimit``:
 
-- ``-a`` or ``--all`` prints all current limits
+**-a** or **--all**
+    Prints all current limits.
 
 The ``fish`` implementation of ``ulimit`` should behave identically to the implementation in bash, except for these differences:
 
diff --git a/doc_src/cmds/umask.rst b/doc_src/cmds/umask.rst
index b6a1e9860..3ebf608b3 100644
--- a/doc_src/cmds/umask.rst
+++ b/doc_src/cmds/umask.rst
@@ -22,11 +22,14 @@ Access rights are explained in the manual page for the ``chmod(1)`` program.
 
 With no parameters, the current file creation mode mask is printed as an octal number.
 
-- ``-h`` or ``--help`` prints this message.
+**-S** or **--symbolic**
+    Prints the umask in symbolic form instead of octal form.
 
-- ``-S`` or ``--symbolic`` prints the umask in symbolic form instead of octal form.
+**-p** or **--as-command**
+    Outputs the umask in a form that may be reused as input.
 
-- ``-p`` or ``--as-command`` outputs the umask in a form that may be reused as input
+**-h** or **--help**
+    Displays help about using this command.
 
 If a numeric mask is specified as a parameter, the current shell's umask will be set to that value, and the rights specified by that mask will be removed from new files and directories by default.
 
diff --git a/doc_src/cmds/wait.rst b/doc_src/cmds/wait.rst
index 2144f5f58..4ebda1cba 100644
--- a/doc_src/cmds/wait.rst
+++ b/doc_src/cmds/wait.rst
@@ -15,10 +15,13 @@ Description
 
 ``wait`` waits for child jobs to complete.
 
-- If a pid is specified, the command waits for the job that the process with the pid belongs to.
-- If a process name is specified, the command waits for the jobs that the matched processes belong to.
-- If neither a pid nor a process name is specified, the command waits for all background jobs.
-- If the **-n** / **--any** flag is provided, the command returns as soon as the first job completes. If it is not provided, it returns after all jobs complete.
+If a *PID* is specified, the command waits for the job that the process with that process ID belongs to.
+
+If a *PROCESS_NAME* is specified, the command waits for the jobs that the matched processes belong to.
+
+If neither a pid nor a process name is specified, the command waits for all background jobs.
+
+If the **-n** or **--any** flag is provided, the command returns as soon as the first job completes. If it is not provided, it returns after all jobs complete.
 
 Example
 -------

From 3a23fdf3598b3a249098c329fdbe0ee100792b71 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sat, 12 Mar 2022 00:18:41 +0800
Subject: [PATCH 251/262] docs: omnibus cleanup

Includes harmonizing the display of options and arguments, standardising
terminology, using the envvar directive more broadly, adding help options to all
commands that support them, simplifying some language, and tidying up multiple
formatting issues.

string documentation is not changed.
---
 doc_src/cmds/abbr.rst            |  5 ++-
 doc_src/cmds/alias.rst           |  8 ++--
 doc_src/cmds/and.rst             |  5 ++-
 doc_src/cmds/argparse.rst        |  2 +-
 doc_src/cmds/begin.rst           |  4 +-
 doc_src/cmds/bg.rst              |  2 +
 doc_src/cmds/bind.rst            |  3 ++
 doc_src/cmds/block.rst           |  8 +++-
 doc_src/cmds/break.rst           |  3 +-
 doc_src/cmds/builtin.rst         |  6 ++-
 doc_src/cmds/cd.rst              |  4 +-
 doc_src/cmds/cdh.rst             |  8 ++--
 doc_src/cmds/command.rst         |  3 ++
 doc_src/cmds/commandline.rst     |  3 ++
 doc_src/cmds/complete.rst        |  5 ++-
 doc_src/cmds/contains.rst        |  3 ++
 doc_src/cmds/dirs.rst            |  7 +++-
 doc_src/cmds/disown.rst          |  2 +
 doc_src/cmds/emit.rst            |  1 +
 doc_src/cmds/exec.rst            |  1 +
 doc_src/cmds/exit.rst            |  2 +
 doc_src/cmds/fg.rst              |  2 +
 doc_src/cmds/fish_add_path.rst   |  5 ++-
 doc_src/cmds/fish_config.rst     |  2 +
 doc_src/cmds/fish_indent.rst     |  3 ++
 doc_src/cmds/fish_key_reader.rst |  6 +--
 doc_src/cmds/fish_opt.rst        | 10 ++---
 doc_src/cmds/fish_svn_prompt.rst | 72 ++++++++++++++++----------------
 doc_src/cmds/fish_vcs_prompt.rst |  2 +-
 doc_src/cmds/for.rst             |  2 +
 doc_src/cmds/funced.rst          |  3 ++
 doc_src/cmds/function.rst        |  2 +-
 doc_src/cmds/functions.rst       |  3 ++
 doc_src/cmds/help.rst            |  7 ++--
 doc_src/cmds/if.rst              |  2 +
 doc_src/cmds/isatty.rst          |  1 +
 doc_src/cmds/jobs.rst            |  5 ++-
 doc_src/cmds/math.rst            |  3 ++
 doc_src/cmds/nextd.rst           |  8 ++--
 doc_src/cmds/not.rst             |  1 +
 doc_src/cmds/or.rst              |  2 +
 doc_src/cmds/popd.rst            |  2 +
 doc_src/cmds/prevd.rst           |  8 ++--
 doc_src/cmds/printf.rst          |  4 +-
 doc_src/cmds/prompt_login.rst    |  2 +-
 doc_src/cmds/prompt_pwd.rst      |  6 +--
 doc_src/cmds/psub.rst            |  3 ++
 doc_src/cmds/pushd.rst           |  4 +-
 doc_src/cmds/pwd.rst             |  3 ++
 doc_src/cmds/random.rst          |  8 +++-
 doc_src/cmds/read.rst            | 65 +++++++++++++++++-----------
 doc_src/cmds/realpath.rst        |  3 ++
 doc_src/cmds/return.rst          |  4 +-
 doc_src/cmds/set.rst             |  7 +++-
 doc_src/cmds/set_color.rst       | 21 ++++++----
 doc_src/cmds/source.rst          |  9 ++--
 doc_src/cmds/status.rst          |  2 +-
 doc_src/cmds/suspend.rst         |  2 +-
 doc_src/cmds/switch.rst          |  4 +-
 doc_src/cmds/test.rst            |  6 +--
 doc_src/cmds/trap.rst            | 11 +++--
 doc_src/cmds/type.rst            |  7 +++-
 doc_src/cmds/ulimit.rst          |  9 ++--
 doc_src/cmds/vared.rst           |  1 +
 doc_src/cmds/wait.rst            |  2 +
 doc_src/cmds/while.rst           |  2 +
 66 files changed, 278 insertions(+), 143 deletions(-)

diff --git a/doc_src/cmds/abbr.rst b/doc_src/cmds/abbr.rst
index 544f41809..2f0682698 100644
--- a/doc_src/cmds/abbr.rst
+++ b/doc_src/cmds/abbr.rst
@@ -46,7 +46,10 @@ The following options are available:
 **-q** or **--query**
     Return 0 (true) if one of the *WORD* is an abbreviation.
 
-In addition, when adding or renaming abbreviations:
+**-h** or **--help**
+    Displays help about using this command.
+
+In addition, when adding or renaming abbreviations, one of the following **SCOPE** options can be used:
 
 **-g** or **--global**
     Use a global variable
diff --git a/doc_src/cmds/alias.rst b/doc_src/cmds/alias.rst
index 9478ad610..000b29004 100644
--- a/doc_src/cmds/alias.rst
+++ b/doc_src/cmds/alias.rst
@@ -9,8 +9,8 @@ Synopsis
 .. synopsis::
 
     alias
-    alias [OPTIONS] NAME DEFINITION
-    alias [OPTIONS] NAME=DEFINITION
+    alias [--save] NAME DEFINITION
+    alias [--save] NAME=DEFINITION
 
 
 Description
@@ -21,7 +21,7 @@ Description
 ``fish`` marks functions that have been created by ``alias`` by including the command used to create them in the function description. You can list ``alias``-created functions by running ``alias`` without arguments. They must be erased using ``functions -e``.
 
 - ``NAME`` is the name of the alias
-- ``DEFINITION`` is the actual command to execute. The string ``$argv`` will be appended.
+- ``DEFINITION`` is the actual command to execute. ``alias`` automatically appends ``$argv``, so that all parameters used with the alias are passed to the actual command.
 
 You cannot create an alias to a function with the same name. Note that spaces need to be escaped in the call to ``alias`` just like at the command line, *even inside quoted parts*.
 
@@ -55,6 +55,6 @@ The following code will create ``rmi``, which runs ``rm`` with additional argume
 See more
 --------
 
-1. The :ref:`function <cmd-function>` builtin this builds on.
+1. The :ref:`function <cmd-function>` command this builds on.
 2. :ref:`Functions <syntax-function>`.
 3. :ref:`Function wrappers <syntax-function-wrappers>`.
diff --git a/doc_src/cmds/and.rst b/doc_src/cmds/and.rst
index f43a45bdd..1b5b477b4 100644
--- a/doc_src/cmds/and.rst
+++ b/doc_src/cmds/and.rst
@@ -1,7 +1,7 @@
 .. _cmd-and:
 
 and - conditionally execute a command
-=========================================
+=====================================
 
 Synopsis
 --------
@@ -19,6 +19,8 @@ Description
 
 ``and`` does not change the current exit status itself, but the command it runs most likely will. The exit status of the last foreground command to exit can always be accessed using the :ref:`$status <variables-status>` variable.
 
+The **-h** or **--help** option displays help about using this command.
+
 Example
 -------
 
@@ -32,3 +34,4 @@ See Also
 --------
 
 - :ref:`or <cmd-or>` command
+- :ref:`not <cmd-not>` command
diff --git a/doc_src/cmds/argparse.rst b/doc_src/cmds/argparse.rst
index 13fc25a13..49c148266 100644
--- a/doc_src/cmds/argparse.rst
+++ b/doc_src/cmds/argparse.rst
@@ -14,7 +14,7 @@ Synopsis
 Description
 -----------
 
-This command makes it easy for fish scripts and functions to handle arguments like how fish builtin commands handle their arguments. You pass arguments that define the known options, followed by a literal **--**, then the arguments to be parsed (which might also include a literal **--**). ``argparse`` then sets variables to indicate the passed options with their values, and sets $argv (and always $argv) to the remaining arguments. More on this in the :ref:`usage <cmd-argparse-usage>` section below.
+This command makes it easy for fish scripts and functions to handle arguments. You pass arguments that define the known options, followed by a literal **--**, then the arguments to be parsed (which might also include a literal **--**). ``argparse`` then sets variables to indicate the passed options with their values, and sets ``$argv`` to the remaining arguments. See the :ref:`usage <cmd-argparse-usage>` section below.
 
 Each option specification (``OPTION_SPEC``) is written in the :ref:`domain specific language <cmd-argparse-option-specification>` described below. All OPTION_SPECs must appear after any argparse flags and before the ``--`` that separates them from the arguments to be parsed.
 
diff --git a/doc_src/cmds/begin.rst b/doc_src/cmds/begin.rst
index 5664db3ad..668d99de2 100644
--- a/doc_src/cmds/begin.rst
+++ b/doc_src/cmds/begin.rst
@@ -15,12 +15,14 @@ Description
 
 ``begin`` is used to create a new block of code.
 
-A block allows the introduction of a new variable scope, redirection of the input or output of a set of commands as a group, or to specify precedence when using the conditional commands like ``and``.
+A block allows the introduction of a new :ref:`variable scope <variables-scope>`, redirection of the input or output of a set of commands as a group, or to specify precedence when using the conditional commands like ``and``.
 
 The block is unconditionally executed. ``begin; ...; end`` is equivalent to ``if true; ...; end``.
 
 ``begin`` does not change the current exit status itself. After the block has completed, ``$status`` will be set to the status returned by the most recent command.
 
+The **-h** or **--help** option displays help about using this command.
+
 Example
 -------
 
diff --git a/doc_src/cmds/bg.rst b/doc_src/cmds/bg.rst
index 8d9b0635c..b84ac2cc8 100644
--- a/doc_src/cmds/bg.rst
+++ b/doc_src/cmds/bg.rst
@@ -24,6 +24,8 @@ When at least one of the arguments isn't a valid job specifier,
 
 When all arguments are valid job specifiers, ``bg`` will background all matching jobs that exist.
 
+The **-h** or **--help** option displays help about using this command.
+
 Example
 -------
 
diff --git a/doc_src/cmds/bind.rst b/doc_src/cmds/bind.rst
index c20fe30af..37970a07b 100644
--- a/doc_src/cmds/bind.rst
+++ b/doc_src/cmds/bind.rst
@@ -81,6 +81,9 @@ The following options are available:
     All invocations except for inserting new bindings can operate on both levels at the same time (if both **--preset** and **--user** are given).
     **--preset** should only be used in full binding sets (like when working on ``fish_vi_key_bindings``).
 
+**-h** or **--help**
+    Displays help about using this command.
+
 Special input functions
 -----------------------
 The following special input functions are available:
diff --git a/doc_src/cmds/block.rst b/doc_src/cmds/block.rst
index 3844da99c..cc01cf525 100644
--- a/doc_src/cmds/block.rst
+++ b/doc_src/cmds/block.rst
@@ -8,7 +8,8 @@ Synopsis
 
 .. synopsis::
 
-    block [OPTIONS]
+    block [(--local | --global)]
+    block --erase
 
 Description
 -----------
@@ -21,6 +22,8 @@ The block can be removed. Any events which triggered while the block was in plac
 
 Event blocks should not be confused with code blocks, which are created with ``begin``, ``if``, ``while`` or ``for``
 
+Without options, the ``block`` command acts with function scope.
+
 The following options are available:
 
 **-l** or **--local**
@@ -32,6 +35,9 @@ The following options are available:
 **-e** or **--erase**
     Release global block.
 
+**-h** or **--help**
+    Displays help about using this command.
+
 Example
 -------
 ::
diff --git a/doc_src/cmds/break.rst b/doc_src/cmds/break.rst
index e05a3341a..7049bec75 100644
--- a/doc_src/cmds/break.rst
+++ b/doc_src/cmds/break.rst
@@ -17,11 +17,10 @@ Synopsis
 Description
 -----------
 
-``break`` halts a currently running loop, such as a :ref:`switch <cmd-switch>`, :ref:`for <cmd-for>` or :ref:`while <cmd-while>` loop. It is usually added inside of a conditional block such as an :ref:`if <cmd-if>` block.
+``break`` halts a currently running loop (*LOOP_CONSTRUCT*), such as a :ref:`switch <cmd-switch>`, :ref:`for <cmd-for>` or :ref:`while <cmd-while>` loop. It is usually added inside of a conditional block such as an :ref:`if <cmd-if>` block.
 
 There are no parameters for ``break``.
 
-
 Example
 -------
 The following code searches all .c files for "smurf", and halts at the first occurrence.
diff --git a/doc_src/cmds/builtin.rst b/doc_src/cmds/builtin.rst
index 8c39b4966..48cce29ab 100644
--- a/doc_src/cmds/builtin.rst
+++ b/doc_src/cmds/builtin.rst
@@ -10,11 +10,12 @@ Synopsis
 
     builtin [OPTIONS] BUILTINNAME
     builtin --query BUILTINNAME ...
+    builtin --names
 
 Description
 -----------
 
-``builtin`` forces the shell to use a builtin command, rather than a function or program.
+``builtin`` forces the shell to use a builtin command named *BUILTIN*, rather than a function or external program.
 
 The following options are available:
 
@@ -24,6 +25,9 @@ The following options are available:
 **-q** or **--query** *BUILTIN*
     Tests if any of the specified builtins exist.
 
+**-h** or **--help**
+    Displays help about using this command.
+
 Example
 -------
 
diff --git a/doc_src/cmds/cd.rst b/doc_src/cmds/cd.rst
index 99e6a691e..e26032816 100644
--- a/doc_src/cmds/cd.rst
+++ b/doc_src/cmds/cd.rst
@@ -12,7 +12,7 @@ Synopsis
 
 Description
 -----------
-**cd** changes the current working directory.
+``cd`` changes the current working directory.
 
 If *DIRECTORY* is given, it will become the new directory. If no parameter is given, the :envvar:`HOME` environment variable will be used.
 
@@ -28,6 +28,8 @@ If you make those universal variables your **cd** history is shared among all fi
 
 As a special case, ``cd .`` is equivalent to ``cd $PWD``, which is useful in cases where a mountpoint has been recycled or a directory has been removed and recreated.
 
+The **--help** or **-h** option displays help about using this command, and does not change the directory.
+
 Examples
 --------
 
diff --git a/doc_src/cmds/cdh.rst b/doc_src/cmds/cdh.rst
index 4a47b1656..b6ee6c089 100644
--- a/doc_src/cmds/cdh.rst
+++ b/doc_src/cmds/cdh.rst
@@ -8,7 +8,7 @@ Synopsis
 
 .. synopsis::
 
-    cdh [DIR]
+    cdh [DIRECTORY]
 
 Description
 -----------
@@ -16,11 +16,11 @@ Description
 ``cdh`` with no arguments presents a list of :ref:`recently visited directories <directory-history>`.
 You can then select one of the entries by letter or number.
 You can also press :kbd:`Tab` to use the completion pager to select an item from the list.
-If you give it a single argument it is equivalent to ``cd DIR``.
+If you give it a single argument it is equivalent to ``cd DIRECTORY``.
 
 Note that the ``cd`` command limits directory history to the 25 most recently visited directories.
-The history is stored in the ``$dirprev`` and ``$dirnext`` variables which this command manipulates.
-If you make those universal variables your ``cd`` history is shared among all fish instances.
+The history is stored in the :envvar:`dirprev` and :envvar:`$dirnext` variables, which this command manipulates.
+If you make those universal variables, your ``cd`` history is shared among all fish instances.
 
 See Also
 --------
diff --git a/doc_src/cmds/command.rst b/doc_src/cmds/command.rst
index c0249fc14..24f6147a4 100644
--- a/doc_src/cmds/command.rst
+++ b/doc_src/cmds/command.rst
@@ -28,6 +28,9 @@ The following options are available:
 **-v** (or **-s** or **--search**)
     Prints the external command that would be executed, or prints nothing if no file with the specified name could be found in :envvar:`PATH`.
 
+**-h** or **--help**
+    Displays help about using this command.
+
 With the **-v** option, ``command`` treats every argument as a separate command to look up and sets the exit status to 0 if any of the specified commands were found, or 127 if no commands could be found. **--quiet** used with **-v** prevents commands being printed, like ``type -q``.
 
 Examples
diff --git a/doc_src/cmds/commandline.rst b/doc_src/cmds/commandline.rst
index 411bd83f3..77799a6be 100644
--- a/doc_src/cmds/commandline.rst
+++ b/doc_src/cmds/commandline.rst
@@ -31,6 +31,9 @@ The following options are available:
     This option cannot be combined with any other option.
     See :ref:`bind <cmd-bind>` for a list of input functions.
 
+**-h** or **--help**
+    Displays help about using this command.
+
 The following options change the way ``commandline`` updates the command line buffer:
 
 **-a** or **--append**
diff --git a/doc_src/cmds/complete.rst b/doc_src/cmds/complete.rst
index 53a9434ee..0326d54f9 100644
--- a/doc_src/cmds/complete.rst
+++ b/doc_src/cmds/complete.rst
@@ -9,7 +9,7 @@ Synopsis
 .. synopsis::
 
     complete ((-c | --command) | (-p | --path)) COMMAND [OPTIONS] 
-    complete ((-C | --do-complete)) [STRING] [--escape] 
+    complete (-C | --do-complete) [--escape] STRING
 
 Description
 -----------
@@ -69,6 +69,9 @@ The following options are available:
 **--escape**
     When used with ``-C``, escape special characters in completions.
 
+**-h** or **--help**
+    Displays help about using this command.
+
 Command specific tab-completions in ``fish`` are based on the notion of options and arguments. An option is a parameter which begins with a hyphen, such as ``-h``, ``-help`` or ``--help``. Arguments are parameters that do not begin with a hyphen. Fish recognizes three styles of options, the same styles as the GNU getopt library. These styles are:
 
 - Short options, like ``-a``. Short options are a single character long, are preceded by a single hyphen and can be grouped together (like ``-la``, which is equivalent to ``-l -a``). Option arguments may be specified by appending the option with the value (``-w32``), or, if ``--require-parameter`` is given, in the following parameter (``-w 32``).
diff --git a/doc_src/cmds/contains.rst b/doc_src/cmds/contains.rst
index 9929a729c..fa8bf8435 100644
--- a/doc_src/cmds/contains.rst
+++ b/doc_src/cmds/contains.rst
@@ -21,6 +21,9 @@ The following options are available:
 **-i** or **--index**
     Print the index (number of the element in the set) of the first matching element.
 
+**-h** or **--help**
+    Displays help about using this command.
+
 Note that ``contains`` interprets all arguments starting with a **-** as an option to ``contains``, until an **--** argument is reached.
 
 See the examples below.
diff --git a/doc_src/cmds/dirs.rst b/doc_src/cmds/dirs.rst
index 13b1c4bcb..cb0d20050 100644
--- a/doc_src/cmds/dirs.rst
+++ b/doc_src/cmds/dirs.rst
@@ -20,9 +20,12 @@ The following options are available:
 **-c**:
     Clear the directory stack instead of printing it.
 
-``dirs`` does not accept any parameters.
+**-h** or **--help**
+    Displays help about using this command.
+
+``dirs`` does not accept any arguments.
 
 See Also
 --------
 
-- the :ref:`cdh <cmd-cdh>` command which provides a more intuitive way to navigate to recently visited directories.
+- the :ref:`cdh <cmd-cdh>` command, which provides a more intuitive way to navigate to recently visited directories.
diff --git a/doc_src/cmds/disown.rst b/doc_src/cmds/disown.rst
index 678f33c39..f73d86f7c 100644
--- a/doc_src/cmds/disown.rst
+++ b/doc_src/cmds/disown.rst
@@ -23,6 +23,8 @@ If a job is stopped, it is sent a signal to continue running, and a warning is p
 
 ``disown`` returns 0 if all specified jobs were disowned successfully, and 1 if any problems were encountered.
 
+The **--help** or **-h** option displays help about using this command.
+
 Example
 -------
 
diff --git a/doc_src/cmds/emit.rst b/doc_src/cmds/emit.rst
index 6b11a15f3..e2fc4100a 100644
--- a/doc_src/cmds/emit.rst
+++ b/doc_src/cmds/emit.rst
@@ -15,6 +15,7 @@ Description
 
 ``emit`` emits, or fires, an event. Events are delivered to, or caught by, special functions called :ref:`event handlers <event>`. The arguments are passed to the event handlers as function arguments.
 
+The **--help** or **-h** option displays help about using this command.
 
 Example
 -------
diff --git a/doc_src/cmds/exec.rst b/doc_src/cmds/exec.rst
index 28be61f50..e8fffdfcb 100644
--- a/doc_src/cmds/exec.rst
+++ b/doc_src/cmds/exec.rst
@@ -15,6 +15,7 @@ Description
 
 ``exec`` replaces the currently running shell with a new command. On successful completion, ``exec`` never returns. ``exec`` cannot be used inside a pipeline.
 
+The **--help** or **-h** option displays help about using this command.
 
 Example
 -------
diff --git a/doc_src/cmds/exit.rst b/doc_src/cmds/exit.rst
index d830da1bd..5b1edeff4 100644
--- a/doc_src/cmds/exit.rst
+++ b/doc_src/cmds/exit.rst
@@ -18,3 +18,5 @@ Description
 Otherwise, the exit status will be that of the last command executed.
 
 If exit is called while sourcing a file (using the :ref:`source <cmd-source>` builtin) the rest of the file will be skipped, but the shell itself will not exit.
+
+The **--help** or **-h** option displays help about using this command.
diff --git a/doc_src/cmds/fg.rst b/doc_src/cmds/fg.rst
index 7db7cc1dd..e35cf12ff 100644
--- a/doc_src/cmds/fg.rst
+++ b/doc_src/cmds/fg.rst
@@ -21,6 +21,8 @@ If ``PID`` is specified, the job containing a process with the specified process
 For compatibility with other shells, job expansion syntax is supported for ``fg``. A *PID* of the format **%1** will foreground job 1.
 Job numbers can be seen in the output of :ref:`jobs <cmd-jobs>`.
 
+The **--help** or **-h** option displays help about using this command.
+
 Example
 -------
 
diff --git a/doc_src/cmds/fish_add_path.rst b/doc_src/cmds/fish_add_path.rst
index c6c907cc5..3a97cf232 100644
--- a/doc_src/cmds/fish_add_path.rst
+++ b/doc_src/cmds/fish_add_path.rst
@@ -24,7 +24,7 @@ Components are normalized by :ref:`realpath <cmd-realpath>`. Trailing slashes ar
 
 Components are added in the order they are given, and they are prepended to the path unless ``--append`` is given (if $fish_user_paths is used, that means they are last in $fish_user_paths, which is itself prepended to $PATH, so they still stay ahead of the system paths).
 
-If no component is new, the variable ($fish_user_paths or $PATH) is not set again or otherwise modified, so variable handlers are not triggered.
+If no component is new, the variable (:envvar:`fish_user_paths` or :envvar:`$PATH`) is not set again or otherwise modified, so variable handlers are not triggered.
 
 If a component is not an existing directory, ``fish_add_path`` ignores it.
 
@@ -55,6 +55,9 @@ Options
 **-n** or **--dry-run**
     Print the ``set`` command that would be used without executing it.
 
+**-h** or **--help**
+    Displays help about using this command.
+
 If ``--move`` is used, it may of course lead to the path swapping order, so you should be careful doing that in config.fish.
 
 
diff --git a/doc_src/cmds/fish_config.rst b/doc_src/cmds/fish_config.rst
index 1ae913680..6fe8ba988 100644
--- a/doc_src/cmds/fish_config.rst
+++ b/doc_src/cmds/fish_config.rst
@@ -43,6 +43,8 @@ Available subcommands for the ``theme`` command:
 
 The themes are loaded from the theme directory shipped with fish or a ``themes`` directory in the fish configuration directory (typically ``~/.config/fish/themes``).
 
+The **-h** or **--help** option displays help about using this command.
+
 Example
 -------
 
diff --git a/doc_src/cmds/fish_indent.rst b/doc_src/cmds/fish_indent.rst
index ca0849a50..dd96c730b 100644
--- a/doc_src/cmds/fish_indent.rst
+++ b/doc_src/cmds/fish_indent.rst
@@ -45,3 +45,6 @@ The following options are available:
 
 **--dump-parse-tree**
     Dumps information about the parsed statements to standard error. This is likely to be of interest only to people working on the fish source code.
+
+**-h** or **--help**
+    Displays help about using this command.
diff --git a/doc_src/cmds/fish_key_reader.rst b/doc_src/cmds/fish_key_reader.rst
index d703f3e3b..523306257 100644
--- a/doc_src/cmds/fish_key_reader.rst
+++ b/doc_src/cmds/fish_key_reader.rst
@@ -13,9 +13,9 @@ Synopsis
 Description
 -----------
 
-``fish_key_reader`` is used to explain how you would bind a certain key sequence. By default, it prints the :ref:`bind <cmd-bind>` command for one key sequence read interactively over standard input.
+:program:`fish_key_reader` is used to explain how you would bind a certain key sequence. By default, it prints the :ref:`bind <cmd-bind>` command for one key sequence read interactively over standard input.
 
-If the character sequence matches a special key name (see ``bind --key-names``),  both ``bind CHARS ...`` and ``bind -k KEYNAME ...`` usage will be shown. In verbose mode (enabled by passing ``--verbose``), additional details about the characters received, such as the delay between chars, are written to stderr.
+If the character sequence matches a special key name (see ``bind --key-names``),  both ``bind CHARS ...`` and ``bind -k KEYNAME ...`` usage will be shown. In verbose mode (enabled by passing ``--verbose``), additional details about the characters received, such as the delay between chars, are written to standard error.
 
 The following options are available:
 
@@ -34,7 +34,7 @@ The following options are available:
 Usage Notes
 -----------
 
-In verbose mode, the delay in milliseconds since the previous character was received is included in the diagnostic information written to stderr. This information may be useful to determine the optimal ``fish_escape_delay_ms`` setting or learn the amount of lag introduced by tools like ``ssh``, ``mosh`` or ``tmux``.
+In verbose mode, the delay in milliseconds since the previous character was received is included in the diagnostic information written to standard error. This information may be useful to determine the optimal ``fish_escape_delay_ms`` setting or learn the amount of lag introduced by tools like ``ssh``, ``mosh`` or ``tmux``.
 
 ``fish_key_reader`` intentionally disables handling of many signals. To terminate ``fish_key_reader`` in ``--continuous`` mode do:
 
diff --git a/doc_src/cmds/fish_opt.rst b/doc_src/cmds/fish_opt.rst
index fa63b7bea..6960a9473 100644
--- a/doc_src/cmds/fish_opt.rst
+++ b/doc_src/cmds/fish_opt.rst
@@ -1,20 +1,20 @@
 .. _cmd-fish_opt:
 
-fish_opt - create an option spec for the argparse command
-=========================================================
+fish_opt - create an option specification for the argparse command
+==================================================================
 
 Synopsis
 --------
 
 .. synopsis::
 
-    fish_opt [--help]
     fish_opt [(-slor | --multiple-vals=) OPTNAME]
+    fish_opt --help
 
 Description
 -----------
 
-This command provides a way to produce option specifications suitable for use with the :ref:`argparse <cmd-argparse>` command. You can, of course, write the option specs by hand without using this command. But you might prefer to use this for the clarity it provides.
+This command provides a way to produce option specifications suitable for use with the :ref:`argparse <cmd-argparse>` command. You can, of course, write the option specifications by hand without using this command. But you might prefer to use this for the clarity it provides.
 
 The following ``argparse`` options are available:
 
@@ -42,7 +42,7 @@ The following ``argparse`` options are available:
 Examples
 --------
 
-Define a single option spec for the boolean help flag:
+Define a single option specification for the boolean help flag:
 
 
 
diff --git a/doc_src/cmds/fish_svn_prompt.rst b/doc_src/cmds/fish_svn_prompt.rst
index edc86b65d..59b7f3733 100644
--- a/doc_src/cmds/fish_svn_prompt.rst
+++ b/doc_src/cmds/fish_svn_prompt.rst
@@ -25,47 +25,47 @@ The fish_svn_prompt function displays information about the current Subversion r
 
 There are numerous customization options, which can be controlled with fish variables.
 
-- ``$__fish_svn_prompt_color_revision``
+- :envvar:`__fish_svn_prompt_color_revision`
     the colour of the revision number to display in the prompt
-- ``$__fish_svn_prompt_char_separator``
+- :envvar:`__fish_svn_prompt_char_separator`
     the separator between status characters
 
 A number of variables control the symbol ("display") and color ("color") for the different status indicators:
 
-- ``$__fish_svn_prompt_char_added_display``
-- ``$__fish_svn_prompt_char_added_color``
-- ``$__fish_svn_prompt_char_conflicted_display``
-- ``$__fish_svn_prompt_char_conflicted_color``
-- ``$__fish_svn_prompt_char_deleted_display``
-- ``$__fish_svn_prompt_char_deleted_color``
-- ``$__fish_svn_prompt_char_ignored_display``
-- ``$__fish_svn_prompt_char_ignored_color``
-- ``$__fish_svn_prompt_char_modified_display``
-- ``$__fish_svn_prompt_char_modified_color``
-- ``$__fish_svn_prompt_char_replaced_display``
-- ``$__fish_svn_prompt_char_replaced_color``
-- ``$__fish_svn_prompt_char_unversioned_external_display``
-- ``$__fish_svn_prompt_char_unversioned_external_color``
-- ``$__fish_svn_prompt_char_unversioned_display``
-- ``$__fish_svn_prompt_char_unversioned_color``
-- ``$__fish_svn_prompt_char_missing_display``
-- ``$__fish_svn_prompt_char_missing_color``
-- ``$__fish_svn_prompt_char_versioned_obstructed_display``
-- ``$__fish_svn_prompt_char_versioned_obstructed_color``
-- ``$__fish_svn_prompt_char_locked_display``
-- ``$__fish_svn_prompt_char_locked_color``
-- ``$__fish_svn_prompt_char_scheduled_display``
-- ``$__fish_svn_prompt_char_scheduled_color``
-- ``$__fish_svn_prompt_char_switched_display``
-- ``$__fish_svn_prompt_char_switched_color``
-- ``$__fish_svn_prompt_char_token_present_display``
-- ``$__fish_svn_prompt_char_token_present_color``
-- ``$__fish_svn_prompt_char_token_other_display``
-- ``$__fish_svn_prompt_char_token_other_color``
-- ``$__fish_svn_prompt_char_token_stolen_display``
-- ``$__fish_svn_prompt_char_token_stolen_color``
-- ``$__fish_svn_prompt_char_token_broken_display``
-- ``$__fish_svn_prompt_char_token_broken_color``
+- :envvar:`__fish_svn_prompt_char_added_display`
+- :envvar:`__fish_svn_prompt_char_added_color`
+- :envvar:`__fish_svn_prompt_char_conflicted_display`
+- :envvar:`__fish_svn_prompt_char_conflicted_color`
+- :envvar:`__fish_svn_prompt_char_deleted_display`
+- :envvar:`__fish_svn_prompt_char_deleted_color`
+- :envvar:`__fish_svn_prompt_char_ignored_display`
+- :envvar:`__fish_svn_prompt_char_ignored_color`
+- :envvar:`__fish_svn_prompt_char_modified_display`
+- :envvar:`__fish_svn_prompt_char_modified_color`
+- :envvar:`__fish_svn_prompt_char_replaced_display`
+- :envvar:`__fish_svn_prompt_char_replaced_color`
+- :envvar:`__fish_svn_prompt_char_unversioned_external_display`
+- :envvar:`__fish_svn_prompt_char_unversioned_external_color`
+- :envvar:`__fish_svn_prompt_char_unversioned_display`
+- :envvar:`__fish_svn_prompt_char_unversioned_color`
+- :envvar:`__fish_svn_prompt_char_missing_display`
+- :envvar:`__fish_svn_prompt_char_missing_color`
+- :envvar:`__fish_svn_prompt_char_versioned_obstructed_display`
+- :envvar:`__fish_svn_prompt_char_versioned_obstructed_color`
+- :envvar:`__fish_svn_prompt_char_locked_display`
+- :envvar:`__fish_svn_prompt_char_locked_color`
+- :envvar:`__fish_svn_prompt_char_scheduled_display`
+- :envvar:`__fish_svn_prompt_char_scheduled_color`
+- :envvar:`__fish_svn_prompt_char_switched_display`
+- :envvar:`__fish_svn_prompt_char_switched_color`
+- :envvar:`__fish_svn_prompt_char_token_present_display`
+- :envvar:`__fish_svn_prompt_char_token_present_color`
+- :envvar:`__fish_svn_prompt_char_token_other_display`
+- :envvar:`__fish_svn_prompt_char_token_other_color`
+- :envvar:`__fish_svn_prompt_char_token_stolen_display`
+- :envvar:`__fish_svn_prompt_char_token_stolen_color`
+- :envvar:`__fish_svn_prompt_char_token_broken_display`
+- :envvar:`__fish_svn_prompt_char_token_broken_color`
 
 See also :ref:`fish_vcs_prompt <cmd-fish_vcs_prompt>`, which will call all supported version control prompt functions, including git, Mercurial and Subversion.
 
diff --git a/doc_src/cmds/fish_vcs_prompt.rst b/doc_src/cmds/fish_vcs_prompt.rst
index 15eb3997d..62baec814 100644
--- a/doc_src/cmds/fish_vcs_prompt.rst
+++ b/doc_src/cmds/fish_vcs_prompt.rst
@@ -29,7 +29,7 @@ It calls out to VCS-specific functions. The currently supported systems are:
 
 If a VCS isn't installed, the respective function does nothing.
 
-The svn prompt is disabled by default because it's slow on large svn repositories. To enable it, modify fish_vcs_prompt to uncomment it. See :ref:`funced <cmd-funced>`.
+The Subversion prompt is disabled by default, because it's slow on large repositories. To enable it, modify ``fish_vcs_prompt`` to uncomment it. See :ref:`funced <cmd-funced>`.
 
 For more information, see the documentation for each of the functions above.
 
diff --git a/doc_src/cmds/for.rst b/doc_src/cmds/for.rst
index 4d5064cc5..f6652f86d 100644
--- a/doc_src/cmds/for.rst
+++ b/doc_src/cmds/for.rst
@@ -17,6 +17,8 @@ Description
 
 Much like :ref:`set <cmd-set>`, **for** does not modify $status, but the evaluation of its subordinate commands can.
 
+The **-h** or **--help** option displays help about using this command.
+
 Example
 -------
 
diff --git a/doc_src/cmds/funced.rst b/doc_src/cmds/funced.rst
index 581e53063..9713da157 100644
--- a/doc_src/cmds/funced.rst
+++ b/doc_src/cmds/funced.rst
@@ -30,6 +30,9 @@ If there is no function called *NAME*, a new function will be created with the s
 **-s** or **--save**
     Automatically save the function after successfully editing it.
 
+**-h** or **--help**
+    Displays help about using this command.
+
 Example
 -------
 
diff --git a/doc_src/cmds/function.rst b/doc_src/cmds/function.rst
index a9d137398..95ef6290e 100644
--- a/doc_src/cmds/function.rst
+++ b/doc_src/cmds/function.rst
@@ -14,7 +14,7 @@ Synopsis
 Description
 -----------
 
-``function`` creates a new function ``NAME`` with the body ``BODY``.
+``function`` creates a new function *NAME* with the body *BODY*.
 
 A function is a list of commands that will be executed when the name of the function is given as a command.
 
diff --git a/doc_src/cmds/functions.rst b/doc_src/cmds/functions.rst
index 860e9ed8d..cac61ab8e 100644
--- a/doc_src/cmds/functions.rst
+++ b/doc_src/cmds/functions.rst
@@ -62,6 +62,9 @@ The following options are available:
 **-t** or **--handlers-type** *TYPE*
     Show all event handlers matching the given *TYPE*.
 
+**-h** or **--help**
+    Displays help about using this command.
+
 The default behavior of ``functions``, when called with no arguments, is to print the names of all defined functions. Unless the ``-a`` option is given, no functions starting with underscores are included in the output.
 
 If any non-option parameters are given, the definition of the specified functions are printed.
diff --git a/doc_src/cmds/help.rst b/doc_src/cmds/help.rst
index 8a344338b..15c64461c 100644
--- a/doc_src/cmds/help.rst
+++ b/doc_src/cmds/help.rst
@@ -17,9 +17,10 @@ Description
 
 If a *SECTION* is specified, the help for that command is shown.
 
-If the BROWSER environment variable is set, it will be used to display the documentation.
-Otherwise, fish will search for a suitable browser.
+The **-h** or **--help** option displays help about using this command.
 
+If the :envvar:`BROWSER`` environment variable is set, it will be used to display the documentation.
+Otherwise, fish will search for a suitable browser.
 To use a different browser than as described above, one can set the :envvar:`fish_help_browser` variable.
 This variable may be set as a list, where the first element is the browser command and the rest are browser options.
 
@@ -31,4 +32,4 @@ Example
 Notes
 -----
 
-Most builtin commands display their help in the terminal when given the **--help** option.
+Most builtin commands, including this one, display their help in the terminal when given the **--help** option.
diff --git a/doc_src/cmds/if.rst b/doc_src/cmds/if.rst
index 771fcdfe5..4d339f457 100644
--- a/doc_src/cmds/if.rst
+++ b/doc_src/cmds/if.rst
@@ -22,6 +22,8 @@ You can use :ref:`and <cmd-and>` or :ref:`or <cmd-or>` in the condition. See the
 
 The exit status of the last foreground command to exit can always be accessed using the :ref:`$status <variables-status>` variable.
 
+The **-h** or **--help** option displays help about using this command.
+
 Example
 -------
 
diff --git a/doc_src/cmds/isatty.rst b/doc_src/cmds/isatty.rst
index f3417aca2..879f0d027 100644
--- a/doc_src/cmds/isatty.rst
+++ b/doc_src/cmds/isatty.rst
@@ -19,6 +19,7 @@ Description
 
 If the specified file descriptor is a terminal device, the exit status of the command is zero. Otherwise, the exit status is non-zero. No messages are printed to standard error.
 
+The **-h** or **--help** option displays help about using this command.
 
 Examples
 --------
diff --git a/doc_src/cmds/jobs.rst b/doc_src/cmds/jobs.rst
index 55c36a99a..56eae582d 100644
--- a/doc_src/cmds/jobs.rst
+++ b/doc_src/cmds/jobs.rst
@@ -33,9 +33,12 @@ Description
 **-q** or **--query**
     Prints no output for evaluation of jobs by exit status only. For compatibility with old fish versions this is also **--quiet** (but this is deprecated).
 
+**-h** or **--help**
+    Displays help about using this command.
+
 On systems that supports this feature, jobs will print the CPU usage of each job since the last command was executed. The CPU usage is expressed as a percentage of full CPU activity. Note that on multiprocessor systems, the total activity may be more than 100\%.
 
-Arguments of the form ``PID`` or ``%JOBID`` restrict the output to jobs with the selected process identifiers or job numbers respectively.
+Arguments of the form *PID* or *%JOBID* restrict the output to jobs with the selected process identifiers or job numbers respectively.
 
 If the output of ``jobs`` is redirected or if it is part of a command substitution, the column header that is usually printed is omitted, making it easier to parse.
 
diff --git a/doc_src/cmds/math.rst b/doc_src/cmds/math.rst
index db203669e..1aac3eada 100644
--- a/doc_src/cmds/math.rst
+++ b/doc_src/cmds/math.rst
@@ -48,6 +48,9 @@ The following options are available:
     Hex numbers will be printed with a ``0x`` prefix.
     Octal numbers will have a prefix of ``0`` but aren't understood by ``math`` as input.
 
+**-h** or **--help**
+    Displays help about using this command.
+
 Return Values
 -------------
 
diff --git a/doc_src/cmds/nextd.rst b/doc_src/cmds/nextd.rst
index 6ea10f316..0e79384c2 100644
--- a/doc_src/cmds/nextd.rst
+++ b/doc_src/cmds/nextd.rst
@@ -13,11 +13,13 @@ Synopsis
 Description
 -----------
 
-``nextd`` moves forwards ``POS`` positions in the :ref:`history of visited directories <directory-history>`; if the end of the history has been hit, a warning is printed.
+``nextd`` moves forwards *POS* positions in the :ref:`history of visited directories <directory-history>`; if the end of the history has been hit, a warning is printed.
 
-If the ``-l`` or ``--list`` flag is specified, the current directory history is also displayed.
+If the **-l** or **--list** option is specified, the current directory history is also displayed.
 
-Note that the ``cd`` command limits directory history to the 25 most recently visited directories. The history is stored in the ``$dirprev`` and ``$dirnext`` variables which this command manipulates.
+The **-h** or **--help** option displays help about using this command.
+
+Note that the ``cd`` command limits directory history to the 25 most recently visited directories. The history is stored in the :envvar:`dirprev` and :envvar:`dirnext` variables which this command manipulates.
 
 Example
 -------
diff --git a/doc_src/cmds/not.rst b/doc_src/cmds/not.rst
index b99c55a73..ceb22b6b7 100644
--- a/doc_src/cmds/not.rst
+++ b/doc_src/cmds/not.rst
@@ -16,6 +16,7 @@ Description
 
 ``not`` negates the exit status of another command. If the exit status is zero, ``not`` returns 1. Otherwise, ``not`` returns 0.
 
+The **-h** or **--help** option displays help about using this command.
 
 Example
 -------
diff --git a/doc_src/cmds/or.rst b/doc_src/cmds/or.rst
index 52c547661..3ef63cf03 100644
--- a/doc_src/cmds/or.rst
+++ b/doc_src/cmds/or.rst
@@ -19,6 +19,8 @@ Description
 
 ``or`` does not change the current exit status itself, but the command it runs most likely will. The exit status of the last foreground command to exit can always be accessed using the :ref:`$status <variables-status>` variable.
 
+The **-h** or **--help** option displays help about using this command.
+
 Example
 -------
 
diff --git a/doc_src/cmds/popd.rst b/doc_src/cmds/popd.rst
index 3eb6b8ad5..c3b7bab78 100644
--- a/doc_src/cmds/popd.rst
+++ b/doc_src/cmds/popd.rst
@@ -15,6 +15,8 @@ Description
 
 ``popd`` removes the top directory from the :ref:`directory stack <directory-stack>` and changes the working directory to the new top directory. Use :ref:`pushd <cmd-pushd>` to add directories to the stack.
 
+The **-h** or **--help** option displays help about using this command.
+
 Example
 -------
 
diff --git a/doc_src/cmds/prevd.rst b/doc_src/cmds/prevd.rst
index 3d9a310ee..7badafd71 100644
--- a/doc_src/cmds/prevd.rst
+++ b/doc_src/cmds/prevd.rst
@@ -13,11 +13,13 @@ Synopsis
 Description
 -----------
 
-``prevd`` moves backwards ``POS`` positions in the :ref:`history of visited directories <directory-history>`; if the beginning of the history has been hit, a warning is printed.
+``prevd`` moves backwards *POS* positions in the :ref:`history of visited directories <directory-history>`; if the beginning of the history has been hit, a warning is printed.
 
-If the ``-l`` or ``--list`` flag is specified, the current history is also displayed.
+If the **-l** or **--list** flag is specified, the current history is also displayed.
 
-Note that the ``cd`` command limits directory history to the 25 most recently visited directories. The history is stored in the ``$dirprev`` and ``$dirnext`` variables which this command manipulates.
+Note that the ``cd`` command limits directory history to the 25 most recently visited directories. The history is stored in the :envvar:`dirprev` and :envvar:`dirnext` variables which this command manipulates.
+
+The **-h** or **--help** option displays help about using this command.
 
 Example
 -------
diff --git a/doc_src/cmds/printf.rst b/doc_src/cmds/printf.rst
index be66487e8..360b6d748 100644
--- a/doc_src/cmds/printf.rst
+++ b/doc_src/cmds/printf.rst
@@ -19,9 +19,9 @@ Description
           To see the documentation on the ``printf`` command you might have,
           use ``command man printf``.
 
-printf uses the format string FORMAT to print the ARGUMENT arguments. This means that it takes format specifiers in the format string and replaces each with an argument.
+``printf`` uses the format string *FORMAT* to print the *ARGUMENT* arguments. This means that it takes format specifiers in the format string and replaces each with an argument.
 
-The ``format`` argument is re-used as many times as necessary to convert all of the given arguments. So ``printf %s\n flounder catfish clownfish shark`` will print four lines.
+The *FORMAT* argument is re-used as many times as necessary to convert all of the given arguments. So ``printf %s\n flounder catfish clownfish shark`` will print four lines.
 
 Unlike :ref:`echo <cmd-echo>`, ``printf`` does not append a new line unless it is specified as part of the string.
 
diff --git a/doc_src/cmds/prompt_login.rst b/doc_src/cmds/prompt_login.rst
index b69dbc5d4..d95631ab2 100644
--- a/doc_src/cmds/prompt_login.rst
+++ b/doc_src/cmds/prompt_login.rst
@@ -13,7 +13,7 @@ Synopsis
 Description
 -----------
 
-``prompt_login`` is a function to describe the current login. It will show the user, the host and also whether the shell is running in a chroot (currently debian's debian_chroot is supported).
+``prompt_login`` is a function to describe the current login. It will show the user, the host and also whether the shell is running in a chroot (currently Debian's ``debian_chroot`` file is supported).
 
 Examples
 --------
diff --git a/doc_src/cmds/prompt_pwd.rst b/doc_src/cmds/prompt_pwd.rst
index e63a1a4db..c95259483 100644
--- a/doc_src/cmds/prompt_pwd.rst
+++ b/doc_src/cmds/prompt_pwd.rst
@@ -15,11 +15,11 @@ Description
 
 ``prompt_pwd`` is a function to print the current working directory in a way suitable for prompts. It will replace the home directory with "~" and shorten every path component but the last to a default of one character.
 
-To change the number of characters per path component, pass ``--dir-length=`` or set ``$fish_prompt_pwd_dir_length`` to the number of characters. Setting it to 0 or an invalid value will disable shortening entirely. This defaults to 1.
+To change the number of characters per path component, pass ``--dir-length=`` or set :envvar:`fish_prompt_pwd_dir_length` to the number of characters. Setting it to 0 or an invalid value will disable shortening entirely. This defaults to 1.
 
-To keep some components unshortened, pass ``--full-length-dirs=`` or set ``$fish_prompt_pwd_full_dirs`` to the number of components. This defaults to 1, keeping the last component.
+To keep some components unshortened, pass ``--full-length-dirs=`` or set :envvar:`$fish_prompt_pwd_full_dirs` to the number of components. This defaults to 1, keeping the last component.
 
-If any positional arguments are given, prompt_pwd shortens them instead of $PWD.
+If any positional arguments are given, ``prompt_pwd`` shortens them instead of $PWD.
 
 Options
 -------
diff --git a/doc_src/cmds/psub.rst b/doc_src/cmds/psub.rst
index b59d81377..92aa1587e 100644
--- a/doc_src/cmds/psub.rst
+++ b/doc_src/cmds/psub.rst
@@ -26,6 +26,9 @@ The following options are available:
 **-s** or **--suffix** *SUFFIX*
     Append SUFFIX to the filename.
 
+**-h** or **--help**
+    Displays help about using this command.
+
 Example
 -------
 
diff --git a/doc_src/cmds/pushd.rst b/doc_src/cmds/pushd.rst
index 95f256816..b941122a5 100644
--- a/doc_src/cmds/pushd.rst
+++ b/doc_src/cmds/pushd.rst
@@ -13,7 +13,7 @@ Synopsis
 Description
 -----------
 
-The ``pushd`` function adds ``DIRECTORY`` to the top of the :ref:`directory stack <directory-stack>` and makes it the current working directory. :ref:`popd <cmd-popd>` will pop it off and return to the original directory.
+The ``pushd`` function adds *DIRECTORY* to the top of the :ref:`directory stack <directory-stack>` and makes it the current working directory. :ref:`popd <cmd-popd>` will pop it off and return to the original directory.
 
 Without arguments, it exchanges the top two directories in the stack.
 
@@ -21,6 +21,8 @@ Without arguments, it exchanges the top two directories in the stack.
 
 ``pushd -NUMBER`` rotates clockwise i.e. top to bottom.
 
+The **-h** or **--help** option displays help about using this command.
+
 Example
 -------
 
diff --git a/doc_src/cmds/pwd.rst b/doc_src/cmds/pwd.rst
index d8a392f87..d094374ef 100644
--- a/doc_src/cmds/pwd.rst
+++ b/doc_src/cmds/pwd.rst
@@ -31,6 +31,9 @@ The following options are available:
 **-P** or **--physical**
     Output the physical working directory, with symlinks resolved.
 
+**-h** or **--help**
+    Displays help about using this command.
+
 See Also
 --------
 
diff --git a/doc_src/cmds/random.rst b/doc_src/cmds/random.rst
index f1a4ff8a4..a1ad74058 100644
--- a/doc_src/cmds/random.rst
+++ b/doc_src/cmds/random.rst
@@ -19,17 +19,21 @@ Description
 
 ``random`` generates a pseudo-random integer from a uniform distribution. The
 range (inclusive) depends on the arguments.
+
 No arguments indicate a range of 0 to 32767 (inclusive).
 
 If one argument is specified, the internal engine will be seeded with the
 argument for future invocations of ``random`` and no output will be produced.
 
-Two arguments indicate a range from START to END (both START and END included).
+Two arguments indicate a range from *START* to *END* (both *START* and *END* included).
 
-Three arguments indicate a range from START to END with a spacing of STEP
+Three arguments indicate a range from *START* to *END* with a spacing of *STEP*
 between possible outputs.
+
 ``random choice`` will select one random item from the succeeding arguments.
 
+The **-h** or **--help** option displays help about using this command.
+
 Note that seeding the engine will NOT give the same result across different
 systems.
 
diff --git a/doc_src/cmds/read.rst b/doc_src/cmds/read.rst
index 3ac9c7298..314d0009d 100644
--- a/doc_src/cmds/read.rst
+++ b/doc_src/cmds/read.rst
@@ -13,48 +13,65 @@ Synopsis
 Description
 -----------
 
-``read`` reads from standard input and either writes the result back to standard output (for use in command substitution), or stores the result in one or more shell variables. By default, ``read`` reads a single line and splits it into variables on spaces or tabs. Alternatively, a null character or a maximum number of characters can be used to terminate the input, and other delimiters can be given. Unlike other shells, there is no default variable (such as ``REPLY``) for storing the result - instead, it is printed on standard output.
+``read`` reads from standard input and either writes the result back to standard output (for use in command substitution), or stores the result in one or more shell variables. By default, ``read`` reads a single line and splits it into variables on spaces or tabs. Alternatively, a null character or a maximum number of characters can be used to terminate the input, and other delimiters can be given. Unlike other shells, there is no default variable (such as :envvar:`REPLY`) for storing the result - instead, it is printed on standard output.
 
 The following options are available:
 
-- ``-c CMD`` or ``--command=CMD`` sets the initial string in the interactive mode command buffer to ``CMD``.
+**-c** *CMD* or **--command** *CMD*
+    Sets the initial string in the interactive mode command buffer to *CMD*.
 
-- ``-d DELIMITER`` or ``--delimiter=DELIMITER`` splits on DELIMITER. DELIMITER will be used as an entire string to split on, not a set of characters.
+**-d** or **--delimiter** *DELIMITER*
+    Splits on *DELIMITER*. *DELIMITER* will be used as an entire string to split on, not a set of characters.
 
-- ``-g`` or ``--global`` makes the variables global.
+**-g** or **--global**
+    Makes the variables global.
 
-- ``-s`` or ``--silent`` masks characters written to the terminal, replacing them with asterisks. This is useful for reading things like passwords or other sensitive information.
+**-s** or **--silent**
+    Masks characters written to the terminal, replacing them with asterisks. This is useful for reading things like passwords or other sensitive information.
 
-- ``-f`` or ``--function`` scopes the variable to the currently executing function. It is erased when the function ends.
+**-f** or **--function**
+    Scopes the variable to the currently executing function. It is erased when the function ends.
 
-- ``-l`` or ``--local`` scopes the variable to the currently executing block. It is erased when the block ends. Outside of a block, this is the same as ``--function``.
+**-l** or **--local**
+    Scopes the variable to the currently executing block. It is erased when the block ends. Outside of a block, this is the same as **--function**.
 
-- ``-n NCHARS`` or ``--nchars=NCHARS`` makes ``read`` return after reading NCHARS characters or the end of
-  the line, whichever comes first.
+**-n** or **--nchars** *NCHARS*
+    Makes ``read`` return after reading *NCHARS* characters or the end of the line, whichever comes first.
 
-- ``-p PROMPT_CMD`` or ``--prompt=PROMPT_CMD`` uses the output of the shell command ``PROMPT_CMD`` as the prompt for the interactive mode. The default prompt command is ``set_color green; echo read; set_color normal; echo "> "``
+**-p** or **--prompt** *PROMPT_CMD*
+    Uses the output of the shell command *PROMPT_CMD* as the prompt for the interactive mode. The default prompt command is ``set_color green; echo read; set_color normal; echo "> "``
 
-- ``-P PROMPT_STR`` or ``--prompt-str=PROMPT_STR`` uses the string as the prompt for the interactive mode. It is equivalent to ``echo PROMPT_STR`` and is provided solely to avoid the need to frame the prompt as a command. All special characters in the string are automatically escaped before being passed to the :ref:`echo <cmd-echo>` command.
+**-P** or **--prompt-str** *PROMPT_STR*
+    Uses the *PROMPT_STR* as the prompt for the interactive mode. It is equivalent to ``echo $PROMPT_STR`` and is provided solely to avoid the need to frame the prompt as a command. All special characters in the string are automatically escaped before being passed to the :ref:`echo <cmd-echo>` command.
 
-- ``-R RIGHT_PROMPT_CMD`` or ``--right-prompt=RIGHT_PROMPT_CMD`` uses the output of the shell command ``RIGHT_PROMPT_CMD`` as the right prompt for the interactive mode. There is no default right prompt command.
+**-R** or **--right-prompt** *RIGHT_PROMPT_CMD*
+    Uses the output of the shell command *RIGHT_PROMPT_CMD* as the right prompt for the interactive mode. There is no default right prompt command.
 
-- ``-S`` or ``--shell`` enables syntax highlighting, tab completions and command termination suitable for entering shellscript code in the interactive mode. NOTE: Prior to fish 3.0, the short opt for ``--shell`` was ``-s``, but it has been changed for compatibility with bash's ``-s`` short opt for ``--silent``.
+**-S** or **--shell**
+    Enables syntax highlighting, tab completions and command termination suitable for entering shellscript code in the interactive mode. NOTE: Prior to fish 3.0, the short opt for **--shell** was **-s**, but it has been changed for compatibility with bash's **-s** short opt for **--silent**.
 
-- ``-t`` -or ``--tokenize`` causes read to split the input into variables by the shell's tokenization rules. This means it will honor quotes and escaping. This option is of course incompatible with other options to control splitting like ``--delimiter`` and does not honor $IFS (like fish's tokenizer). It saves the tokens in the manner they'd be passed to commands on the commandline, so e.g. ``a\ b`` is stored as ``a b``. Note that currently it leaves command substitutions intact along with the parentheses.
+**-t** -or **--tokenize**
+    Causes read to split the input into variables by the shell's tokenization rules. This means it will honor quotes and escaping. This option is of course incompatible with other options to control splitting like **--delimiter** and does not honor :envvar:`IFS` (like fish's tokenizer). It saves the tokens in the manner they'd be passed to commands on the commandline, so e.g. ``a\ b`` is stored as ``a b``. Note that currently it leaves command substitutions intact along with the parentheses.
 
-- ``-u`` or ``--unexport`` prevents the variables from being exported to child processes (default behaviour).
+**-u** or **--unexport**
+    Prevents the variables from being exported to child processes (default behaviour).
 
-- ``-U`` or ``--universal`` causes the specified shell variable to be made universal.
+**-U** or **--universal**
+    Causes the specified shell variable to be made universal.
 
-- ``-x`` or ``--export`` exports the variables to child processes.
+**-x** or **--export**
+    Exports the variables to child processes.
 
-- ``-a`` or ``--list`` stores the result as a list in a single variable. This option is also available as ``--array`` for backwards compatibility.
+**-a** or **--list**
+    Stores the result as a list in a single variable. This option is also available as **--array** for backwards compatibility.
 
-- ``-z`` or ``--null`` marks the end of the line with the NUL character, instead of newline. This also disables interactive mode.
+**-z** or **--null**
+    Marks the end of the line with the NUL character, instead of newline. This also disables interactive mode.
 
-- ``-L`` or ``--line`` reads each line into successive variables, and stops after each variable has been filled. This cannot be combined with the ``--delimiter`` option.
+**-L** or **--line**
+    Reads each line into successive variables, and stops after each variable has been filled. This cannot be combined with the ``--delimiter`` option.
 
-Without the ``--line`` option, ``read`` reads a single line of input from standard input, breaks it into tokens, and then assigns one token to each variable specified in ``VARIABLES``. If there are more tokens than variables, the complete remainder is assigned to the last variable.
+Without the ``--line`` option, ``read`` reads a single line of input from standard input, breaks it into tokens, and then assigns one token to each variable specified in *VARIABLES*. If there are more tokens than variables, the complete remainder is assigned to the last variable.
 
 If no option to determine how to split like ``--delimiter``, ``--line`` or ``--tokenize`` is given, the variable ``IFS`` is used as a list of characters to split on. Relying on the use of ``IFS`` is deprecated and this behaviour will be removed in future versions. The default value of ``IFS`` contains space, tab and newline characters. As a special case, if ``IFS`` is set to the empty string, each character of the input is considered a separate token.
 
@@ -74,14 +91,14 @@ When ``read`` reaches the end-of-file (EOF) instead of the terminator, the exit
 Otherwise, it is set to 0.
 
 In order to protect the shell from consuming too many system resources, ``read`` will only consume a
-maximum of 100 MiB (104857600 bytes); if the terminator is not reached before this limit then VARIABLE
+maximum of 100 MiB (104857600 bytes); if the terminator is not reached before this limit then *VARIABLE*
 is set to empty and the exit status is set to 122. This limit can be altered with the
-``fish_read_limit`` variable. If set to 0 (zero), the limit is removed.
+:envvar:`fish_read_limit` variable. If set to 0 (zero), the limit is removed.
 
 Example
 -------
 
-The following code stores the value 'hello' in the shell variable ``$foo``.
+The following code stores the value 'hello' in the shell variable :envvar:`$foo`.
 
 
 
diff --git a/doc_src/cmds/realpath.rst b/doc_src/cmds/realpath.rst
index c4bd18dfc..a3427fa32 100644
--- a/doc_src/cmds/realpath.rst
+++ b/doc_src/cmds/realpath.rst
@@ -29,3 +29,6 @@ The following options are available:
 
 **-s** or **--no-symlinks**
     Don't resolve symlinks, only make paths absolute, squash multiple slashes and remove trailing slashes.
+
+**-h** or **--help**
+    Displays help about using this command.
diff --git a/doc_src/cmds/return.rst b/doc_src/cmds/return.rst
index 307d5dafc..4bb16d36e 100644
--- a/doc_src/cmds/return.rst
+++ b/doc_src/cmds/return.rst
@@ -15,7 +15,7 @@ Description
 -----------
 
 :program:`return` halts a currently running function.
-The exit status is set to ``N`` if it is given.
+The exit status is set to *N* if it is given.
 If :program:`return` is invoked outside of a function or dot script it is equivalent to exit.
 
 It is often added inside of a conditional block such as an :ref:`if <cmd-if>` statement or a :ref:`switch <cmd-switch>` statement to conditionally stop the executing function and return to the caller; it can also be used to specify the exit status of a function.
@@ -23,6 +23,8 @@ It is often added inside of a conditional block such as an :ref:`if <cmd-if>` st
 If at the top level of a script, it exits with the given status, like :ref:`exit <cmd-exit>`.
 If at the top level in an interactive session, it will set :envvar:`status`, but not exit the shell.
 
+The **-h** or **--help** option displays help about using this command.
+
 Example
 -------
 
diff --git a/doc_src/cmds/set.rst b/doc_src/cmds/set.rst
index 7a8741272..7ccaf228e 100644
--- a/doc_src/cmds/set.rst
+++ b/doc_src/cmds/set.rst
@@ -82,6 +82,9 @@ The following other options are available:
 **-L** or **--long**
     Do not abbreviate long values when printing set variables.
 
+**-h** or **--help**
+    Displays help about using this command.
+
 If a variable is set to more than one value, the variable will be a list with the specified elements. If a variable is set to zero elements, it will become a list with zero elements.
 
 If the variable name is one or more list elements, such as ``PATH[1 3 7]``, only those list elements specified will be changed. If you specify a negative index when expanding or assigning to a list variable, the index will be calculated from the end of the list. For example, the index -1 means the last index of a list.
@@ -108,12 +111,12 @@ In query mode, the scope to be examined can be specified. Whether the variable h
 
 In erase mode, if variable indices are specified, only the specified slices of the list variable will be erased.
 
-``set`` requires all options to come before any other arguments. For example, ``set flags -l`` will have the effect of setting the value of the variable ``flags`` to '-l', not making the variable local.
+``set`` requires all options to come before any other arguments. For example, ``set flags -l`` will have the effect of setting the value of the variable :envvar:`flags` to '-l', not making the variable local.
 
 Exit status
 -----------
 
-In assignment mode, ``set`` does not modify the exit status, but passes along whatever $status was set, including by command substitutions. This allows capturing the output and exit status of a subcommand, like in ``if set output (command)``.
+In assignment mode, ``set`` does not modify the exit status, but passes along whatever :envvar:`status` was set, including by command substitutions. This allows capturing the output and exit status of a subcommand, like in ``if set output (command)``.
 
 In query mode, the exit status is the number of variables that were not found.
 
diff --git a/doc_src/cmds/set_color.rst b/doc_src/cmds/set_color.rst
index 23f142912..db1ba1796 100644
--- a/doc_src/cmds/set_color.rst
+++ b/doc_src/cmds/set_color.rst
@@ -13,16 +13,16 @@ Synopsis
 Description
 -----------
 
-``set_color`` is used to control the color and styling of text in the terminal. ``VALUE`` describes that styling. ``VALUE`` can be a reserved color name like *red* or a RGB color value given as 3 or 6 hexadecimal digits ("F27" or "FF2277"). A special keyword *normal* resets text formatting to terminal defaults.
+``set_color`` is used to control the color and styling of text in the terminal. *VALUE* describes that styling. *VALUE* can be a reserved color name like **red** or a RGB color value given as 3 or 6 hexadecimal digits ("F27" or "FF2277"). A special keyword **normal** resets text formatting to terminal defaults.
 
 Valid colors include:
 
-  - *black*, *red*, *green*, *yellow*, *blue*, *magenta*, *cyan*, *white*
-  - *brblack*, *brred*, *brgreen*, *bryellow*, *brblue*, *brmagenta*, *brcyan*, *brwhite*
+  - **black**, **red**, **green**, **yellow**, **blue**, **magenta**, **cyan**, **white**
+  - **brblack**, **brred**, **brgreen**, **bryellow**, **brblue**, **brmagenta**, **brcyan**, **brwhite**
 
-The *br*- (as in 'bright') forms are full-brightness variants of the 8 standard-brightness colors on many terminals. *brblack* has higher brightness than *black* - towards gray.
+The *br*- (as in 'bright') forms are full-brightness variants of the 8 standard-brightness colors on many terminals. **brblack** has higher brightness than **black** - towards gray.
 
-An RGB value with three or six hex digits, such as A0FF33 or f2f can be used. ``fish`` will choose the closest supported color. A three digit value is equivalent to specifying each digit twice; e.g., ``set_color 2BC`` is the same as ``set_color 22BBCC``. Hexadecimal RGB values can be in lower or uppercase. Depending on the capabilities of your terminal (and the level of support ``set_color`` has for it) the actual color may be approximated by a nearby matching reserved color name or ``set_color`` may not have an effect on color.
+An RGB value with three or six hex digits, such as A0FF33 or f2f can be used. Fish will choose the closest supported color. A three digit value is equivalent to specifying each digit twice; e.g., ``set_color 2BC`` is the same as ``set_color 22BBCC``. Hexadecimal RGB values can be in lower or uppercase. Depending on the capabilities of your terminal (and the level of support ``set_color`` has for it) the actual color may be approximated by a nearby matching reserved color name or ``set_color`` may not have an effect on color.
 
 A second color may be given as a desired fallback color. e.g. ``set_color 124212 brblue`` will instruct set_color to use *brblue* if a terminal is not capable of the exact shade of grey desired. This is very useful when an 8 or 16 color terminal might otherwise not use a color.
 
@@ -49,15 +49,18 @@ The following options are available:
 **-u** or **--underline**
     Sets underlined mode.
 
+**-h** or **--help**
+    Displays help about using this command.
+
 Using the **normal** keyword will reset foreground, background, and all formatting back to default.
 
 Notes
 -----
 
-1. Using the *normal* keyword will reset both background and foreground colors to whatever is the default for the terminal.
+1. Using the **normal** keyword will reset both background and foreground colors to whatever is the default for the terminal.
 2. Setting the background color only affects subsequently written characters. Fish provides no way to set the background color for the entire terminal window. Configuring the window background color (and other attributes such as its opacity) has to be done using whatever mechanisms the terminal provides. Look for a config option.
 3. Some terminals use the ``--bold`` escape sequence to switch to a brighter color set rather than increasing the weight of text.
-4. ``set_color`` works by printing sequences of characters to *stdout*. If used in command substitution or a pipe, these characters will also be captured. This may or may not be desirable. Checking the exit status of ``isatty stdout`` before using ``set_color`` can be useful to decide not to colorize output in a script.
+4. ``set_color`` works by printing sequences of characters to standard output. If used in command substitution or a pipe, these characters will also be captured. This may or may not be desirable. Checking the exit status of ``isatty stdout`` before using ``set_color`` can be useful to decide not to colorize output in a script.
 
 Examples
 --------
@@ -78,13 +81,13 @@ Fish uses some heuristics to determine what colors a terminal supports to avoid
 
 In particular it will:
 
-- Enable 256 colors if $TERM contains "xterm", except for known exceptions (like MacOS 10.6 Terminal.app)
+- Enable 256 colors if :envvar:`TERM` contains "xterm", except for known exceptions (like MacOS 10.6 Terminal.app)
 - Enable 24-bit ("true-color") even if the $TERM entry only reports 256 colors. This includes modern xterm, VTE-based terminals like Gnome Terminal, Konsole and iTerm2.
 - Detect support for italics, dim, reverse and other modes.
 
 If terminfo reports 256 color support for a terminal, 256 color support will always be enabled.
 
-To force true-color support on or off, set $fish_term24bit to "1" for on and 0 for off - ``set -g fish_term24bit 1``.
+To force true-color support on or off, set :envvar:`fish_term24bit`` to "1" for on and 0 for off - ``set -g fish_term24bit 1``.
 
 To debug color palette problems, ``tput colors`` may be useful to see the number of colors in terminfo for a terminal. Fish launched as ``fish -d2`` will include diagnostic messages that indicate the color support mode in use.
 
diff --git a/doc_src/cmds/source.rst b/doc_src/cmds/source.rst
index 1a0092c3c..8dd1cd49c 100644
--- a/doc_src/cmds/source.rst
+++ b/doc_src/cmds/source.rst
@@ -15,18 +15,19 @@ Synopsis
 Description
 -----------
 
-``source`` evaluates the commands of the specified file in the current shell as a new block of code. This is different from starting a new process to perform the commands (i.e. ``fish < FILE``) since the commands will be evaluated by the current shell, which means that changes in shell variables will affect the current shell. If additional arguments are specified after the file name, they will be inserted into the ``$argv`` variable. The ``$argv`` variable will not include the name of the sourced file.
+``source`` evaluates the commands of the specified *FILE* in the current shell as a new block of code. This is different from starting a new process to perform the commands (i.e. ``fish < FILE``) since the commands will be evaluated by the current shell, which means that changes in shell variables will affect the current shell. If additional arguments are specified after the file name, they will be inserted into the :envvar:`argv` variable. The :envvar:`argv` variable will not include the name of the sourced file.
 
-fish will search the working directory to resolve relative paths but will not search ``$PATH``.
+fish will search the working directory to resolve relative paths but will not search :envvar:`PATH` .
 
 If no file is specified and stdin is not the terminal, or if the file name ``-`` is used, stdin will be read.
 
 The exit status of ``source`` is the exit status of the last job to execute. If something goes wrong while opening or reading the file, ``source`` exits with a non-zero status.
 
-``.`` (a single period) is an alias for the ``source`` command. The use of ``.`` is deprecated in favour of ``source``, and ``.`` will be removed in a future version of fish.
+**.** (a single period) is an alias for the ``source`` command. The use of **.** is deprecated in favour of ``source``, and **.** will be removed in a future version of fish.
 
 ``source`` creates a new :ref:`local scope<variables-scope>`; ``set --local`` within a sourced block will not affect variables in the enclosing scope.
 
+The **-h** or **--help** option displays help about using this command.
 
 Example
 -------
@@ -42,4 +43,4 @@ Example
 Caveats
 -------
 
-In fish versions prior to 2.3.0, the ``$argv`` variable would have a single element (the name of the sourced file) if no arguments are present. Otherwise, it would contain arguments without the name of the sourced file. That behavior was very confusing and unlike other shells such as bash and zsh.
+In fish versions prior to 2.3.0, the :envvar:`argv` variable would have a single element (the name of the sourced file) if no arguments are present. Otherwise, it would contain arguments without the name of the sourced file. That behavior was very confusing and unlike other shells such as bash and zsh.
diff --git a/doc_src/cmds/status.rst b/doc_src/cmds/status.rst
index f6d7a6ada..1508fe8c3 100644
--- a/doc_src/cmds/status.rst
+++ b/doc_src/cmds/status.rst
@@ -34,7 +34,7 @@ Description
 
 With no arguments, ``status`` displays a summary of the current login and job control status of the shell.
 
-The following operations (sub-commands) are available:
+The following operations (subcommands) are available:
 
 **is-command-substitution**, **-c** or **--is-command-substitution**
     Returns 0 if fish is currently executing a command substitution.
diff --git a/doc_src/cmds/suspend.rst b/doc_src/cmds/suspend.rst
index 853044b87..529beef71 100644
--- a/doc_src/cmds/suspend.rst
+++ b/doc_src/cmds/suspend.rst
@@ -13,4 +13,4 @@ Synopsis
 Description
 -----------
 
-``suspend`` suspends execution of the current shell by sending it a SIGTSTP signal, returning to the controlling process. It can be resumed later by sending it a SIGCONT.  In order to prevent suspending a shell that doesn't have a controlling process, it will not suspend the shell if it is a login shell. This requirement is bypassed if the ``--force`` option is given or the shell is not interactive.
+``suspend`` suspends execution of the current shell by sending it a SIGTSTP signal, returning to the controlling process. It can be resumed later by sending it a SIGCONT.  In order to prevent suspending a shell that doesn't have a controlling process, it will not suspend the shell if it is a login shell. This requirement is bypassed if the **--force** option is given or the shell is not interactive.
diff --git a/doc_src/cmds/switch.rst b/doc_src/cmds/switch.rst
index 4079501a7..0d7b1caa4 100644
--- a/doc_src/cmds/switch.rst
+++ b/doc_src/cmds/switch.rst
@@ -25,9 +25,7 @@ Note that command substitutions in a case statement will be evaluated even if it
 Example
 -------
 
-If the variable \$animal contains the name of an animal, the following code would attempt to classify it:
-
-
+If the variable :envvar:`animal` contains the name of an animal, the following code would attempt to classify it:
 
 ::
 
diff --git a/doc_src/cmds/test.rst b/doc_src/cmds/test.rst
index eb09db5e8..b3d865690 100644
--- a/doc_src/cmds/test.rst
+++ b/doc_src/cmds/test.rst
@@ -143,7 +143,7 @@ Expressions can be grouped using parentheses.
 **(** *EXPRESSION* **)**
      Returns the value of *EXPRESSION*.
 
- Note that parentheses will usually require escaping with ``\(`` to avoid being interpreted as a command substitution.
+Note that parentheses will usually require escaping with ``\(`` to avoid being interpreted as a command substitution.
 
 
 Examples
@@ -160,7 +160,7 @@ If the ``/tmp`` directory exists, copy the ``/etc/motd`` file to it:
     end
 
 
-If the variable ``MANPATH`` is defined and not empty, print the contents. (If ``MANPATH`` is not defined, then it will expand to zero arguments, unless quoted.)
+If the variable :envvar:`MANPATH` is defined and not empty, print the contents. (If :envvar:`MANPATH` is not defined, then it will expand to zero arguments, unless quoted.)
 
 
 
@@ -193,7 +193,7 @@ Numerical comparisons will simply fail if one of the operands is not a number:
     end
 
 
-A common comparison is with $status:
+A common comparison is with :envvar:`status`:
 
 
 
diff --git a/doc_src/cmds/trap.rst b/doc_src/cmds/trap.rst
index 85fbcfff5..455fda2ee 100644
--- a/doc_src/cmds/trap.rst
+++ b/doc_src/cmds/trap.rst
@@ -29,15 +29,18 @@ The following parameters are available:
 **-p** or **--print**
     Prints all defined signal handlers.
 
-If ``ARG`` and ``REASON`` are both specified, ``ARG`` is the command to be executed when the event specified by ``REASON`` occurs (e.g., the signal is delivered).
+**-h** or **--help**
+    Displays help about using this command.
 
-If ``ARG`` is absent (and there is a single REASON) or -, each specified signal is reset to its original disposition (the value it had upon entrance to the shell).  If ``ARG`` is the null string the signal specified by each ``REASON`` is ignored by the shell and by the commands it invokes.
+If *ARG* and *REASON* are both specified, *ARG* is the command to be executed when the event specified by *REASON* occurs (e.g., the signal is delivered).
 
-If ``ARG`` is not present and ``-p`` has been supplied, then the trap commands associated with each ``REASON`` are displayed. If no arguments are supplied or if only ``-p`` is given, ``trap`` prints the list of commands associated with each signal.
+If *ARG* is absent (and there is a single *REASON*) or ``-``, each specified signal is reset to its original disposition (the value it had upon entrance to the shell).  If *ARG* is the null string the signal specified by each *REASON* is ignored by the shell and by the commands it invokes.
+
+If *ARG* is not present and **-p** has been supplied, then the trap commands associated with each *REASON* are displayed. If no arguments are supplied or if only **-p** is given, ``trap`` prints the list of commands associated with each signal.
 
 Signal names are case insensitive and the ``SIG`` prefix is optional.
 
-The exit status is 1 if any ``REASON`` is invalid; otherwise trap returns 0.
+The exit status is 1 if any *REASON* is invalid; otherwise trap returns 0.
 
 Example
 -------
diff --git a/doc_src/cmds/type.rst b/doc_src/cmds/type.rst
index 6172b1607..4fb5d263f 100644
--- a/doc_src/cmds/type.rst
+++ b/doc_src/cmds/type.rst
@@ -13,7 +13,7 @@ Synopsis
 Description
 -----------
 
-With no options, :command:`type` indicates how each ``NAME`` would be interpreted if used as a command name.
+With no options, :command:`type` indicates how each *NAME* would be interpreted if used as a command name.
 
 The following options are available:
 
@@ -38,7 +38,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**.
 
-The ``-q``, ``-p``, ``-t`` and ``-P`` flags (and their long flag aliases) are mutually exclusive. Only one can be specified at a time.
+**-h** or **--help**
+    Displays help about using this command.
+
+The **-q**, **-p**, **-t** and **-P** flags (and their long flag aliases) are mutually exclusive. Only one can be specified at a time.
 
 
 Example
diff --git a/doc_src/cmds/ulimit.rst b/doc_src/cmds/ulimit.rst
index ce7a34cf4..620c9c94e 100644
--- a/doc_src/cmds/ulimit.rst
+++ b/doc_src/cmds/ulimit.rst
@@ -69,13 +69,16 @@ The following additional options are also understood by ``ulimit``:
 **-a** or **--all**
     Prints all current limits.
 
+**-h** or **--help**
+    Displays help about using this command.
+
 The ``fish`` implementation of ``ulimit`` should behave identically to the implementation in bash, except for these differences:
 
-- Fish ``ulimit`` supports GNU-style long options for all switches
+- Fish ``ulimit`` supports GNU-style long options for all switches.
 
-- Fish ``ulimit`` does not support the ``-p`` option for getting the pipe size. The bash implementation consists of a compile-time check that empirically guesses this number by writing to a pipe and waiting for SIGPIPE. Fish does not do this because it this method of determining pipe size is unreliable. Depending on bash version, there may also be further additional limits to set in bash that do not exist in fish.
+- Fish ``ulimit`` does not support the **-p** option for getting the pipe size. The bash implementation consists of a compile-time check that empirically guesses this number by writing to a pipe and waiting for SIGPIPE. Fish does not do this because it this method of determining pipe size is unreliable. Depending on bash version, there may also be further additional limits to set in bash that do not exist in fish.
 
-- Fish ``ulimit`` does not support getting or setting multiple limits in one command, except reporting all values using the ``-a`` switch
+- Fish ``ulimit`` does not support getting or setting multiple limits in one command, except reporting all values using the **-a** switch.
 
 
 Example
diff --git a/doc_src/cmds/vared.rst b/doc_src/cmds/vared.rst
index 0feda6108..db10c3d96 100644
--- a/doc_src/cmds/vared.rst
+++ b/doc_src/cmds/vared.rst
@@ -15,6 +15,7 @@ Description
 
 ``vared`` is used to interactively edit the value of an environment variable. Array variables as a whole can not be edited using ``vared``, but individual list elements can.
 
+The **-h** or **--help** option displays help about using this command.
 
 Example
 -------
diff --git a/doc_src/cmds/wait.rst b/doc_src/cmds/wait.rst
index 4ebda1cba..25cba5b10 100644
--- a/doc_src/cmds/wait.rst
+++ b/doc_src/cmds/wait.rst
@@ -23,6 +23,8 @@ If neither a pid nor a process name is specified, the command waits for all back
 
 If the **-n** or **--any** flag is provided, the command returns as soon as the first job completes. If it is not provided, it returns after all jobs complete.
 
+The **-h** or **--help** option displays help about using this command.
+
 Example
 -------
 
diff --git a/doc_src/cmds/while.rst b/doc_src/cmds/while.rst
index 7e0060536..77d0b592d 100644
--- a/doc_src/cmds/while.rst
+++ b/doc_src/cmds/while.rst
@@ -19,6 +19,8 @@ The exit status of the **while** loop is the exit status of the last iteration o
 
 You can use :ref:`and <cmd-and>` or :ref:`or <cmd-or>` for complex conditions. Even more complex control can be achieved with ``while true`` containing a :ref:`break <cmd-break>`.
 
+The **-h** or **--help** option displays help about using this command.
+
 Example
 -------
 

From 838056fe18903bcd26009cfe9122d2344379fbb1 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 11 Mar 2022 19:05:26 +0100
Subject: [PATCH 252/262] docs: Remove prompt from multiline commands

If a code block includes a line starting with ">", we assume it shows
an interactive session, all lines starting with ">" are commands and
the rest is output.

Unfortunately, in something like:

```
> for val in $PATh
    echo "entry: $val"
  end

entry: /usr/bin
```

this won't highlight the dangling lines. We could also prefix them
with `>`, but that require us to parse them in blocks or the `end`
would be an error.

So, for now, simply don't give these as a prompt but as a script with
cheesy comments describing the output.
---
 doc_src/tutorial.rst | 46 +++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/doc_src/tutorial.rst b/doc_src/tutorial.rst
index cbab7ed55..95befebb0 100644
--- a/doc_src/tutorial.rst
+++ b/doc_src/tutorial.rst
@@ -361,14 +361,15 @@ You can also access ranges of elements, known as "slices":
 
 You can iterate over a list (or a slice) with a for loop::
 
-    > for val in $PATH
-        echo "entry: $val"
-      end
-    entry: /usr/bin/
-    entry: /bin
-    entry: /usr/sbin
-    entry: /sbin
-    entry: /usr/local/bin
+    for val in $PATH
+      echo "entry: $val"
+    end
+    # Will print:
+    # entry: /usr/bin/
+    # entry: /bin
+    # entry: /usr/sbin
+    # entry: /sbin
+    # entry: /usr/local/bin
 
 Lists adjacent to other lists or strings are expanded as :ref:`cartesian products <cartesian-product>` unless quoted (see :ref:`Variable expansion <expand-variable>`)::
 
@@ -569,13 +570,13 @@ Functions
 
 A fish function is a list of commands, which may optionally take arguments. Unlike other shells, arguments are not passed in "numbered variables" like ``$1``, but instead in a single list ``$argv``. To create a function, use the :ref:`function <cmd-function>` builtin::
 
-    > function say_hello
-         echo Hello $argv
-      end
-    > say_hello
-    Hello
-    > say_hello everybody!
-    Hello everybody!
+    function say_hello
+        echo Hello $argv
+    end
+    say_hello
+    # prints: Hello
+    say_hello everybody!
+    # prints: Hello everybody!
 
 
 Unlike other shells, fish does not have aliases or special prompt syntax. Functions take their place. [#]_
@@ -603,25 +604,26 @@ Loops
 
 While loops::
 
-    > while true
+    while true
         echo "Loop forever"
     end
-    Loop forever
-    Loop forever
-    Loop forever
-    ... # yes, this really will loop forever. Unless you abort it with ctrl-c.
+    # Prints:
+    # Loop forever
+    # Loop forever
+    # Loop forever
+    # yes, this really will loop forever. Unless you abort it with ctrl-c.
 
 
 For loops can be used to iterate over a list. For example, a list of files::
 
-    > for file in *.txt
+    for file in *.txt
         cp $file $file.bak
     end
 
 
 Iterating over a list of numbers can be done with ``seq``::
 
-    > for x in (seq 5)
+    for x in (seq 5)
         touch file_$x.txt
     end
 

From 9575f0eb4ff3e30e27a9f7563f25eec1cbec0b4f Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 11 Mar 2022 19:13:50 +0100
Subject: [PATCH 253/262] docs: Readd link to full configuration section to
 index

---
 doc_src/index.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc_src/index.rst b/doc_src/index.rst
index 9232f215f..95f501e53 100644
--- a/doc_src/index.rst
+++ b/doc_src/index.rst
@@ -109,7 +109,9 @@ To store configuration write it to a file called ``~/.config/fish/config.fish``.
 
 ``.fish`` scripts in ``~/.config/fish/conf.d/`` are also automatically executed before ``config.fish``.
 
-These files are read on the startup of every shell, whether interactive and/or if they're login shells. Use ``status --is-interactive`` and ``status --is-login`` to discriminate.
+These files are read on the startup of every shell, whether interactive and/or if they're login shells. Use ``status --is-interactive`` and ``status --is-login`` to do things only in interactive/login shells, respectively.
+
+This is the short version; for a full explanation, like for sysadmins or integration for developers of other software, see :ref:`Configuration files <configuration>`.
 
 Examples:
 ---------

From a6d484836e55a0a1aa1f04c8b59ce4461fc323f4 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 11 Mar 2022 20:14:47 +0100
Subject: [PATCH 254/262] docs: Align text left

Otherwise this does "justify", which in bad cases can spread the text
over the width of the whole line, leaving awkward space between words.

This looks something like

```
The    main    file    is    ~/.config/fish/config.fish
```

The current python docs theme also left-aligns.
---
 doc_src/python_docs_theme/static/pydoctheme.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc_src/python_docs_theme/static/pydoctheme.css b/doc_src/python_docs_theme/static/pydoctheme.css
index 2f629ac48..3795956ff 100644
--- a/doc_src/python_docs_theme/static/pydoctheme.css
+++ b/doc_src/python_docs_theme/static/pydoctheme.css
@@ -160,6 +160,7 @@ div.body {
 
 div.body p {
     line-height: 2em;
+    text-align: left;
 }
 
 div.body h1, div.body h2, div.body h3, div.body h4, div.body h5, div.body h6 {

From 4bc6b36bed5217498b9a3a70c6eeedeee467c1c2 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sat, 12 Mar 2022 22:22:00 +0800
Subject: [PATCH 255/262] string docs: format options and arguments in line
 with other pages

There are a number of items which don't fit cleanly into the styles used in the
synopses, and have been left alone.
---
 doc_src/cmds/string-collect.rst |  4 ++--
 doc_src/cmds/string-escape.rst  | 10 +++++-----
 doc_src/cmds/string-join.rst    |  4 ++--
 doc_src/cmds/string-length.rst  |  6 +++---
 doc_src/cmds/string-lower.rst   |  2 +-
 doc_src/cmds/string-match.rst   | 16 ++++++++--------
 doc_src/cmds/string-pad.rst     | 10 +++++-----
 doc_src/cmds/string-repeat.rst  |  2 +-
 doc_src/cmds/string-replace.rst |  8 ++++----
 doc_src/cmds/string-split.rst   |  8 ++++----
 doc_src/cmds/string-sub.rst     |  2 +-
 doc_src/cmds/string-trim.rst    |  2 +-
 doc_src/cmds/string-upper.rst   |  2 +-
 doc_src/cmds/string.rst         |  8 ++++----
 14 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/doc_src/cmds/string-collect.rst b/doc_src/cmds/string-collect.rst
index fbacdd99b..ad6d72826 100644
--- a/doc_src/cmds/string-collect.rst
+++ b/doc_src/cmds/string-collect.rst
@@ -23,9 +23,9 @@ A command like ``echo (cmd | string collect)`` is mostly equivalent to a quoted
 
 If invoked with multiple arguments instead of input, ``string collect`` preserves each argument separately, where the number of output arguments is equal to the number of arguments given to ``string collect``.
 
-Any trailing newlines on the input are trimmed, just as with ``"$(cmd)"`` substitution. Use ``--no-trim-newlines`` to disable this behavior, which may be useful when running a command such as ``set contents (cat filename | string collect -N)``.
+Any trailing newlines on the input are trimmed, just as with ``"$(cmd)"`` substitution. Use **--no-trim-newlines** to disable this behavior, which may be useful when running a command such as ``set contents (cat filename | string collect -N)``.
 
-With ``--allow-empty``, ``string collect`` always prints one (empty) argument. This can be used to prevent an argument from disappearing.
+With **--allow-empty**, ``string collect`` always prints one (empty) argument. This can be used to prevent an argument from disappearing.
 
 .. END DESCRIPTION
 
diff --git a/doc_src/cmds/string-escape.rst b/doc_src/cmds/string-escape.rst
index cddc80184..ba9bc250b 100644
--- a/doc_src/cmds/string-escape.rst
+++ b/doc_src/cmds/string-escape.rst
@@ -18,15 +18,15 @@ Description
 
 .. BEGIN DESCRIPTION
 
-``string escape`` escapes each STRING in one of three ways. The first is ``--style=script``. This is the default. It alters the string such that it can be passed back to ``eval`` to produce the original argument again. By default, all special characters are escaped, and quotes are used to simplify the output when possible. If ``-n`` or ``--no-quoted`` is given, the simplifying quoted format is not used. Exit status: 0 if at least one string was escaped, or 1 otherwise.
+``string escape`` escapes each *STRING* in one of three ways. The first is **--style=script**. This is the default. It alters the string such that it can be passed back to ``eval`` to produce the original argument again. By default, all special characters are escaped, and quotes are used to simplify the output when possible. If **-n** or **--no-quoted** is given, the simplifying quoted format is not used. Exit status: 0 if at least one string was escaped, or 1 otherwise.
 
-``--style=var`` ensures the string can be used as a variable name by hex encoding any non-alphanumeric characters. The string is first converted to UTF-8 before being encoded.
+**--style=var** ensures the string can be used as a variable name by hex encoding any non-alphanumeric characters. The string is first converted to UTF-8 before being encoded.
 
-``--style=url`` ensures the string can be used as a URL by hex encoding any character which is not legal in a URL. The string is first converted to UTF-8 before being encoded.
+**--style=url** ensures the string can be used as a URL by hex encoding any character which is not legal in a URL. The string is first converted to UTF-8 before being encoded.
 
-``--style=regex`` escapes an input string for literal matching within a regex expression. The string is first converted to UTF-8 before being encoded.
+**--style=regex** escapes an input string for literal matching within a regex expression. The string is first converted to UTF-8 before being encoded.
 
-``string unescape`` performs the inverse of the ``string escape`` command. If the string to be unescaped is not properly formatted it is ignored. For example, doing ``string unescape --style=var (string escape --style=var $str)`` will return the original string. There is no support for unescaping ``--style=regex``.
+``string unescape`` performs the inverse of the ``string escape`` command. If the string to be unescaped is not properly formatted it is ignored. For example, doing ``string unescape --style=var (string escape --style=var $str)`` will return the original string. There is no support for unescaping **--style=regex**.
 
 .. END DESCRIPTION
 
diff --git a/doc_src/cmds/string-join.rst b/doc_src/cmds/string-join.rst
index cf6a60c4a..e9c01df33 100644
--- a/doc_src/cmds/string-join.rst
+++ b/doc_src/cmds/string-join.rst
@@ -18,9 +18,9 @@ Description
 
 .. BEGIN DESCRIPTION
 
-``string join`` joins its STRING arguments into a single string separated by SEP, which can be an empty string. Exit status: 0 if at least one join was performed, or 1 otherwise.
+``string join`` joins its *STRING* arguments into a single string separated by *SEP*, which can be an empty string. Exit status: 0 if at least one join was performed, or 1 otherwise.
 
-``string join0`` joins its STRING arguments into a single string separated by the zero byte (NUL), and adds a trailing NUL. This is most useful in conjunction with tools that accept NUL-delimited input, such as ``sort -z``. Exit status: 0 if at least one join was performed, or 1 otherwise.
+``string join0`` joins its *STRING* arguments into a single string separated by the zero byte (NUL), and adds a trailing NUL. This is most useful in conjunction with tools that accept NUL-delimited input, such as ``sort -z``. Exit status: 0 if at least one join was performed, or 1 otherwise.
 
 Because Unix uses NUL as the string terminator, passing the output of ``string join0`` as an *argument* to a command (via a :ref:`command substitution <expand-command-substitution>`) won't actually work. Fish will pass the correct bytes along, but the command won't be able to tell where the argument ends. This is a limitation of Unix' argument passing.
 
diff --git a/doc_src/cmds/string-length.rst b/doc_src/cmds/string-length.rst
index ec4fb9ed4..6f59b6fdb 100644
--- a/doc_src/cmds/string-length.rst
+++ b/doc_src/cmds/string-length.rst
@@ -10,7 +10,7 @@ Synopsis
 
 .. synopsis::
 
-    string length [-q | --quiet] [STRING ...]
+    string length [-q | --quiet] [-V | --visible] [STRING ...]
 
 .. END SYNOPSIS
 
@@ -19,9 +19,9 @@ Description
 
 .. BEGIN DESCRIPTION
 
-``string length`` reports the length of each string argument in characters. Exit status: 0 if at least one non-empty STRING was given, or 1 otherwise.
+``string length`` reports the length of each string argument in characters. Exit status: 0 if at least one non-empty *STRING* was given, or 1 otherwise.
 
-With ``-V`` or ``--visible``, it uses the visible width of the arguments. That means it will discount escape sequences fish knows about, account for $fish_emoji_width and $fish_ambiguous_width. It will also count each line (separated by ``\n``) on its own, and with a carriage return (``\r``) count only the widest stretch on a line. The intent is to measure the number of columns the STRING would occupy in the current terminal.
+With **-V** or **--visible**, it uses the visible width of the arguments. That means it will discount escape sequences fish knows about, account for $fish_emoji_width and $fish_ambiguous_width. It will also count each line (separated by ``\n``) on its own, and with a carriage return (``\r``) count only the widest stretch on a line. The intent is to measure the number of columns the *STRING* would occupy in the current terminal.
 
 .. END DESCRIPTION
 
diff --git a/doc_src/cmds/string-lower.rst b/doc_src/cmds/string-lower.rst
index 08a36ca19..3188b621e 100644
--- a/doc_src/cmds/string-lower.rst
+++ b/doc_src/cmds/string-lower.rst
@@ -17,7 +17,7 @@ Description
 
 .. BEGIN DESCRIPTION
 
-``string lower`` converts each string argument to lowercase. Exit status: 0 if at least one string was converted to lowercase, else 1. This means that in conjunction with the ``-q`` flag you can readily test whether a string is already lowercase.
+``string lower`` converts each string argument to lowercase. Exit status: 0 if at least one string was converted to lowercase, else 1. This means that in conjunction with the **-q** flag you can readily test whether a string is already lowercase.
 
 .. END DESCRIPTION
 
diff --git a/doc_src/cmds/string-match.rst b/doc_src/cmds/string-match.rst
index ceebaa0c4..f0d58930a 100644
--- a/doc_src/cmds/string-match.rst
+++ b/doc_src/cmds/string-match.rst
@@ -19,21 +19,21 @@ Description
 
 .. BEGIN DESCRIPTION
 
-``string match`` tests each STRING against PATTERN and prints matching substrings. Only the first match for each STRING is reported unless ``-a`` or ``--all`` is given, in which case all matches are reported.
+``string match`` tests each *STRING* against *PATTERN* and prints matching substrings. Only the first match for each *STRING* is reported unless **-a** or **--all** is given, in which case all matches are reported.
 
-If you specify the ``-e`` or ``--entire`` then each matching string is printed including any prefix or suffix not matched by the pattern (equivalent to ``grep`` without the ``-o`` flag). You can, obviously, achieve the same result by prepending and appending ``*`` or ``.*`` depending on whether or not you have specified the ``--regex`` flag. The ``--entire`` flag is simply a way to avoid having to complicate the pattern in that fashion and make the intent of the ``string match`` clearer. Without ``--entire`` and ``--regex``, a PATTERN will need to match the entire STRING before it will be reported.
+If you specify the **-e** or **--entire** then each matching string is printed including any prefix or suffix not matched by the pattern (equivalent to ``grep`` without the **-o** flag). You can, obviously, achieve the same result by prepending and appending **\*** or **.*** depending on whether or not you have specified the **--regex** flag. The **--entire** flag is simply a way to avoid having to complicate the pattern in that fashion and make the intent of the ``string match`` clearer. Without **--entire** and **--regex**, a *PATTERN* will need to match the entire *STRING* before it will be reported.
 
-Matching can be made case-insensitive with ``--ignore-case`` or ``-i``.
+Matching can be made case-insensitive with **--ignore-case** or **-i**.
 
-If ``--groups-only`` or ``-g`` is given, only the capturing groups will be reported - meaning the full match will be skipped. This is incompatible with ``--entire`` and ``--invert``, and requires ``--regex``. It is useful as a simple cutting tool instead of ``string replace``, so you can simply choose "this part" of a string.
+If **--groups-only** or **-g** is given, only the capturing groups will be reported - meaning the full match will be skipped. This is incompatible with **--entire** and **--invert**, and requires **--regex**. It is useful as a simple cutting tool instead of ``string replace``, so you can simply choose "this part" of a string.
 
-If ``--index`` or ``-n`` is given, each match is reported as a 1-based start position and a length. By default, PATTERN is interpreted as a glob pattern matched against each entire STRING argument. A glob pattern is only considered a valid match if it matches the entire STRING.
+If **--index** or **-n** is given, each match is reported as a 1-based start position and a length. By default, PATTERN is interpreted as a glob pattern matched against each entire *STRING* argument. A glob pattern is only considered a valid match if it matches the entire *STRING*.
 
-If ``--regex`` or ``-r`` is given, PATTERN is interpreted as a Perl-compatible regular expression, which does not have to match the entire STRING. For a regular expression containing capturing groups, multiple items will be reported for each match, one for the entire match and one for each capturing group. With this, only the matching part of the STRING will be reported, unless ``--entire`` is given.
+If **--regex** or **-r** is given, *PATTERN* is interpreted as a Perl-compatible regular expression, which does not have to match the entire *STRING*. For a regular expression containing capturing groups, multiple items will be reported for each match, one for the entire match and one for each capturing group. With this, only the matching part of the *STRING* will be reported, unless **--entire** is given.
 
-When matching via regular expressions, ``string match`` automatically sets variables for all named capturing groups (``(?<name>expression)``). It will create a variable with the name of the group, in the default scope, for each named capturing group, and set it to the value of the capturing group in the first matched argument. If a named capture group matched an empty string, the variable will be set to the empty string (like ``set var ""``). If it did not match, the variable will be set to nothing (like ``set var``).  When ``--regex`` is used with ``--all``, this behavior changes. Each named variable will contain a list of matches, with the first match contained in the first element, the second match in the second, and so on. If the group was empty or did not match, the corresponding element will be an empty string.
+When matching via regular expressions, ``string match`` automatically sets variables for all named capturing groups (``(?<name>expression)``). It will create a variable with the name of the group, in the default scope, for each named capturing group, and set it to the value of the capturing group in the first matched argument. If a named capture group matched an empty string, the variable will be set to the empty string (like ``set var ""``). If it did not match, the variable will be set to nothing (like ``set var``).  When **--regex** is used with **--all**, this behavior changes. Each named variable will contain a list of matches, with the first match contained in the first element, the second match in the second, and so on. If the group was empty or did not match, the corresponding element will be an empty string.
 
-If ``--invert`` or ``-v`` is used the selected lines will be only those which do not match the given glob pattern or regular expression.
+If **--invert** or **-v** is used the selected lines will be only those which do not match the given glob pattern or regular expression.
 
 Exit status: 0 if at least one match was found, or 1 otherwise.
 
diff --git a/doc_src/cmds/string-pad.rst b/doc_src/cmds/string-pad.rst
index c70ea6d5e..e7f61a0a3 100644
--- a/doc_src/cmds/string-pad.rst
+++ b/doc_src/cmds/string-pad.rst
@@ -18,15 +18,15 @@ Description
 
 .. BEGIN DESCRIPTION
 
-``string pad`` extends each STRING to the given visible width by adding CHAR to the left. That means the width of all visible characters added together, excluding escape sequences and accounting for $fish_emoji_width and $fish_ambiguous_width. It is the amount of columns in a terminal the STRING occupies.
+``string pad`` extends each *STRING* to the given visible width by adding *CHAR* to the left. That means the width of all visible characters added together, excluding escape sequences and accounting for :envvar:`fish_emoji_width` and :envvar:`fish_ambiguous_width`. It is the amount of columns in a terminal the *STRING* occupies.
 
-The escape sequences reflect what *fish* knows about, and how it computes its output. Your terminal might support more escapes, or not support escape sequences that fish knows about.
+The escape sequences reflect what fish knows about, and how it computes its output. Your terminal might support more escapes, or not support escape sequences that fish knows about.
 
-If ``-r`` or ``--right`` is given, add the padding after a string.
+If **-r** or **--right** is given, add the padding after a string.
 
-If ``-c`` or ``--char`` is given, pad with CHAR instead of whitespace.
+If **-c** or **--char** is given, pad with *CHAR* instead of whitespace.
 
-The output is padded to the maximum width of all input strings. If ``-w`` or ``--width`` is given, use at least that.
+The output is padded to the maximum width of all input strings. If **-w** or **--width** is given, use at least that.
 
 .. END DESCRIPTION
 
diff --git a/doc_src/cmds/string-repeat.rst b/doc_src/cmds/string-repeat.rst
index 53ada8f62..fdaf076d4 100644
--- a/doc_src/cmds/string-repeat.rst
+++ b/doc_src/cmds/string-repeat.rst
@@ -18,7 +18,7 @@ Description
 
 .. BEGIN DESCRIPTION
 
-``string repeat`` repeats the STRING ``-n`` or ``--count`` times. The ``-m`` or ``--max`` option will limit the number of outputted char (excluding the newline). This option can be used by itself or in conjunction with ``--count``. If both ``--count`` and ``--max`` are present, max char will be outputed unless the final repeated string size is less than max, in that case, the string will repeat until count has been reached. Both ``--count`` and ``--max`` will accept a number greater than or equal to zero, in the case of zero, nothing will be outputed. If ``-N`` or ``--no-newline`` is given, the output won't contain a newline character at the end. Exit status: 0 if yielded string is not empty, 1 otherwise.
+``string repeat`` repeats the *STRING* **-n** or **--count** times. The **-m** or **--max** option will limit the number of outputted characters (excluding the newline). This option can be used by itself or in conjunction with **--count**. If both **--count** and **--max** are present, max char will be outputed unless the final repeated string size is less than max, in that case, the string will repeat until count has been reached. Both **--count** and **--max** will accept a number greater than or equal to zero, in the case of zero, nothing will be outputed. If **-N** or **--no-newline** is given, the output won't contain a newline character at the end. Exit status: 0 if yielded string is not empty, 1 otherwise.
 
 .. END DESCRIPTION
 
diff --git a/doc_src/cmds/string-replace.rst b/doc_src/cmds/string-replace.rst
index 2017f0c5b..059c5c86f 100644
--- a/doc_src/cmds/string-replace.rst
+++ b/doc_src/cmds/string-replace.rst
@@ -9,7 +9,7 @@ Synopsis
 .. synopsis::
 
     string replace [-a | --all] [-f | --filter] [-i | --ignore-case]
-                   [-r | --regex] [-q | --quiet] PATTERN REPLACE [STRING ...]
+                   [-r | --regex] [-q | --quiet] PATTERN REPLACEMENT [STRING ...]
 
 .. END SYNOPSIS
 
@@ -18,11 +18,11 @@ Description
 
 .. BEGIN DESCRIPTION
 
-``string replace`` is similar to ``string match`` but replaces non-overlapping matching substrings with a replacement string and prints the result. By default, PATTERN is treated as a literal substring to be matched.
+``string replace`` is similar to ``string match`` but replaces non-overlapping matching substrings with a replacement string and prints the result. By default, *PATTERN* is treated as a literal substring to be matched.
 
-If ``-r`` or ``--regex`` is given, PATTERN is interpreted as a Perl-compatible regular expression, and REPLACEMENT can contain C-style escape sequences like ``\t`` as well as references to capturing groups by number or name as ``$n`` or ``${n}``.
+If **-r** or **--regex** is given, *PATTERN* is interpreted as a Perl-compatible regular expression, and *REPLACEMENT* can contain C-style escape sequences like **\t** as well as references to capturing groups by number or name as *$n* or *${n}*.
 
-If you specify the ``-f`` or ``--filter`` flag then each input string is printed only if a replacement was done. This is useful where you would otherwise use this idiom: ``a_cmd | string match pattern | string replace pattern new_pattern``. You can instead just write ``a_cmd | string replace --filter pattern new_pattern``.
+If you specify the **-f** or **--filter** flag then each input string is printed only if a replacement was done. This is useful where you would otherwise use this idiom: ``a_cmd | string match pattern | string replace pattern new_pattern``. You can instead just write ``a_cmd | string replace --filter pattern new_pattern``.
 
 Exit status: 0 if at least one replacement was performed, or 1 otherwise.
 
diff --git a/doc_src/cmds/string-split.rst b/doc_src/cmds/string-split.rst
index 480fb3336..084742e5a 100644
--- a/doc_src/cmds/string-split.rst
+++ b/doc_src/cmds/string-split.rst
@@ -20,13 +20,13 @@ Description
 
 .. BEGIN DESCRIPTION
 
-``string split`` splits each STRING on the separator SEP, which can be an empty string. If ``-m`` or ``--max`` is specified, at most MAX splits are done on each STRING. If ``-r`` or ``--right`` is given, splitting is performed right-to-left. This is useful in combination with ``-m`` or ``--max``. With ``-n`` or ``--no-empty``, empty results are excluded from consideration (e.g. ``hello\n\nworld`` would expand to two strings and not three). Exit status: 0 if at least one split was performed, or 1 otherwise.
+``string split`` splits each *STRING* on the separator *SEP*, which can be an empty string. If **-m** or **--max** is specified, at most MAX splits are done on each *STRING*. If **-r** or **--right** is given, splitting is performed right-to-left. This is useful in combination with **-m** or **--max**. With **-n** or **--no-empty**, empty results are excluded from consideration (e.g. ``hello\n\nworld`` would expand to two strings and not three). Exit status: 0 if at least one split was performed, or 1 otherwise.
 
-Use ``-f`` or ``--fields`` to print out specific fields. Unless ``--allow-empty`` is used, if a given field does not exist, then the command exits with status 1 and does not print anything.
+Use **-f** or **--fields** to print out specific fields. Unless **--allow-empty** is used, if a given field does not exist, then the command exits with status 1 and does not print anything.
 
-See also the ``--delimiter`` option of the :ref:`read <cmd-read>` command.
+See also the **--delimiter** option of the :ref:`read <cmd-read>` command.
 
-``string split0`` splits each STRING on the zero byte (NUL). Options are the same as ``string split`` except that no separator is given.
+``string split0`` splits each *STRING* on the zero byte (NUL). Options are the same as ``string split`` except that no separator is given.
 
 ``split0`` has the important property that its output is not further split when used in a command substitution, allowing for the command substitution to produce elements containing newlines. This is most useful when used with Unix tools that produce zero bytes, such as ``find -print0`` or ``sort -z``. See split0 examples below.
 
diff --git a/doc_src/cmds/string-sub.rst b/doc_src/cmds/string-sub.rst
index 784abe2e1..04c243eb8 100644
--- a/doc_src/cmds/string-sub.rst
+++ b/doc_src/cmds/string-sub.rst
@@ -18,7 +18,7 @@ Description
 
 .. BEGIN DESCRIPTION
 
-``string sub`` prints a substring of each string argument. The start/end of the substring can be specified with ``-s``/``-e`` or ``--start``/``--end`` followed by a 1-based index value. Positive index values are relative to the start of the string and negative index values are relative to the end of the string. The default start value is 1. The length of the substring can be specified with ``-l`` or ``--length``. If the length or end is not specified, the substring continues to the end of each STRING. Exit status: 0 if at least one substring operation was performed, 1 otherwise. ``--length`` is mutually exclusive with ``--end``.
+``string sub`` prints a substring of each string argument. The start/end of the substring can be specified with **-s**/**-e** or **--start**/**--end** followed by a 1-based index value. Positive index values are relative to the start of the string and negative index values are relative to the end of the string. The default start value is 1. The length of the substring can be specified with **-l** or **--length**. If the length or end is not specified, the substring continues to the end of each STRING. Exit status: 0 if at least one substring operation was performed, 1 otherwise. **--length** is mutually exclusive with **--end**.
 
 .. END DESCRIPTION
 
diff --git a/doc_src/cmds/string-trim.rst b/doc_src/cmds/string-trim.rst
index 16a67ab1a..2e6ed048b 100644
--- a/doc_src/cmds/string-trim.rst
+++ b/doc_src/cmds/string-trim.rst
@@ -18,7 +18,7 @@ Description
 
 .. BEGIN DESCRIPTION
 
-``string trim`` removes leading and trailing whitespace from each STRING. If ``-l`` or ``--left`` is given, only leading whitespace is removed. If ``-r`` or ``--right`` is given, only trailing whitespace is trimmed. The ``-c`` or ``--chars`` switch causes the characters in CHARS to be removed instead of whitespace. Exit status: 0 if at least one character was trimmed, or 1 otherwise.
+``string trim`` removes leading and trailing whitespace from each *STRING*. If **-l** or **--left** is given, only leading whitespace is removed. If **-r** or **--right** is given, only trailing whitespace is trimmed. The **-c** or **--chars** switch causes the characters in *CHARS* to be removed instead of whitespace. Exit status: 0 if at least one character was trimmed, or 1 otherwise.
 
 .. END DESCRIPTION
 
diff --git a/doc_src/cmds/string-upper.rst b/doc_src/cmds/string-upper.rst
index 47f68fdf8..87c120630 100644
--- a/doc_src/cmds/string-upper.rst
+++ b/doc_src/cmds/string-upper.rst
@@ -17,7 +17,7 @@ Description
 
 .. BEGIN DESCRIPTION
 
-``string upper`` converts each string argument to uppercase. Exit status: 0 if at least one string was converted to uppercase, else 1. This means that in conjunction with the ``-q`` flag you can readily test whether a string is already uppercase.
+``string upper`` converts each string argument to uppercase. Exit status: 0 if at least one string was converted to uppercase, else 1. This means that in conjunction with the **-q** flag you can readily test whether a string is already uppercase.
 
 .. END DESCRIPTION
 
diff --git a/doc_src/cmds/string.rst b/doc_src/cmds/string.rst
index 15a853945..a7a23484a 100644
--- a/doc_src/cmds/string.rst
+++ b/doc_src/cmds/string.rst
@@ -39,11 +39,11 @@ Description
 
 ``string`` performs operations on strings.
 
-STRING arguments are taken from the command line unless standard input is connected to a pipe or a file, in which case they are read from standard input, one STRING per line. It is an error to supply STRING arguments on the command line and on standard input.
+*STRING* arguments are taken from the command line unless standard input is connected to a pipe or a file, in which case they are read from standard input, one *STRING* per line. It is an error to supply *STRING* arguments on the command line and on standard input.
 
 Arguments beginning with ``-`` are normally interpreted as switches; ``--`` causes the following arguments not to be treated as switches even if they begin with ``-``. Switches and required arguments are recognized only on the command line.
 
-Most subcommands accept a ``-q`` or ``--quiet`` switch, which suppresses the usual output but exits with the documented status. In this case these commands will quit early, without reading all of the available input.
+Most subcommands accept a **-q** or **--quiet** switch, which suppresses the usual output but exits with the documented status. In this case these commands will quit early, without reading all of the available input.
 
 The following subcommands are available.
 
@@ -274,7 +274,7 @@ Examples
 Regular Expressions
 -------------------
 
-Both the ``match`` and ``replace`` subcommand support regular expressions when used with the ``-r`` or ``--regex`` option. The dialect is that of PCRE2.
+Both the ``match`` and ``replace`` subcommand support regular expressions when used with the **-r** or **--regex** option. The dialect is that of PCRE2.
 
 In general, special characters are special by default, so ``a+`` matches one or more "a"s, while ``a\+`` matches an "a" and then a "+". ``(a+)`` matches one or more "a"s in a capturing group (``(?:XXXX)`` denotes a non-capturing group). For the replacement parameter of ``replace``, ``$n`` refers to the n-th group of the match. In the match parameter, ``\n`` (e.g. ``\1``) refers back to groups.
 
@@ -335,7 +335,7 @@ If you are familiar with these, it is useful to know how ``string`` differs from
 
 In contrast to these classics, ``string`` reads input either from stdin or as arguments. ``string`` also does not deal with files, so it requires redirections to be used with them.
 
-In contrast to ``grep``, ``string``'s ``match`` defaults to glob-mode, while ``replace`` defaults to literal matching. If set to regex-mode, they use PCRE regular expressions, which is comparable to ``grep``'s ``-P`` option. ``match`` defaults to printing just the match, which is like ``grep`` with ``-o`` (use ``--entire`` to enable grep-like behavior).
+In contrast to ``grep``, ``string``'s ``match`` defaults to glob-mode, while ``replace`` defaults to literal matching. If set to regex-mode, they use PCRE regular expressions, which is comparable to ``grep``'s ``-P`` option. ``match`` defaults to printing just the match, which is like ``grep`` with ``-o`` (use **--entire** to enable grep-like behavior).
 
 Like ``sed``'s ``s/old/new/`` command, ``string replace`` still prints strings that don't match. ``sed``'s ``-n`` in combination with a ``/p`` modifier or command is like ``string replace -f``.
 

From 1e714f9d1335d487d9d1bbc900e75c21c64fcd5f Mon Sep 17 00:00:00 2001
From: Ilan Cosman <ilancosman@gmail.com>
Date: Fri, 11 Mar 2022 09:52:56 -0800
Subject: [PATCH 256/262] Changelog for 3.4

---
 CHANGELOG.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 0d590bc7f..7bc5e53ef 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,7 +2,7 @@ fish 3.4.0 (released ???)
 =========================
 
 ..
-   Ignore for 3.4.0 changelog: 1363 2876 3625 3954 6477 7357 7602 8008 8059 8077 8079 8084 8096 8118 8127 8128 8130 8137 8139 8146 8151 8153 8161 8170 8176 8183 8184 8191 8192 8195 8202 8204 8205 8206 8219 8221 8222 8224 8227 8228 8229 8230 8231 8235 8236 8237 8238 8239 8241 8243 8249 8252 8253 8256 8257 8260 8268 8270 8271 8277 8280 8285 8287 8289 8295 8299 8305 8306 8308 8310 8311 8314 8321 8323 8326 8327 8334 8335 8337 8338 8344 8353 8358 8365 8367 8368 8380 8381 8385 8391 8394 8403 8406 8409 8410 8419 8429 8430 8433 8438 8439 8441 8444 8446 8449 8456 8457 8471 8472 8476 8477 8478 8479 8480 8487 8492 8495 8497 8500 8511 8518 8521 8522 8526 8527 8528 8548 8549 8559 8575 8584 8587 8588 8570 8591 8596 8597 8601 8608 8612 8613 8614 8615 8621 8623 8625 8626 8630 8633 8636 8639 8643 8645 8647 8650 8651 8652 8653 8654 8655 8656 8658 8660 8661 8662 8665 8667 8672 8675 8676 8686 8700 8710 8724 8729 8731 8738
+   Ignore for 3.4.0 changelog: 1363 2876 3625 3954 6477 7357 7602 8008 8059 8077 8078 8079 8084 8096 8118 8127 8128 8130 8137 8139 8146 8151 8153 8161 8170 8176 8183 8184 8191 8192 8195 8202 8204 8205 8206 8219 8221 8222 8224 8227 8228 8229 8230 8231 8235 8236 8237 8238 8239 8241 8243 8249 8252 8253 8256 8257 8260 8268 8270 8271 8277 8280 8285 8287 8289 8295 8299 8305 8306 8308 8310 8311 8314 8321 8323 8326 8327 8334 8335 8337 8338 8344 8353 8358 8365 8367 8368 8379 8380 8381 8385 8391 8394 8403 8406 8409 8410 8419 8429 8430 8433 8438 8439 8441 8444 8446 8449 8456 8457 8471 8472 8476 8477 8478 8479 8480 8487 8492 8495 8497 8500 8511 8518 8521 8522 8526 8527 8528 8548 8549 8559 8575 8584 8587 8588 8570 8591 8596 8597 8601 8608 8612 8613 8614 8615 8621 8623 8625 8626 8630 8633 8636 8639 8643 8645 8647 8650 8651 8652 8653 8654 8655 8656 8658 8660 8661 8662 8665 8667 8672 8675 8676 8684 8686 8700 8710 8712 8724 8727 8729 8731 8738 8739 8748
 
 Notable improvements and fixes
 ------------------------------
@@ -156,10 +156,12 @@ Completions
   - ``exif`` (:issue:`8246`)
   - ``findstr`` (:issue:`8481`)
   - ``git-sizer`` (:issue:`8156`)
+  - ``gnome-extensions`` (:issue:`8732`)
   - ``gping`` (:issue:`8181`)
   - ``isatty`` (:issue:`8609`)
   - ``istioctl`` (:issue:`8343`)
   - ``kmutil``
+  - ``kubectl`` (:issue:`8734`)
   - ``matlab`` (:issue:`8505`)
   - ``mono`` (:issue:`8415`) and related tools ``csharp``, ``gacutil``, ``gendarme``, ``ikdasm``, ``ilasm``, ``mkbundle``, ``monodis``, ``monop``, ``sqlsharp`` and ``xsp`` (:issue:`8452`)
   -  Angular's ``ng`` (:issue:`8111`)

From 1edb642abe6d9485b621afd4cdcf85a146b4f0d1 Mon Sep 17 00:00:00 2001
From: Ilan Cosman <ilancosman@gmail.com>
Date: Fri, 11 Mar 2022 10:00:55 -0800
Subject: [PATCH 257/262] Ignore own PR

---
 CHANGELOG.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7bc5e53ef..cadda13cb 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,7 +2,7 @@ fish 3.4.0 (released ???)
 =========================
 
 ..
-   Ignore for 3.4.0 changelog: 1363 2876 3625 3954 6477 7357 7602 8008 8059 8077 8078 8079 8084 8096 8118 8127 8128 8130 8137 8139 8146 8151 8153 8161 8170 8176 8183 8184 8191 8192 8195 8202 8204 8205 8206 8219 8221 8222 8224 8227 8228 8229 8230 8231 8235 8236 8237 8238 8239 8241 8243 8249 8252 8253 8256 8257 8260 8268 8270 8271 8277 8280 8285 8287 8289 8295 8299 8305 8306 8308 8310 8311 8314 8321 8323 8326 8327 8334 8335 8337 8338 8344 8353 8358 8365 8367 8368 8379 8380 8381 8385 8391 8394 8403 8406 8409 8410 8419 8429 8430 8433 8438 8439 8441 8444 8446 8449 8456 8457 8471 8472 8476 8477 8478 8479 8480 8487 8492 8495 8497 8500 8511 8518 8521 8522 8526 8527 8528 8548 8549 8559 8575 8584 8587 8588 8570 8591 8596 8597 8601 8608 8612 8613 8614 8615 8621 8623 8625 8626 8630 8633 8636 8639 8643 8645 8647 8650 8651 8652 8653 8654 8655 8656 8658 8660 8661 8662 8665 8667 8672 8675 8676 8684 8686 8700 8710 8712 8724 8727 8729 8731 8738 8739 8748
+   Ignore for 3.4.0 changelog: 1363 2876 3625 3954 6477 7357 7602 8008 8059 8077 8078 8079 8084 8096 8118 8127 8128 8130 8137 8139 8146 8151 8153 8161 8170 8176 8183 8184 8191 8192 8195 8202 8204 8205 8206 8219 8221 8222 8224 8227 8228 8229 8230 8231 8235 8236 8237 8238 8239 8241 8243 8249 8252 8253 8256 8257 8260 8268 8270 8271 8277 8280 8285 8287 8289 8295 8299 8305 8306 8308 8310 8311 8314 8321 8323 8326 8327 8334 8335 8337 8338 8344 8353 8358 8365 8367 8368 8379 8380 8381 8385 8391 8394 8403 8406 8409 8410 8419 8429 8430 8433 8438 8439 8441 8444 8446 8449 8456 8457 8471 8472 8476 8477 8478 8479 8480 8487 8492 8495 8497 8500 8511 8518 8521 8522 8526 8527 8528 8548 8549 8559 8575 8584 8587 8588 8570 8591 8596 8597 8601 8608 8612 8613 8614 8615 8621 8623 8625 8626 8630 8633 8636 8639 8643 8645 8647 8650 8651 8652 8653 8654 8655 8656 8658 8660 8661 8662 8665 8667 8672 8675 8676 8684 8686 8700 8710 8712 8724 8727 8729 8731 8738 8739 8748 8776
 
 Notable improvements and fixes
 ------------------------------

From c6d68b4593eb5d9b514c4cc68ff2ee6b95405e94 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sat, 12 Mar 2022 22:28:44 +0800
Subject: [PATCH 258/262] CHANGELOG: work on 3.4.0

---
 CHANGELOG.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index cadda13cb..027c6d89b 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,7 +2,7 @@ fish 3.4.0 (released ???)
 =========================
 
 ..
-   Ignore for 3.4.0 changelog: 1363 2876 3625 3954 6477 7357 7602 8008 8059 8077 8078 8079 8084 8096 8118 8127 8128 8130 8137 8139 8146 8151 8153 8161 8170 8176 8183 8184 8191 8192 8195 8202 8204 8205 8206 8219 8221 8222 8224 8227 8228 8229 8230 8231 8235 8236 8237 8238 8239 8241 8243 8249 8252 8253 8256 8257 8260 8268 8270 8271 8277 8280 8285 8287 8289 8295 8299 8305 8306 8308 8310 8311 8314 8321 8323 8326 8327 8334 8335 8337 8338 8344 8353 8358 8365 8367 8368 8379 8380 8381 8385 8391 8394 8403 8406 8409 8410 8419 8429 8430 8433 8438 8439 8441 8444 8446 8449 8456 8457 8471 8472 8476 8477 8478 8479 8480 8487 8492 8495 8497 8500 8511 8518 8521 8522 8526 8527 8528 8548 8549 8559 8575 8584 8587 8588 8570 8591 8596 8597 8601 8608 8612 8613 8614 8615 8621 8623 8625 8626 8630 8633 8636 8639 8643 8645 8647 8650 8651 8652 8653 8654 8655 8656 8658 8660 8661 8662 8665 8667 8672 8675 8676 8684 8686 8700 8710 8712 8724 8727 8729 8731 8738 8739 8748 8776
+   Ignore for 3.4.0 changelog: 1363 2876 3625 3954 6477 7357 7602 8008 8059 8077 8078 8079 8084 8096 8118 8127 8128 8130 8137 8139 8146 8151 8153 8161 8170 8176 8183 8184 8191 8192 8195 8202 8204 8205 8206 8219 8221 8222 8224 8227 8228 8229 8230 8231 8235 8236 8237 8238 8239 8241 8243 8249 8252 8253 8256 8257 8260 8268 8270 8271 8277 8280 8285 8287 8289 8295 8299 8305 8306 8308 8310 8311 8314 8321 8323 8326 8327 8334 8335 8337 8338 8344 8353 8358 8365 8367 8368 8379 8380 8381 8385 8391 8394 8403 8406 8409 8410 8419 8429 8430 8433 8438 8439 8441 8444 8446 8449 8456 8457 8471 8472 8476 8477 8478 8479 8480 8487 8492 8495 8497 8500 8511 8518 8521 8522 8526 8527 8528 8548 8549 8559 8575 8584 8587 8588 8570 8591 8596 8597 8601 8608 8612 8613 8614 8615 8621 8623 8625 8626 8630 8633 8636 8639 8643 8645 8647 8650 8651 8652 8653 8654 8655 8656 8658 8660 8661 8662 8665 8667 8672 8675 8676 8684 8686 8692 8698 8700 8710 8712 8724 8727 8729 8731 8738 8739 8748 8776
 
 Notable improvements and fixes
 ------------------------------

From c7e4350ab6c5dc6ae5cca3b0bd2401db59ee32ed Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sat, 12 Mar 2022 22:24:18 +0800
Subject: [PATCH 259/262] Release 3.4.0

Fixes #8092.
---
 CHANGELOG.rst | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 027c6d89b..e54d8c7e4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,8 +1,5 @@
-fish 3.4.0 (released ???)
-=========================
-
-..
-   Ignore for 3.4.0 changelog: 1363 2876 3625 3954 6477 7357 7602 8008 8059 8077 8078 8079 8084 8096 8118 8127 8128 8130 8137 8139 8146 8151 8153 8161 8170 8176 8183 8184 8191 8192 8195 8202 8204 8205 8206 8219 8221 8222 8224 8227 8228 8229 8230 8231 8235 8236 8237 8238 8239 8241 8243 8249 8252 8253 8256 8257 8260 8268 8270 8271 8277 8280 8285 8287 8289 8295 8299 8305 8306 8308 8310 8311 8314 8321 8323 8326 8327 8334 8335 8337 8338 8344 8353 8358 8365 8367 8368 8379 8380 8381 8385 8391 8394 8403 8406 8409 8410 8419 8429 8430 8433 8438 8439 8441 8444 8446 8449 8456 8457 8471 8472 8476 8477 8478 8479 8480 8487 8492 8495 8497 8500 8511 8518 8521 8522 8526 8527 8528 8548 8549 8559 8575 8584 8587 8588 8570 8591 8596 8597 8601 8608 8612 8613 8614 8615 8621 8623 8625 8626 8630 8633 8636 8639 8643 8645 8647 8650 8651 8652 8653 8654 8655 8656 8658 8660 8661 8662 8665 8667 8672 8675 8676 8684 8686 8692 8698 8700 8710 8712 8724 8727 8729 8731 8738 8739 8748 8776
+fish 3.4.0 (released March 12, 2022)
+====================================
 
 Notable improvements and fixes
 ------------------------------
@@ -20,7 +17,7 @@ Notable improvements and fixes
     # this will still split on newlines only.
 
 - Complementing the ``prompt`` command in 3.3.0, ``fish_config`` gained a ``theme`` subcommand to show and pick from the sample themes (meaning color schemes) directly in the terminal, instead of having to open a Web browser. For example ``fish_config theme choose Nord`` loads the Nord theme in the current session (:issue:`8132`). The current theme can be saved with ``fish_config theme dump``, and custom themes can be added by saving them in ``~/.config/fish/themes/``.
-- ``set`` and ``read`` learned a new option ``--function`` to set a variable in the function's top scope. This should be a more familiar way of scoping variables and avoids issues with ``--local``, which is actually block-scoped (:issue:`565`, :issue:`8145`)::
+- ``set`` and ``read`` learned a new option, ``--function``, to set a variable in the function's top scope. This should be a more familiar way of scoping variables and avoids issues with ``--local``, which is actually block-scoped (:issue:`565`, :issue:`8145`)::
 
     function demonstration
         if true
@@ -38,6 +35,7 @@ Notable improvements and fixes
 
 - Performance improvements to globbing, especially on systems using glibc. In some cases (large directories with files with many numbers in the names) this almost halves the time taken to expand the glob.
 - Autosuggestions can now be turned off by setting ``$fish_autosuggestion_enabled`` to 0, and (almost) all highlighting can be turned off by choosing the new "None" theme. The exception is necessary colors, like those which distinguish autosuggestions from the actual command line. (:issue:`8376`)
+- The ``fish_git_prompt`` function, which is included in the default prompts, now overrides ``git`` to avoid running  commands set by per-repository configuration. This avoids a potential security issue in some circumstances, and has been assigned CVE-2022-20001 (:issue:`8589`).
 
 Deprecations and removed features
 ---------------------------------

From a0e639e1fa4379ea6f22aac87d7c0ff889586521 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 14 Dec 2021 20:29:07 +0100
Subject: [PATCH 260/262] read: Remove super old TODO

This was never a problem. If we need it, it's in the git log
---
 src/builtins/read.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/builtins/read.cpp b/src/builtins/read.cpp
index 3aa3bb3bb..a72e66de3 100644
--- a/src/builtins/read.cpp
+++ b/src/builtins/read.cpp
@@ -494,8 +494,6 @@ maybe_t<int> builtin_read(parser_t &parser, io_streams_t &streams, const wchar_t
     do {
         buff.clear();
 
-        // TODO: Determine if the original set of conditions for interactive reads should be
-        // reinstated: if (isatty(0) && streams.stdin_fd == STDIN_FILENO && !split_null) {
         int stream_stdin_is_a_tty = isatty(streams.stdin_fd);
         if (stream_stdin_is_a_tty && !opts.split_null) {
             // Read interactively using reader_readline(). This does not support splitting on null.

From 9ada7d9aad8cbb4a491fc0bae4fdc2c58958be3a Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 14 Dec 2021 20:32:09 +0100
Subject: [PATCH 261/262] read: Also read in chunks when directly redirected

We can't always read in chunks because we often can't bear to
overread:

```fish
echo foo\nbar | begin
    read -l foo
    read -l bar
end
```

needs to have the first read read `foo` and the second read `bar`. So
here we can only read one byte at a time.

However, when we are directly redirected:

```fish
echo foo | read foo
```

we can, because the data is only for us anyway. The stream will be
closed after, so anything not read just goes away. Nobody else is
there to read.

This dramatically speeds up `read` of long lines through a pipe. How
much depends on the length of the line.

With lines of 5000 characters it's about 15x, with lines of 50
characters about 2x, lines of 5 characters about 1.07x.

See #8542.
---
 src/builtins/read.cpp  | 15 +++++++++++----
 tests/checks/read.fish |  9 +++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/builtins/read.cpp b/src/builtins/read.cpp
index a72e66de3..914b62b08 100644
--- a/src/builtins/read.cpp
+++ b/src/builtins/read.cpp
@@ -262,7 +262,7 @@ static int read_interactive(parser_t &parser, wcstring &buff, int nchars, bool s
 /// of chars.
 ///
 /// Returns an exit status.
-static int read_in_chunks(int fd, wcstring &buff, bool split_null) {
+static int read_in_chunks(int fd, wcstring &buff, bool split_null, bool do_seek) {
     int exit_res = STATUS_CMD_OK;
     std::string str;
     bool eof = false;
@@ -284,7 +284,7 @@ static int read_in_chunks(int fd, wcstring &buff, bool split_null) {
         if (bytes_consumed < bytes_read) {
             // We found a splitter. The +1 because we need to treat the splitter as consumed, but
             // not append it to the string.
-            if (lseek(fd, bytes_consumed - bytes_read + 1, SEEK_CUR) == -1) {
+            if (do_seek && lseek(fd, bytes_consumed - bytes_read + 1, SEEK_CUR) == -1) {
                 wperror(L"lseek");
                 return STATUS_CMD_ERROR;
             }
@@ -501,8 +501,15 @@ maybe_t<int> builtin_read(parser_t &parser, io_streams_t &streams, const wchar_t
                 read_interactive(parser, buff, opts.nchars, opts.shell, opts.silent, opts.prompt,
                                  opts.right_prompt, opts.commandline, streams.stdin_fd);
         } else if (!opts.nchars && !stream_stdin_is_a_tty &&
-                   lseek(streams.stdin_fd, 0, SEEK_CUR) != -1) {
-            exit_res = read_in_chunks(streams.stdin_fd, buff, opts.split_null);
+                   (streams.stdin_is_directly_redirected || lseek(streams.stdin_fd, 0, SEEK_CUR) != -1)) {
+            // We read in chunks when we either can seek (so we put the bytes back),
+            // or we have the bytes to ourselves (because it's directly redirected).
+            //
+            // Note we skip seeking back even if we're directly redirected to a seekable stream,
+            // under the assumption that the stream will be closed soon anyway.
+            // You don't rewind VHS tapes before throwing them in the trash.
+            // TODO: Do this when nchars is set by seeking back.
+            exit_res = read_in_chunks(streams.stdin_fd, buff, opts.split_null, !streams.stdin_is_directly_redirected);
         } else {
             exit_res =
                 read_one_char_at_a_time(streams.stdin_fd, buff, opts.nchars, opts.split_null);
diff --git a/tests/checks/read.fish b/tests/checks/read.fish
index 8801b6246..2ed2925c8 100644
--- a/tests/checks/read.fish
+++ b/tests/checks/read.fish
@@ -366,3 +366,12 @@ function-scoped-read
 # CHECK: $skamtebord[1]: |bar|
 # CHECK: $craaab: set in local scope, unexported, with 1 elements
 # CHECK: $craaab[1]: |baz|
+
+echo foo\nbar\nbaz | begin
+    read -l foo
+    read -l bar
+    cat
+    # CHECK: baz
+    echo $bar
+    # CHECK: bar
+end

From 59e50f77bcca46e7b147dedd83137daaf9afde96 Mon Sep 17 00:00:00 2001
From: Andrey Mishchenko <mishchea@gmail.com>
Date: Sun, 13 Mar 2022 03:23:35 -0700
Subject: [PATCH 262/262] Allow underscores as separators in the `math` builtin
 (#8611)

* Implement fish_wcstod_underscores

* Add fish_wcstod_underscores unit tests

* Switch to using fish_wcstod_underscores in tinyexpr

* Add tests for math builtin underscore separator functionality

* Add documentation for underscore separators for math builtin

* Add a changelog entry for underscore numeric separators
---
 CHANGELOG.rst          |  1 +
 doc_src/cmds/math.rst  |  2 ++
 src/fish_tests.cpp     | 44 +++++++++++++++++++++++++++++++
 src/tinyexpr.cpp       |  2 +-
 src/wutil.cpp          | 59 ++++++++++++++++++++++++++++++++++++++++++
 src/wutil.h            |  1 +
 tests/checks/math.fish | 21 +++++++++++++++
 7 files changed, 129 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e54d8c7e4..da9f07bea 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -69,6 +69,7 @@ Scripting improvements
 - ``$fish_user_paths`` is now automatically deduplicated to fix a common user error of appending to it in config.fish when it is universal (:issue:`8117`). :ref:`fish_add_path <cmd-fish_add_path>` remains the recommended way to add to $PATH.
 - ``return`` can now be used outside functions. In scripts, it does the same thing as ``exit``. In interactive mode,it sets ``$status`` without exiting (:issue:`8148`).
 - An oversight prevented all syntax checks from running on commands given to ``fish -c`` (:issue:`8171`). This includes checks such as ``exec`` not being allowed in a pipeline, and ``$$`` not being a valid variable. Generally, another error was generated anyway.
+- ``math`` now allows you to use underscores as visual separators when writing numbers - for example, ``math 1_000 + 2_000`` returns ``3000`` (:issue:`8496`).
 - ``fish_indent`` now correctly reformats tokens that end with a backslash followed by a newline (:issue:`8197`).
 - ``commandline`` gained an ``--is-valid`` option to check if the command line is syntactically valid and complete. This allows basic implementation of transient prompts (:issue:`8142`).
 - ``commandline`` gained a ``--paging-full-mode`` option to check if the pager is showing all the possible lines (no "7 more rows" message) (:issue:`8485`).
diff --git a/doc_src/cmds/math.rst b/doc_src/cmds/math.rst
index 1aac3eada..8c73298e7 100644
--- a/doc_src/cmds/math.rst
+++ b/doc_src/cmds/math.rst
@@ -64,6 +64,8 @@ Syntax
 For numbers, ``.`` is always the radix character regardless of locale - ``2.5``, not ``2,5``.
 Scientific notation (``10e5``) and hexadecimal (``0xFF``) are also available.
 
+``math`` allows you to use underscores as visual separators for digit grouping. For example, you can write ``1_000_000``, ``0x_89_AB_CD_EF``, and ``1.234_567_e89``.
+
 Operators
 ---------
 
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 94221bf12..3f005e056 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -3000,6 +3000,49 @@ static void test_wcstod() {
     tod_test(L"nope", "nope");
 }
 
+static void test_fish_wcstod_underscores() {
+    say(L"Testing fish_wcstod_underscores");
+
+    auto test_case = [](const wchar_t *s, size_t expected_num_consumed) {
+        wchar_t *endptr = nullptr;
+        fish_wcstod_underscores(s, &endptr);
+        size_t num_consumed = (size_t)(endptr - (wchar_t *)s);
+        do_test(expected_num_consumed == num_consumed);
+    };
+
+    test_case(L"123", 3);
+    test_case(L"1_2.3_4.5_6", 7);
+    test_case(L"1_2", 3);
+    test_case(L"1_._2", 5);
+    test_case(L"1__2", 4);
+    test_case(L" 1__2 3__4 ", 5);
+    test_case(L"1_2 3_4", 3);
+    test_case(L" 1", 2);
+    test_case(L" 1_", 3);
+    test_case(L" 1__", 4);
+    test_case(L" 1___", 5);
+    test_case(L" 1___ 2___", 5);
+    test_case(L" _1", 3);
+    test_case(L"1 ", 1);
+    test_case(L"infinity_", 8);
+    test_case(L" -INFINITY", 10);
+    test_case(L"_infinity", 0);
+    test_case(L"nan(0)", 6);
+    test_case(L"nan(0)_", 6);
+    test_case(L"_nan(0)", 0);
+    // We don't strip the underscores in this commented-out test case, and the behavior is
+    // implementation-defined, so we don't actually know how many characters will get consumed. On
+    // macOS the strtod man page only says what happens with an alphanumeric string passed to nan(),
+    // but the strtod consumes all of the characters even if there are underscores.
+    // test_case(L"nan(0_1_2)", 3);
+    test_case(L" _ 1", 0);
+    test_case(L"0x_dead_beef", 12);
+    test_case(L"None", 0);
+    test_case(L" None", 0);
+    test_case(L"Also none", 0);
+    test_case(L" Also none", 0);
+}
+
 static void test_dup2s() {
     using std::make_shared;
     io_chain_t chain;
@@ -6801,6 +6844,7 @@ static const test_t s_tests[]{
     {TEST_GROUP("abbreviations"), test_abbreviations},
     {TEST_GROUP("builtins/test"), test_test},
     {TEST_GROUP("wcstod"), test_wcstod},
+    {TEST_GROUP("fish_wcstod_underscores"), test_fish_wcstod_underscores},
     {TEST_GROUP("dup2s"), test_dup2s},
     {TEST_GROUP("dup2s"), test_dup2s_fd_for_target_fd},
     {TEST_GROUP("path"), test_path},
diff --git a/src/tinyexpr.cpp b/src/tinyexpr.cpp
index e7d4449fd..d2bf295f2 100644
--- a/src/tinyexpr.cpp
+++ b/src/tinyexpr.cpp
@@ -272,7 +272,7 @@ static void next_token(state *s) {
 
         /* Try reading a number. */
         if ((s->next[0] >= '0' && s->next[0] <= '9') || s->next[0] == '.') {
-            s->value = fish_wcstod(s->next, const_cast<wchar_t **>(&s->next));
+            s->value = fish_wcstod_underscores(s->next, const_cast<wchar_t **>(&s->next));
             s->type = TOK_NUMBER;
         } else {
             /* Look for a function call. */
diff --git a/src/wutil.cpp b/src/wutil.cpp
index 55c8affef..ccacb24c4 100644
--- a/src/wutil.cpp
+++ b/src/wutil.cpp
@@ -18,9 +18,11 @@
 #include <unistd.h>
 #include <wctype.h>
 
+#include <algorithm>
 #include <atomic>
 #include <cstring>
 #include <cwchar>
+#include <iterator>
 #include <string>
 #include <unordered_map>
 
@@ -711,6 +713,63 @@ double fish_wcstod(const wchar_t *str, wchar_t **endptr) {
     return std::wcstod(str, endptr);
 }
 
+/// Like wcstod(), but allows underscore separators. Leading, trailing, and multiple underscores are
+/// allowed, as are underscores next to decimal (.), exponent (E/e/P/p), and hexadecimal (X/x)
+/// delimiters. This consumes trailing underscores -- endptr will point past the last underscore
+/// which is legal to include in a parse (according to the above rules). Free-floating leading
+/// underscores ("_ 3") are not allowed and will result in a no-parse. Underscores are not allowed
+/// before or inside of "infinity" or "nan" input. Trailing underscores after "infinity" or "nan"
+/// are not consumed.
+double fish_wcstod_underscores(const wchar_t *str, wchar_t **endptr) {
+    const wchar_t *orig = str;
+    while (iswspace(*str)) str++; // Skip leading whitespace.
+    size_t leading_whitespace = size_t(str - orig);
+    auto is_sign = [](wchar_t c) { return c == L'+' || c == L'-'; };
+    auto is_inf_or_nan_char = [](wchar_t c) {
+        return c == L'i' || c == L'I' || c == L'n' || c == L'N';
+    };
+    // We don't do any underscore-stripping for infinity/NaN.
+    if (is_inf_or_nan_char(*str) || (is_sign(*str) && is_inf_or_nan_char(*(str + 1)))) {
+        return fish_wcstod(orig, endptr);
+    }
+    // We build a string to pass to the system wcstod, pruned of underscores. We will take all
+    // leading alphanumeric characters that can appear in a strtod numeric literal, dots (.), and
+    // signs (+/-). In order to be more clever, for example to stop earlier in the case of strings
+    // like "123xxxxx", we would need to do a full parse, because sometimes 'a' is a hex digit and
+    // sometimes it is the end of the parse, sometimes a dot '.' is a decimal delimiter and
+    // sometimes it is the end of the valid parse, as in "1_2.3_4.5_6", etc.
+    wcstring pruned;
+    // We keep track of the positions *in the pruned string* where there used to be underscores. We
+    // will pass the pruned version of the input string to the system wcstod, which in turn will
+    // tell us how many characters it consumed. Then we will set our own endptr based on (1) the
+    // number of characters consumed from the pruned string, and (2) how many underscores came
+    // before the last consumed character. The alternative to doing it this way (for example, "only
+    // deleting the correct underscores") would require actually parsing the input string, so that
+    // we can know when to stop grabbing characters and dropping underscores, as in "1_2.3_4.5_6".
+    std::vector<size_t> underscores;
+    // If we wanted to future-proof against a strtod from the future that, say, allows octal
+    // literals using 0o, etc., we could just use iswalnum, instead of iswxdigit and P/p/X/x checks.
+    while (iswxdigit(*str) || *str == L'P' || *str == L'p' || *str == L'X' || *str == L'x' ||
+           is_sign(*str) || *str == L'.' || *str == L'_') {
+        if (*str == L'_') underscores.push_back(pruned.length());
+        else pruned.push_back(*str);
+        str++;
+    }
+    const wchar_t *pruned_begin = pruned.c_str();
+    const wchar_t *pruned_end = nullptr;
+    double result = fish_wcstod(pruned_begin, (wchar_t **)(&pruned_end));
+    if (pruned_end == pruned_begin) {
+        if (endptr) *endptr = (wchar_t *)orig;
+        return result;
+    }
+    auto consumed_underscores_end = std::upper_bound(underscores.begin(), underscores.end(),
+                                                     size_t(pruned_end - pruned_begin));
+    size_t num_underscores_consumed = std::distance(underscores.begin(), consumed_underscores_end);
+    if (endptr) *endptr = (wchar_t *)(orig + leading_whitespace + (pruned_end - pruned_begin)
+                                    + num_underscores_consumed);
+    return result;
+}
+
 file_id_t file_id_t::from_stat(const struct stat &buf) {
     file_id_t result = {};
     result.device = buf.st_dev;
diff --git a/src/wutil.h b/src/wutil.h
index 139f5c8aa..dcb7f8345 100644
--- a/src/wutil.h
+++ b/src/wutil.h
@@ -133,6 +133,7 @@ long long fish_wcstoll(const wchar_t *str, const wchar_t **endptr = nullptr, int
 unsigned long long fish_wcstoull(const wchar_t *str, const wchar_t **endptr = nullptr,
                                  int base = 10);
 double fish_wcstod(const wchar_t *str, wchar_t **endptr);
+double fish_wcstod_underscores(const wchar_t *str, wchar_t **endptr);
 
 /// Class for representing a file's inode. We use this to detect and avoid symlink loops, among
 /// other things. While an inode / dev pair is sufficient to distinguish co-existing files, Linux
diff --git a/tests/checks/math.fish b/tests/checks/math.fish
index ae3ba8680..455d0fac0 100644
--- a/tests/checks/math.fish
+++ b/tests/checks/math.fish
@@ -261,3 +261,24 @@ math pow 2 x cos'(-pi)', 2
 math 'ncr(0/0, 1)'
 # CHECKERR: math: Error: Result is infinite
 # CHECKERR: 'ncr(0/0, 1)'
+
+math 0_1
+# CHECK: 1
+math 0x0_A
+# CHECK: 10
+math 1_000 + 2_000
+# CHECK: 3000
+math 1_0_0_0
+# CHECK: 1000
+math 0_0.5_0 + 0_1.0_0
+# CHECK: 1.5
+math 2e0_0_2
+# CHECK: 200
+math -0_0.5_0_0E0_0_3
+# CHECK: -500
+math 20e-0_1
+# CHECK: 2
+math 0x0_2.0_0_0P0_2
+# CHECK: 8
+math -0x8p-0_3
+# CHECK: -1